aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-12-20 18:47:42 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-12-20 18:47:42 +0100
commitc998a97d6f7790469a63fe0c97911d1d36051905 (patch)
treec40d0b2fcb255ea0f35cd4e0386befa04c70e9ae
parent9032dda232e5d7e178b1d9e40ab37dd25973459c (diff)
`make format`
-rw-r--r--game/AquariumSubScene.cpp18
-rw-r--r--mwe/events/include/event.h2
-rw-r--r--src/crepe/manager/EventManager.h2
-rw-r--r--src/crepe/system/InputSystem.h6
4 files changed, 11 insertions, 17 deletions
diff --git a/game/AquariumSubScene.cpp b/game/AquariumSubScene.cpp
index f4b20f6..40e22b7 100644
--- a/game/AquariumSubScene.cpp
+++ b/game/AquariumSubScene.cpp
@@ -14,8 +14,7 @@ float AquariumSubScene::create(Scene & scn, float begin_x) {
GameObject aquarium_begin
= scn.new_object("aquarium_begin", "background", vec2(begin_x, 0));
- Asset aquarium_begin_asset{
- "asset/background/aquarium/glassTubeFG_1_TVOS.png"};
+ Asset aquarium_begin_asset{"asset/background/aquarium/glassTubeFG_1_TVOS.png"};
aquarium_begin.add_component<Sprite>(aquarium_begin_asset, Sprite::Data{
.sorting_in_layer = 4,
.order_in_layer = 0,
@@ -25,8 +24,7 @@ float AquariumSubScene::create(Scene & scn, float begin_x) {
GameObject aquarium_middle_1
= scn.new_object("aquarium_middle", "background", vec2(begin_x, 0));
- Asset aquarium_middle_1_asset{
- "asset/background/aquarium/glassTubeFG_3_TVOS.png"};
+ Asset aquarium_middle_1_asset{"asset/background/aquarium/glassTubeFG_3_TVOS.png"};
aquarium_middle_1.add_component<Sprite>(aquarium_middle_1_asset, Sprite::Data{
.sorting_in_layer = 4,
.order_in_layer = 2,
@@ -38,8 +36,7 @@ float AquariumSubScene::create(Scene & scn, float begin_x) {
GameObject aquarium_middle_2
= scn.new_object("aquarium_middle", "background", vec2(begin_x, 0));
- Asset aquarium_middle_2_asset{
- "asset/background/aquarium/glassTubeFG_3_TVOS.png"};
+ Asset aquarium_middle_2_asset{"asset/background/aquarium/glassTubeFG_3_TVOS.png"};
aquarium_middle_2.add_component<Sprite>(aquarium_middle_2_asset, Sprite::Data{
.sorting_in_layer = 4,
.order_in_layer = 3,
@@ -49,8 +46,7 @@ float AquariumSubScene::create(Scene & scn, float begin_x) {
GameObject aquarium_middle_3
= scn.new_object("aquarium_middle", "background", vec2(begin_x, 0));
- Asset aquarium_middle_3_asset{
- "asset/background/aquarium/glassTubeFG_3_TVOS.png"};
+ Asset aquarium_middle_3_asset{"asset/background/aquarium/glassTubeFG_3_TVOS.png"};
aquarium_middle_3.add_component<Sprite>(aquarium_middle_3_asset, Sprite::Data{
.sorting_in_layer = 4,
.order_in_layer = 4,
@@ -62,8 +58,7 @@ float AquariumSubScene::create(Scene & scn, float begin_x) {
GameObject aquarium_middle_4
= scn.new_object("aquarium_middle", "background", vec2(begin_x, 0));
- Asset aquarium_middle_4_asset{
- "asset/background/aquarium/glassTubeFG_3_TVOS.png"};
+ Asset aquarium_middle_4_asset{"asset/background/aquarium/glassTubeFG_3_TVOS.png"};
aquarium_middle_4.add_component<Sprite>(aquarium_middle_4_asset, Sprite::Data{
.sorting_in_layer = 4,
.order_in_layer = 5,
@@ -74,8 +69,7 @@ float AquariumSubScene::create(Scene & scn, float begin_x) {
this->add_background(scn, begin_x);
GameObject aquarium_end = scn.new_object("aquarium_end", "background", vec2(begin_x, 0));
- Asset aquarium_end_asset{
- "asset/background/aquarium/glassTubeFG_2_TVOS.png"};
+ Asset aquarium_end_asset{"asset/background/aquarium/glassTubeFG_2_TVOS.png"};
aquarium_end.add_component<Sprite>(aquarium_end_asset, Sprite::Data{
.sorting_in_layer = 4,
.order_in_layer = 1,
diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index e1b220b..ee1bf52 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -148,7 +148,7 @@ private:
};
class ShutDownEvent : public Event {
public:
- ShutDownEvent() : Event("ShutDownEvent"){};
+ ShutDownEvent() : Event("ShutDownEvent") {};
REGISTER_EVENT_TYPE(ShutDownEvent)
diff --git a/src/crepe/manager/EventManager.h b/src/crepe/manager/EventManager.h
index 930d950..0a57fb1 100644
--- a/src/crepe/manager/EventManager.h
+++ b/src/crepe/manager/EventManager.h
@@ -106,7 +106,7 @@ private:
* \brief Represents an entry in the event queue.
*/
struct QueueEntry {
- std::unique_ptr<Event, std::function<void(Event*)>> event; ///< The event instance.
+ std::unique_ptr<Event, std::function<void(Event *)>> event; ///< The event instance.
event_channel_t channel = CHANNEL_ALL; ///< The channel associated with the event.
std::type_index type; ///< The type of the event.
};
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 2cb80e5..45b238b 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -23,7 +23,7 @@ public:
/**
* \param metadata Metadata of the button pressed
*/
- ButtonPressEvent(const Metadata & metadata) : metadata(metadata){};
+ ButtonPressEvent(const Metadata & metadata) : metadata(metadata) {};
};
//! Event triggered when the mouse enters a button
class ButtonEnterEvent : public Event {
@@ -33,7 +33,7 @@ public:
/**
* \param metadata Metadata of the button pressed
*/
- ButtonEnterEvent(const Metadata & metadata) : metadata(metadata){};
+ ButtonEnterEvent(const Metadata & metadata) : metadata(metadata) {};
};
//! Event triggered when the mouse leaves a button
class ButtonExitEvent : public Event {
@@ -43,7 +43,7 @@ public:
/**
* \param metadata Metadata of the button pressed
*/
- ButtonExitEvent(const Metadata & metadata) : metadata(metadata){};
+ ButtonExitEvent(const Metadata & metadata) : metadata(metadata) {};
};
/**