merge conficts fixed

1 files changed, 17 insertions, 3 deletions

diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h
index 6cae579..6079a76 100644
--- a/src/crepe/api/Rigidbody.h
+++ b/src/crepe/api/Rigidbody.h
@@ -1,16 +1,30 @@
 #pragma once
 
+#include <cstdint>
+
 #include "../Component.h"
 
 namespace crepe::api {
 
+// FIXME: can't this enum be defined inside the class declaration of Rigidbody?
+enum class BodyType {
+	//! Does not move (e.g. walls, ground ...)
+	STATIC,
+	//! Moves and responds to forces (e.g. player, physics objects ...)
+	DYNAMIC,
+	//! Moves but does not respond to forces (e.g. moving platforms ...)
+	KINEMATIC,
+};
+
 class Rigidbody : public Component {
 public:
-	Rigidbody(int mass, int gravityScale, int bodyType);
-
+	Rigidbody(uint32_t game_object_id, int mass, int gravity_scale,
+			  BodyType body_type);
+	int32_t velocity_x;
+	int32_t velocity_y;
 	int mass;
 	int gravity_scale;
-	int body_type;
+	BodyType body_type;
 };
 
 } // namespace crepe::api