diff options
| author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-13 19:22:23 +0100 | 
|---|---|---|
| committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-13 19:22:23 +0100 | 
| commit | d69f1642cb397d68d591718f83028e14620ab340 (patch) | |
| tree | 8f4294169949420710bb3c77f759ea7c0731a806 | |
| parent | 6c35bd16f254f687f2b415234e36b13f0f8897a8 (diff) | |
`make format`
| -rw-r--r-- | src/crepe/ComponentManager.cpp | 10 | ||||
| -rw-r--r-- | src/crepe/ComponentManager.h | 6 | ||||
| -rw-r--r-- | src/crepe/api/Scene.cpp | 4 | ||||
| -rw-r--r-- | src/example/ecs.cpp | 12 | ||||
| -rw-r--r-- | src/example/scene_manager.cpp | 22 | 
5 files changed, 33 insertions, 21 deletions
| diff --git a/src/crepe/ComponentManager.cpp b/src/crepe/ComponentManager.cpp index 1e23609..7af0380 100644 --- a/src/crepe/ComponentManager.cpp +++ b/src/crepe/ComponentManager.cpp @@ -25,11 +25,11 @@ void ComponentManager::delete_all_components() {  ComponentManager::ComponentManager() { dbg_trace(); }  ComponentManager::~ComponentManager() { dbg_trace(); } -GameObject ComponentManager::new_object(const string & name, -										  const string & tag, -										  const Vector2 & position, -										  double rotation, double scale) { -	GameObject object{*this, this->next_id, name, tag, position, rotation, scale}; +GameObject ComponentManager::new_object(const string & name, const string & tag, +										const Vector2 & position, +										double rotation, double scale) { +	GameObject object{*this,	this->next_id, name, tag, +					  position, rotation,	   scale};  	this->next_id++;  	return object;  } diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h index 31a8bfa..51c84a4 100644 --- a/src/crepe/ComponentManager.h +++ b/src/crepe/ComponentManager.h @@ -102,9 +102,9 @@ public:  	// TODO: doxygen  	GameObject new_object(const std::string & name, -							const std::string & tag = "", -							const Vector2 & position = {0, 0}, -							double rotation = 0, double scale = 0); +						  const std::string & tag = "", +						  const Vector2 & position = {0, 0}, +						  double rotation = 0, double scale = 0);  private:  	/** diff --git a/src/crepe/api/Scene.cpp b/src/crepe/api/Scene.cpp index 008d689..88aa82d 100644 --- a/src/crepe/api/Scene.cpp +++ b/src/crepe/api/Scene.cpp @@ -2,4 +2,6 @@  using namespace crepe; -Scene::Scene(ComponentManager & mgr, const std::string & name) : component_manager(mgr), name(name) {} +Scene::Scene(ComponentManager & mgr, const std::string & name) +	: component_manager(mgr), +	  name(name) {} diff --git a/src/example/ecs.cpp b/src/example/ecs.cpp index 06fc563..5f83da1 100644 --- a/src/example/ecs.cpp +++ b/src/example/ecs.cpp @@ -14,10 +14,14 @@ int main() {  	// Create a few GameObjects  	try {  		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); +		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); diff --git a/src/example/scene_manager.cpp b/src/example/scene_manager.cpp index 1c982aa..24ab72e 100644 --- a/src/example/scene_manager.cpp +++ b/src/example/scene_manager.cpp @@ -16,9 +16,12 @@ public:  	void load_scene() {  		auto & mgr = this->component_manager; -		GameObject object1 = mgr.new_object("scene_1", "tag_scene_1", Vector2{0, 0}, 0, 1); -		GameObject object2 = mgr.new_object("scene_1", "tag_scene_1", Vector2{1, 0}, 0, 1); -		GameObject object3 = mgr.new_object("scene_1", "tag_scene_1", Vector2{2, 0}, 0, 1); +		GameObject object1 +			= mgr.new_object("scene_1", "tag_scene_1", Vector2{0, 0}, 0, 1); +		GameObject object2 +			= mgr.new_object("scene_1", "tag_scene_1", Vector2{1, 0}, 0, 1); +		GameObject object3 +			= mgr.new_object("scene_1", "tag_scene_1", Vector2{2, 0}, 0, 1);  	}  }; @@ -28,10 +31,14 @@ public:  	void load_scene() {  		auto & mgr = this->component_manager; -		GameObject object1 = mgr.new_object("scene_2", "tag_scene_2", Vector2{0, 0}, 0, 1); -		GameObject object2 = mgr.new_object("scene_2", "tag_scene_2", Vector2{0, 1}, 0, 1); -		GameObject object3 = mgr.new_object("scene_2", "tag_scene_2", Vector2{0, 2}, 0, 1); -		GameObject object4 = mgr.new_object("scene_2", "tag_scene_2", Vector2{0, 3}, 0, 1); +		GameObject object1 +			= mgr.new_object("scene_2", "tag_scene_2", Vector2{0, 0}, 0, 1); +		GameObject object2 +			= mgr.new_object("scene_2", "tag_scene_2", Vector2{0, 1}, 0, 1); +		GameObject object3 +			= mgr.new_object("scene_2", "tag_scene_2", Vector2{0, 2}, 0, 1); +		GameObject object4 +			= mgr.new_object("scene_2", "tag_scene_2", Vector2{0, 3}, 0, 1);  	}  }; @@ -77,4 +84,3 @@ int main() {  	return 0;  } - |