From 90c6bf03e59fdec64f850310bcbff45ae86f69e3 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 7 Dec 2024 14:18:54 +0100
Subject: more script utilities

---
 src/test/ScriptSceneTest.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/test/ScriptSceneTest.cpp')

diff --git a/src/test/ScriptSceneTest.cpp b/src/test/ScriptSceneTest.cpp
index 9ee1e52..8e849c1 100644
--- a/src/test/ScriptSceneTest.cpp
+++ b/src/test/ScriptSceneTest.cpp
@@ -18,7 +18,7 @@ public:
 	class MyScene : public Scene {};
 };
 
-TEST_F(ScriptSceneTest, Inactive) {
+TEST_F(ScriptSceneTest, Default) {
 	BehaviorScript & behaviorscript = this->behaviorscript;
 	MyScript & script = this->script;
 
@@ -28,3 +28,4 @@ TEST_F(ScriptSceneTest, Inactive) {
 	script.set_next_scene(non_default_value);
 	EXPECT_EQ(non_default_value, scene_manager.next_scene);
 }
+
-- 
cgit v1.2.3


From f3009ab8f0785a54d3fd83c0d758c8ebd901adda Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 7 Dec 2024 14:19:26 +0100
Subject: `make format`

---
 src/crepe/manager/ComponentManager.cpp | 11 ++++-------
 src/crepe/manager/ComponentManager.h   |  5 +++--
 src/crepe/manager/ComponentManager.hpp | 11 +++++++----
 src/test/ECSTest.cpp                   |  1 -
 src/test/ScriptECSTest.cpp             |  5 ++---
 src/test/ScriptSceneTest.cpp           |  1 -
 src/test/ScriptTest.cpp                |  1 -
 7 files changed, 16 insertions(+), 19 deletions(-)

(limited to 'src/test/ScriptSceneTest.cpp')

diff --git a/src/crepe/manager/ComponentManager.cpp b/src/crepe/manager/ComponentManager.cpp
index 44774d9..df30d27 100644
--- a/src/crepe/manager/ComponentManager.cpp
+++ b/src/crepe/manager/ComponentManager.cpp
@@ -64,14 +64,11 @@ void ComponentManager::set_persistent(game_object_id_t id, bool persistent) {
 }
 
 set<game_object_id_t> ComponentManager::get_objects_by_name(const string & name) const {
-	return this->get_objects_by_predicate<Metadata>([name](const Metadata & data) {
-		return data.name == name;
-	});
+	return this->get_objects_by_predicate<Metadata>(
+		[name](const Metadata & data) { return data.name == name; });
 }
 
 set<game_object_id_t> ComponentManager::get_objects_by_tag(const string & tag) const {
-	return this->get_objects_by_predicate<Metadata>([tag](const Metadata & data) {
-		return data.tag == tag;
-	});
+	return this->get_objects_by_predicate<Metadata>(
+		[tag](const Metadata & data) { return data.tag == tag; });
 }
-
diff --git a/src/crepe/manager/ComponentManager.h b/src/crepe/manager/ComponentManager.h
index 4e53954..685cae5 100644
--- a/src/crepe/manager/ComponentManager.h
+++ b/src/crepe/manager/ComponentManager.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <memory>
+#include <set>
 #include <typeindex>
 #include <unordered_map>
 #include <vector>
-#include <set>
 
 #include "../Component.h"
 #include "../types.h"
@@ -156,7 +156,8 @@ public:
 
 private:
 	template <typename T>
-	std::set<game_object_id_t> get_objects_by_predicate(const std::function<bool (const T &)> & pred) const;
+	std::set<game_object_id_t>
+	get_objects_by_predicate(const std::function<bool(const T &)> & pred) const;
 	template <typename T>
 	RefVector<T> get_components_by_ids(const std::set<game_object_id_t> & ids) const;
 
diff --git a/src/crepe/manager/ComponentManager.hpp b/src/crepe/manager/ComponentManager.hpp
index 52df368..9e70865 100644
--- a/src/crepe/manager/ComponentManager.hpp
+++ b/src/crepe/manager/ComponentManager.hpp
@@ -101,7 +101,8 @@ RefVector<T> ComponentManager::get_components_by_id(game_object_id_t id) const {
 	type_index type = typeid(T);
 	if (!this->components.contains(type)) return {};
 
-	const by_id_index<vector<unique_ptr<Component>>> & components_by_id = this->components.at(type);
+	const by_id_index<vector<unique_ptr<Component>>> & components_by_id
+		= this->components.at(type);
 	if (id >= components_by_id.size()) return {};
 
 	RefVector<T> out = {};
@@ -151,7 +152,8 @@ RefVector<T> ComponentManager::get_components_by_type() const {
 }
 
 template <typename T>
-std::set<game_object_id_t> ComponentManager::get_objects_by_predicate(const std::function<bool (const T &)> & pred) const {
+std::set<game_object_id_t>
+ComponentManager::get_objects_by_predicate(const std::function<bool(const T &)> & pred) const {
 	using namespace std;
 
 	set<game_object_id_t> objects = {};
@@ -168,9 +170,10 @@ std::set<game_object_id_t> ComponentManager::get_objects_by_predicate(const std:
 }
 
 template <typename T>
-RefVector<T> ComponentManager::get_components_by_ids(const std::set<game_object_id_t> & ids) const {
+RefVector<T>
+ComponentManager::get_components_by_ids(const std::set<game_object_id_t> & ids) const {
 	using namespace std;
-	
+
 	RefVector<T> out = {};
 	for (game_object_id_t id : ids) {
 		RefVector<T> components = get_components_by_id<T>(id);
diff --git a/src/test/ECSTest.cpp b/src/test/ECSTest.cpp
index ed5341e..af2b7b0 100644
--- a/src/test/ECSTest.cpp
+++ b/src/test/ECSTest.cpp
@@ -466,4 +466,3 @@ TEST_F(ECSTest, ComponentsByTag) {
 		EXPECT_EQ(objects.size(), 3);
 	}
 }
-
diff --git a/src/test/ScriptECSTest.cpp b/src/test/ScriptECSTest.cpp
index 4477e55..1ec33ba 100644
--- a/src/test/ScriptECSTest.cpp
+++ b/src/test/ScriptECSTest.cpp
@@ -4,8 +4,8 @@
 
 #include <crepe/api/BehaviorScript.h>
 #include <crepe/api/GameObject.h>
-#include <crepe/api/Script.h>
 #include <crepe/api/Metadata.h>
+#include <crepe/api/Script.h>
 #include <crepe/manager/ComponentManager.h>
 #include <crepe/system/ScriptSystem.h>
 
@@ -32,8 +32,7 @@ TEST_F(ScriptECSTest, GetOwnComponent) {
 TEST_F(ScriptECSTest, GetOwnComponents) {
 	const unsigned COUNT = 4;
 
-	for (unsigned i = 0; i < COUNT; i++)
-		entity.add_component<TestComponent>();
+	for (unsigned i = 0; i < COUNT; i++) entity.add_component<TestComponent>();
 
 	MyScript & script = this->script;
 	RefVector<TestComponent> components = script.get_components<TestComponent>();
diff --git a/src/test/ScriptSceneTest.cpp b/src/test/ScriptSceneTest.cpp
index 8e849c1..2568049 100644
--- a/src/test/ScriptSceneTest.cpp
+++ b/src/test/ScriptSceneTest.cpp
@@ -28,4 +28,3 @@ TEST_F(ScriptSceneTest, Default) {
 	script.set_next_scene(non_default_value);
 	EXPECT_EQ(non_default_value, scene_manager.next_scene);
 }
-
diff --git a/src/test/ScriptTest.cpp b/src/test/ScriptTest.cpp
index b0b2546..acdae70 100644
--- a/src/test/ScriptTest.cpp
+++ b/src/test/ScriptTest.cpp
@@ -73,4 +73,3 @@ TEST_F(ScriptTest, UpdateInactive) {
 		system.update();
 	}
 }
-
-- 
cgit v1.2.3