Created file for Player

4 files changed, 97 insertions, 72 deletions

diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 307c8da..ef2595f 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -5,6 +5,7 @@ set(GAME_HEADERS
 	Hallway.h
 	Start.h
 	GameScene.h
+	Player.h
 )
 
 set(GAME_SOURCES
@@ -15,6 +16,7 @@ set(GAME_SOURCES
 	Hallway.cpp
 	Start.cpp
 	GameScene.cpp
+	Player.cpp
 )
 
 add_executable(game ${GAME_SOURCES} ${GAME_HEADERS})
diff --git a/src/example/GameScene.cpp b/src/example/GameScene.cpp
index 4422514..343f26c 100644
--- a/src/example/GameScene.cpp
+++ b/src/example/GameScene.cpp
@@ -1,12 +1,12 @@
 #include "GameScene.h"
 #include "Background.h"
-#include "api/Animator.h"
-#include "api/Asset.h"
-#include "api/BoxCollider.h"
-#include "api/Transform.h"
+#include "Player.h"
 
 #include <cmath>
+#include <crepe/api/Animator.h>
+#include <crepe/api/Asset.h>
 #include <crepe/api/BehaviorScript.h>
+#include <crepe/api/BoxCollider.h>
 #include <crepe/api/Camera.h>
 #include <crepe/api/Color.h>
 #include <crepe/api/Event.h>
@@ -14,6 +14,7 @@
 #include <crepe/api/Rigidbody.h>
 #include <crepe/api/Script.h>
 #include <crepe/api/Sprite.h>
+#include <crepe/api/Transform.h>
 #include <crepe/types.h>
 #include <iostream>
 
@@ -87,24 +88,6 @@ private:
 	bool took_jetpack = false;
 };
 
-class PlayerScript : public Script {
-public:
-	void init() {
-		subscribe<KeyPressEvent>(
-			[this](const KeyPressEvent & ev) -> bool { return this->keypressed(ev); });
-	}
-
-private:
-	bool keypressed(const KeyPressEvent & event) {
-		if (event.key == Keycode::SPACE) {
-			Rigidbody & rb = this->get_components_by_name<Rigidbody>("player").front();
-			rb.add_force_linear(vec2(0, -10));
-			return true;
-		}
-		return false;
-	}
-};
-
 void GameScene::load_scene() {
 	Background background(*this);
 
@@ -114,57 +97,9 @@ void GameScene::load_scene() {
 									 .bg_color = Color::RED,
 								 });
 	camera.add_component<BehaviorScript>().set_script<MoveCameraScript>();
-	camera.add_component<Rigidbody>(Rigidbody::Data{
-		.linear_velocity = vec2(0, 0),
-	});
+	camera.add_component<Rigidbody>(Rigidbody::Data{});
 
-	GameObject player = new_object("player", "player", vec2(-100, 200));
-	Asset player_body_asset{"asset/jetpack_joyride/barry/defaultBody.png"};
-	Sprite & player_body_sprite
-		= player.add_component<Sprite>(player_body_asset, Sprite::Data{
-															  .sorting_in_layer = 10,
-															  .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/jetpack_joyride/barry/defaultHead.png"};
-	Sprite & player_head_sprite
-		= player.add_component<Sprite>(player_head_asset, Sprite::Data{
-															  .sorting_in_layer = 10,
-															  .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/jetpack_joyride/barry/jetpackDefault.png"};
-	Sprite & player_jetpack_sprite = player.add_component<Sprite>(
-		player_jetpack_asset, Sprite::Data{
-								  .sorting_in_layer = 10,
-								  .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 = 10,
-		.body_type = Rigidbody::BodyType::DYNAMIC,
-		.linear_velocity = vec2(100, 0),
-	});
-	player.add_component<BoxCollider>(vec2(50, 50));
-	player.add_component<BehaviorScript>().set_script<PlayerScript>().active = false;
+	Player player(*this);
 
 	GameObject floor = new_object("floor", "game_world", vec2(0, 325));
 	floor.add_component<Rigidbody>(Rigidbody::Data{
diff --git a/src/example/Player.cpp b/src/example/Player.cpp
new file mode 100644
index 0000000..a3126cf
--- /dev/null
+++ b/src/example/Player.cpp
@@ -0,0 +1,78 @@
+#include "Player.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;
+
+class PlayerScript : public Script {
+public:
+	void init() {
+		subscribe<KeyPressEvent>(
+			[this](const KeyPressEvent & ev) -> bool { return this->keypressed(ev); });
+	}
+
+private:
+	bool keypressed(const KeyPressEvent & event) {
+		if (event.key == Keycode::SPACE) {
+			Rigidbody & rb = this->get_components_by_name<Rigidbody>("player").front();
+			rb.add_force_linear(vec2(0, -10));
+			return true;
+		}
+		return false;
+	}
+};
+
+Player::Player(Scene & scn) {
+	GameObject player = scn.new_object("player", "player", vec2(-100, 200));
+	Asset player_body_asset{"asset/jetpack_joyride/barry/defaultBody.png"};
+	Sprite & player_body_sprite
+		= player.add_component<Sprite>(player_body_asset, Sprite::Data{
+															  .sorting_in_layer = 10,
+															  .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/jetpack_joyride/barry/defaultHead.png"};
+	Sprite & player_head_sprite
+		= player.add_component<Sprite>(player_head_asset, Sprite::Data{
+															  .sorting_in_layer = 10,
+															  .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/jetpack_joyride/barry/jetpackDefault.png"};
+	Sprite & player_jetpack_sprite = player.add_component<Sprite>(
+		player_jetpack_asset, Sprite::Data{
+								  .sorting_in_layer = 10,
+								  .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 = 10,
+		.body_type = Rigidbody::BodyType::DYNAMIC,
+		.linear_velocity = vec2(100, 0),
+	});
+	player.add_component<BoxCollider>(vec2(50, 50));
+	player.add_component<BehaviorScript>().set_script<PlayerScript>().active = false;
+}
diff --git a/src/example/Player.h b/src/example/Player.h
new file mode 100644
index 0000000..139f6e4
--- /dev/null
+++ b/src/example/Player.h
@@ -0,0 +1,10 @@
+#pragma once
+
+namespace crepe {
+class Scene;
+}
+
+class Player {
+public:
+	Player(crepe::Scene & scn);
+};