merge with master

1 files changed, 12 insertions, 14 deletions

diff --git a/src/example/ecs.cpp b/src/example/ecs.cpp
index e61c398..d5ba51b 100644
--- a/src/example/ecs.cpp
+++ b/src/example/ecs.cpp
@@ -9,13 +9,15 @@ using namespace crepe;
 using namespace std;
 
 int main() {
+	ComponentManager mgr{};
+
 	// Create a few GameObjects
 	try {
-		GameObject body(0, "body", "person", Vector2{0, 0}, 0, 1);
-		GameObject right_leg(1, "rightLeg", "person", Vector2{1, 1}, 0, 1);
-		GameObject left_leg(2, "leftLeg", "person", Vector2{1, 1}, 0, 1);
-		GameObject right_foot(3, "rightFoot", "person", Vector2{2, 2}, 0, 1);
-		GameObject left_foot(4, "leftFoot", "person", Vector2{2, 2}, 0, 1);
+		GameObject body = mgr.new_object("body", "person", Vector2{0, 0}, 0, 1);
+		GameObject right_leg = mgr.new_object("rightLeg", "person", Vector2{1, 1}, 0, 1);
+		GameObject left_leg = mgr.new_object("leftLeg", "person", Vector2{1, 1}, 0, 1);
+		GameObject right_foot = mgr.new_object("rightFoot", "person", Vector2{2, 2}, 0, 1);
+		GameObject left_foot = mgr.new_object("leftFoot", "person", Vector2{2, 2}, 0, 1);
 
 		// Set the parent of each GameObject
 		right_foot.set_parent(right_leg);
@@ -30,25 +32,21 @@ int main() {
 	}
 
 	// Get the Metadata and Transform components of each GameObject
-	ComponentManager & mgr = ComponentManager::get_instance();
-	vector<reference_wrapper<Metadata>> metadata
-		= mgr.get_components_by_type<Metadata>();
-	vector<reference_wrapper<Transform>> transform
-		= mgr.get_components_by_type<Transform>();
+	vector<reference_wrapper<Metadata>> metadata = mgr.get_components_by_type<Metadata>();
+	vector<reference_wrapper<Transform>> transform = mgr.get_components_by_type<Transform>();
 
 	// Print the Metadata and Transform components
 	for (auto & m : metadata) {
 		cout << "Id: " << m.get().game_object_id << " Name: " << m.get().name
-			 << " Tag: " << m.get().tag << " Parent: " << m.get().parent
-			 << " Children: ";
+			 << " Tag: " << m.get().tag << " Parent: " << m.get().parent << " Children: ";
 		for (auto & c : m.get().children) {
 			cout << c << " ";
 		}
 		cout << endl;
 	}
 	for (auto & t : transform) {
-		cout << "Id: " << t.get().game_object_id << " Position: ["
-			 << t.get().position.x << ", " << t.get().position.y << "]" << endl;
+		cout << "Id: " << t.get().game_object_id << " Position: [" << t.get().position.x
+			 << ", " << t.get().position.y << "]" << endl;
 	}
 
 	return 0;