Merge remote-tracking branch 'origin/loek/game' into niels/game

5 files changed, 20 insertions, 24 deletions

diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
index 0a290e0..24bbbd2 100644
--- a/game/prefab/ZapperObject.cpp
+++ b/game/prefab/ZapperObject.cpp
@@ -81,12 +81,9 @@ ZapperObject::ZapperObject(crepe::GameObject && base)
 	  })},
 	  collider {add_component<BoxCollider>(vec2(0, 0))} {
 	this->set_active(false);
-	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;
 
@@ -119,4 +116,3 @@ void ZapperObject::set_active(bool active) {
 
 	this->active = active;
 }
-
diff --git a/game/prefab/ZapperPoolScript.cpp b/game/prefab/ZapperPoolScript.cpp
index b9b2a76..b832ddd 100644
--- a/game/prefab/ZapperPoolScript.cpp
+++ b/game/prefab/ZapperPoolScript.cpp
@@ -23,36 +23,38 @@ void ZapperPoolScript::init() {
 }
 
 void ZapperPoolScript::fixed_update(crepe::duration_t) {
-	float threshold = camera_transform->position.x - camera_camera->viewport_size.x / 2 - OFFSCREEN_MARGIN;
+	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 < threshold)
-			zapper.set_active(false);
+		if (zapper.transform.position.x < threshold) zapper.set_active(false);
 	}
 }
 
 void ZapperPoolScript::spawn_random() {
 	OptionalRef<ZapperObject> zapper = this->get_next_zapper();
 	if (!zapper) return; // pool exhausted
-	
-	vec2 pos = {
-		.x = camera_transform->position.x + camera_camera->viewport_size.x / 2 + OFFSCREEN_MARGIN,
-		.y = Random::f(0.5, -0.5) * HALLWAY_HEIGHT,
-	};
 
 	bool horizontal = Random::b();
+	vec2 pos;
 	float rotation, length;
+	pos.x
+		= camera_transform->position.x + camera_camera->viewport_size.x / 2 + OFFSCREEN_MARGIN;
 
 	if (horizontal) {
 		rotation = 90;
 		length = Random::f(400, 200);
+		pos.y = Random::f(0.5, -0.5) * HALLWAY_HEIGHT;
+		// align zapper to right edge of camera
+		pos.x -= MAX_LENGTH - (length / 2);
 	} else {
 		rotation = 0;
-		length = Random::f(200, 50);
-		if (abs(pos.y) + length / 2 > HALLWAY_HEIGHT / 2) {
-			// TODO: fix offset
-		}
+		length = Random::f(200, 75);
+		// ensure zapper doesn't crash into ceiling or floor
+		pos.y = Random::f(0.5, -0.5) * (HALLWAY_HEIGHT - length);
+		// align zapper to right edge of camera
+		pos.x -= MAX_LENGTH;
 	}
 
 	zapper->place(pos, rotation, length);
@@ -66,4 +68,3 @@ OptionalRef<ZapperObject> ZapperPoolScript::get_next_zapper() {
 	}
 	return {};
 }
-
diff --git a/game/prefab/ZapperPoolScript.h b/game/prefab/ZapperPoolScript.h
index 6aee8b2..2208c80 100644
--- a/game/prefab/ZapperPoolScript.h
+++ b/game/prefab/ZapperPoolScript.h
@@ -28,6 +28,6 @@ private:
 	void spawn_random();
 
 private:
-	static constexpr float OFFSCREEN_MARGIN = 40;
+	static constexpr float MAX_LENGTH = 400;
+	static constexpr float OFFSCREEN_MARGIN = 50 + MAX_LENGTH;
 };
-
diff --git a/game/prefab/ZapperPoolSubScene.cpp b/game/prefab/ZapperPoolSubScene.cpp
index e341090..8422b8c 100644
--- a/game/prefab/ZapperPoolSubScene.cpp
+++ b/game/prefab/ZapperPoolSubScene.cpp
@@ -1,13 +1,13 @@
 #include <crepe/api/BehaviorScript.h>
 
-#include "ZapperPoolSubScene.h"
 #include "ZapperPoolScript.h"
+#include "ZapperPoolSubScene.h"
 
 using namespace crepe;
 using namespace std;
 
 ZapperPoolSubScene::ZapperPoolSubScene(Scene & scene)
-	: controller { scene.new_object("controller") } {
+	: controller {scene.new_object("controller")} {
 
 	Log::logf(Log::DEBUG, "Building zapper pool...");
 	vector<ZapperObject> pool;
@@ -16,4 +16,3 @@ ZapperPoolSubScene::ZapperPoolSubScene(Scene & scene)
 	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 f930e22..6f6e297 100644
--- a/game/prefab/ZapperPoolSubScene.h
+++ b/game/prefab/ZapperPoolSubScene.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <crepe/api/Scene.h>
-#include <crepe/api/GameObject.h>
 #include <crepe/api/Event.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/Scene.h>
 #include <crepe/util/OptionalRef.h>
 
 class CreateZapperEvent : public crepe::Event {};