From f31bd86ae5d7df21b788a273d4f2e530136ec184 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 7 Jan 2025 14:42:11 +0100 Subject: Added Script suffix --- game/CMakeLists.txt | 2 +- game/workers/PanicFromPlayer.cpp | 45 ---------------------------------- game/workers/PanicFromPlayer.h | 8 ------ game/workers/PanicFromPlayerScript.cpp | 45 ++++++++++++++++++++++++++++++++++ game/workers/PanicFromPlayerScript.h | 8 ++++++ game/workers/WorkersSubScene.cpp | 18 +++++++------- 6 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 game/workers/PanicFromPlayer.cpp delete mode 100644 game/workers/PanicFromPlayer.h create mode 100644 game/workers/PanicFromPlayerScript.cpp create mode 100644 game/workers/PanicFromPlayerScript.h diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index dc6a3fd..0fb2424 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -24,7 +24,7 @@ add_executable(main background/StartSubScene.cpp workers/WorkersSubScene.cpp workers/WorkerScript.cpp - workers/PanicFromPlayer.cpp + workers/PanicFromPlayerScript.cpp main.cpp ) diff --git a/game/workers/PanicFromPlayer.cpp b/game/workers/PanicFromPlayer.cpp deleted file mode 100644 index fbf4611..0000000 --- a/game/workers/PanicFromPlayer.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "PanicFromPlayer.h" - -#include -#include -#include -#include -#include - -using namespace crepe; -using namespace std; - -void PanicFromPlayer::fixed_update(duration_t dt) { - Animator & anim_player = this->get_components_by_name("player").front(); - - if (anim_player.data.col == 1) { - Transform & trans_player = this->get_components_by_name("player").back(); - Transform & trans_worker = this->get_components().back(); - - float result_x = trans_player.position.x - trans_worker.position.x; - - if (result_x < 100 && result_x > -20) { - RefVector anim_worker = this->get_components(); - RefVector sprite_worker = this->get_components(); - Rigidbody & rb_worker = this->get_components().back(); - - if (anim_worker.front().get().data.col != 1) { - anim_worker.front().get().set_anim(1); - anim_worker.back().get().set_anim(1); - - anim_worker.front().get().data.fps = 10; - anim_worker.back().get().data.fps = 10; - } - - if (result_x < 0) { - rb_worker.data.linear_velocity.x = 10000 * dt.count(); - sprite_worker.front().get().data.flip.flip_x = false; - sprite_worker.back().get().data.flip.flip_x = false; - } else { - rb_worker.data.linear_velocity.x = -5000 * dt.count(); - sprite_worker.front().get().data.flip.flip_x = true; - sprite_worker.back().get().data.flip.flip_x = true; - } - } - } -}; diff --git a/game/workers/PanicFromPlayer.h b/game/workers/PanicFromPlayer.h deleted file mode 100644 index 804df5c..0000000 --- a/game/workers/PanicFromPlayer.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#include - -class PanicFromPlayer : public crepe::Script { -public: - void fixed_update(crepe::duration_t dt); -}; diff --git a/game/workers/PanicFromPlayerScript.cpp b/game/workers/PanicFromPlayerScript.cpp new file mode 100644 index 0000000..1e49aaa --- /dev/null +++ b/game/workers/PanicFromPlayerScript.cpp @@ -0,0 +1,45 @@ +#include "PanicFromPlayerScript.h" + +#include +#include +#include +#include +#include + +using namespace crepe; +using namespace std; + +void PanicFromPlayerScript::fixed_update(duration_t dt) { + Animator & anim_player = this->get_components_by_name("player").front(); + + if (anim_player.data.col == 1) { + Transform & trans_player = this->get_components_by_name("player").back(); + Transform & trans_worker = this->get_components().back(); + + float result_x = trans_player.position.x - trans_worker.position.x; + + if (result_x < 100 && result_x > -20) { + RefVector anim_worker = this->get_components(); + RefVector sprite_worker = this->get_components(); + Rigidbody & rb_worker = this->get_components().back(); + + if (anim_worker.front().get().data.col != 1) { + anim_worker.front().get().set_anim(1); + anim_worker.back().get().set_anim(1); + + anim_worker.front().get().data.fps = 10; + anim_worker.back().get().data.fps = 10; + } + + if (result_x < 0) { + rb_worker.data.linear_velocity.x = 10000 * dt.count(); + sprite_worker.front().get().data.flip.flip_x = false; + sprite_worker.back().get().data.flip.flip_x = false; + } else { + rb_worker.data.linear_velocity.x = -5000 * dt.count(); + sprite_worker.front().get().data.flip.flip_x = true; + sprite_worker.back().get().data.flip.flip_x = true; + } + } + } +}; diff --git a/game/workers/PanicFromPlayerScript.h b/game/workers/PanicFromPlayerScript.h new file mode 100644 index 0000000..d173e89 --- /dev/null +++ b/game/workers/PanicFromPlayerScript.h @@ -0,0 +1,8 @@ +#pragma once + +#include + +class PanicFromPlayerScript : public crepe::Script { +public: + void fixed_update(crepe::duration_t dt); +}; diff --git a/game/workers/WorkersSubScene.cpp b/game/workers/WorkersSubScene.cpp index 5b070f8..e5b4678 100644 --- a/game/workers/WorkersSubScene.cpp +++ b/game/workers/WorkersSubScene.cpp @@ -1,5 +1,5 @@ #include "WorkersSubScene.h" -#include "PanicFromPlayer.h" +#include "PanicFromPlayerScript.h" #include "WorkerScript.h" #include "../Config.h" @@ -69,7 +69,7 @@ void WorkersSubScene::worker1(crepe::Scene & scn, float start_x, float init_spee .linear_velocity = vec2(init_speed, 0), .collision_layers = {COLL_LAY_BOT_TOP}, }); - worker_1.add_component().set_script(); + worker_1.add_component().set_script(); if (init_speed < 0) { worker_1_body_sprite.data.flip = Sprite::FlipSettings {true, false}; @@ -117,7 +117,7 @@ void WorkersSubScene::worker2(crepe::Scene & scn, float start_x, float init_spee .linear_velocity = vec2(init_speed, 0), .collision_layers = {COLL_LAY_BOT_TOP}, }); - worker_2.add_component().set_script(); + worker_2.add_component().set_script(); if (init_speed < 0) { worker_2_body_sprite.data.flip = Sprite::FlipSettings {true, false}; @@ -165,7 +165,7 @@ void WorkersSubScene::worker3(crepe::Scene & scn, float start_x, float init_spee .linear_velocity = vec2(init_speed, 0), .collision_layers = {COLL_LAY_BOT_TOP}, }); - worker_3.add_component().set_script(); + worker_3.add_component().set_script(); if (init_speed < 0) { worker_3_body_sprite.data.flip = Sprite::FlipSettings {true, false}; @@ -213,7 +213,7 @@ void WorkersSubScene::worker4(crepe::Scene & scn, float start_x, float init_spee .linear_velocity = vec2(init_speed, 0), .collision_layers = {COLL_LAY_BOT_HIGH}, }); - worker_4.add_component().set_script(); + worker_4.add_component().set_script(); if (init_speed < 0) { worker_4_body_sprite.data.flip = Sprite::FlipSettings {true, false}; @@ -261,7 +261,7 @@ void WorkersSubScene::worker5(crepe::Scene & scn, float start_x, float init_spee .linear_velocity = vec2(init_speed, 0), .collision_layers = {COLL_LAY_BOT_HIGH}, }); - worker_5.add_component().set_script(); + worker_5.add_component().set_script(); if (init_speed < 0) { worker_5_body_sprite.data.flip = Sprite::FlipSettings {true, false}; @@ -309,7 +309,7 @@ void WorkersSubScene::worker6(crepe::Scene & scn, float start_x, float init_spee .linear_velocity = vec2(init_speed, 0), .collision_layers = {COLL_LAY_BOT_LOW}, }); - worker_6.add_component().set_script(); + worker_6.add_component().set_script(); if (init_speed < 0) { worker_6_body_sprite.data.flip = Sprite::FlipSettings {true, false}; @@ -357,7 +357,7 @@ void WorkersSubScene::worker7(crepe::Scene & scn, float start_x, float init_spee .linear_velocity = vec2(init_speed, 0), .collision_layers = {COLL_LAY_BOT_LOW}, }); - worker_7.add_component().set_script(); + worker_7.add_component().set_script(); if (init_speed < 0) { worker_7_body_sprite.data.flip = Sprite::FlipSettings {true, false}; @@ -405,7 +405,7 @@ void WorkersSubScene::worker8(crepe::Scene & scn, float start_x, float init_spee .linear_velocity = vec2(init_speed, 0), .collision_layers = {COLL_LAY_BOT_LOW}, }); - worker_8.add_component().set_script(); + worker_8.add_component().set_script(); if (init_speed < 0) { worker_8_body_sprite.data.flip = Sprite::FlipSettings {true, false}; -- cgit v1.2.3