From f2028cd4def82f5f6a52392ff011f6d0fa4aa315 Mon Sep 17 00:00:00 2001 From: JAROWMR Date: Tue, 7 Jan 2025 22:07:32 +0100 Subject: correct naming --- .../mainmenu/ButtonTransitionPreviewScript.cpp | 21 --------------------- game/menus/mainmenu/ButtonTransitionPreviewScript.h | 12 ------------ .../mainmenu/ButtonTransitionPreviewSubScript.cpp | 21 +++++++++++++++++++++ .../mainmenu/ButtonTransitionPreviewSubScript.h | 12 ++++++++++++ game/menus/mainmenu/MainMenuScene.cpp | 4 ++-- game/menus/mainmenu/TransitionStartScript.cpp | 15 --------------- game/menus/mainmenu/TransitionStartScript.h | 9 --------- game/menus/mainmenu/TransitionStartSubScript.cpp | 15 +++++++++++++++ game/menus/mainmenu/TransitionStartSubScript.h | 9 +++++++++ 9 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 game/menus/mainmenu/ButtonTransitionPreviewScript.cpp delete mode 100644 game/menus/mainmenu/ButtonTransitionPreviewScript.h create mode 100644 game/menus/mainmenu/ButtonTransitionPreviewSubScript.cpp create mode 100644 game/menus/mainmenu/ButtonTransitionPreviewSubScript.h delete mode 100644 game/menus/mainmenu/TransitionStartScript.cpp delete mode 100644 game/menus/mainmenu/TransitionStartScript.h create mode 100644 game/menus/mainmenu/TransitionStartSubScript.cpp create mode 100644 game/menus/mainmenu/TransitionStartSubScript.h (limited to 'game/menus/mainmenu') diff --git a/game/menus/mainmenu/ButtonTransitionPreviewScript.cpp b/game/menus/mainmenu/ButtonTransitionPreviewScript.cpp deleted file mode 100644 index 084d02b..0000000 --- a/game/menus/mainmenu/ButtonTransitionPreviewScript.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "ButtonTransitionPreviewScript.h" - -#include "../MenusConfig.h" - -using namespace crepe; -using namespace std; - -void ButtonTransitionPreviewScript::init(){ - IButtonScript::init(); - this->subscribe([this](const ButtonPressEvent& e) { return this->on_button_press(e); }); -} - -bool ButtonTransitionPreviewScript::on_button_press(const ButtonPressEvent& e){ - if(!this->transition) this->transition = true; - return false; -} - -const char* ButtonTransitionPreviewScript::get_scene_name() const { - // Provide the next scene defined in MainMenuConfig - return PREVIEW_SCENE; -} diff --git a/game/menus/mainmenu/ButtonTransitionPreviewScript.h b/game/menus/mainmenu/ButtonTransitionPreviewScript.h deleted file mode 100644 index 5973dbf..0000000 --- a/game/menus/mainmenu/ButtonTransitionPreviewScript.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "ITransitionScript.h" - -#include "../IButtonScript.h" - -class ButtonTransitionPreviewScript : public ITransitionScript, public IButtonScript { -public: - void init() override; - bool on_button_press(const crepe::ButtonPressEvent& e); - const char* get_scene_name() const override; -}; diff --git a/game/menus/mainmenu/ButtonTransitionPreviewSubScript.cpp b/game/menus/mainmenu/ButtonTransitionPreviewSubScript.cpp new file mode 100644 index 0000000..8c055ec --- /dev/null +++ b/game/menus/mainmenu/ButtonTransitionPreviewSubScript.cpp @@ -0,0 +1,21 @@ +#include "ButtonTransitionPreviewSubScript.h" + +#include "../MenusConfig.h" + +using namespace crepe; +using namespace std; + +void ButtonTransitionPreviewSubScript::init(){ + IButtonScript::init(); + this->subscribe([this](const ButtonPressEvent& e) { return this->on_button_press(e); }); +} + +bool ButtonTransitionPreviewSubScript::on_button_press(const ButtonPressEvent& e){ + if(!this->transition) this->transition = true; + return false; +} + +const char* ButtonTransitionPreviewSubScript::get_scene_name() const { + // Provide the next scene defined in MainMenuConfig + return PREVIEW_SCENE; +} diff --git a/game/menus/mainmenu/ButtonTransitionPreviewSubScript.h b/game/menus/mainmenu/ButtonTransitionPreviewSubScript.h new file mode 100644 index 0000000..6e6b0b2 --- /dev/null +++ b/game/menus/mainmenu/ButtonTransitionPreviewSubScript.h @@ -0,0 +1,12 @@ +#pragma once + +#include "ITransitionScript.h" + +#include "../IButtonScript.h" + +class ButtonTransitionPreviewSubScript : public ITransitionScript, public IButtonScript { +public: + void init() override; + bool on_button_press(const crepe::ButtonPressEvent& e); + const char* get_scene_name() const override; +}; diff --git a/game/menus/mainmenu/MainMenuScene.cpp b/game/menus/mainmenu/MainMenuScene.cpp index 15cf6d5..e0dfbee 100644 --- a/game/menus/mainmenu/MainMenuScene.cpp +++ b/game/menus/mainmenu/MainMenuScene.cpp @@ -1,6 +1,6 @@ #include "MainMenuScene.h" -#include "TransitionStartScript.h" +#include "TransitionStartSubScript.h" #include "MainMenuConfig.h" #include "../ButtonSubScene.h" @@ -29,7 +29,7 @@ void MainMenuScene::load_scene(){ Camera::Data{ .bg_color = Color::RED, }); - camera_object.add_component().set_script(); + camera_object.add_component().set_script(); //Button menu diff --git a/game/menus/mainmenu/TransitionStartScript.cpp b/game/menus/mainmenu/TransitionStartScript.cpp deleted file mode 100644 index 9b395de..0000000 --- a/game/menus/mainmenu/TransitionStartScript.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "TransitionStartScript.h" - -#include "../MenusConfig.h" - -using namespace crepe; -using namespace std; - -void TransitionStartScript::fixed_update(crepe::duration_t dt){ - if(this->get_key_state(Keycode::ENTER) && this->transition == false) this->transition = true; -} - -const char* TransitionStartScript::get_scene_name() const { - // Provide the next scene defined in MainMenuConfig - return START_SCENE; -} diff --git a/game/menus/mainmenu/TransitionStartScript.h b/game/menus/mainmenu/TransitionStartScript.h deleted file mode 100644 index c6df1b9..0000000 --- a/game/menus/mainmenu/TransitionStartScript.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include "ITransitionScript.h" - -class TransitionStartScript : public ITransitionScript { -public: - void fixed_update(crepe::duration_t dt) override; - const char* get_scene_name() const override; -}; diff --git a/game/menus/mainmenu/TransitionStartSubScript.cpp b/game/menus/mainmenu/TransitionStartSubScript.cpp new file mode 100644 index 0000000..6ad4673 --- /dev/null +++ b/game/menus/mainmenu/TransitionStartSubScript.cpp @@ -0,0 +1,15 @@ +#include "TransitionStartSubScript.h" + +#include "../MenusConfig.h" + +using namespace crepe; +using namespace std; + +void TransitionStartSubScript::fixed_update(crepe::duration_t dt){ + if(this->get_key_state(Keycode::ENTER) && this->transition == false) this->transition = true; +} + +const char* TransitionStartSubScript::get_scene_name() const { + // Provide the next scene defined in MainMenuConfig + return START_SCENE; +} diff --git a/game/menus/mainmenu/TransitionStartSubScript.h b/game/menus/mainmenu/TransitionStartSubScript.h new file mode 100644 index 0000000..b41360d --- /dev/null +++ b/game/menus/mainmenu/TransitionStartSubScript.h @@ -0,0 +1,9 @@ +#pragma once + +#include "ITransitionScript.h" + +class TransitionStartSubScript : public ITransitionScript { +public: + void fixed_update(crepe::duration_t dt) override; + const char* get_scene_name() const override; +}; -- cgit v1.2.3