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/prefab/CMakeLists.txt   |  2 --
 game/prefab/PlayerObject.cpp | 71 --------------------------------------------
 game/prefab/PlayerObject.h   | 30 -------------------
 game/prefab/PlayerScript.cpp | 13 --------
 game/prefab/PlayerScript.h   | 16 ----------
 5 files changed, 132 deletions(-)
 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/prefab')

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