aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/crepe/api/Event.h4
-rw-r--r--src/crepe/api/Script.cpp1
-rw-r--r--src/crepe/api/Script.h4
-rw-r--r--src/crepe/api/Script.hpp15
-rw-r--r--src/test/SceneManagerTest.cpp4
-rw-r--r--src/test/ScriptTest.cpp11
6 files changed, 20 insertions, 19 deletions
diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index ab4be2b..b267e3e 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -93,7 +93,7 @@ public:
/**
* \brief Event triggered during a collision between objects.
*/
-class CollisionEvent : public Event { };
+class CollisionEvent : public Event {};
/**
* \brief Event triggered when text is submitted, e.g., from a text input.
@@ -109,4 +109,4 @@ public:
*/
class ShutDownEvent : public Event {};
-}
+} // namespace crepe
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index d3fae07..0e73848 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -14,4 +14,3 @@ void Script::subscribe(const EventHandler<CollisionEvent> & callback) {
const game_object_id_t & game_object_id = *this->game_object_id_ref;
this->subscribe_internal(callback, game_object_id);
}
-
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 373b253..8356fd2 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -127,6 +127,7 @@ protected:
Script() = default;
//! Only \c BehaviorScript instantiates Script
friend class BehaviorScript;
+
public:
// std::unique_ptr destroys script
virtual ~Script();
@@ -180,7 +181,8 @@ private:
template <>
void Script::subscribe(const EventHandler<CollisionEvent> & callback);
template <>
-void Script::subscribe(const EventHandler<CollisionEvent> & callback, event_channel_t) = delete;
+void Script::subscribe(const EventHandler<CollisionEvent> & callback, event_channel_t)
+ = delete;
} // namespace crepe
diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp
index 8186bd4..e60be07 100644
--- a/src/crepe/api/Script.hpp
+++ b/src/crepe/api/Script.hpp
@@ -31,13 +31,16 @@ void Script::logf(Args &&... args) {
}
template <typename EventType>
-void Script::subscribe_internal(const EventHandler<EventType> & callback, event_channel_t channel) {
+void Script::subscribe_internal(const EventHandler<EventType> & callback,
+ event_channel_t channel) {
EventManager & mgr = *this->event_manager_ref;
- subscription_t listener = mgr.subscribe<EventType>([this, callback](const EventType & data) -> bool {
- bool & active = *this->active_ref;
- if (!active) return false;
- return callback(data);
- }, channel);
+ subscription_t listener = mgr.subscribe<EventType>(
+ [this, callback](const EventType & data) -> bool {
+ bool & active = *this->active_ref;
+ if (!active) return false;
+ return callback(data);
+ },
+ channel);
this->listeners.push_back(listener);
}
diff --git a/src/test/SceneManagerTest.cpp b/src/test/SceneManagerTest.cpp
index dab2ce9..1efcfb2 100644
--- a/src/test/SceneManagerTest.cpp
+++ b/src/test/SceneManagerTest.cpp
@@ -21,7 +21,7 @@ public:
GameObject object3 = mgr.new_object("scene_1", "tag_scene_1", Vector2{2, 0}, 0, 1);
}
- string get_name() const { return "scene1";}
+ string get_name() const { return "scene1"; }
};
class ConcreteScene2 : public Scene {
@@ -36,7 +36,7 @@ public:
GameObject object4 = mgr.new_object("scene_2", "tag_scene_2", Vector2{0, 3}, 0, 1);
}
- string get_name() const { return "scene2";}
+ string get_name() const { return "scene2"; }
};
class SceneManagerTest : public ::testing::Test {
diff --git a/src/test/ScriptTest.cpp b/src/test/ScriptTest.cpp
index 875c422..c35c3e2 100644
--- a/src/test/ScriptTest.cpp
+++ b/src/test/ScriptTest.cpp
@@ -6,18 +6,18 @@
#include <crepe/ComponentManager.h>
#include <crepe/api/BehaviorScript.h>
+#include <crepe/api/Event.h>
+#include <crepe/api/EventManager.h>
#include <crepe/api/GameObject.h>
#include <crepe/api/Script.h>
#include <crepe/api/Vector2.h>
-#include <crepe/api/Event.h>
-#include <crepe/api/EventManager.h>
#include <crepe/system/ScriptSystem.h>
using namespace std;
using namespace crepe;
using namespace testing;
-class MyEvent : public Event { };
+class MyEvent : public Event {};
class ScriptTest : public Test {
public:
@@ -39,9 +39,7 @@ public:
// init should never be called more than once
EXPECT_LE(this->init_count, 1);
}
- void update() {
- this->update_count++;
- }
+ void update() { this->update_count++; }
public:
unsigned init_count = 0;
@@ -125,4 +123,3 @@ TEST_F(ScriptTest, ListScripts) {
}
ASSERT_EQ(1, script_count);
}
-