From 7e12ebdf945d40d6f11872cf5852c9bb54d1864f Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 22 Dec 2024 16:12:31 +0100
Subject: big WIP

---
 game/CMakeLists.txt            | 17 +++++-----
 game/Config.h                  | 11 ++++++
 game/GameScene.cpp             | 20 ++++++-----
 game/PlayerScript.cpp          | 11 ------
 game/PlayerScript.h            |  8 -----
 game/PlayerSubScene.cpp        | 76 ------------------------------------------
 game/PlayerSubScene.h          | 10 ------
 game/background/CMakeLists.txt |  9 +++++
 game/main.cpp                  |  3 ++
 game/prefab/CMakeLists.txt     |  5 +++
 game/prefab/PlayerObject.cpp   | 76 ++++++++++++++++++++++++++++++++++++++++++
 game/prefab/PlayerObject.h     | 30 +++++++++++++++++
 game/prefab/PlayerScript.cpp   | 26 +++++++++++++++
 game/prefab/PlayerScript.h     | 23 +++++++++++++
 game/prefab/ZapperObject.h     |  7 ++++
 15 files changed, 209 insertions(+), 123 deletions(-)
 delete mode 100644 game/PlayerScript.cpp
 delete mode 100644 game/PlayerScript.h
 delete mode 100644 game/PlayerSubScene.cpp
 delete mode 100644 game/PlayerSubScene.h
 create mode 100644 game/background/CMakeLists.txt
 create mode 100644 game/prefab/CMakeLists.txt
 create mode 100644 game/prefab/PlayerObject.cpp
 create mode 100644 game/prefab/PlayerObject.h
 create mode 100644 game/prefab/PlayerScript.cpp
 create mode 100644 game/prefab/PlayerScript.h
 create mode 100644 game/prefab/ZapperObject.h

(limited to 'game')

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 937b5e6..a149487 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -8,20 +8,19 @@ set(CMAKE_BUILD_TYPE Debug)
 project(game C CXX)
 
 add_subdirectory(../src crepe)
-add_executable(main
-	background/AquariumSubScene.cpp
-	background/BackgroundSubScene.cpp
-	background/ForestParallaxScript.cpp
-	background/ForestSubScene.cpp
+
+add_executable(main)
+
+target_sources(main PUBLIC
 	GameScene.cpp
-	background/HallwaySubScene.cpp
 	MoveCameraManualyScript.cpp
-	PlayerScript.cpp
-	PlayerSubScene.cpp
 	StartGameScript.cpp
-	background/StartSubScene.cpp
 	main.cpp
 )
 
+add_subdirectory(background)
+add_subdirectory(prefab)
+
 target_link_libraries(main PUBLIC crepe)
+target_include_directories(main PRIVATE .)
 
diff --git a/game/Config.h b/game/Config.h
index ec753df..350cd02 100644
--- a/game/Config.h
+++ b/game/Config.h
@@ -1,5 +1,16 @@
 #pragma once
 
+#include <crepe/api/Config.h>
+
+static const crepe::Config ENGINE_CONFIG {
+	.log {
+		.level = crepe::Log::Level::DEBUG,
+	},
+	.window_settings {
+		.window_title = "Jetpack joyride clone",
+	},
+};
+
 static constexpr int SORT_IN_LAY_BACK_BACKGROUND = 3; // For all scenes
 static constexpr int SORT_IN_LAY_BACKGROUND = 4; // For all scenes
 static constexpr int SORT_IN_LAY_FORE_BACKGROUND = 5; // For all scenes
diff --git a/game/GameScene.cpp b/game/GameScene.cpp
index 2511567..57c6531 100644
--- a/game/GameScene.cpp
+++ b/game/GameScene.cpp
@@ -1,11 +1,3 @@
-#include "GameScene.h"
-#include "Config.h"
-#include "MoveCameraManualyScript.h"
-#include "PlayerSubScene.h"
-#include "StartGameScript.h"
-
-#include "background/BackgroundSubScene.h"
-
 #include <cmath>
 #include <crepe/api/Animator.h>
 #include <crepe/api/Asset.h>
@@ -22,10 +14,20 @@
 #include <crepe/api/Transform.h>
 #include <crepe/types.h>
 
+#include "GameScene.h"
+#include "Config.h"
+#include "MoveCameraManualyScript.h"
+#include "StartGameScript.h"
+
+#include "background/BackgroundSubScene.h"
+#include "prefab/PlayerObject.h"
+
 using namespace crepe;
 using namespace std;
 
 void GameScene::load_scene() {
+	logf(Log::DEBUG, "Loading (main) GameScene...");
+
 	BackgroundSubScene background(*this);
 
 	GameObject camera = new_object("camera", "camera", vec2(650, 0));
@@ -38,7 +40,7 @@ void GameScene::load_scene() {
 	camera.add_component<BehaviorScript>().set_script<MoveCameraManualyScript>();
 	camera.add_component<Rigidbody>(Rigidbody::Data {});
 
-	PlayerSubScene player(*this);
+	PlayerObject player {new_object("player", "player", vec2(-100, 200))};
 
 	GameObject floor = new_object("floor", "game_world", vec2(0, 325));
 	floor.add_component<Rigidbody>(Rigidbody::Data {
diff --git a/game/PlayerScript.cpp b/game/PlayerScript.cpp
deleted file mode 100644
index 1c388f5..0000000
--- a/game/PlayerScript.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "PlayerScript.h"
-
-#include <crepe/api/Rigidbody.h>
-
-using namespace crepe;
-using namespace std;
-
-void PlayerScript::fixed_update(crepe::duration_t dt) {
-	Rigidbody & rb = this->get_components_by_name<Rigidbody>("player").front();
-	if (this->get_key_state(Keycode::SPACE)) rb.add_force_linear(vec2(0, -10));
-}
diff --git a/game/PlayerScript.h b/game/PlayerScript.h
deleted file mode 100644
index 84c4f7f..0000000
--- a/game/PlayerScript.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include <crepe/api/Script.h>
-
-class PlayerScript : public crepe::Script {
-public:
-	void fixed_update(crepe::duration_t dt);
-};
diff --git a/game/PlayerSubScene.cpp b/game/PlayerSubScene.cpp
deleted file mode 100644
index 00b7810..0000000
--- a/game/PlayerSubScene.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "PlayerSubScene.h"
-#include "Config.h"
-#include "PlayerScript.h"
-
-#include <crepe/api/Animator.h>
-#include <crepe/api/GameObject.h>
-#include <crepe/api/Scene.h>
-#include <crepe/api/Script.h>
-#include <crepe/api/Sprite.h>
-
-using namespace crepe;
-using namespace std;
-
-PlayerSubScene::PlayerSubScene(Scene & scn) {
-	GameObject player = scn.new_object("player", "player", vec2(-100, 200));
-	Asset player_body_asset {"asset/barry/defaultBody.png"};
-	Sprite & player_body_sprite = player.add_component<Sprite>(
-		player_body_asset,
-		Sprite::Data {
-			.sorting_in_layer = SORT_IN_LAY_PLAYER,
-			.order_in_layer = 0,
-			.size = vec2(0, 50),
-		}
-	);
-	player.add_component<Animator>(
-		player_body_sprite, ivec2(32, 32), uvec2(4, 8),
-		Animator::Data {
-			.fps = 5,
-			.looping = true,
-		}
-	);
-	Asset player_head_asset {"asset/barry/defaultHead.png"};
-	Sprite & player_head_sprite = player.add_component<Sprite>(
-		player_head_asset,
-		Sprite::Data {
-			.sorting_in_layer = SORT_IN_LAY_PLAYER,
-			.order_in_layer = 1,
-			.size = vec2(0, 50),
-			.position_offset = vec2(0, -20),
-		}
-	);
-	player.add_component<Animator>(
-		player_head_sprite, ivec2(32, 32), uvec2(4, 8),
-		Animator::Data {
-			.fps = 5,
-			.looping = true,
-		}
-	);
-	Asset player_jetpack_asset {"asset/barry/jetpackDefault.png"};
-	Sprite & player_jetpack_sprite = player.add_component<Sprite>(
-		player_jetpack_asset,
-		Sprite::Data {
-			.sorting_in_layer = SORT_IN_LAY_PLAYER,
-			.order_in_layer = 2,
-			.size = vec2(0, 60),
-			.position_offset = vec2(-20, 0),
-		}
-	);
-	player_jetpack_sprite.active = false;
-	player.add_component<Animator>(
-		player_jetpack_sprite, ivec2(32, 44), uvec2(4, 4),
-		Animator::Data {
-			.fps = 5,
-			.looping = true,
-		}
-	);
-	player.add_component<Rigidbody>(Rigidbody::Data {
-		.gravity_scale = 20,
-		.body_type = Rigidbody::BodyType::DYNAMIC,
-		.linear_velocity = vec2(100, 0),
-		.collision_layers = {COLL_LAY_BOT_TOP},
-		.collision_layer = COLL_LAY_PLAYER,
-	});
-	player.add_component<BoxCollider>(vec2(50, 50));
-	player.add_component<BehaviorScript>().set_script<PlayerScript>().active = false;
-}
diff --git a/game/PlayerSubScene.h b/game/PlayerSubScene.h
deleted file mode 100644
index bf94c32..0000000
--- a/game/PlayerSubScene.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-namespace crepe {
-class Scene;
-}
-
-class PlayerSubScene {
-public:
-	PlayerSubScene(crepe::Scene & scn);
-};
diff --git a/game/background/CMakeLists.txt b/game/background/CMakeLists.txt
new file mode 100644
index 0000000..1d705f5
--- /dev/null
+++ b/game/background/CMakeLists.txt
@@ -0,0 +1,9 @@
+target_sources(main PUBLIC
+	AquariumSubScene.cpp
+	BackgroundSubScene.cpp
+	ForestParallaxScript.cpp
+	ForestSubScene.cpp
+	HallwaySubScene.cpp
+	StartSubScene.cpp
+)
+
diff --git a/game/main.cpp b/game/main.cpp
index 325b66d..2198f73 100644
--- a/game/main.cpp
+++ b/game/main.cpp
@@ -1,11 +1,14 @@
 #include <crepe/api/Engine.h>
 #include <crepe/api/Script.h>
 
+#include "Config.h"
 #include "GameScene.h"
 
 using namespace crepe;
 
 int main() {
+	Config::get_instance() = ENGINE_CONFIG;
+
 	Engine gameloop;
 	gameloop.add_scene<GameScene>();
 
diff --git a/game/prefab/CMakeLists.txt b/game/prefab/CMakeLists.txt
new file mode 100644
index 0000000..a588090
--- /dev/null
+++ b/game/prefab/CMakeLists.txt
@@ -0,0 +1,5 @@
+target_sources(main PUBLIC
+	PlayerObject.cpp
+	PlayerScript.cpp
+)
+
diff --git a/game/prefab/PlayerObject.cpp b/game/prefab/PlayerObject.cpp
new file mode 100644
index 0000000..736704a
--- /dev/null
+++ b/game/prefab/PlayerObject.cpp
@@ -0,0 +1,76 @@
+#include <crepe/util/Log.h>
+
+#include "Config.h"
+#include "PlayerObject.h"
+#include "PlayerScript.h"
+
+using namespace crepe;
+
+PlayerObject::PlayerObject(crepe::GameObject && base)
+	: GameObject(std::move(base)),
+	  sprite {
+		  .body = add_component<Sprite>(
+			  Asset {"asset/barry/defaultBody.png"},
+			  Sprite::Data {
+				  .sorting_in_layer = SORT_IN_LAY_PLAYER,
+				  .order_in_layer = 0,
+				  .size = vec2(0, 50),
+			  }
+		  ),
+		  .head = add_component<Sprite>(
+			  Asset {"asset/barry/defaultHead.png"},
+			  Sprite::Data {
+				  .sorting_in_layer = SORT_IN_LAY_PLAYER,
+				  .order_in_layer = 1,
+				  .size = vec2(0, 50),
+				  .position_offset = vec2(0, -20),
+			  }
+		  ),
+		  .jetpack = add_component<Sprite>(
+			  Asset {"asset/barry/jetpackDefault.png"},
+			  Sprite::Data {
+				  .sorting_in_layer = SORT_IN_LAY_PLAYER,
+				  .order_in_layer = 2,
+				  .size = vec2(0, 60),
+				  .position_offset = vec2(-20, 0),
+			  }
+		  )
+	  },
+	  animator {
+		  .body = add_component<Animator>(
+			  sprite.body, ivec2(32, 32), uvec2(4, 8),
+			  Animator::Data {
+				  .fps = 5,
+				  .looping = true,
+			  }
+		  ),
+		  .head = add_component<Animator>(
+			  sprite.head, ivec2(32, 32), uvec2(4, 8),
+			  Animator::Data {
+				  .fps = 5,
+				  .looping = true,
+			  }
+		  ),
+		  .jetpack = add_component<Animator>(
+			  sprite.jetpack, ivec2(32, 44), uvec2(4, 4),
+			  Animator::Data {
+				  .fps = 5,
+				  .looping = true,
+			  }
+		  ),
+	  },
+	  body(add_component<Rigidbody>(Rigidbody::Data {
+		  .gravity_scale = 20,
+		  .body_type = Rigidbody::BodyType::DYNAMIC,
+		  .linear_velocity = vec2(100, 0),
+		  .collision_layers = {COLL_LAY_BOT_TOP},
+		  .collision_layer = COLL_LAY_PLAYER,
+	  })),
+	  collider(add_component<BoxCollider>(vec2(50, 50))),
+	  controller(add_component<BehaviorScript>().set_script<PlayerScript>(this)) {
+	sprite.jetpack.active = false;
+	// controller.active = false;
+
+	Log::logf(Log::DEBUG, "PlayerObject:     ref            {}", (void*) &(this->body.game_object_id));
+}
+
diff --git a/game/prefab/PlayerObject.h b/game/prefab/PlayerObject.h
new file mode 100644
index 0000000..a44d367
--- /dev/null
+++ b/game/prefab/PlayerObject.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <crepe/api/Animator.h>
+#include <crepe/api/BehaviorScript.h>
+#include <crepe/api/BoxCollider.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/Rigidbody.h>
+#include <crepe/api/Sprite.h>
+
+class PlayerObject : public crepe::GameObject {
+public:
+	PlayerObject(crepe::GameObject &&);
+
+public:
+	struct {
+		crepe::Sprite & body;
+		crepe::Sprite & head;
+		crepe::Sprite & jetpack;
+	} sprite;
+
+	struct {
+		crepe::Animator & body;
+		crepe::Animator & head;
+		crepe::Animator & jetpack;
+	} animator;
+
+	crepe::Rigidbody & body;
+	crepe::BoxCollider & collider;
+	crepe::BehaviorScript & controller;
+};
diff --git a/game/prefab/PlayerScript.cpp b/game/prefab/PlayerScript.cpp
new file mode 100644
index 0000000..e4a4951
--- /dev/null
+++ b/game/prefab/PlayerScript.cpp
@@ -0,0 +1,26 @@
+#include <crepe/api/Rigidbody.h>
+#include <cassert>
+
+#include "PlayerScript.h"
+
+using namespace crepe;
+using namespace std;
+
+PlayerScript::PlayerScript(PlayerObject * player) : player(player) {
+	logf(Log::DEBUG, "PlayerScript: [C] player         {}", (void*) &(*player));
+	logf(Log::DEBUG, "PlayerScript: [C] player.body    {}", (void*) &(player->body));
+	logf(Log::DEBUG, "PlayerScript: [C] player.body.id {}", (void*) &(player->body.game_object_id));
+}
+
+void PlayerScript::init() {
+	logf(Log::DEBUG, "PlayerScript: [C] player         {}", (void*) &(*player));
+	logf(Log::DEBUG, "PlayerScript: [C] player.body    {}", (void*) &(player->body));
+	logf(Log::DEBUG, "PlayerScript: [C] player.body.id {}", (void*) &(player->body.game_object_id));
+	player->controller.active = false;
+}
+
+void PlayerScript::fixed_update(crepe::duration_t dt) {
+	if (this->get_key_state(Keycode::SPACE))
+		player->body.add_force_linear({ 0, -10 });
+}
+
diff --git a/game/prefab/PlayerScript.h b/game/prefab/PlayerScript.h
new file mode 100644
index 0000000..bd4a00a
--- /dev/null
+++ b/game/prefab/PlayerScript.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <crepe/api/Script.h>
+
+#include "PlayerObject.h"
+
+class PlayerScript : public crepe::Script {
+public:
+	PlayerScript(PlayerObject * player);
+
+	PlayerScript(const PlayerScript &) = delete;
+	PlayerScript(PlayerScript &&) = delete;
+	PlayerScript & operator=(const PlayerScript &) = delete;
+	PlayerScript & operator=(PlayerScript &&) = delete;
+
+protected:
+	void fixed_update(crepe::duration_t dt);
+	void init();
+
+protected:
+	PlayerObject * player = nullptr;
+};
+
diff --git a/game/prefab/ZapperObject.h b/game/prefab/ZapperObject.h
new file mode 100644
index 0000000..1f32cd7
--- /dev/null
+++ b/game/prefab/ZapperObject.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include <crepe/api/GameObject.h>
+
+class ZapperObject : public crepe::GameObject {
+	// afsd
+};
-- 
cgit v1.2.3


From 0dae96161a99158815a8075b5c405a35b0939936 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 22 Dec 2024 17:26:27 +0100
Subject: fix Player prefab

---
 game/prefab/PlayerObject.cpp      |  8 ++------
 game/prefab/PlayerScript.cpp      | 15 ++-------------
 game/prefab/PlayerScript.h        | 10 ++--------
 src/crepe/api/GameObject.h        |  7 -------
 src/crepe/system/ScriptSystem.cpp |  8 +++++---
 5 files changed, 11 insertions(+), 37 deletions(-)

(limited to 'game')

diff --git a/game/prefab/PlayerObject.cpp b/game/prefab/PlayerObject.cpp
index 736704a..ef7b6cc 100644
--- a/game/prefab/PlayerObject.cpp
+++ b/game/prefab/PlayerObject.cpp
@@ -1,5 +1,3 @@
-#include <crepe/util/Log.h>
-
 #include "Config.h"
 #include "PlayerObject.h"
 #include "PlayerScript.h"
@@ -67,10 +65,8 @@ PlayerObject::PlayerObject(crepe::GameObject && base)
 		  .collision_layer = COLL_LAY_PLAYER,
 	  })),
 	  collider(add_component<BoxCollider>(vec2(50, 50))),
-	  controller(add_component<BehaviorScript>().set_script<PlayerScript>(this)) {
+	  controller(add_component<BehaviorScript>().set_script<PlayerScript>(*this)) {
 	sprite.jetpack.active = false;
-	// controller.active = false;
-
-	Log::logf(Log::DEBUG, "PlayerObject:     ref            {}", (void*) &(this->body.game_object_id));
+	controller.active = false;
 }
 
diff --git a/game/prefab/PlayerScript.cpp b/game/prefab/PlayerScript.cpp
index e4a4951..67aadb6 100644
--- a/game/prefab/PlayerScript.cpp
+++ b/game/prefab/PlayerScript.cpp
@@ -6,21 +6,10 @@
 using namespace crepe;
 using namespace std;
 
-PlayerScript::PlayerScript(PlayerObject * player) : player(player) {
-	logf(Log::DEBUG, "PlayerScript: [C] player         {}", (void*) &(*player));
-	logf(Log::DEBUG, "PlayerScript: [C] player.body    {}", (void*) &(player->body));
-	logf(Log::DEBUG, "PlayerScript: [C] player.body.id {}", (void*) &(player->body.game_object_id));
-}
-
-void PlayerScript::init() {
-	logf(Log::DEBUG, "PlayerScript: [C] player         {}", (void*) &(*player));
-	logf(Log::DEBUG, "PlayerScript: [C] player.body    {}", (void*) &(player->body));
-	logf(Log::DEBUG, "PlayerScript: [C] player.body.id {}", (void*) &(player->body.game_object_id));
-	player->controller.active = false;
-}
+PlayerScript::PlayerScript(const PlayerObject & player) : player(player) { }
 
 void PlayerScript::fixed_update(crepe::duration_t dt) {
 	if (this->get_key_state(Keycode::SPACE))
-		player->body.add_force_linear({ 0, -10 });
+		player.body.add_force_linear({ 0, -10 });
 }
 
diff --git a/game/prefab/PlayerScript.h b/game/prefab/PlayerScript.h
index bd4a00a..131c73f 100644
--- a/game/prefab/PlayerScript.h
+++ b/game/prefab/PlayerScript.h
@@ -6,18 +6,12 @@
 
 class PlayerScript : public crepe::Script {
 public:
-	PlayerScript(PlayerObject * player);
-
-	PlayerScript(const PlayerScript &) = delete;
-	PlayerScript(PlayerScript &&) = delete;
-	PlayerScript & operator=(const PlayerScript &) = delete;
-	PlayerScript & operator=(PlayerScript &&) = delete;
+	PlayerScript(const PlayerObject & player);
 
 protected:
 	void fixed_update(crepe::duration_t dt);
-	void init();
 
 protected:
-	PlayerObject * player = nullptr;
+	PlayerObject player;
 };
 
diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h
index c66da3d..043913a 100644
--- a/src/crepe/api/GameObject.h
+++ b/src/crepe/api/GameObject.h
@@ -37,13 +37,6 @@ private:
 	//! ComponentManager instances GameObject
 	friend class ComponentManager;
 
-protected:
-	GameObject(GameObject &&) = default;
-
-	GameObject(const GameObject &) = delete;
-	GameObject & operator=(const GameObject &) = delete;
-	GameObject & operator=(GameObject &&) = delete;
-
 public:
 	//! The id of the GameObject
 	const game_object_id_t id;
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 4cce42b..411a9a3 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -36,15 +36,17 @@ void ScriptSystem::update(
 				script->init();
 				script->initialized = true;
 			} catch (const exception & e) {
-				Log::logf(Log::Level::WARNING, "Uncaught exception in {} init: {}", behavior_script.name, e.what());
+				Log::logf(Log::Level::WARNING, "Disabled script \"{}\" due to exception in init function: {}", behavior_script.name, e.what());
+				behavior_script.active = false;
 			}
 		}
 
 		try {
 			(*script.*update_function)(delta_time);
 		} catch (const exception & e) {
-			// TODO: print if it is fixed/frame update
-			Log::logf(Log::Level::WARNING, "Uncaught exception in {}: {}", behavior_script.name, e.what());
+			// TODO: discern between fixed/frame update
+			Log::logf(Log::Level::WARNING, "Disabled script \"{}\" due to exception in update function: {}", behavior_script.name, e.what());
+			behavior_script.active = false;
 		}
 	}
 }
-- 
cgit v1.2.3


From a600cc55468a6513743ce916aa3da129270c23f0 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 22 Dec 2024 20:04:33 +0100
Subject: more WIP zapper

---
 game/GameScene.cpp                  |  5 ++-
 game/StartGameScript.cpp            |  2 +-
 game/background/HallwaySubScene.cpp |  7 +---
 game/prefab/CMakeLists.txt          |  2 +
 game/prefab/ZapperObject.cpp        | 84 +++++++++++++++++++++++++++++++++++++
 game/prefab/ZapperObject.h          | 32 +++++++++++++-
 game/prefab/ZapperScript.cpp        | 23 ++++++++++
 game/prefab/ZapperScript.h          | 18 ++++++++
 src/crepe/api/Animator.cpp          | 18 ++------
 src/crepe/api/Animator.h            | 21 ++++------
 src/crepe/api/BehaviorScript.h      |  2 +
 src/crepe/api/BehaviorScript.hpp    |  1 +
 src/crepe/api/Sprite.h              | 13 +++---
 src/crepe/system/AnimatorSystem.cpp | 36 ++++++++--------
 14 files changed, 204 insertions(+), 60 deletions(-)
 create mode 100644 game/prefab/ZapperObject.cpp
 create mode 100644 game/prefab/ZapperScript.cpp
 create mode 100644 game/prefab/ZapperScript.h

(limited to 'game')

diff --git a/game/GameScene.cpp b/game/GameScene.cpp
index 57c6531..90a8b58 100644
--- a/game/GameScene.cpp
+++ b/game/GameScene.cpp
@@ -21,6 +21,7 @@
 
 #include "background/BackgroundSubScene.h"
 #include "prefab/PlayerObject.h"
+#include "prefab/ZapperObject.h"
 
 using namespace crepe;
 using namespace std;
@@ -40,7 +41,7 @@ void GameScene::load_scene() {
 	camera.add_component<BehaviorScript>().set_script<MoveCameraManualyScript>();
 	camera.add_component<Rigidbody>(Rigidbody::Data {});
 
-	PlayerObject player {new_object("player", "player", vec2(-100, 200))};
+	PlayerObject {new_object("player", "player", vec2(-100, 200))};
 
 	GameObject floor = new_object("floor", "game_world", vec2(0, 325));
 	floor.add_component<Rigidbody>(Rigidbody::Data {
@@ -66,6 +67,8 @@ void GameScene::load_scene() {
 	});
 	ceiling.add_component<BoxCollider>(vec2(INFINITY, 200));
 
+	ZapperObject {new_object("zapper", "zapper", vec2(800, 0))};
+
 	GameObject start_game_script = new_object("start_game_script", "script", vec2(0, 0));
 	start_game_script.add_component<BehaviorScript>().set_script<StartGameScript>();
 }
diff --git a/game/StartGameScript.cpp b/game/StartGameScript.cpp
index 50ba86c..1196d47 100644
--- a/game/StartGameScript.cpp
+++ b/game/StartGameScript.cpp
@@ -40,7 +40,7 @@ void StartGameScript::fixed_update(crepe::duration_t dt) {
 	if (player_transform.position.x > 275 && !this->took_jetpack) {
 		Animator & jetpack_stand_anim
 			= this->get_components_by_name<Animator>("start_begin").back();
-		jetpack_stand_anim.next_anim();
+		// jetpack_stand_anim.next_anim();
 		Sprite & jetpack_sprite = this->get_components_by_name<Sprite>("player").back();
 		jetpack_sprite.active = true;
 
diff --git a/game/background/HallwaySubScene.cpp b/game/background/HallwaySubScene.cpp
index 4d96c94..9a6654a 100644
--- a/game/background/HallwaySubScene.cpp
+++ b/game/background/HallwaySubScene.cpp
@@ -153,11 +153,6 @@ void HallwaySubScene::add_sector_number(
 	Animator & sector_num_anim = obj.add_component<Animator>(
 		sector_num_sprite, ivec2(256, 128), uvec2(4, 4), Animator::Data {}
 	);
-	int column = (sector_num - 1) / 4;
-	int row = (sector_num - 1) % 4;
-	sector_num_anim.set_anim(column);
-	for (int i = 0; i < row; i++) {
-		sector_num_anim.next_anim();
-	}
+	sector_num_anim.data.frame++;
 	sector_num_anim.pause();
 }
diff --git a/game/prefab/CMakeLists.txt b/game/prefab/CMakeLists.txt
index a588090..03084e4 100644
--- a/game/prefab/CMakeLists.txt
+++ b/game/prefab/CMakeLists.txt
@@ -1,5 +1,7 @@
 target_sources(main PUBLIC
 	PlayerObject.cpp
 	PlayerScript.cpp
+	ZapperObject.cpp
+	ZapperScript.cpp
 )
 
diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
new file mode 100644
index 0000000..2791162
--- /dev/null
+++ b/game/prefab/ZapperObject.cpp
@@ -0,0 +1,84 @@
+#include "Config.h"
+#include "ZapperObject.h"
+#include "ZapperScript.h"
+
+using namespace crepe;
+
+ZapperObject::ZapperObject(crepe::GameObject && base)
+	: GameObject(std::move(base)),
+	  sprite {
+		  .orb_start = add_component<Sprite>(
+			  Asset {"asset/obstacles/zapper/orbAnim.png"},
+			  Sprite::Data {
+				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
+					.order_in_layer = 1,
+				  .size = vec2{0, 1} * SCALE,
+					.position_offset = {0, 100},
+			  }
+		  ),
+		  .orb_end = add_component<Sprite>(
+				sprite.orb_start.source,
+				Sprite::Data {
+					.flip = {true, true},
+					.sorting_in_layer = SORT_IN_LAY_OBSTACLES,
+					.order_in_layer = 1,
+				  .size = vec2{0, 1} * SCALE,
+					.position_offset = {0, -100},
+				}
+		  ),
+		  .glow_start = add_component<Sprite>(
+			  Asset {"asset/obstacles/zapper/regular_zappers/glow.png"},
+			  Sprite::Data {
+				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
+					.order_in_layer = -1,
+				  .size = vec2{2, 2} * SCALE,
+					.position_offset = {0, 100},
+			  }
+		  ),
+		  .glow_end = add_component<Sprite>(
+				sprite.glow_start.source,
+				Sprite::Data {
+					.flip = {true, true},
+					.sorting_in_layer = SORT_IN_LAY_OBSTACLES,
+					.order_in_layer = -1,
+				  .size = vec2{2, 2} * SCALE,
+					.position_offset = {0, -100},
+				}
+		  ),
+			.beam = add_component<Sprite>(
+			  Asset {"asset/obstacles/zapper/regular_zappers/zapEffect.png"},
+			  Sprite::Data {
+				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
+					.order_in_layer = 0,
+				  .size = vec2{200, 50},
+					.angle_offset = 90,
+			  }
+			),
+	  },
+	  animator {
+			.orb_start = add_component<Animator>(
+			  sprite.orb_start, ivec2(62, 42), uvec2(4, 1),
+			  Animator::Data {
+				  .fps = 10,
+				  .looping = true,
+			  }
+			),
+			.orb_end = add_component<Animator>(
+				sprite.orb_end, ivec2(62, 42), uvec2(4, 1),
+				animator.orb_start.data
+			),
+			.glow_start = add_component<Animator>(
+				sprite.glow_start, ivec2(128, 128), uvec2(4, 4),
+				Animator::Data {
+					.fps = 30,
+					.looping = true,
+				}
+			),
+			.glow_end = add_component<Animator>(
+				sprite.glow_end, ivec2(128, 128), uvec2(4, 4),
+				animator.glow_start.data
+			),
+	  },
+	  controller(add_component<BehaviorScript>().set_script<ZapperScript>(*this))
+{ }
+
diff --git a/game/prefab/ZapperObject.h b/game/prefab/ZapperObject.h
index 1f32cd7..6b68146 100644
--- a/game/prefab/ZapperObject.h
+++ b/game/prefab/ZapperObject.h
@@ -1,7 +1,37 @@
 #pragma once
 
+#include <crepe/api/Animator.h>
+#include <crepe/api/BehaviorScript.h>
+#include <crepe/api/BoxCollider.h>
 #include <crepe/api/GameObject.h>
+#include <crepe/api/Rigidbody.h>
+#include <crepe/api/Sprite.h>
 
 class ZapperObject : public crepe::GameObject {
-	// afsd
+public:
+	ZapperObject(crepe::GameObject &&);
+
+public:
+	struct {
+		crepe::Sprite & orb_start;
+		crepe::Sprite & orb_end;
+		crepe::Sprite & glow_start;
+		crepe::Sprite & glow_end;
+		crepe::Sprite & beam;
+	} sprite;
+
+	struct {
+		crepe::Animator & orb_start;
+		crepe::Animator & orb_end;
+		crepe::Animator & glow_start;
+		crepe::Animator & glow_end;
+	} animator;
+
+	// crepe::Rigidbody & body;
+	// crepe::BoxCollider & collider;
+	crepe::BehaviorScript & controller;
+
+private:
+	static constexpr int SCALE = 60;
 };
+
diff --git a/game/prefab/ZapperScript.cpp b/game/prefab/ZapperScript.cpp
new file mode 100644
index 0000000..b9b24be
--- /dev/null
+++ b/game/prefab/ZapperScript.cpp
@@ -0,0 +1,23 @@
+#include <crepe/api/Rigidbody.h>
+#include <cassert>
+
+#include "ZapperScript.h"
+
+using namespace crepe;
+using namespace std;
+
+ZapperScript::ZapperScript(const ZapperObject & zapper) : zapper(zapper) { }
+
+void ZapperScript::init() {
+	zapper.sprite.beam.mask = {
+		.w = 350,
+		.h = 117,
+		.x = 0,
+		.y = 0,
+	};
+}
+
+void ZapperScript::frame_update(duration_t delta_time) {
+	zapper.sprite.beam.mask.x += 4;
+}
+
diff --git a/game/prefab/ZapperScript.h b/game/prefab/ZapperScript.h
new file mode 100644
index 0000000..5a960df
--- /dev/null
+++ b/game/prefab/ZapperScript.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <crepe/api/Script.h>
+
+#include "ZapperObject.h"
+
+class ZapperScript : public crepe::Script {
+public:
+	ZapperScript(const ZapperObject & zapper);
+
+protected:
+	void init();
+	void frame_update(crepe::duration_t delta_time);
+
+protected:
+	ZapperObject zapper;
+};
+
diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index c558d86..5ac0617 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -36,24 +36,12 @@ void Animator::pause() { this->active = false; }
 
 void Animator::stop() {
 	this->active = false;
-	this->data.col = 0;
-	this->data.row = 0;
+	this->data.frame = this->data.cycle_start;
 }
 void Animator::set_fps(int fps) { this->data.fps = fps; }
 
 void Animator::set_cycle_range(int start, int end) {
-	this->data.cycle_start = start, this->data.cycle_end = end;
+	this->data.cycle_start = start;
+	this->data.cycle_end = end;
 }
 
-void Animator::set_anim(int col) {
-	Animator::Data & ctx = this->data;
-	this->spritesheet.mask.x = ctx.row = 0;
-	ctx.col = col;
-	this->spritesheet.mask.y = ctx.col * this->spritesheet.mask.h;
-}
-
-void Animator::next_anim() {
-	Animator::Data & ctx = this->data;
-	ctx.row = ++ctx.row % this->grid_size.x;
-	this->spritesheet.mask.x = ctx.row * this->spritesheet.mask.w;
-}
diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h
index 102894d..8be693e 100644
--- a/src/crepe/api/Animator.h
+++ b/src/crepe/api/Animator.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../types.h"
+#include "../manager/LoopTimerManager.h"
 
 #include "Component.h"
 #include "Sprite.h"
@@ -22,16 +23,15 @@ public:
 	struct Data {
 		//! frames per second for animation
 		unsigned int fps = 1;
-		//! The current col being animated.
-		unsigned int col = 0;
-		//! The current row being animated.
-		unsigned int row = 0;
+		//! The current frame being shown
+		unsigned int frame = 0;
+
 		//! should the animation loop
 		bool looping = false;
 		//! starting frame for cycling
 		unsigned int cycle_start = 0;
 		//! end frame for cycling (-1 = use last frame)
-		int cycle_end = -1;
+		unsigned int cycle_end = -1;
 	};
 
 public:
@@ -60,14 +60,6 @@ public:
 	 * \param end of row animation
 	 */
 	void set_cycle_range(int start, int end);
-	/**
-	 * \brief select which column to animate from
-	 *
-	 * \param col animation column
-	 */
-	void set_anim(int col);
-	//! will go to the next animaiton of current row
-	void next_anim();
 
 public:
 	/**
@@ -101,6 +93,9 @@ private:
 
 	//! Uses the spritesheet
 	friend AnimatorSystem;
+
+	//! Elasped time since last frame change
+	duration_t elapsed;
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index 3909b96..52cf259 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -48,6 +48,8 @@ public:
 	BehaviorScript & set_script(Args &&... args);
 
 protected:
+	//! Script type name
+	std::string name = "unknown script";
 	//! Script instance
 	std::unique_ptr<Script> script = nullptr;
 	//! ScriptSystem needs direct access to the script instance
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index 353d5e2..218f27c 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -11,6 +11,7 @@ template <class T, typename... Args>
 BehaviorScript & BehaviorScript::set_script(Args &&... args) {
 	static_assert(std::is_base_of<Script, T>::value);
 	this->script = std::unique_ptr<Script>(new T(std::forward<Args>(args)...));
+	this->name = typeid(T).name();
 
 	this->script->game_object_id = this->game_object_id;
 	this->script->active = this->active;
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index a3fc319..ef65f64 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -110,15 +110,16 @@ private:
 	 */
 	float aspect_ratio = 0;
 
-	struct Rect {
-		int w = 0;
-		int h = 0;
-		int x = 0;
-		int y = 0;
+public:
+	struct Mask {
+		unsigned w = 0;
+		unsigned h = 0;
+		unsigned x = 0;
+		unsigned y = 0;
 	};
 	//! Render area of the sprite this will also be adjusted by the AnimatorSystem if an Animator
 	// object is present in GameObject. this is in sprite pixels
-	Rect mask;
+	Mask mask;
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index e5ab2fa..467d2a2 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -13,28 +13,30 @@ void AnimatorSystem::frame_update() {
 	LoopTimerManager & timer = this->mediator.loop_timer;
 	RefVector<Animator> animations = mgr.get_components_by_type<Animator>();
 
-	float elapsed_time = duration_cast<duration<float>>(timer.get_elapsed_time()).count();
+	duration_t elapsed = timer.get_delta_time();
 
-	for (Animator & a : animations) {
-		if (!a.active) continue;
-		if (a.data.fps == 0) continue;
+	for (Animator & animator : animations) {
+		if (!animator.active) continue;
 
-		Animator::Data & ctx = a.data;
-		float frame_duration = 1.0f / ctx.fps;
+		Animator::Data & data = animator.data;
+		if (animator.data.fps == 0) continue;
 
-		int last_frame = ctx.row;
+		if (animator.data.cycle_end == -1)
+			animator.data.cycle_end = animator.grid_size.x * animator.grid_size.y;
 
-		int cycle_end = (ctx.cycle_end == -1) ? a.grid_size.x : ctx.cycle_end;
-		int total_frames = cycle_end - ctx.cycle_start;
+		animator.elapsed += elapsed;
+		duration_t frame_duration = 1000ms / animator.data.fps;
 
-		int curr_frame = static_cast<int>(elapsed_time / frame_duration) % total_frames;
-
-		ctx.row = ctx.cycle_start + curr_frame;
-		a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w;
-		a.spritesheet.mask.y = (ctx.col * a.spritesheet.mask.h);
-
-		if (!ctx.looping && curr_frame == ctx.cycle_start && last_frame == total_frames - 1) {
-			a.active = false;
+		if (animator.elapsed > frame_duration) {
+			animator.elapsed = 0ms;
+			animator.data.frame++;
+			
+			if (animator.data.looping && animator.data.frame >= animator.data.cycle_end)
+				animator.data.frame = animator.data.cycle_start;
 		}
+
+		Sprite::Mask & mask = animator.spritesheet.mask;
+		mask.x = animator.data.frame % animator.grid_size.x * mask.w;
+		mask.y = animator.data.frame / animator.grid_size.x * mask.h;
 	}
 }
-- 
cgit v1.2.3


From ec69f40540317215d0f30e1f8e43d0e18450f8cc Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 22 Dec 2024 20:05:02 +0100
Subject: `make format`

---
 game/GameScene.cpp                  |  2 +-
 game/prefab/PlayerObject.cpp        |  3 +-
 game/prefab/PlayerScript.cpp        |  8 ++--
 game/prefab/PlayerScript.h          |  1 -
 game/prefab/ZapperObject.cpp        | 92 ++++++++++++++++++-------------------
 game/prefab/ZapperObject.h          |  1 -
 game/prefab/ZapperScript.cpp        |  9 ++--
 game/prefab/ZapperScript.h          |  1 -
 src/crepe/api/Animator.cpp          |  1 -
 src/crepe/api/Animator.h            |  2 +-
 src/crepe/api/Engine.cpp            |  3 +-
 src/crepe/facade/SignalCatch.cpp    |  9 +---
 src/crepe/facade/SignalCatch.h      |  3 +-
 src/crepe/manager/SystemManager.cpp | 10 +++-
 src/crepe/manager/SystemManager.hpp |  2 +-
 src/crepe/system/AnimatorSystem.cpp |  2 +-
 src/crepe/system/ScriptSystem.cpp   | 12 ++++-
 17 files changed, 77 insertions(+), 84 deletions(-)

(limited to 'game')

diff --git a/game/GameScene.cpp b/game/GameScene.cpp
index 90a8b58..b287763 100644
--- a/game/GameScene.cpp
+++ b/game/GameScene.cpp
@@ -14,8 +14,8 @@
 #include <crepe/api/Transform.h>
 #include <crepe/types.h>
 
-#include "GameScene.h"
 #include "Config.h"
+#include "GameScene.h"
 #include "MoveCameraManualyScript.h"
 #include "StartGameScript.h"
 
diff --git a/game/prefab/PlayerObject.cpp b/game/prefab/PlayerObject.cpp
index ef7b6cc..2d48bf8 100644
--- a/game/prefab/PlayerObject.cpp
+++ b/game/prefab/PlayerObject.cpp
@@ -1,5 +1,5 @@
-#include "Config.h"
 #include "PlayerObject.h"
+#include "Config.h"
 #include "PlayerScript.h"
 
 using namespace crepe;
@@ -69,4 +69,3 @@ PlayerObject::PlayerObject(crepe::GameObject && base)
 	sprite.jetpack.active = false;
 	controller.active = false;
 }
-
diff --git a/game/prefab/PlayerScript.cpp b/game/prefab/PlayerScript.cpp
index 67aadb6..3d06476 100644
--- a/game/prefab/PlayerScript.cpp
+++ b/game/prefab/PlayerScript.cpp
@@ -1,15 +1,13 @@
-#include <crepe/api/Rigidbody.h>
 #include <cassert>
+#include <crepe/api/Rigidbody.h>
 
 #include "PlayerScript.h"
 
 using namespace crepe;
 using namespace std;
 
-PlayerScript::PlayerScript(const PlayerObject & player) : player(player) { }
+PlayerScript::PlayerScript(const PlayerObject & player) : player(player) {}
 
 void PlayerScript::fixed_update(crepe::duration_t dt) {
-	if (this->get_key_state(Keycode::SPACE))
-		player.body.add_force_linear({ 0, -10 });
+	if (this->get_key_state(Keycode::SPACE)) player.body.add_force_linear({0, -10});
 }
-
diff --git a/game/prefab/PlayerScript.h b/game/prefab/PlayerScript.h
index 131c73f..cc0f0aa 100644
--- a/game/prefab/PlayerScript.h
+++ b/game/prefab/PlayerScript.h
@@ -14,4 +14,3 @@ protected:
 protected:
 	PlayerObject player;
 };
-
diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
index 2791162..b848f18 100644
--- a/game/prefab/ZapperObject.cpp
+++ b/game/prefab/ZapperObject.cpp
@@ -1,5 +1,5 @@
-#include "Config.h"
 #include "ZapperObject.h"
+#include "Config.h"
 #include "ZapperScript.h"
 
 using namespace crepe;
@@ -11,74 +11,70 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 			  Asset {"asset/obstacles/zapper/orbAnim.png"},
 			  Sprite::Data {
 				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
-					.order_in_layer = 1,
-				  .size = vec2{0, 1} * SCALE,
-					.position_offset = {0, 100},
+				  .order_in_layer = 1,
+				  .size = vec2 {0, 1} * SCALE,
+				  .position_offset = {0, 100},
 			  }
 		  ),
 		  .orb_end = add_component<Sprite>(
-				sprite.orb_start.source,
-				Sprite::Data {
-					.flip = {true, true},
-					.sorting_in_layer = SORT_IN_LAY_OBSTACLES,
-					.order_in_layer = 1,
-				  .size = vec2{0, 1} * SCALE,
-					.position_offset = {0, -100},
-				}
+			  sprite.orb_start.source,
+			  Sprite::Data {
+				  .flip = {true, true},
+				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
+				  .order_in_layer = 1,
+				  .size = vec2 {0, 1} * SCALE,
+				  .position_offset = {0, -100},
+			  }
 		  ),
 		  .glow_start = add_component<Sprite>(
 			  Asset {"asset/obstacles/zapper/regular_zappers/glow.png"},
 			  Sprite::Data {
 				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
-					.order_in_layer = -1,
-				  .size = vec2{2, 2} * SCALE,
-					.position_offset = {0, 100},
+				  .order_in_layer = -1,
+				  .size = vec2 {2, 2} * SCALE,
+				  .position_offset = {0, 100},
 			  }
 		  ),
 		  .glow_end = add_component<Sprite>(
-				sprite.glow_start.source,
-				Sprite::Data {
-					.flip = {true, true},
-					.sorting_in_layer = SORT_IN_LAY_OBSTACLES,
-					.order_in_layer = -1,
-				  .size = vec2{2, 2} * SCALE,
-					.position_offset = {0, -100},
-				}
+			  sprite.glow_start.source,
+			  Sprite::Data {
+				  .flip = {true, true},
+				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
+				  .order_in_layer = -1,
+				  .size = vec2 {2, 2} * SCALE,
+				  .position_offset = {0, -100},
+			  }
 		  ),
-			.beam = add_component<Sprite>(
+		  .beam = add_component<Sprite>(
 			  Asset {"asset/obstacles/zapper/regular_zappers/zapEffect.png"},
 			  Sprite::Data {
 				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
-					.order_in_layer = 0,
-				  .size = vec2{200, 50},
-					.angle_offset = 90,
+				  .order_in_layer = 0,
+				  .size = vec2 {200, 50},
+				  .angle_offset = 90,
 			  }
-			),
+		  ),
 	  },
 	  animator {
-			.orb_start = add_component<Animator>(
+		  .orb_start = add_component<Animator>(
 			  sprite.orb_start, ivec2(62, 42), uvec2(4, 1),
 			  Animator::Data {
 				  .fps = 10,
 				  .looping = true,
 			  }
-			),
-			.orb_end = add_component<Animator>(
-				sprite.orb_end, ivec2(62, 42), uvec2(4, 1),
-				animator.orb_start.data
-			),
-			.glow_start = add_component<Animator>(
-				sprite.glow_start, ivec2(128, 128), uvec2(4, 4),
-				Animator::Data {
-					.fps = 30,
-					.looping = true,
-				}
-			),
-			.glow_end = add_component<Animator>(
-				sprite.glow_end, ivec2(128, 128), uvec2(4, 4),
-				animator.glow_start.data
-			),
+		  ),
+		  .orb_end = add_component<Animator>(
+			  sprite.orb_end, ivec2(62, 42), uvec2(4, 1), animator.orb_start.data
+		  ),
+		  .glow_start = add_component<Animator>(
+			  sprite.glow_start, ivec2(128, 128), uvec2(4, 4),
+			  Animator::Data {
+				  .fps = 30,
+				  .looping = true,
+			  }
+		  ),
+		  .glow_end = add_component<Animator>(
+			  sprite.glow_end, ivec2(128, 128), uvec2(4, 4), animator.glow_start.data
+		  ),
 	  },
-	  controller(add_component<BehaviorScript>().set_script<ZapperScript>(*this))
-{ }
-
+	  controller(add_component<BehaviorScript>().set_script<ZapperScript>(*this)) {}
diff --git a/game/prefab/ZapperObject.h b/game/prefab/ZapperObject.h
index 6b68146..151e368 100644
--- a/game/prefab/ZapperObject.h
+++ b/game/prefab/ZapperObject.h
@@ -34,4 +34,3 @@ public:
 private:
 	static constexpr int SCALE = 60;
 };
-
diff --git a/game/prefab/ZapperScript.cpp b/game/prefab/ZapperScript.cpp
index b9b24be..01eb7aa 100644
--- a/game/prefab/ZapperScript.cpp
+++ b/game/prefab/ZapperScript.cpp
@@ -1,12 +1,12 @@
-#include <crepe/api/Rigidbody.h>
 #include <cassert>
+#include <crepe/api/Rigidbody.h>
 
 #include "ZapperScript.h"
 
 using namespace crepe;
 using namespace std;
 
-ZapperScript::ZapperScript(const ZapperObject & zapper) : zapper(zapper) { }
+ZapperScript::ZapperScript(const ZapperObject & zapper) : zapper(zapper) {}
 
 void ZapperScript::init() {
 	zapper.sprite.beam.mask = {
@@ -17,7 +17,4 @@ void ZapperScript::init() {
 	};
 }
 
-void ZapperScript::frame_update(duration_t delta_time) {
-	zapper.sprite.beam.mask.x += 4;
-}
-
+void ZapperScript::frame_update(duration_t delta_time) { zapper.sprite.beam.mask.x += 4; }
diff --git a/game/prefab/ZapperScript.h b/game/prefab/ZapperScript.h
index 5a960df..b090c8d 100644
--- a/game/prefab/ZapperScript.h
+++ b/game/prefab/ZapperScript.h
@@ -15,4 +15,3 @@ protected:
 protected:
 	ZapperObject zapper;
 };
-
diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index 5ac0617..f6f2654 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -44,4 +44,3 @@ void Animator::set_cycle_range(int start, int end) {
 	this->data.cycle_start = start;
 	this->data.cycle_end = end;
 }
-
diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h
index 8be693e..bcf6379 100644
--- a/src/crepe/api/Animator.h
+++ b/src/crepe/api/Animator.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../types.h"
 #include "../manager/LoopTimerManager.h"
+#include "../types.h"
 
 #include "Component.h"
 #include "Sprite.h"
diff --git a/src/crepe/api/Engine.cpp b/src/crepe/api/Engine.cpp
index bf3f50c..8766aea 100644
--- a/src/crepe/api/Engine.cpp
+++ b/src/crepe/api/Engine.cpp
@@ -1,7 +1,7 @@
 #include <segvcatch.h>
 
-#include "../util/Log.h"
 #include "../facade/SignalCatch.h"
+#include "../util/Log.h"
 
 #include "Engine.h"
 
@@ -77,4 +77,3 @@ void Engine::frame_update() {
 	this->system_manager.frame_update();
 	this->loop_timer.enforce_frame_rate();
 }
-
diff --git a/src/crepe/facade/SignalCatch.cpp b/src/crepe/facade/SignalCatch.cpp
index ad92d28..4988047 100644
--- a/src/crepe/facade/SignalCatch.cpp
+++ b/src/crepe/facade/SignalCatch.cpp
@@ -15,11 +15,6 @@ SignalCatch::~SignalCatch() {
 	segvcatch::init_fpe();
 }
 
-void SignalCatch::segv() {
-	throw runtime_error("segmentation fault");
-}
-
-void SignalCatch::fpe() {
-	throw domain_error("floating point exception");
-}
+void SignalCatch::segv() { throw runtime_error("segmentation fault"); }
 
+void SignalCatch::fpe() { throw domain_error("floating point exception"); }
diff --git a/src/crepe/facade/SignalCatch.h b/src/crepe/facade/SignalCatch.h
index 4562215..cf86b56 100644
--- a/src/crepe/facade/SignalCatch.h
+++ b/src/crepe/facade/SignalCatch.h
@@ -20,5 +20,4 @@ public:
 	SignalCatch & operator=(SignalCatch &&) = delete;
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/manager/SystemManager.cpp b/src/crepe/manager/SystemManager.cpp
index c8f4f3d..fea59aa 100644
--- a/src/crepe/manager/SystemManager.cpp
+++ b/src/crepe/manager/SystemManager.cpp
@@ -37,7 +37,10 @@ void SystemManager::fixed_update() noexcept {
 		try {
 			entry.system.fixed_update();
 		} catch (const exception & e) {
-			Log::logf(Log::Level::WARNING, "Uncaught exception in {} fixed update: {}", entry.name, e.what());
+			Log::logf(
+				Log::Level::WARNING, "Uncaught exception in {} fixed update: {}", entry.name,
+				e.what()
+			);
 		}
 	}
 }
@@ -48,7 +51,10 @@ void SystemManager::frame_update() noexcept {
 		try {
 			entry.system.frame_update();
 		} catch (const exception & e) {
-			Log::logf(Log::Level::WARNING, "Uncaught exception in {} frame update: {}", entry.name, e.what());
+			Log::logf(
+				Log::Level::WARNING, "Uncaught exception in {} frame update: {}", entry.name,
+				e.what()
+			);
 		}
 	}
 }
diff --git a/src/crepe/manager/SystemManager.hpp b/src/crepe/manager/SystemManager.hpp
index a4c11e3..a19a253 100644
--- a/src/crepe/manager/SystemManager.hpp
+++ b/src/crepe/manager/SystemManager.hpp
@@ -38,7 +38,7 @@ void SystemManager::load_system() {
 		throw runtime_error(format("SystemManager: {} is already initialized", type.name()));
 	System * system = new T(this->mediator);
 	this->systems[type] = unique_ptr<System>(system);
-	this->system_order.push_back(SystemEntry{
+	this->system_order.push_back(SystemEntry {
 		.system = *this->systems[type],
 		.name = type.name(),
 	});
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index 467d2a2..6c93372 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -30,7 +30,7 @@ void AnimatorSystem::frame_update() {
 		if (animator.elapsed > frame_duration) {
 			animator.elapsed = 0ms;
 			animator.data.frame++;
-			
+
 			if (animator.data.looping && animator.data.frame >= animator.data.cycle_end)
 				animator.data.frame = animator.data.cycle_start;
 		}
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 411a9a3..f1e31f9 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -36,7 +36,11 @@ void ScriptSystem::update(
 				script->init();
 				script->initialized = true;
 			} catch (const exception & e) {
-				Log::logf(Log::Level::WARNING, "Disabled script \"{}\" due to exception in init function: {}", behavior_script.name, e.what());
+				Log::logf(
+					Log::Level::WARNING,
+					"Disabled script \"{}\" due to exception in init function: {}",
+					behavior_script.name, e.what()
+				);
 				behavior_script.active = false;
 			}
 		}
@@ -45,7 +49,11 @@ void ScriptSystem::update(
 			(*script.*update_function)(delta_time);
 		} catch (const exception & e) {
 			// TODO: discern between fixed/frame update
-			Log::logf(Log::Level::WARNING, "Disabled script \"{}\" due to exception in update function: {}", behavior_script.name, e.what());
+			Log::logf(
+				Log::Level::WARNING,
+				"Disabled script \"{}\" due to exception in update function: {}",
+				behavior_script.name, e.what()
+			);
 			behavior_script.active = false;
 		}
 	}
-- 
cgit v1.2.3


From d4f443070017c5c2e6a938bf4d0a86b70ae6beaa Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Mon, 6 Jan 2025 10:26:03 +0100
Subject: revert Animator

---
 game/StartGameScript.cpp            |  2 +-
 game/background/HallwaySubScene.cpp |  7 ++++++-
 src/crepe/api/Animator.cpp          | 19 ++++++++++++++++---
 src/crepe/api/Animator.h            | 21 +++++++++++++--------
 src/crepe/api/Sprite.h              | 13 ++++++-------
 src/crepe/system/AnimatorSystem.cpp | 34 ++++++++++++++++------------------
 6 files changed, 58 insertions(+), 38 deletions(-)

(limited to 'game')

diff --git a/game/StartGameScript.cpp b/game/StartGameScript.cpp
index 1196d47..50ba86c 100644
--- a/game/StartGameScript.cpp
+++ b/game/StartGameScript.cpp
@@ -40,7 +40,7 @@ void StartGameScript::fixed_update(crepe::duration_t dt) {
 	if (player_transform.position.x > 275 && !this->took_jetpack) {
 		Animator & jetpack_stand_anim
 			= this->get_components_by_name<Animator>("start_begin").back();
-		// jetpack_stand_anim.next_anim();
+		jetpack_stand_anim.next_anim();
 		Sprite & jetpack_sprite = this->get_components_by_name<Sprite>("player").back();
 		jetpack_sprite.active = true;
 
diff --git a/game/background/HallwaySubScene.cpp b/game/background/HallwaySubScene.cpp
index 9a6654a..4d96c94 100644
--- a/game/background/HallwaySubScene.cpp
+++ b/game/background/HallwaySubScene.cpp
@@ -153,6 +153,11 @@ void HallwaySubScene::add_sector_number(
 	Animator & sector_num_anim = obj.add_component<Animator>(
 		sector_num_sprite, ivec2(256, 128), uvec2(4, 4), Animator::Data {}
 	);
-	sector_num_anim.data.frame++;
+	int column = (sector_num - 1) / 4;
+	int row = (sector_num - 1) % 4;
+	sector_num_anim.set_anim(column);
+	for (int i = 0; i < row; i++) {
+		sector_num_anim.next_anim();
+	}
 	sector_num_anim.pause();
 }
diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index f6f2654..c558d86 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -36,11 +36,24 @@ void Animator::pause() { this->active = false; }
 
 void Animator::stop() {
 	this->active = false;
-	this->data.frame = this->data.cycle_start;
+	this->data.col = 0;
+	this->data.row = 0;
 }
 void Animator::set_fps(int fps) { this->data.fps = fps; }
 
 void Animator::set_cycle_range(int start, int end) {
-	this->data.cycle_start = start;
-	this->data.cycle_end = end;
+	this->data.cycle_start = start, this->data.cycle_end = end;
+}
+
+void Animator::set_anim(int col) {
+	Animator::Data & ctx = this->data;
+	this->spritesheet.mask.x = ctx.row = 0;
+	ctx.col = col;
+	this->spritesheet.mask.y = ctx.col * this->spritesheet.mask.h;
+}
+
+void Animator::next_anim() {
+	Animator::Data & ctx = this->data;
+	ctx.row = ++ctx.row % this->grid_size.x;
+	this->spritesheet.mask.x = ctx.row * this->spritesheet.mask.w;
 }
diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h
index bcf6379..102894d 100644
--- a/src/crepe/api/Animator.h
+++ b/src/crepe/api/Animator.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "../manager/LoopTimerManager.h"
 #include "../types.h"
 
 #include "Component.h"
@@ -23,15 +22,16 @@ public:
 	struct Data {
 		//! frames per second for animation
 		unsigned int fps = 1;
-		//! The current frame being shown
-		unsigned int frame = 0;
-
+		//! The current col being animated.
+		unsigned int col = 0;
+		//! The current row being animated.
+		unsigned int row = 0;
 		//! should the animation loop
 		bool looping = false;
 		//! starting frame for cycling
 		unsigned int cycle_start = 0;
 		//! end frame for cycling (-1 = use last frame)
-		unsigned int cycle_end = -1;
+		int cycle_end = -1;
 	};
 
 public:
@@ -60,6 +60,14 @@ public:
 	 * \param end of row animation
 	 */
 	void set_cycle_range(int start, int end);
+	/**
+	 * \brief select which column to animate from
+	 *
+	 * \param col animation column
+	 */
+	void set_anim(int col);
+	//! will go to the next animaiton of current row
+	void next_anim();
 
 public:
 	/**
@@ -93,9 +101,6 @@ private:
 
 	//! Uses the spritesheet
 	friend AnimatorSystem;
-
-	//! Elasped time since last frame change
-	duration_t elapsed;
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index ef65f64..a3fc319 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -110,16 +110,15 @@ private:
 	 */
 	float aspect_ratio = 0;
 
-public:
-	struct Mask {
-		unsigned w = 0;
-		unsigned h = 0;
-		unsigned x = 0;
-		unsigned y = 0;
+	struct Rect {
+		int w = 0;
+		int h = 0;
+		int x = 0;
+		int y = 0;
 	};
 	//! Render area of the sprite this will also be adjusted by the AnimatorSystem if an Animator
 	// object is present in GameObject. this is in sprite pixels
-	Mask mask;
+	Rect mask;
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index 6c93372..e5ab2fa 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -13,30 +13,28 @@ void AnimatorSystem::frame_update() {
 	LoopTimerManager & timer = this->mediator.loop_timer;
 	RefVector<Animator> animations = mgr.get_components_by_type<Animator>();
 
-	duration_t elapsed = timer.get_delta_time();
+	float elapsed_time = duration_cast<duration<float>>(timer.get_elapsed_time()).count();
 
-	for (Animator & animator : animations) {
-		if (!animator.active) continue;
+	for (Animator & a : animations) {
+		if (!a.active) continue;
+		if (a.data.fps == 0) continue;
 
-		Animator::Data & data = animator.data;
-		if (animator.data.fps == 0) continue;
+		Animator::Data & ctx = a.data;
+		float frame_duration = 1.0f / ctx.fps;
 
-		if (animator.data.cycle_end == -1)
-			animator.data.cycle_end = animator.grid_size.x * animator.grid_size.y;
+		int last_frame = ctx.row;
 
-		animator.elapsed += elapsed;
-		duration_t frame_duration = 1000ms / animator.data.fps;
+		int cycle_end = (ctx.cycle_end == -1) ? a.grid_size.x : ctx.cycle_end;
+		int total_frames = cycle_end - ctx.cycle_start;
 
-		if (animator.elapsed > frame_duration) {
-			animator.elapsed = 0ms;
-			animator.data.frame++;
+		int curr_frame = static_cast<int>(elapsed_time / frame_duration) % total_frames;
 
-			if (animator.data.looping && animator.data.frame >= animator.data.cycle_end)
-				animator.data.frame = animator.data.cycle_start;
-		}
+		ctx.row = ctx.cycle_start + curr_frame;
+		a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w;
+		a.spritesheet.mask.y = (ctx.col * a.spritesheet.mask.h);
 
-		Sprite::Mask & mask = animator.spritesheet.mask;
-		mask.x = animator.data.frame % animator.grid_size.x * mask.w;
-		mask.y = animator.data.frame / animator.grid_size.x * mask.h;
+		if (!ctx.looping && curr_frame == ctx.cycle_start && last_frame == total_frames - 1) {
+			a.active = false;
+		}
 	}
 }
-- 
cgit v1.2.3


From 7126db6e1d97b7ede4cc929abfdeadd360e4cb74 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Mon, 6 Jan 2025 11:58:27 +0100
Subject: WIP

---
 game/prefab/CMakeLists.txt   |  1 -
 game/prefab/ZapperObject.cpp |  8 +++-----
 game/prefab/ZapperObject.h   |  2 --
 game/prefab/ZapperScript.cpp | 20 --------------------
 game/prefab/ZapperScript.h   | 17 -----------------
 game/util/scrollgen          | 36 ++++++++++++++++++++++++++++++++++++
 6 files changed, 39 insertions(+), 45 deletions(-)
 delete mode 100644 game/prefab/ZapperScript.cpp
 delete mode 100644 game/prefab/ZapperScript.h
 create mode 100755 game/util/scrollgen

(limited to 'game')

diff --git a/game/prefab/CMakeLists.txt b/game/prefab/CMakeLists.txt
index 03084e4..5585a32 100644
--- a/game/prefab/CMakeLists.txt
+++ b/game/prefab/CMakeLists.txt
@@ -2,6 +2,5 @@ target_sources(main PUBLIC
 	PlayerObject.cpp
 	PlayerScript.cpp
 	ZapperObject.cpp
-	ZapperScript.cpp
 )
 
diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
index b848f18..e63a5f2 100644
--- a/game/prefab/ZapperObject.cpp
+++ b/game/prefab/ZapperObject.cpp
@@ -1,6 +1,5 @@
 #include "ZapperObject.h"
 #include "Config.h"
-#include "ZapperScript.h"
 
 using namespace crepe;
 
@@ -67,14 +66,13 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 			  sprite.orb_end, ivec2(62, 42), uvec2(4, 1), animator.orb_start.data
 		  ),
 		  .glow_start = add_component<Animator>(
-			  sprite.glow_start, ivec2(128, 128), uvec2(4, 4),
+			  sprite.glow_start, ivec2(128, 128), uvec2(16, 1),
 			  Animator::Data {
 				  .fps = 30,
 				  .looping = true,
 			  }
 		  ),
 		  .glow_end = add_component<Animator>(
-			  sprite.glow_end, ivec2(128, 128), uvec2(4, 4), animator.glow_start.data
+			  sprite.glow_end, ivec2(128, 128), uvec2(16, 1), animator.glow_start.data
 		  ),
-	  },
-	  controller(add_component<BehaviorScript>().set_script<ZapperScript>(*this)) {}
+	  } {}
diff --git a/game/prefab/ZapperObject.h b/game/prefab/ZapperObject.h
index 151e368..cc2d37c 100644
--- a/game/prefab/ZapperObject.h
+++ b/game/prefab/ZapperObject.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <crepe/api/Animator.h>
-#include <crepe/api/BehaviorScript.h>
 #include <crepe/api/BoxCollider.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Rigidbody.h>
@@ -29,7 +28,6 @@ public:
 
 	// crepe::Rigidbody & body;
 	// crepe::BoxCollider & collider;
-	crepe::BehaviorScript & controller;
 
 private:
 	static constexpr int SCALE = 60;
diff --git a/game/prefab/ZapperScript.cpp b/game/prefab/ZapperScript.cpp
deleted file mode 100644
index 01eb7aa..0000000
--- a/game/prefab/ZapperScript.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <cassert>
-#include <crepe/api/Rigidbody.h>
-
-#include "ZapperScript.h"
-
-using namespace crepe;
-using namespace std;
-
-ZapperScript::ZapperScript(const ZapperObject & zapper) : zapper(zapper) {}
-
-void ZapperScript::init() {
-	zapper.sprite.beam.mask = {
-		.w = 350,
-		.h = 117,
-		.x = 0,
-		.y = 0,
-	};
-}
-
-void ZapperScript::frame_update(duration_t delta_time) { zapper.sprite.beam.mask.x += 4; }
diff --git a/game/prefab/ZapperScript.h b/game/prefab/ZapperScript.h
deleted file mode 100644
index b090c8d..0000000
--- a/game/prefab/ZapperScript.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <crepe/api/Script.h>
-
-#include "ZapperObject.h"
-
-class ZapperScript : public crepe::Script {
-public:
-	ZapperScript(const ZapperObject & zapper);
-
-protected:
-	void init();
-	void frame_update(crepe::duration_t delta_time);
-
-protected:
-	ZapperObject zapper;
-};
diff --git a/game/util/scrollgen b/game/util/scrollgen
new file mode 100755
index 0000000..0389107
--- /dev/null
+++ b/game/util/scrollgen
@@ -0,0 +1,36 @@
+#!/bin/sh
+INPUT="$1"
+FRAMES="$2"
+
+die() {
+	echo "$@"
+	exit 1
+}
+check_command() {
+	cmd="$1"
+	command -v "$cmd" > /dev/null || die "command '$cmd' not found"
+}
+
+check_command magick
+check_command identify
+[ "$#" -eq 2 ] || die "usage: $0 <input image> <frame count>"
+[ -e "$INPUT" ] || die "file not found: $INPUT"
+[ "$FRAMES" -gt 0 ] || die "invalid frame count: $FRAMES"
+
+tile_width=$(identify -format "%w" "$INPUT")
+tile_height=$(identify -format "%h" "$INPUT")
+
+OUTPUT="$INPUT.scroll.png"
+magick -size "${tile_width}x$(( $tile_height * $FRAMES ))" 'xc:#ff00ff00' "$OUTPUT"
+
+for i in $(seq 0 $(( $FRAMES - 1 ))); do
+	offset_x=$(( $tile_width * $i / $FRAMES ))
+	offset_y=$(( i * $tile_height ))
+
+	magick "$OUTPUT" "$INPUT" -geometry "+${offset_x}+${offset_y}" -composite "$OUTPUT"
+	magick "$OUTPUT" "$INPUT" -geometry "+$(( $offset_x - $tile_width ))+${offset_y}" -composite "$OUTPUT"
+	echo "+${offset_x}+${offset_y}"
+done
+
+# magick -size ${total_width}x${sprite_height} xc:none canvas.png
+
-- 
cgit v1.2.3


From 8620f57f7101b2090add89330e74854b77161d3f Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Mon, 6 Jan 2025 13:18:40 +0100
Subject: place zapper method

---
 game/prefab/ZapperObject.cpp | 35 +++++++++++++++++++++++++----------
 game/prefab/ZapperObject.h   |  5 ++++-
 src/crepe/api/Vector2.h      | 39 +++++++++++++++++++++------------------
 src/crepe/api/Vector2.hpp    | 10 ++++++++++
 src/test/Vector2Test.cpp     | 10 ++++++++++
 5 files changed, 70 insertions(+), 29 deletions(-)

(limited to 'game')

diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
index e63a5f2..fcc6467 100644
--- a/game/prefab/ZapperObject.cpp
+++ b/game/prefab/ZapperObject.cpp
@@ -1,3 +1,5 @@
+#include <crepe/api/Transform.h>
+
 #include "ZapperObject.h"
 #include "Config.h"
 
@@ -11,8 +13,7 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 			  Sprite::Data {
 				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
 				  .order_in_layer = 1,
-				  .size = vec2 {0, 1} * SCALE,
-				  .position_offset = {0, 100},
+				  .size = vec2(0, 42) * SCALE,
 			  }
 		  ),
 		  .orb_end = add_component<Sprite>(
@@ -21,8 +22,7 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 				  .flip = {true, true},
 				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
 				  .order_in_layer = 1,
-				  .size = vec2 {0, 1} * SCALE,
-				  .position_offset = {0, -100},
+				  .size = vec2(0, 42) * SCALE,
 			  }
 		  ),
 		  .glow_start = add_component<Sprite>(
@@ -30,8 +30,7 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 			  Sprite::Data {
 				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
 				  .order_in_layer = -1,
-				  .size = vec2 {2, 2} * SCALE,
-				  .position_offset = {0, 100},
+				  .size = vec2(128, 128) * SCALE,
 			  }
 		  ),
 		  .glow_end = add_component<Sprite>(
@@ -40,8 +39,7 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 				  .flip = {true, true},
 				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
 				  .order_in_layer = -1,
-				  .size = vec2 {2, 2} * SCALE,
-				  .position_offset = {0, -100},
+				  .size = vec2(128, 128) * SCALE,
 			  }
 		  ),
 		  .beam = add_component<Sprite>(
@@ -49,7 +47,7 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 			  Sprite::Data {
 				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
 				  .order_in_layer = 0,
-				  .size = vec2 {200, 50},
+				  .size = vec2(0, 40 * SCALE),
 				  .angle_offset = 90,
 			  }
 		  ),
@@ -75,4 +73,21 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 		  .glow_end = add_component<Animator>(
 			  sprite.glow_end, ivec2(128, 128), uvec2(16, 1), animator.glow_start.data
 		  ),
-	  } {}
+		} {
+			this->place(this->transform.position, 0, 300);
+		}
+
+void ZapperObject::place(const crepe::vec2 & position, float rotation, float length) {
+	this->transform.position = position;
+	this->transform.rotation = rotation;
+
+	vec2 offset = vec2(0, 1) * length / 2;
+
+	this->sprite.orb_start.data.position_offset = offset;
+	this->sprite.glow_start.data.position_offset = offset;
+	this->sprite.orb_end.data.position_offset = -offset;
+	this->sprite.glow_end.data.position_offset = -offset;
+
+	this->sprite.beam.data.size.x = length;
+}
+
diff --git a/game/prefab/ZapperObject.h b/game/prefab/ZapperObject.h
index cc2d37c..b4bb942 100644
--- a/game/prefab/ZapperObject.h
+++ b/game/prefab/ZapperObject.h
@@ -30,5 +30,8 @@ public:
 	// crepe::BoxCollider & collider;
 
 private:
-	static constexpr int SCALE = 60;
+	static constexpr float SCALE = 0.8;
+
+public:
+	void place(const crepe::vec2 & position, float rotation, float length);
 };
diff --git a/src/crepe/api/Vector2.h b/src/crepe/api/Vector2.h
index 52e1bb6..0f46964 100644
--- a/src/crepe/api/Vector2.h
+++ b/src/crepe/api/Vector2.h
@@ -11,55 +11,55 @@ struct Vector2 {
 	T y = 0;
 
 	//! Subtracts another vector from this vector and returns the result.
-	Vector2 operator-(const Vector2<T> & other) const;
+	Vector2<T> operator-(const Vector2<T> & other) const;
 
 	//! Subtracts a scalar value from both components of this vector and returns the result.
-	Vector2 operator-(T scalar) const;
+	Vector2<T> operator-(T scalar) const;
 
 	//! Adds another vector to this vector and returns the result.
-	Vector2 operator+(const Vector2<T> & other) const;
+	Vector2<T> operator+(const Vector2<T> & other) const;
 
 	//! Adds a scalar value to both components of this vector and returns the result.
-	Vector2 operator+(T scalar) const;
+	Vector2<T> operator+(T scalar) const;
 
 	//! Multiplies this vector by another vector element-wise and returns the result.
-	Vector2 operator*(const Vector2<T> & other) const;
+	Vector2<T> operator*(const Vector2<T> & other) const;
 
 	//! Multiplies this vector by a scalar and returns the result.
-	Vector2 operator*(T scalar) const;
+	Vector2<T> operator*(T scalar) const;
 
 	//! Divides this vector by another vector element-wise and returns the result.
-	Vector2 operator/(const Vector2<T> & other) const;
+	Vector2<T> operator/(const Vector2<T> & other) const;
 
 	//! Divides this vector by a scalar and returns the result.
-	Vector2 operator/(T scalar) const;
+	Vector2<T> operator/(T scalar) const;
 
 	//! Adds another vector to this vector and updates this vector.
-	Vector2 & operator+=(const Vector2<T> & other);
+	Vector2<T> & operator+=(const Vector2<T> & other);
 
 	//! Adds a scalar value to both components of this vector and updates this vector.
-	Vector2 & operator+=(T other);
+	Vector2<T> & operator+=(T other);
 
 	//! Subtracts another vector from this vector and updates this vector.
-	Vector2 & operator-=(const Vector2<T> & other);
+	Vector2<T> & operator-=(const Vector2<T> & other);
 
 	//! Subtracts a scalar value from both components of this vector and updates this vector.
-	Vector2 & operator-=(T other);
+	Vector2<T> & operator-=(T other);
 
 	//! Multiplies this vector by another vector element-wise and updates this vector.
-	Vector2 & operator*=(const Vector2<T> & other);
+	Vector2<T> & operator*=(const Vector2<T> & other);
 
 	//! Multiplies this vector by a scalar and updates this vector.
-	Vector2 & operator*=(T other);
+	Vector2<T> & operator*=(T other);
 
 	//! Divides this vector by another vector element-wise and updates this vector.
-	Vector2 & operator/=(const Vector2<T> & other);
+	Vector2<T> & operator/=(const Vector2<T> & other);
 
 	//! Divides this vector by a scalar and updates this vector.
-	Vector2 & operator/=(T other);
+	Vector2<T> & operator/=(T other);
 
 	//! Returns the negation of this vector.
-	Vector2 operator-() const;
+	Vector2<T> operator-() const;
 
 	//! Checks if this vector is equal to another vector.
 	bool operator==(const Vector2<T> & other) const;
@@ -89,10 +89,13 @@ struct Vector2 {
 	T distance_squared(const Vector2<T> & other) const;
 
 	//! Returns the perpendicular vector to this vector.
-	Vector2 perpendicular() const;
+	Vector2<T> perpendicular() const;
 
 	//! Checks if both components of the vector are NaN.
 	bool is_nan() const;
+
+	//! Rotate this vector clockwise by \c deg degrees
+	Vector2<T> rotate(float deg) const;
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/Vector2.hpp b/src/crepe/api/Vector2.hpp
index e195760..a4ce641 100644
--- a/src/crepe/api/Vector2.hpp
+++ b/src/crepe/api/Vector2.hpp
@@ -168,4 +168,14 @@ bool Vector2<T>::is_nan() const {
 	return std::isnan(x) && std::isnan(y);
 }
 
+template <class T>
+Vector2<T> Vector2<T>::rotate(float deg) const {
+	float rad = -deg / 180 * M_PI;
+	return {
+		x * std::cos(rad) - y * std::sin(rad),
+		x * std::sin(rad) + y * std::cos(rad),
+	};
+}
+
+
 } // namespace crepe
diff --git a/src/test/Vector2Test.cpp b/src/test/Vector2Test.cpp
index 1e21af9..b17f95a 100644
--- a/src/test/Vector2Test.cpp
+++ b/src/test/Vector2Test.cpp
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 
 #include <crepe/api/Vector2.h>
+#include <crepe/types.h>
 
 using namespace crepe;
 
@@ -530,3 +531,12 @@ TEST_F(Vector2Test, Perpendicular) {
 	EXPECT_FLOAT_EQ(result4.x, -4.0f);
 	EXPECT_FLOAT_EQ(result4.y, 3.0f);
 }
+
+TEST_F(Vector2Test, Rotate) {
+	vec2 foo {0, 1};
+
+	foo = foo.rotate(90);
+	const float GOOD_ENOUGH = 0.001;
+	EXPECT_NEAR(foo.x, 1, GOOD_ENOUGH);
+	EXPECT_NEAR(foo.y, 0, GOOD_ENOUGH);
+}
-- 
cgit v1.2.3


From 743cdd5b2fe175605352c337396c3d70dac66247 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 7 Jan 2025 09:43:53 +0100
Subject: roll back player controller

---
 game/CMakeLists.txt          |  2 ++
 game/GameScene.cpp           |  4 +--
 game/PlayerScript.cpp        | 11 +++++++
 game/PlayerScript.h          |  8 +++++
 game/PlayerSubScene.cpp      | 76 ++++++++++++++++++++++++++++++++++++++++++++
 game/PlayerSubScene.h        | 10 ++++++
 game/prefab/CMakeLists.txt   |  2 --
 game/prefab/PlayerObject.cpp | 71 -----------------------------------------
 game/prefab/PlayerObject.h   | 30 -----------------
 game/prefab/PlayerScript.cpp | 13 --------
 game/prefab/PlayerScript.h   | 16 ----------
 11 files changed, 109 insertions(+), 134 deletions(-)
 create mode 100644 game/PlayerScript.cpp
 create mode 100644 game/PlayerScript.h
 create mode 100644 game/PlayerSubScene.cpp
 create mode 100644 game/PlayerSubScene.h
 delete mode 100644 game/prefab/PlayerObject.cpp
 delete mode 100644 game/prefab/PlayerObject.h
 delete mode 100644 game/prefab/PlayerScript.cpp
 delete mode 100644 game/prefab/PlayerScript.h

(limited to 'game')

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index a149487..32d7085 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -15,6 +15,8 @@ target_sources(main PUBLIC
 	GameScene.cpp
 	MoveCameraManualyScript.cpp
 	StartGameScript.cpp
+	PlayerScript.cpp
+	PlayerSubScene.cpp
 	main.cpp
 )
 
diff --git a/game/GameScene.cpp b/game/GameScene.cpp
index b287763..71612e3 100644
--- a/game/GameScene.cpp
+++ b/game/GameScene.cpp
@@ -20,7 +20,7 @@
 #include "StartGameScript.h"
 
 #include "background/BackgroundSubScene.h"
-#include "prefab/PlayerObject.h"
+#include "PlayerSubScene.h"
 #include "prefab/ZapperObject.h"
 
 using namespace crepe;
@@ -41,7 +41,7 @@ void GameScene::load_scene() {
 	camera.add_component<BehaviorScript>().set_script<MoveCameraManualyScript>();
 	camera.add_component<Rigidbody>(Rigidbody::Data {});
 
-	PlayerObject {new_object("player", "player", vec2(-100, 200))};
+	PlayerSubScene player(*this);
 
 	GameObject floor = new_object("floor", "game_world", vec2(0, 325));
 	floor.add_component<Rigidbody>(Rigidbody::Data {
diff --git a/game/PlayerScript.cpp b/game/PlayerScript.cpp
new file mode 100644
index 0000000..1c388f5
--- /dev/null
+++ b/game/PlayerScript.cpp
@@ -0,0 +1,11 @@
+#include "PlayerScript.h"
+
+#include <crepe/api/Rigidbody.h>
+
+using namespace crepe;
+using namespace std;
+
+void PlayerScript::fixed_update(crepe::duration_t dt) {
+	Rigidbody & rb = this->get_components_by_name<Rigidbody>("player").front();
+	if (this->get_key_state(Keycode::SPACE)) rb.add_force_linear(vec2(0, -10));
+}
diff --git a/game/PlayerScript.h b/game/PlayerScript.h
new file mode 100644
index 0000000..84c4f7f
--- /dev/null
+++ b/game/PlayerScript.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <crepe/api/Script.h>
+
+class PlayerScript : public crepe::Script {
+public:
+	void fixed_update(crepe::duration_t dt);
+};
diff --git a/game/PlayerSubScene.cpp b/game/PlayerSubScene.cpp
new file mode 100644
index 0000000..00b7810
--- /dev/null
+++ b/game/PlayerSubScene.cpp
@@ -0,0 +1,76 @@
+#include "PlayerSubScene.h"
+#include "Config.h"
+#include "PlayerScript.h"
+
+#include <crepe/api/Animator.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/Scene.h>
+#include <crepe/api/Script.h>
+#include <crepe/api/Sprite.h>
+
+using namespace crepe;
+using namespace std;
+
+PlayerSubScene::PlayerSubScene(Scene & scn) {
+	GameObject player = scn.new_object("player", "player", vec2(-100, 200));
+	Asset player_body_asset {"asset/barry/defaultBody.png"};
+	Sprite & player_body_sprite = player.add_component<Sprite>(
+		player_body_asset,
+		Sprite::Data {
+			.sorting_in_layer = SORT_IN_LAY_PLAYER,
+			.order_in_layer = 0,
+			.size = vec2(0, 50),
+		}
+	);
+	player.add_component<Animator>(
+		player_body_sprite, ivec2(32, 32), uvec2(4, 8),
+		Animator::Data {
+			.fps = 5,
+			.looping = true,
+		}
+	);
+	Asset player_head_asset {"asset/barry/defaultHead.png"};
+	Sprite & player_head_sprite = player.add_component<Sprite>(
+		player_head_asset,
+		Sprite::Data {
+			.sorting_in_layer = SORT_IN_LAY_PLAYER,
+			.order_in_layer = 1,
+			.size = vec2(0, 50),
+			.position_offset = vec2(0, -20),
+		}
+	);
+	player.add_component<Animator>(
+		player_head_sprite, ivec2(32, 32), uvec2(4, 8),
+		Animator::Data {
+			.fps = 5,
+			.looping = true,
+		}
+	);
+	Asset player_jetpack_asset {"asset/barry/jetpackDefault.png"};
+	Sprite & player_jetpack_sprite = player.add_component<Sprite>(
+		player_jetpack_asset,
+		Sprite::Data {
+			.sorting_in_layer = SORT_IN_LAY_PLAYER,
+			.order_in_layer = 2,
+			.size = vec2(0, 60),
+			.position_offset = vec2(-20, 0),
+		}
+	);
+	player_jetpack_sprite.active = false;
+	player.add_component<Animator>(
+		player_jetpack_sprite, ivec2(32, 44), uvec2(4, 4),
+		Animator::Data {
+			.fps = 5,
+			.looping = true,
+		}
+	);
+	player.add_component<Rigidbody>(Rigidbody::Data {
+		.gravity_scale = 20,
+		.body_type = Rigidbody::BodyType::DYNAMIC,
+		.linear_velocity = vec2(100, 0),
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_PLAYER,
+	});
+	player.add_component<BoxCollider>(vec2(50, 50));
+	player.add_component<BehaviorScript>().set_script<PlayerScript>().active = false;
+}
diff --git a/game/PlayerSubScene.h b/game/PlayerSubScene.h
new file mode 100644
index 0000000..bf94c32
--- /dev/null
+++ b/game/PlayerSubScene.h
@@ -0,0 +1,10 @@
+#pragma once
+
+namespace crepe {
+class Scene;
+}
+
+class PlayerSubScene {
+public:
+	PlayerSubScene(crepe::Scene & scn);
+};
diff --git a/game/prefab/CMakeLists.txt b/game/prefab/CMakeLists.txt
index 5585a32..5f8ea6c 100644
--- a/game/prefab/CMakeLists.txt
+++ b/game/prefab/CMakeLists.txt
@@ -1,6 +1,4 @@
 target_sources(main PUBLIC
-	PlayerObject.cpp
-	PlayerScript.cpp
 	ZapperObject.cpp
 )
 
diff --git a/game/prefab/PlayerObject.cpp b/game/prefab/PlayerObject.cpp
deleted file mode 100644
index 2d48bf8..0000000
--- a/game/prefab/PlayerObject.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "PlayerObject.h"
-#include "Config.h"
-#include "PlayerScript.h"
-
-using namespace crepe;
-
-PlayerObject::PlayerObject(crepe::GameObject && base)
-	: GameObject(std::move(base)),
-	  sprite {
-		  .body = add_component<Sprite>(
-			  Asset {"asset/barry/defaultBody.png"},
-			  Sprite::Data {
-				  .sorting_in_layer = SORT_IN_LAY_PLAYER,
-				  .order_in_layer = 0,
-				  .size = vec2(0, 50),
-			  }
-		  ),
-		  .head = add_component<Sprite>(
-			  Asset {"asset/barry/defaultHead.png"},
-			  Sprite::Data {
-				  .sorting_in_layer = SORT_IN_LAY_PLAYER,
-				  .order_in_layer = 1,
-				  .size = vec2(0, 50),
-				  .position_offset = vec2(0, -20),
-			  }
-		  ),
-		  .jetpack = add_component<Sprite>(
-			  Asset {"asset/barry/jetpackDefault.png"},
-			  Sprite::Data {
-				  .sorting_in_layer = SORT_IN_LAY_PLAYER,
-				  .order_in_layer = 2,
-				  .size = vec2(0, 60),
-				  .position_offset = vec2(-20, 0),
-			  }
-		  )
-	  },
-	  animator {
-		  .body = add_component<Animator>(
-			  sprite.body, ivec2(32, 32), uvec2(4, 8),
-			  Animator::Data {
-				  .fps = 5,
-				  .looping = true,
-			  }
-		  ),
-		  .head = add_component<Animator>(
-			  sprite.head, ivec2(32, 32), uvec2(4, 8),
-			  Animator::Data {
-				  .fps = 5,
-				  .looping = true,
-			  }
-		  ),
-		  .jetpack = add_component<Animator>(
-			  sprite.jetpack, ivec2(32, 44), uvec2(4, 4),
-			  Animator::Data {
-				  .fps = 5,
-				  .looping = true,
-			  }
-		  ),
-	  },
-	  body(add_component<Rigidbody>(Rigidbody::Data {
-		  .gravity_scale = 20,
-		  .body_type = Rigidbody::BodyType::DYNAMIC,
-		  .linear_velocity = vec2(100, 0),
-		  .collision_layers = {COLL_LAY_BOT_TOP},
-		  .collision_layer = COLL_LAY_PLAYER,
-	  })),
-	  collider(add_component<BoxCollider>(vec2(50, 50))),
-	  controller(add_component<BehaviorScript>().set_script<PlayerScript>(*this)) {
-	sprite.jetpack.active = false;
-	controller.active = false;
-}
diff --git a/game/prefab/PlayerObject.h b/game/prefab/PlayerObject.h
deleted file mode 100644
index a44d367..0000000
--- a/game/prefab/PlayerObject.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include <crepe/api/Animator.h>
-#include <crepe/api/BehaviorScript.h>
-#include <crepe/api/BoxCollider.h>
-#include <crepe/api/GameObject.h>
-#include <crepe/api/Rigidbody.h>
-#include <crepe/api/Sprite.h>
-
-class PlayerObject : public crepe::GameObject {
-public:
-	PlayerObject(crepe::GameObject &&);
-
-public:
-	struct {
-		crepe::Sprite & body;
-		crepe::Sprite & head;
-		crepe::Sprite & jetpack;
-	} sprite;
-
-	struct {
-		crepe::Animator & body;
-		crepe::Animator & head;
-		crepe::Animator & jetpack;
-	} animator;
-
-	crepe::Rigidbody & body;
-	crepe::BoxCollider & collider;
-	crepe::BehaviorScript & controller;
-};
diff --git a/game/prefab/PlayerScript.cpp b/game/prefab/PlayerScript.cpp
deleted file mode 100644
index 3d06476..0000000
--- a/game/prefab/PlayerScript.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <cassert>
-#include <crepe/api/Rigidbody.h>
-
-#include "PlayerScript.h"
-
-using namespace crepe;
-using namespace std;
-
-PlayerScript::PlayerScript(const PlayerObject & player) : player(player) {}
-
-void PlayerScript::fixed_update(crepe::duration_t dt) {
-	if (this->get_key_state(Keycode::SPACE)) player.body.add_force_linear({0, -10});
-}
diff --git a/game/prefab/PlayerScript.h b/game/prefab/PlayerScript.h
deleted file mode 100644
index cc0f0aa..0000000
--- a/game/prefab/PlayerScript.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <crepe/api/Script.h>
-
-#include "PlayerObject.h"
-
-class PlayerScript : public crepe::Script {
-public:
-	PlayerScript(const PlayerObject & player);
-
-protected:
-	void fixed_update(crepe::duration_t dt);
-
-protected:
-	PlayerObject player;
-};
-- 
cgit v1.2.3


From f8496d3d48beeb6e0c5ef8dc82e16d281c94148e Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 7 Jan 2025 10:05:58 +0100
Subject: add collider to zapper

---
 game/prefab/ZapperObject.cpp | 11 +++++++++++
 game/prefab/ZapperObject.h   |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'game')

diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
index fcc6467..f70415c 100644
--- a/game/prefab/ZapperObject.cpp
+++ b/game/prefab/ZapperObject.cpp
@@ -73,6 +73,15 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 		  .glow_end = add_component<Animator>(
 			  sprite.glow_end, ivec2(128, 128), uvec2(16, 1), animator.glow_start.data
 		  ),
+		},
+		body {
+			add_component<Rigidbody>(Rigidbody::Data {
+				.body_type = Rigidbody::BodyType::KINEMATIC,
+				.kinematic_collision = false,
+			})
+		},
+		collider {
+			add_component<BoxCollider>(vec2(0, 0))
 		} {
 			this->place(this->transform.position, 0, 300);
 		}
@@ -89,5 +98,7 @@ void ZapperObject::place(const crepe::vec2 & position, float rotation, float len
 	this->sprite.glow_end.data.position_offset = -offset;
 
 	this->sprite.beam.data.size.x = length;
+
+	this->collider.dimensions = offset.rotate(rotation) * 2 + vec2(30, 30) * SCALE;
 }
 
diff --git a/game/prefab/ZapperObject.h b/game/prefab/ZapperObject.h
index b4bb942..c43af67 100644
--- a/game/prefab/ZapperObject.h
+++ b/game/prefab/ZapperObject.h
@@ -26,8 +26,8 @@ public:
 		crepe::Animator & glow_end;
 	} animator;
 
-	// crepe::Rigidbody & body;
-	// crepe::BoxCollider & collider;
+	crepe::Rigidbody & body;
+	crepe::BoxCollider & collider;
 
 private:
 	static constexpr float SCALE = 0.8;
-- 
cgit v1.2.3


From 725bb89cd3690d396502ab90baa35fa4eec6fe98 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 7 Jan 2025 10:08:47 +0100
Subject: `make format`

---
 game/GameScene.cpp           |  2 +-
 game/prefab/ZapperObject.cpp | 23 +++++++++--------------
 src/crepe/api/Vector2.hpp    |  1 -
 3 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'game')

diff --git a/game/GameScene.cpp b/game/GameScene.cpp
index 71612e3..dc0038b 100644
--- a/game/GameScene.cpp
+++ b/game/GameScene.cpp
@@ -19,8 +19,8 @@
 #include "MoveCameraManualyScript.h"
 #include "StartGameScript.h"
 
-#include "background/BackgroundSubScene.h"
 #include "PlayerSubScene.h"
+#include "background/BackgroundSubScene.h"
 #include "prefab/ZapperObject.h"
 
 using namespace crepe;
diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
index f70415c..8df2075 100644
--- a/game/prefab/ZapperObject.cpp
+++ b/game/prefab/ZapperObject.cpp
@@ -1,7 +1,7 @@
 #include <crepe/api/Transform.h>
 
-#include "ZapperObject.h"
 #include "Config.h"
+#include "ZapperObject.h"
 
 using namespace crepe;
 
@@ -73,18 +73,14 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 		  .glow_end = add_component<Animator>(
 			  sprite.glow_end, ivec2(128, 128), uvec2(16, 1), animator.glow_start.data
 		  ),
-		},
-		body {
-			add_component<Rigidbody>(Rigidbody::Data {
-				.body_type = Rigidbody::BodyType::KINEMATIC,
-				.kinematic_collision = false,
-			})
-		},
-		collider {
-			add_component<BoxCollider>(vec2(0, 0))
-		} {
-			this->place(this->transform.position, 0, 300);
-		}
+	  },
+	  body {add_component<Rigidbody>(Rigidbody::Data {
+		  .body_type = Rigidbody::BodyType::KINEMATIC,
+		  .kinematic_collision = false,
+	  })},
+	  collider {add_component<BoxCollider>(vec2(0, 0))} {
+	this->place(this->transform.position, 0, 300);
+}
 
 void ZapperObject::place(const crepe::vec2 & position, float rotation, float length) {
 	this->transform.position = position;
@@ -101,4 +97,3 @@ void ZapperObject::place(const crepe::vec2 & position, float rotation, float len
 
 	this->collider.dimensions = offset.rotate(rotation) * 2 + vec2(30, 30) * SCALE;
 }
-
diff --git a/src/crepe/api/Vector2.hpp b/src/crepe/api/Vector2.hpp
index a4ce641..5709f46 100644
--- a/src/crepe/api/Vector2.hpp
+++ b/src/crepe/api/Vector2.hpp
@@ -177,5 +177,4 @@ Vector2<T> Vector2<T>::rotate(float deg) const {
 	};
 }
 
-
 } // namespace crepe
-- 
cgit v1.2.3


From bcfa2d9543c2fc7d83003b243e526ab64efab6e1 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 7 Jan 2025 10:40:16 +0100
Subject: cleanup

---
 game/GameScene.cpp           | 17 -----------------
 game/prefab/ZapperObject.cpp |  1 +
 2 files changed, 1 insertion(+), 17 deletions(-)

(limited to 'game')

diff --git a/game/GameScene.cpp b/game/GameScene.cpp
index 4193581..c393ef7 100644
--- a/game/GameScene.cpp
+++ b/game/GameScene.cpp
@@ -74,23 +74,6 @@ void GameScene::load_scene() {
 	GameObject start_game_script = new_object("start_game_script", "script", vec2(0, 0));
 	start_game_script.add_component<BehaviorScript>().set_script<StartGameScript>();
 
-	// zapper, laser and missile (below) for testing purpose only!!!
-	GameObject zapper = new_object("zapper", "zapper", vec2(1000, 0));
-	Asset zapper_asset {"asset/obstacles/zapper/regular_zappers/zapEffect.png"};
-	Sprite & zapper_sprite = zapper.add_component<Sprite>(
-		zapper_asset,
-		Sprite::Data {
-			.sorting_in_layer = SORT_IN_LAY_OBSTACLES,
-			.order_in_layer = 0,
-			.size = vec2(100, 100),
-		}
-	);
-	zapper.add_component<Rigidbody>(Rigidbody::Data {
-		.body_type = Rigidbody::BodyType::KINEMATIC,
-		.kinematic_collision = false,
-		.collision_layer = COLL_LAY_ZAPPER,
-	});
-	zapper.add_component<BoxCollider>(vec2(100, 100));
 	GameObject laser = new_object("laser", "laser", vec2(2000, 0));
 	Asset laser_asset {"asset/obstacles/laser/laserPower.png"};
 	Sprite & laser_sprite = laser.add_component<Sprite>(
diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
index 8df2075..944a53f 100644
--- a/game/prefab/ZapperObject.cpp
+++ b/game/prefab/ZapperObject.cpp
@@ -77,6 +77,7 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 	  body {add_component<Rigidbody>(Rigidbody::Data {
 		  .body_type = Rigidbody::BodyType::KINEMATIC,
 		  .kinematic_collision = false,
+			.collision_layer = COLL_LAY_ZAPPER,
 	  })},
 	  collider {add_component<BoxCollider>(vec2(0, 0))} {
 	this->place(this->transform.position, 0, 300);
-- 
cgit v1.2.3


From aa2d2e05bc90b90ab503eff1f58bfc8c2b9c1741 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 7 Jan 2025 10:40:28 +0100
Subject: `make format`

---
 game/GameScene.cpp           | 2 +-
 game/prefab/ZapperObject.cpp | 2 +-
 src/crepe/api/Engine.cpp     | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'game')

diff --git a/game/GameScene.cpp b/game/GameScene.cpp
index c393ef7..1eefce1 100644
--- a/game/GameScene.cpp
+++ b/game/GameScene.cpp
@@ -21,8 +21,8 @@
 #include "GameScene.h"
 #include "MoveCameraManualyScript.h"
 
-#include "player/PlayerSubScene.h"
 #include "background/BackgroundSubScene.h"
+#include "player/PlayerSubScene.h"
 #include "prefab/ZapperObject.h"
 
 using namespace crepe;
diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
index 944a53f..4055ac4 100644
--- a/game/prefab/ZapperObject.cpp
+++ b/game/prefab/ZapperObject.cpp
@@ -77,7 +77,7 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 	  body {add_component<Rigidbody>(Rigidbody::Data {
 		  .body_type = Rigidbody::BodyType::KINEMATIC,
 		  .kinematic_collision = false,
-			.collision_layer = COLL_LAY_ZAPPER,
+		  .collision_layer = COLL_LAY_ZAPPER,
 	  })},
 	  collider {add_component<BoxCollider>(vec2(0, 0))} {
 	this->place(this->transform.position, 0, 300);
diff --git a/src/crepe/api/Engine.cpp b/src/crepe/api/Engine.cpp
index bfc1c4a..35743e3 100644
--- a/src/crepe/api/Engine.cpp
+++ b/src/crepe/api/Engine.cpp
@@ -70,4 +70,3 @@ void Engine::loop() {
 		}
 	}
 }
-
-- 
cgit v1.2.3


From 6d69c8ef6b663bd6716b441cc7d01164c7e33dfc Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 7 Jan 2025 13:04:49 +0100
Subject: more WIP zapperpool

---
 game/GameScene.cpp                 |  4 ++--
 game/prefab/CMakeLists.txt         |  1 +
 game/prefab/ZapperObject.cpp       | 18 ++++++++++++++++++
 game/prefab/ZapperObject.h         |  1 +
 game/prefab/ZapperPoolScript.h     |  8 ++++++++
 game/prefab/ZapperPoolSubScene.cpp | 13 +++++++++++++
 game/prefab/ZapperPoolSubScene.h   | 21 +++++++++++++++++++++
 7 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 game/prefab/ZapperPoolScript.h
 create mode 100644 game/prefab/ZapperPoolSubScene.cpp
 create mode 100644 game/prefab/ZapperPoolSubScene.h

(limited to 'game')

diff --git a/game/GameScene.cpp b/game/GameScene.cpp
index 1eefce1..698677b 100644
--- a/game/GameScene.cpp
+++ b/game/GameScene.cpp
@@ -23,7 +23,7 @@
 
 #include "background/BackgroundSubScene.h"
 #include "player/PlayerSubScene.h"
-#include "prefab/ZapperObject.h"
+#include "prefab/ZapperPoolSubScene.h"
 
 using namespace crepe;
 using namespace std;
@@ -69,7 +69,7 @@ void GameScene::load_scene() {
 	});
 	ceiling.add_component<BoxCollider>(vec2(INFINITY, 200));
 
-	ZapperObject {new_object("zapper", "zapper", vec2(800, 0))};
+	ZapperPoolSubScene {*this};
 
 	GameObject start_game_script = new_object("start_game_script", "script", vec2(0, 0));
 	start_game_script.add_component<BehaviorScript>().set_script<StartGameScript>();
diff --git a/game/prefab/CMakeLists.txt b/game/prefab/CMakeLists.txt
index 5f8ea6c..d77b9b1 100644
--- a/game/prefab/CMakeLists.txt
+++ b/game/prefab/CMakeLists.txt
@@ -1,4 +1,5 @@
 target_sources(main PUBLIC
 	ZapperObject.cpp
+	ZapperPoolSubScene.cpp
 )
 
diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
index 4055ac4..3c70d04 100644
--- a/game/prefab/ZapperObject.cpp
+++ b/game/prefab/ZapperObject.cpp
@@ -81,6 +81,7 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 	  })},
 	  collider {add_component<BoxCollider>(vec2(0, 0))} {
 	this->place(this->transform.position, 0, 300);
+	this->set_active(false);
 }
 
 void ZapperObject::place(const crepe::vec2 & position, float rotation, float length) {
@@ -98,3 +99,20 @@ void ZapperObject::place(const crepe::vec2 & position, float rotation, float len
 
 	this->collider.dimensions = offset.rotate(rotation) * 2 + vec2(30, 30) * SCALE;
 }
+
+void ZapperObject::set_active(bool active) {
+	this->sprite.orb_start.active = active;
+	this->sprite.orb_end.active = active;
+	this->sprite.glow_start.active = active;
+	this->sprite.glow_end.active = active;
+	this->sprite.beam.active = active;
+
+	this->animator.orb_start.active = active;
+	this->animator.orb_end.active = active;
+	this->animator.glow_start.active = active;
+	this->animator.glow_end.active = active;
+
+	this->body.active = active;
+	this->collider.active = active;
+}
+
diff --git a/game/prefab/ZapperObject.h b/game/prefab/ZapperObject.h
index c43af67..9f4e4a1 100644
--- a/game/prefab/ZapperObject.h
+++ b/game/prefab/ZapperObject.h
@@ -34,4 +34,5 @@ private:
 
 public:
 	void place(const crepe::vec2 & position, float rotation, float length);
+	void set_active(bool active);
 };
diff --git a/game/prefab/ZapperPoolScript.h b/game/prefab/ZapperPoolScript.h
new file mode 100644
index 0000000..79f9a89
--- /dev/null
+++ b/game/prefab/ZapperPoolScript.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <crepe/api/Script.h>
+
+class ZapperPoolScript : public crepe::Script {
+
+};
+
diff --git a/game/prefab/ZapperPoolSubScene.cpp b/game/prefab/ZapperPoolSubScene.cpp
new file mode 100644
index 0000000..578688a
--- /dev/null
+++ b/game/prefab/ZapperPoolSubScene.cpp
@@ -0,0 +1,13 @@
+#include "ZapperPoolSubScene.h"
+
+using namespace crepe;
+using namespace std;
+
+ZapperPoolSubScene::ZapperPoolSubScene(Scene & scene)
+	: controller { scene.new_object("controller") } {
+		for (size_t i = 0; i < this->POOL_SIZE; i++)
+			zappers.emplace_back(scene.new_object("zapper"));
+
+	
+}
+
diff --git a/game/prefab/ZapperPoolSubScene.h b/game/prefab/ZapperPoolSubScene.h
new file mode 100644
index 0000000..79598ce
--- /dev/null
+++ b/game/prefab/ZapperPoolSubScene.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <vector>
+
+#include <crepe/api/Scene.h>
+#include <crepe/api/GameObject.h>
+
+#include "ZapperObject.h"
+
+class ZapperPoolSubScene {
+public:
+	ZapperPoolSubScene(crepe::Scene & scene);
+
+public:
+	crepe::GameObject controller;
+	std::vector<ZapperObject> zappers;
+
+private:
+	static constexpr size_t POOL_SIZE = 4;
+
+};
-- 
cgit v1.2.3


From b8acb539a3580bf0665fe435c55f33ba16cb507e Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 8 Jan 2025 09:58:34 +0100
Subject: WIP

---
 game/CMakeLists.txt              |  2 +-
 game/Config.h                    |  7 ++++---
 game/Random.cpp                  | 28 ++++++++++++++++++++++++++++
 game/Random.h                    | 11 +++++++++++
 game/main.cpp                    |  7 +++++--
 game/prefab/ZapperPoolScript.cpp |  9 ++++++++-
 6 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 game/Random.cpp
 create mode 100644 game/Random.h

(limited to 'game')

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 48844b7..5c7bb6b 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -4,7 +4,6 @@ set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
 set(CMAKE_BUILD_TYPE Debug)
-
 project(game C CXX)
 
 add_subdirectory(../src crepe)
@@ -45,6 +44,7 @@ target_sources(main PUBLIC
 	hud/HudSubScene.cpp
 	hud/HudScript.cpp
 	hud/SpeedScript.cpp
+	Random.cpp
 )
 
 add_subdirectory(background)
diff --git a/game/Config.h b/game/Config.h
index 8c27226..95846d2 100644
--- a/game/Config.h
+++ b/game/Config.h
@@ -31,11 +31,12 @@ static constexpr int COLL_LAY_ZAPPER = 6; // Only for GameScene
 static constexpr int COLL_LAY_LASER = 7; // Only for GameScene
 static constexpr int COLL_LAY_MISSILE = 8; // Only for GameScene
 
-static constexpr int GAME_HEIGHT = 800; // In game units
+static constexpr float GAME_HEIGHT = 800; // In game units
+static constexpr float HALLWAY_HEIGHT = 475; // In game units
 
-static constexpr int VIEWPORT_X = 1100; // In game units
+static constexpr float VIEWPORT_X = 1100; // In game units
 // 'GAME_HEIGHT' (below) should be replaced by '500' when game development is finished
-static constexpr int VIEWPORT_Y = 500; // In game units
+static constexpr float VIEWPORT_Y = 500; // In game units
 
 // Font settings
 static constexpr const char* FONT = "Jetpackia";
diff --git a/game/Random.cpp b/game/Random.cpp
new file mode 100644
index 0000000..59be3c5
--- /dev/null
+++ b/game/Random.cpp
@@ -0,0 +1,28 @@
+#include <cstdlib>
+
+#include "Random.h"
+
+float Random::f(float upper, float lower) {
+	float range = upper - lower;
+	float x = ((float) rand() / (float) (RAND_MAX)) * range;
+	return x + lower;
+}
+
+double Random::d(double upper, double lower) {
+	double range = upper - lower;
+	double x = ((double) rand() / (double) (RAND_MAX)) * range;
+	return x + lower;
+}
+
+int Random::i(int upper, int lower) {
+	int range = upper - lower;
+	int x = rand() % range;
+	return x + lower;
+}
+
+unsigned Random::u(unsigned upper, unsigned lower) {
+	unsigned range = upper - lower;
+	unsigned x = rand() % range;
+	return x + lower;
+}
+
diff --git a/game/Random.h b/game/Random.h
new file mode 100644
index 0000000..cf05e87
--- /dev/null
+++ b/game/Random.h
@@ -0,0 +1,11 @@
+#pragma once
+
+class Random {
+public:
+	static float f(float upper = 1.0, float lower = 0.0);
+	static double d(double upper = 1.0, double lower = 0.0);
+	static int i(int upper, int lower = 0);
+	static unsigned u(unsigned upper, unsigned lower = 0);
+
+};
+
diff --git a/game/main.cpp b/game/main.cpp
index bd5ca93..b6458b8 100644
--- a/game/main.cpp
+++ b/game/main.cpp
@@ -1,3 +1,5 @@
+#include <cstdlib>
+
 #include <crepe/api/Engine.h>
 #include <crepe/api/Script.h>
 
@@ -6,16 +8,17 @@
 #include "menus/mainmenu/MainMenuScene.h"
 #include "menus/shop/ShopMenuScene.h"
 
-
 using namespace crepe;
 
 int main() {
+	srand(time(NULL));
+
 	Config::get_instance() = ENGINE_CONFIG;
 
 	Engine gameloop;
+	gameloop.add_scene<GameScene>();
 	gameloop.add_scene<MainMenuScene>();
 	gameloop.add_scene<ShopMenuScene>();
-	gameloop.add_scene<GameScene>();
 
 	return gameloop.main();
 }
diff --git a/game/prefab/ZapperPoolScript.cpp b/game/prefab/ZapperPoolScript.cpp
index e42adc9..c6ce1e7 100644
--- a/game/prefab/ZapperPoolScript.cpp
+++ b/game/prefab/ZapperPoolScript.cpp
@@ -1,9 +1,11 @@
 #include <crepe/api/Camera.h>
 
 #include "../Config.h"
+#include "../Random.h"
 
 #include "ZapperPoolScript.h"
 #include "ZapperPoolSubScene.h"
+#include "util/OptionalRef.h"
 
 using namespace crepe;
 using namespace std;
@@ -24,9 +26,14 @@ void ZapperPoolScript::fixed_update(crepe::duration_t) {
 }
 
 void ZapperPoolScript::spawn_random() {
+	OptionalRef<ZapperObject> zapper = pool.get_next_zapper();
+	if (!zapper) return; // pool exhausted
+	
 	vec2 pos = this->get_camera_pos();
-	logf(Log::DEBUG, "Spawning random zapper at {}", pos);
+	pos.y = Random::f(0.5, -0.5) * HALLWAY_HEIGHT;
 
+	zapper->place(pos, 0, Random::f(400, 200));
+	logf(Log::DEBUG, "Spawning random zapper at {}", pos);
 }
 
 vec2 ZapperPoolScript::get_camera_pos() {
-- 
cgit v1.2.3


From 06d41eb2d58de21a8340ca59952b96cabc8caee6 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 8 Jan 2025 11:13:40 +0100
Subject: pooling working

---
 game/prefab/ZapperObject.cpp       | 10 +++++++---
 game/prefab/ZapperPoolScript.cpp   | 37 ++++++++++++++++++++++++-------------
 game/prefab/ZapperPoolScript.h     | 11 ++++++++---
 game/prefab/ZapperPoolSubScene.cpp | 14 ++++----------
 game/prefab/ZapperPoolSubScene.h   |  8 --------
 5 files changed, 43 insertions(+), 37 deletions(-)

(limited to 'game')

diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
index 61681ae..712eca9 100644
--- a/game/prefab/ZapperObject.cpp
+++ b/game/prefab/ZapperObject.cpp
@@ -13,7 +13,7 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 			  Sprite::Data {
 				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
 				  .order_in_layer = 1,
-				  .size = vec2(0, 42) * SCALE,
+				  .size = vec2(0, 50) * SCALE,
 			  }
 		  ),
 		  .orb_end = add_component<Sprite>(
@@ -22,7 +22,7 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 				  .flip = {true, true},
 				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
 				  .order_in_layer = 1,
-				  .size = vec2(0, 42) * SCALE,
+				  .size = vec2(0, 50) * SCALE,
 			  }
 		  ),
 		  .glow_start = add_component<Sprite>(
@@ -81,10 +81,12 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 	  })},
 	  collider {add_component<BoxCollider>(vec2(0, 0))} {
 	this->set_active(false);
-	Log::logf(Log::DEBUG, "creating zapper");
+	Log::logf(Log::DEBUG, "Creating zapper");
 }
 
 void ZapperObject::place(const crepe::vec2 & position, float rotation, float length) {
+	Log::logf(Log::DEBUG, "Placing zapper [position = {}, rotation = {}, length = {}]", position, rotation, length);
+
 	this->transform.position = position;
 	this->transform.rotation = rotation;
 
@@ -98,6 +100,8 @@ void ZapperObject::place(const crepe::vec2 & position, float rotation, float len
 	this->sprite.beam.data.size.x = length;
 
 	this->collider.dimensions = offset.rotate(rotation) * 2 + vec2(30, 30) * SCALE;
+
+	this->set_active(true);
 }
 
 void ZapperObject::set_active(bool active) {
diff --git a/game/prefab/ZapperPoolScript.cpp b/game/prefab/ZapperPoolScript.cpp
index c6ce1e7..812024b 100644
--- a/game/prefab/ZapperPoolScript.cpp
+++ b/game/prefab/ZapperPoolScript.cpp
@@ -10,37 +10,48 @@
 using namespace crepe;
 using namespace std;
 
-ZapperPoolScript::ZapperPoolScript(ZapperPoolSubScene & pool) : pool(pool) {}
+ZapperPoolScript::ZapperPoolScript(std::vector<ZapperObject> && pool) : pool(pool) {}
 
 void ZapperPoolScript::init() {
 	subscribe<CreateZapperEvent>([this](const CreateZapperEvent &) {
 		this->spawn_random();
 		return true;
 	});
+
+	camera_transform = get_components_by_name<Transform>(CAMERA_NAME).back();
+	camera_camera = get_components_by_name<Camera>(CAMERA_NAME).back();
 }
 
 void ZapperPoolScript::fixed_update(crepe::duration_t) {
-	if (i++ < 80) return;
-	i = 0;
+	for (ZapperObject & zapper : this->pool) {
+		if (!zapper.active) continue;
+
+		if (zapper.transform.position.x < camera_transform->position.x)
+			zapper.set_active(false);
+	}
+
+	if (i-- > 0) return;
+	i = 200;
 	queue_event<CreateZapperEvent>();
 }
 
 void ZapperPoolScript::spawn_random() {
-	OptionalRef<ZapperObject> zapper = pool.get_next_zapper();
+	OptionalRef<ZapperObject> zapper = this->get_next_zapper();
 	if (!zapper) return; // pool exhausted
 	
-	vec2 pos = this->get_camera_pos();
-	pos.y = Random::f(0.5, -0.5) * HALLWAY_HEIGHT;
+	vec2 pos = {
+		.x = camera_transform->position.x + camera_camera->viewport_size.x / 2,
+		.y = Random::f(0.5, -0.5) * HALLWAY_HEIGHT,
+	};
 
 	zapper->place(pos, 0, Random::f(400, 200));
-	logf(Log::DEBUG, "Spawning random zapper at {}", pos);
 }
 
-vec2 ZapperPoolScript::get_camera_pos() {
-	Transform & transform = get_components_by_name<Transform>(CAMERA_NAME).back();
-	Camera & camera = get_components_by_name<Camera>(CAMERA_NAME).back();
-
-	// right middle edge position
-	return transform.position + vec2(camera.viewport_size.x / 2, 0);
+OptionalRef<ZapperObject> ZapperPoolScript::get_next_zapper() {
+	for (ZapperObject & zapper : this->pool) {
+		if (zapper.active) continue;
+		return zapper;
+	}
+	return {};
 }
 
diff --git a/game/prefab/ZapperPoolScript.h b/game/prefab/ZapperPoolScript.h
index 7c4701c..5daba79 100644
--- a/game/prefab/ZapperPoolScript.h
+++ b/game/prefab/ZapperPoolScript.h
@@ -2,11 +2,14 @@
 
 #include <crepe/api/Script.h>
 
+#include "ZapperObject.h"
+#include "util/OptionalRef.h"
+
 class ZapperPoolSubScene;
 
 class ZapperPoolScript : public crepe::Script {
 public:
-	ZapperPoolScript(ZapperPoolSubScene & pool);
+	ZapperPoolScript(std::vector<ZapperObject> && pool);
 
 	void init();
 	void fixed_update(crepe::duration_t);
@@ -14,10 +17,12 @@ public:
 	unsigned i = 0;
 
 private:
-	ZapperPoolSubScene & pool;
+	std::vector<ZapperObject> pool;
 
 private:
-	crepe::vec2 get_camera_pos();
+	crepe::OptionalRef<crepe::Transform> camera_transform;
+	crepe::OptionalRef<crepe::Camera> camera_camera;
+	crepe::OptionalRef<ZapperObject> get_next_zapper();
 
 private:
 	void spawn_random();
diff --git a/game/prefab/ZapperPoolSubScene.cpp b/game/prefab/ZapperPoolSubScene.cpp
index d7d30ea..923ed57 100644
--- a/game/prefab/ZapperPoolSubScene.cpp
+++ b/game/prefab/ZapperPoolSubScene.cpp
@@ -8,18 +8,12 @@ using namespace std;
 
 ZapperPoolSubScene::ZapperPoolSubScene(Scene & scene)
 	: controller { scene.new_object("controller") } {
-	this->controller.add_component<BehaviorScript>().set_script<ZapperPoolScript>(*this);
 
 	Log::logf(Log::DEBUG, "Building zapper pool...");
+	vector<ZapperObject> pool;
 	for (size_t i = 0; i < this->POOL_SIZE; i++)
-		zappers.emplace_back(scene.new_object("zapper"));
-}
-
-OptionalRef<ZapperObject> ZapperPoolSubScene::get_next_zapper() {
-	for (ZapperObject & zapper : this->zappers) {
-		if (!zapper.active) continue;
-		return zapper;
-	}
-	return {};
+		pool.emplace_back(scene.new_object("zapper"));
+	BehaviorScript & behavior = this->controller.add_component<BehaviorScript>();
+	behavior.set_script<ZapperPoolScript>(std::move(pool));
 }
 
diff --git a/game/prefab/ZapperPoolSubScene.h b/game/prefab/ZapperPoolSubScene.h
index 25328ee..f930e22 100644
--- a/game/prefab/ZapperPoolSubScene.h
+++ b/game/prefab/ZapperPoolSubScene.h
@@ -1,14 +1,10 @@
 #pragma once
 
-#include <vector>
-
 #include <crepe/api/Scene.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Event.h>
 #include <crepe/util/OptionalRef.h>
 
-#include "ZapperObject.h"
-
 class CreateZapperEvent : public crepe::Event {};
 
 class ZapperPoolSubScene {
@@ -17,11 +13,7 @@ public:
 
 private:
 	crepe::GameObject controller;
-	std::vector<ZapperObject> zappers;
 
 private:
 	static constexpr size_t POOL_SIZE = 4;
-
-public:
-	crepe::OptionalRef<ZapperObject> get_next_zapper();
 };
-- 
cgit v1.2.3


From 46c2cbdcbe5e7dbc4d86a5d43b3bd7275b7a1c33 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 8 Jan 2025 11:59:51 +0100
Subject: WIP

---
 game/GameScene.cpp                 | 33 ---------------------------------
 game/Random.cpp                    |  4 ++++
 game/Random.h                      |  1 +
 game/prefab/ZapperObject.cpp       |  2 --
 game/prefab/ZapperPoolScript.cpp   | 12 +++++++++---
 game/prefab/ZapperPoolScript.h     |  3 +++
 game/prefab/ZapperPoolSubScene.cpp |  2 +-
 7 files changed, 18 insertions(+), 39 deletions(-)

(limited to 'game')

diff --git a/game/GameScene.cpp b/game/GameScene.cpp
index 8bd6c74..6c21843 100644
--- a/game/GameScene.cpp
+++ b/game/GameScene.cpp
@@ -103,39 +103,6 @@ void GameScene::load_scene() {
 	Asset boom_audio_asset {"asset/sfx/window_smash.ogg"};
 	boom_audio.add_component<AudioSource>(boom_audio_asset);
 
-	GameObject laser = new_object("laser", "laser", vec2(2000, 0));
-	Asset laser_asset {"asset/obstacles/laser/laserPower.png"};
-	Sprite & laser_sprite = laser.add_component<Sprite>(
-		laser_asset,
-		Sprite::Data {
-			.sorting_in_layer = SORT_IN_LAY_OBSTACLES,
-			.order_in_layer = 0,
-			.size = vec2(100, 100),
-		}
-	);
-	laser.add_component<Rigidbody>(Rigidbody::Data {
-		.body_type = Rigidbody::BodyType::KINEMATIC,
-		.kinematic_collision = false,
-		.collision_layer = COLL_LAY_LASER,
-	});
-	laser.add_component<BoxCollider>(vec2(100, 100));
-	GameObject missile = new_object("missile", "missile", vec2(4000, 0));
-	Asset missile_asset {"asset/obstacles/missile/missile.png"};
-	Sprite & missile_sprite = missile.add_component<Sprite>(
-		missile_asset,
-		Sprite::Data {
-			.sorting_in_layer = SORT_IN_LAY_OBSTACLES,
-			.order_in_layer = 0,
-			.size = vec2(100, 100),
-		}
-	);
-	missile.add_component<Rigidbody>(Rigidbody::Data {
-		.body_type = Rigidbody::BodyType::KINEMATIC,
-		.kinematic_collision = false,
-		.collision_layer = COLL_LAY_MISSILE,
-	});
-	missile.add_component<BoxCollider>(vec2(100, 100));
-
 	EndGameSubScene endgamewindow;
 	endgamewindow.create(*this);
 }
diff --git a/game/Random.cpp b/game/Random.cpp
index 59be3c5..821ddc8 100644
--- a/game/Random.cpp
+++ b/game/Random.cpp
@@ -26,3 +26,7 @@ unsigned Random::u(unsigned upper, unsigned lower) {
 	return x + lower;
 }
 
+bool Random::b() {
+	return rand() % 2;
+}
+
diff --git a/game/Random.h b/game/Random.h
index cf05e87..8db616c 100644
--- a/game/Random.h
+++ b/game/Random.h
@@ -6,6 +6,7 @@ public:
 	static double d(double upper = 1.0, double lower = 0.0);
 	static int i(int upper, int lower = 0);
 	static unsigned u(unsigned upper, unsigned lower = 0);
+	static bool b();
 
 };
 
diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
index 712eca9..0a290e0 100644
--- a/game/prefab/ZapperObject.cpp
+++ b/game/prefab/ZapperObject.cpp
@@ -100,8 +100,6 @@ void ZapperObject::place(const crepe::vec2 & position, float rotation, float len
 	this->sprite.beam.data.size.x = length;
 
 	this->collider.dimensions = offset.rotate(rotation) * 2 + vec2(30, 30) * SCALE;
-
-	this->set_active(true);
 }
 
 void ZapperObject::set_active(bool active) {
diff --git a/game/prefab/ZapperPoolScript.cpp b/game/prefab/ZapperPoolScript.cpp
index 812024b..e201149 100644
--- a/game/prefab/ZapperPoolScript.cpp
+++ b/game/prefab/ZapperPoolScript.cpp
@@ -23,10 +23,11 @@ void ZapperPoolScript::init() {
 }
 
 void ZapperPoolScript::fixed_update(crepe::duration_t) {
+	float threshold = camera_transform->position.x - camera_camera->viewport_size.x / 2 - OFFSCREEN_MARGIN;
 	for (ZapperObject & zapper : this->pool) {
 		if (!zapper.active) continue;
 
-		if (zapper.transform.position.x < camera_transform->position.x)
+		if (zapper.transform.position.x < threshold)
 			zapper.set_active(false);
 	}
 
@@ -40,11 +41,16 @@ void ZapperPoolScript::spawn_random() {
 	if (!zapper) return; // pool exhausted
 	
 	vec2 pos = {
-		.x = camera_transform->position.x + camera_camera->viewport_size.x / 2,
+		.x = camera_transform->position.x + camera_camera->viewport_size.x / 2 + OFFSCREEN_MARGIN,
 		.y = Random::f(0.5, -0.5) * HALLWAY_HEIGHT,
 	};
 
-	zapper->place(pos, 0, Random::f(400, 200));
+	bool horizontal = Random::b();
+	float rotation = 90.0 * horizontal;
+	float length = horizontal ? Random::f(400, 200) : Random::f(200, 50);
+
+	zapper->place(pos, rotation, length);
+	zapper->set_active(true);
 }
 
 OptionalRef<ZapperObject> ZapperPoolScript::get_next_zapper() {
diff --git a/game/prefab/ZapperPoolScript.h b/game/prefab/ZapperPoolScript.h
index 5daba79..6aee8b2 100644
--- a/game/prefab/ZapperPoolScript.h
+++ b/game/prefab/ZapperPoolScript.h
@@ -26,5 +26,8 @@ private:
 
 private:
 	void spawn_random();
+
+private:
+	static constexpr float OFFSCREEN_MARGIN = 40;
 };
 
diff --git a/game/prefab/ZapperPoolSubScene.cpp b/game/prefab/ZapperPoolSubScene.cpp
index 923ed57..e341090 100644
--- a/game/prefab/ZapperPoolSubScene.cpp
+++ b/game/prefab/ZapperPoolSubScene.cpp
@@ -12,7 +12,7 @@ ZapperPoolSubScene::ZapperPoolSubScene(Scene & scene)
 	Log::logf(Log::DEBUG, "Building zapper pool...");
 	vector<ZapperObject> pool;
 	for (size_t i = 0; i < this->POOL_SIZE; i++)
-		pool.emplace_back(scene.new_object("zapper"));
+		pool.emplace_back(scene.new_object("zapper", "zapper"));
 	BehaviorScript & behavior = this->controller.add_component<BehaviorScript>();
 	behavior.set_script<ZapperPoolScript>(std::move(pool));
 }
-- 
cgit v1.2.3


From d9c67da9b8c2d8d25ef4dd2c700ddc78573d3a60 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 8 Jan 2025 12:11:14 +0100
Subject: WIP

---
 game/prefab/ZapperPoolScript.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'game')

diff --git a/game/prefab/ZapperPoolScript.cpp b/game/prefab/ZapperPoolScript.cpp
index e201149..ac6ce96 100644
--- a/game/prefab/ZapperPoolScript.cpp
+++ b/game/prefab/ZapperPoolScript.cpp
@@ -46,8 +46,18 @@ void ZapperPoolScript::spawn_random() {
 	};
 
 	bool horizontal = Random::b();
-	float rotation = 90.0 * horizontal;
-	float length = horizontal ? Random::f(400, 200) : Random::f(200, 50);
+	float rotation, length;
+
+	if (horizontal) {
+		rotation = 90;
+		length = Random::f(400, 200);
+	} else {
+		rotation = 0;
+		length = Random::f(200, 50);
+		if (abs(pos.y) + length / 2 > HALLWAY_HEIGHT / 2) {
+			// TODO: fix offset
+		}
+	}
 
 	zapper->place(pos, rotation, length);
 	zapper->set_active(true);
-- 
cgit v1.2.3