merge conficts fixed

1 files changed, 30 insertions, 0 deletions

diff --git a/src/example/physics.cpp b/src/example/physics.cpp
new file mode 100644
index 0000000..db69b9b
--- /dev/null
+++ b/src/example/physics.cpp
@@ -0,0 +1,30 @@
+#include "PhysicsSystem.h"
+#include <chrono>
+#include <crepe/Component.h>
+#include <crepe/ComponentManager.h>
+#include <crepe/api/Force.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/Rigidbody.h>
+#include <crepe/api/Transform.h>
+#include <iostream>
+#include <thread>
+
+using namespace crepe::api;
+using namespace crepe;
+using namespace std;
+
+int main(int argc, char * argv[]) {
+	PhysicsSystem physics_system;
+	GameObject * game_object[2];
+	game_object[1] = new GameObject(2, "Name", "Tag", 0); // not found not used
+	game_object[0] = new GameObject(5, "Name", "Tag", 0);
+	Point point = {
+		.x = 0,
+		.y = 0,
+	};
+	game_object[0]->add_component<Transform>(point, 0, 0);
+	game_object[0]->add_component<Rigidbody>(1, 1, BodyType::DYNAMIC);
+	game_object[0]->add_component<Force>(1, 0);
+	physics_system.update();
+	return 0;
+}