wip rigidbody

Author: Kordeyrow

proj-BirdEngine/include/containers.h

@@ -10,14 +10,16 @@ struct Vector2 {
 	float x, y; 
 };
 struct Direction : public Vector2 { 
-public: 
+public:
+	Direction() = default;
 	Direction(float x = 0, float y = 0) : Vector2{ x, y } {}
 	Direction(int x = 0, int y = 0) : Vector2{ (float)x, (float)y } {}
 };
 struct Size : public Vector2 { 
 public: 
-	Size(float width = 0, float height = 0) : Vector2{ width, height } {}
-	Size(int width = 0, int height = 0) : Vector2{ (float)width, (float)height } {}
+	Size() = default;
+	Size(float width, float height) : Vector2{ width, height } {}
+	Size(int width, int height) : Vector2{ (float)width, (float)height } {}
 };
 struct Position : public Vector2 { 
 public: 
@@ -78,7 +80,7 @@ class Transform : public Component {
 	Size size;
 	float rotation = 0;
 
-	Transform(GameObjectID owner_id, Position pos, Size sz, float rot)
+	Transform(GameObjectID owner_id, Position pos, Size sz, float rot = 0)
 		: position(pos), size(sz), rotation(rot), Component { owner_id } {}
 
 	void set(int x) {
@@ -116,6 +118,37 @@ struct less_than_compare_key_RenderSystemComponent {
 	}
 };
 
+		class PhysicsSystemComponent : public Component {
+		public:
+			PhysicsSystemComponent(GameObjectID owner_id)
+				: Component{ owner_id } {}
+			virtual Transform* transform() = 0;
+		};
+
+		class Collider : public Component {
+		private:
+			Transform* _transform;
+			Size _size;
+		public:
+			Collider(GameObjectID owner_id, Transform* transform)
+				: Component{ owner_id }, _transform{ transform } {}
+			const Size& size() { return _size; }
+			Transform* transform() {
+				return _transform;
+			}
+		};
+
+		class Rigidbody : public PhysicsSystemComponent {
+			Vector2 velocity;
+		public:
+			Collider* _collider;
+			Rigidbody(GameObjectID owner_id, Transform* transform)
+				: PhysicsSystemComponent{ owner_id }, _collider{ new Collider{owner_id, transform} } {}
+			Collider* collider() {
+				return _collider;
+			}
+		};
+
 class Sprite : public RenderSystemComponent {
 public:
 	Transform* _transform;
@@ -139,7 +172,15 @@ class Sprite : public RenderSystemComponent {
 class GameObject { 
 private:
 	GameObjectID _id = next_id();
-	std::vector<Component*> _component_list = { new Transform {_id, Position{10, 10}, Size{10, 10}, 0} };
+	std::vector<Component*> _component_list = { 
+		new Transform {
+			_id,
+			Position{10, 10}, 
+			Size{10, 10}, 
+			0
+		}
+	};
+
 public:
 	const GameObjectID& id() { return _id; };
 	const std::vector<Component*>& component_list() { return _component_list; };
@@ -153,7 +194,7 @@ class GameObject {
 	T* add_component(Args&&... args) {
 		static_assert(std::is_base_of<Component, T>::value, "T must inherit Component");
 
-		// Check if a component of type T already exists and is unique
+		// Check if a component of type T already exists and should be unique
 		for (Component* comp : _component_list) {
 			T* t = dynamic_cast<T*>(comp);
 			if (t && t->unique_on_gameobject()) {

proj-BirdEngine/src/engine_core.cpp

@@ -57,19 +57,35 @@ namespace WING_API {
 
 namespace WING {
 
-    class PhysicsSystemComponent {
+    class RenderSystem {
+    private:
+        std::shared_ptr<DeviceInterface> _device_interface;
+    public:
+        RenderSystem(std::shared_ptr<DeviceInterface> device_interface_)
+            : _device_interface{ device_interface_ } {}
 
-    };
+        void update(std::vector<RenderSystemComponent*> comps) {
+
+            //_device_interface->renderer()->draw();
+
+            _device_interface->renderer()->draw_background();
 
-    class PhysicsSystem {
+            std::sort(comps.begin(), comps.end(), less_than_compare_key_RenderSystemComponent());
+            for (RenderSystemComponent* c : comps)
+            {
+                auto d = Drawable{ c->texture_id(), c->transform(), c->layer_index() };
+                _device_interface->renderer()->draw_drawable(d);
+            }
 
+            _device_interface->renderer()->apply_draw();
+        }
     };
 
-    class RenderSystem {
+    class PsysicsSystem {
     private:
         std::shared_ptr<DeviceInterface> _device_interface;
     public:
-        RenderSystem(std::shared_ptr<DeviceInterface> device_interface_)
+        PsysicsSystem(std::shared_ptr<DeviceInterface> device_interface_)
             : _device_interface{ device_interface_ } {}
 
         void update(std::vector<RenderSystemComponent*> comps) {
@@ -93,6 +109,7 @@ namespace WING {
     std::shared_ptr<WING::Registry> _registry = std::make_shared<WING::Registry>();
     bool initialized = false;
     bool game_initialized = false;
+    PsysicsSystem psysics_system;
     RenderSystem render_system{ _device_interface };
     Scene* current_scene = nullptr;
 

proj-FlappyBird/src/main.cpp

@@ -1,4 +1,4 @@
-#include <SDL.h>
+//#include <SDL.h>
 #include <wing.h>
 //#include <game/game.h> 
 #include <res_manager/texture_manager.h>
@@ -48,7 +48,7 @@ bool init() {
     Registry::set_start_scene(main_scene_id);
     pipe = Registry::create_new_gameobject();
     pipe->get_component<Transform>()->set(100, 100, 100, 100);
-    pipe->add_component<Sprite>(pipe->get_component<Transform>(), texture_manager.get_texture_id(TEXTURE_KEY::PIPE));
+    pipe->add_component<Sprite>(pipe->get_component<Transform>(), texture_manager.get_texture_id(TEXTURE_KEY::TEXTURE_FLAPPY_BIRD_UP_WING));
     Registry::add_gameobject_to_scene(pipe, main_scene_id);
 
 
@@ -61,8 +61,8 @@ void run_game() {
     //////////////program_state = BirdEngine::instance()->update();
 
     // Move
-    auto p = pipe->get_component<Transform>()->position;
-    pipe->get_component<Transform>()->set(p.x + 1, 100, 100, 100);
+    //auto p = pipe->get_component<Transform>()->position;
+    //pipe->get_component<Transform>()->set(p.x + 1, 100, 100, 100);
 
     Wing::run_game();
     // TEST