From bc66e7195c80facca244f933b882011e5e81fa3c Mon Sep 17 00:00:00 2001 From: JAROWMR Date: Tue, 7 Jan 2025 13:20:50 +0100 Subject: coins use events --- game/coins/CoinPool.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'game/coins/CoinPool.cpp') diff --git a/game/coins/CoinPool.cpp b/game/coins/CoinPool.cpp index 5720c2f..59b987c 100644 --- a/game/coins/CoinPool.cpp +++ b/game/coins/CoinPool.cpp @@ -1,5 +1,8 @@ #include "CoinPool.h" +#include "CoinScript.h" #include "CoinSubScene.h" +#include "api/BehaviorScript.h" +#include "api/GameObject.h" using namespace crepe; using namespace std; -- cgit v1.2.3 From 41f890863706ee8ede43021fe83b776b638a18b7 Mon Sep 17 00:00:00 2001 From: JAROWMR Date: Tue, 7 Jan 2025 14:06:45 +0100 Subject: fixed coins and improved coin --- game/coins/CoinPool.cpp | 5 ++++- game/coins/CoinScript.cpp | 4 ++-- game/coins/CoinSubScene.cpp | 3 +-- game/coins/CoinSubScene.h | 2 +- game/coins/CoinSystemScript.cpp | 2 +- game/coins/CoinSystemScript.h | 2 +- game/hud/HudScript.cpp | 28 +++++++++++++++------------- game/hud/HudScript.h | 2 ++ game/player/PlayerEndScript.cpp | 2 +- game/player/PlayerScript.cpp | 6 +++--- game/player/PlayerSubScene.cpp | 2 +- 11 files changed, 32 insertions(+), 26 deletions(-) (limited to 'game/coins/CoinPool.cpp') diff --git a/game/coins/CoinPool.cpp b/game/coins/CoinPool.cpp index 59b987c..439b3b3 100644 --- a/game/coins/CoinPool.cpp +++ b/game/coins/CoinPool.cpp @@ -8,6 +8,9 @@ using namespace crepe; using namespace std; void CoinPool::create_coins(crepe::Scene & scn) { + int amount = 0; CoinSubScene coin; - while(coin.create(scn) < this->MAXIMUM_AMOUNT); + while(amount < this->MAXIMUM_AMOUNT){ + amount = coin.create(scn,amount); + } } diff --git a/game/coins/CoinScript.cpp b/game/coins/CoinScript.cpp index 5960446..a3ee3b9 100644 --- a/game/coins/CoinScript.cpp +++ b/game/coins/CoinScript.cpp @@ -10,11 +10,11 @@ using namespace crepe; using namespace std; bool CoinScript::on_collision(const CollisionEvent & collisionData){ - if(collisionData.info.other.metadata.tag != "coin") return true; + if(collisionData.info.other.metadata.tag != "coin") return false; this->get_components_by_name(collisionData.info.other.metadata.name).front().get().active = false; this->get_components_by_name(collisionData.info.other.metadata.name).front().get().active = false; this->amount++; - return true; + return false; } void CoinScript::init(){ diff --git a/game/coins/CoinSubScene.cpp b/game/coins/CoinSubScene.cpp index 72319ca..9c9caa3 100644 --- a/game/coins/CoinSubScene.cpp +++ b/game/coins/CoinSubScene.cpp @@ -11,10 +11,9 @@ using namespace crepe; using namespace std; -int CoinSubScene::create(Scene & scn){ +int CoinSubScene::create(Scene & scn,int coin_counter){ vec2 size = {20, 20}; - static int coin_counter = 0; string unique_name = "coin_" + to_string(coin_counter++); GameObject coin = scn.new_object(unique_name.c_str(),"coin",vec2{650,0},0,1); diff --git a/game/coins/CoinSubScene.h b/game/coins/CoinSubScene.h index f85f427..ddb6450 100644 --- a/game/coins/CoinSubScene.h +++ b/game/coins/CoinSubScene.h @@ -8,5 +8,5 @@ class Scene; class CoinSubScene { public: - int create(crepe::Scene & scn); + int create(crepe::Scene & scn,int coin_counter); }; diff --git a/game/coins/CoinSystemScript.cpp b/game/coins/CoinSystemScript.cpp index c9c301e..573c825 100644 --- a/game/coins/CoinSystemScript.cpp +++ b/game/coins/CoinSystemScript.cpp @@ -9,7 +9,7 @@ using namespace crepe; using namespace std; -std::vector CoinSystemScript::coin_locations; + void CoinSystemScript::init() { engine.seed(rd()); diff --git a/game/coins/CoinSystemScript.h b/game/coins/CoinSystemScript.h index f558f08..c65b533 100644 --- a/game/coins/CoinSystemScript.h +++ b/game/coins/CoinSystemScript.h @@ -49,7 +49,7 @@ private: static constexpr float SPAWN_DISTANCE = 600; static constexpr float DESPAWN_DISTANCE = 600; static constexpr float SPAWN_AREA = 50; - static std::vector coin_locations; + std::vector coin_locations; private: // preset one settings // ***** ***** diff --git a/game/hud/HudScript.cpp b/game/hud/HudScript.cpp index d7a043a..30a5c15 100644 --- a/game/hud/HudScript.cpp +++ b/game/hud/HudScript.cpp @@ -19,19 +19,21 @@ void HudScript::init() { txt.offset = TOP_LEFT+FONTOFFSET+BEST_OFFSET + vec2{record.size() * BEST_CHAR_WIDTH/2,0}; this->subscribe([this](const GetCoinEvent e)-> bool { return this->get_coin(e); }); - this->subscribe([this](const KeyPressEvent & ev) -> bool { - if(ev.key != Keycode::END) return false; - Text & txt_fps = this->get_components_by_name(HUD_FPS).front(); - this->show_fps = !this->show_fps; - if(this->show_fps) - { - txt_fps.active = true; - } - else { - txt_fps.active = false; - } - return true; - }); + this->subscribe([this](const KeyPressEvent & ev) -> bool { return this->toggle_fps(ev);}); +} + +bool HudScript::toggle_fps(crepe::KeyPressEvent ev){ + if(ev.key != Keycode::END) return false; + Text & txt_fps = this->get_components_by_name(HUD_FPS).front(); + this->show_fps = !this->show_fps; + if(this->show_fps) + { + txt_fps.active = true; + } + else { + txt_fps.active = false; + } + return true; } void HudScript::frame_update(crepe::duration_t dt) { diff --git a/game/hud/HudScript.h b/game/hud/HudScript.h index 0aa10a4..d780d4b 100644 --- a/game/hud/HudScript.h +++ b/game/hud/HudScript.h @@ -1,5 +1,6 @@ #pragma once +#include "api/Event.h" #include "api/Script.h" #include "manager/SaveManager.h" @@ -12,6 +13,7 @@ public: void init() override; void frame_update(crepe::duration_t dt) override; bool get_coin(const GetCoinEvent e); + bool toggle_fps(crepe::KeyPressEvent ev); private: crepe::SaveManager* savemgr; bool show_fps = false; diff --git a/game/player/PlayerEndScript.cpp b/game/player/PlayerEndScript.cpp index 1554c84..f3d9aad 100644 --- a/game/player/PlayerEndScript.cpp +++ b/game/player/PlayerEndScript.cpp @@ -94,7 +94,7 @@ bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) { this->trigger_event(); } - return true; + return false; } return false; diff --git a/game/player/PlayerScript.cpp b/game/player/PlayerScript.cpp index 472d7c8..c151d53 100644 --- a/game/player/PlayerScript.cpp +++ b/game/player/PlayerScript.cpp @@ -36,7 +36,7 @@ bool PlayerScript::on_collision(const CollisionEvent & ev) { } play_scr.active = false; end_scr.active = true; - return true; + return false; } else if (ev.info.other.metadata.tag == "laser") { for (Animator & anim : animators) { anim.active = true; @@ -49,7 +49,7 @@ bool PlayerScript::on_collision(const CollisionEvent & ev) { } play_scr.active = false; end_scr.active = true; - return true; + return false; } else if (ev.info.other.metadata.tag == "missile") { for (Animator & anim : animators) { anim.active = true; @@ -62,7 +62,7 @@ bool PlayerScript::on_collision(const CollisionEvent & ev) { } play_scr.active = false; end_scr.active = true; - return true; + return false; } return false; diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp index fff9287..e6da6f7 100644 --- a/game/player/PlayerSubScene.cpp +++ b/game/player/PlayerSubScene.cpp @@ -150,6 +150,6 @@ PlayerSubScene::PlayerSubScene(Scene & scn) { .collision_layer = COLL_LAY_PLAYER, }); player.add_component().set_script().active = false; - player.add_component().set_script().active = false; player.add_component().set_script(); + player.add_component().set_script().active = false; } -- cgit v1.2.3 From 055ca804ebe27ea77f1c09079f119a0526426e70 Mon Sep 17 00:00:00 2001 From: JAROWMR Date: Tue, 7 Jan 2025 21:10:50 +0100 Subject: fixed includes --- game/coins/CoinPool.cpp | 3 --- game/coins/CoinPool.h | 3 +-- game/coins/CoinScript.cpp | 8 +++++--- game/coins/CoinSubScene.cpp | 14 +++++++------- game/coins/CoinSystemScript.cpp | 11 ++++++----- game/coins/CoinSystemScript.h | 11 ++++++----- game/hud/HudConfig.h | 2 +- game/hud/HudScript.cpp | 11 +++++++---- game/hud/HudScript.h | 6 +++--- game/hud/HudSubScene.cpp | 9 ++++++--- game/hud/HudSubScene.h | 3 ++- game/hud/SpeedScript.cpp | 7 ++++--- game/hud/SpeedScript.h | 4 ++-- game/menus/ButtonNextMainMenuScript.cpp | 7 +++++-- game/menus/ButtonSetMainMenuScript.cpp | 5 +++-- game/menus/FloatingWindowSubScene.cpp | 2 +- game/menus/FloatingWindowSubScene.h | 2 +- game/menus/IFloatingWindowScript.cpp | 5 +++-- game/menus/IFloatingWindowScript.h | 1 + game/menus/endgame/EndGameSubScene.cpp | 11 +++++++---- game/menus/endgame/EndGameSubScript.cpp | 11 +++++++---- game/menus/endgame/EndGameSubScript.h | 3 ++- 22 files changed, 80 insertions(+), 59 deletions(-) (limited to 'game/coins/CoinPool.cpp') diff --git a/game/coins/CoinPool.cpp b/game/coins/CoinPool.cpp index 439b3b3..1d2d0de 100644 --- a/game/coins/CoinPool.cpp +++ b/game/coins/CoinPool.cpp @@ -1,8 +1,5 @@ #include "CoinPool.h" -#include "CoinScript.h" #include "CoinSubScene.h" -#include "api/BehaviorScript.h" -#include "api/GameObject.h" using namespace crepe; using namespace std; diff --git a/game/coins/CoinPool.h b/game/coins/CoinPool.h index 83058f7..d94c352 100644 --- a/game/coins/CoinPool.h +++ b/game/coins/CoinPool.h @@ -1,7 +1,6 @@ #pragma once -#include "api/Scene.h" - +#include class CoinPool { public: diff --git a/game/coins/CoinScript.cpp b/game/coins/CoinScript.cpp index 2ecbb98..3d18780 100644 --- a/game/coins/CoinScript.cpp +++ b/game/coins/CoinScript.cpp @@ -1,11 +1,13 @@ #include "CoinScript.h" -#include "api/CircleCollider.h" -#include "api/Sprite.h" + #include "manager/SaveManager.h" + #include "../Config.h" -#include "../Events.h" #include "../hud/HudScript.h" +#include +#include + using namespace crepe; using namespace std; diff --git a/game/coins/CoinSubScene.cpp b/game/coins/CoinSubScene.cpp index 9c9caa3..63f9e89 100644 --- a/game/coins/CoinSubScene.cpp +++ b/game/coins/CoinSubScene.cpp @@ -1,13 +1,13 @@ #include "CoinSubScene.h" -#include "api/Animator.h" -#include "api/BehaviorScript.h" -#include "api/CircleCollider.h" -#include "api/Rigidbody.h" -#include "api/Scene.h" -#include "api/AudioSource.h" -#include "CoinScript.h" + #include "../Config.h" +#include +#include +#include +#include +#include + using namespace crepe; using namespace std; diff --git a/game/coins/CoinSystemScript.cpp b/game/coins/CoinSystemScript.cpp index 573c825..a58e3fd 100644 --- a/game/coins/CoinSystemScript.cpp +++ b/game/coins/CoinSystemScript.cpp @@ -1,11 +1,12 @@ #include "CoinSystemScript.h" -#include "CoinPool.h" -#include "api/CircleCollider.h" -#include "api/Metadata.h" -#include "api/Sprite.h" -#include "api/Transform.h" + #include +#include +#include +#include +#include + using namespace crepe; using namespace std; diff --git a/game/coins/CoinSystemScript.h b/game/coins/CoinSystemScript.h index c65b533..b432f68 100644 --- a/game/coins/CoinSystemScript.h +++ b/game/coins/CoinSystemScript.h @@ -1,13 +1,14 @@ #pragma once -#include "types.h" #include -#include "api/CircleCollider.h" -#include "api/Script.h" -#include "api/Sprite.h" -#include "api/Transform.h" #include +#include +#include +#include +#include +#include + class CoinSystemScript : public crepe::Script { private: struct CoinData{ diff --git a/game/hud/HudConfig.h b/game/hud/HudConfig.h index e3497fb..2da3b66 100644 --- a/game/hud/HudConfig.h +++ b/game/hud/HudConfig.h @@ -1,5 +1,5 @@ #pragma once -#include "types.h" +#include static constexpr crepe::vec2 TOP_LEFT = {-530,-230}; static constexpr const char* HUD_DISTANCE = "hud_distance"; diff --git a/game/hud/HudScript.cpp b/game/hud/HudScript.cpp index 165f245..4aca15e 100644 --- a/game/hud/HudScript.cpp +++ b/game/hud/HudScript.cpp @@ -1,12 +1,15 @@ #include "HudScript.h" -#include "api/Text.h" -#include "api/Transform.h" -#include "manager/SaveManager.h" +#include "HudConfig.h" + #include "../Config.h" #include "../Events.h" -#include "HudConfig.h" + #include +#include +#include +#include + using namespace crepe; using namespace std; diff --git a/game/hud/HudScript.h b/game/hud/HudScript.h index cf939f4..5b9ec17 100644 --- a/game/hud/HudScript.h +++ b/game/hud/HudScript.h @@ -1,8 +1,8 @@ #pragma once -#include "api/Event.h" -#include "api/Script.h" -#include "manager/SaveManager.h" +#include +#include +#include struct GetCoinEvent : public crepe::Event { int amount_of_coins; diff --git a/game/hud/HudSubScene.cpp b/game/hud/HudSubScene.cpp index 4995624..8b87a2e 100644 --- a/game/hud/HudSubScene.cpp +++ b/game/hud/HudSubScene.cpp @@ -1,9 +1,12 @@ #include "HudSubScene.h" -#include "api/GameObject.h" -#include "api/Text.h" -#include "../Config.h" #include "HudConfig.h" +#include "../Config.h" + +#include +#include + + using namespace crepe; using namespace std; diff --git a/game/hud/HudSubScene.h b/game/hud/HudSubScene.h index 711a34d..be696e9 100644 --- a/game/hud/HudSubScene.h +++ b/game/hud/HudSubScene.h @@ -1,6 +1,7 @@ #pragma once -#include "api/Scene.h" +#include + class HudSubScene { public: diff --git a/game/hud/SpeedScript.cpp b/game/hud/SpeedScript.cpp index 69534d9..c9f7188 100644 --- a/game/hud/SpeedScript.cpp +++ b/game/hud/SpeedScript.cpp @@ -1,7 +1,8 @@ #include "SpeedScript.h" -#include "api/Event.h" -#include "api/KeyCodes.h" -#include "manager/LoopTimerManager.h" + +#include +#include +#include using namespace crepe; using namespace std; diff --git a/game/hud/SpeedScript.h b/game/hud/SpeedScript.h index 8bd7271..76ada4f 100644 --- a/game/hud/SpeedScript.h +++ b/game/hud/SpeedScript.h @@ -1,7 +1,7 @@ #pragma once -#include "api/Script.h" -#include "manager/SaveManager.h" +#include +#include class SpeedScript : public crepe::Script { public: diff --git a/game/menus/ButtonNextMainMenuScript.cpp b/game/menus/ButtonNextMainMenuScript.cpp index d7f48e2..7ebb2cf 100644 --- a/game/menus/ButtonNextMainMenuScript.cpp +++ b/game/menus/ButtonNextMainMenuScript.cpp @@ -1,11 +1,14 @@ #include "ButtonNextMainMenuScript.h" #include "MenusConfig.h" #include "ValueBroker.h" -#include "api/AudioSource.h" + #include "manager/SaveManager.h" -#include "types.h" + #include "../Config.h" +#include +#include + using namespace crepe; using namespace std; diff --git a/game/menus/ButtonSetMainMenuScript.cpp b/game/menus/ButtonSetMainMenuScript.cpp index e967dfb..1e4179c 100644 --- a/game/menus/ButtonSetMainMenuScript.cpp +++ b/game/menus/ButtonSetMainMenuScript.cpp @@ -1,7 +1,8 @@ #include "ButtonSetMainMenuScript.h" #include "MenusConfig.h" -#include "api/AudioSource.h" -#include "types.h" + +#include +#include using namespace crepe; using namespace std; diff --git a/game/menus/FloatingWindowSubScene.cpp b/game/menus/FloatingWindowSubScene.cpp index 16963bb..640d151 100644 --- a/game/menus/FloatingWindowSubScene.cpp +++ b/game/menus/FloatingWindowSubScene.cpp @@ -1,8 +1,8 @@ #include "FloatingWindowSubScene.h" #include "MenusConfig.h" -#include "types.h" +#include #include #include #include diff --git a/game/menus/FloatingWindowSubScene.h b/game/menus/FloatingWindowSubScene.h index a0bd854..1ce7c38 100644 --- a/game/menus/FloatingWindowSubScene.h +++ b/game/menus/FloatingWindowSubScene.h @@ -1,6 +1,6 @@ #pragma once -#include "types.h" +#include #include class FloatingWindowSubScene { diff --git a/game/menus/IFloatingWindowScript.cpp b/game/menus/IFloatingWindowScript.cpp index ce84de7..8d6c838 100644 --- a/game/menus/IFloatingWindowScript.cpp +++ b/game/menus/IFloatingWindowScript.cpp @@ -1,6 +1,7 @@ #include "IFloatingWindowScript.h" -#include "api/Sprite.h" -#include "types.h" + +#include +#include using namespace crepe; diff --git a/game/menus/IFloatingWindowScript.h b/game/menus/IFloatingWindowScript.h index 9775726..dff4091 100644 --- a/game/menus/IFloatingWindowScript.h +++ b/game/menus/IFloatingWindowScript.h @@ -1,6 +1,7 @@ #pragma once #include + #include class IFloatingWindowScript : public virtual crepe::Script { diff --git a/game/menus/endgame/EndGameSubScene.cpp b/game/menus/endgame/EndGameSubScene.cpp index 5360c96..c97ce52 100644 --- a/game/menus/endgame/EndGameSubScene.cpp +++ b/game/menus/endgame/EndGameSubScene.cpp @@ -1,14 +1,17 @@ #include "EndGameSubScene.h" +#include "EndGameSubScript.h" + #include "../FloatingWindowSubScene.h" #include "../ButtonSubScene.h" -#include +#include "../../Config.h" + #include + #include #include -#include "EndGameSubScript.h" -#include "types.h" -#include "../../Config.h" +#include +#include using namespace crepe; using namespace std; diff --git a/game/menus/endgame/EndGameSubScript.cpp b/game/menus/endgame/EndGameSubScript.cpp index 2be6931..2204df0 100644 --- a/game/menus/endgame/EndGameSubScript.cpp +++ b/game/menus/endgame/EndGameSubScript.cpp @@ -1,12 +1,15 @@ #include "EndGameSubScript.h" + #include "../IFloatingWindowScript.h" -#include "api/Button.h" -#include "api/Sprite.h" -#include "api/Text.h" -#include "types.h" #include "../../Events.h" + #include +#include +#include +#include +#include + using namespace crepe; EndGameSubScript::EndGameSubScript(const std::string & tag){ diff --git a/game/menus/endgame/EndGameSubScript.h b/game/menus/endgame/EndGameSubScript.h index 2ce3ec7..4b63a4e 100644 --- a/game/menus/endgame/EndGameSubScript.h +++ b/game/menus/endgame/EndGameSubScript.h @@ -1,7 +1,8 @@ #pragma once #include "../IFloatingWindowScript.h" -#include "api/Event.h" + +#include #include class EndGameSubScript : public IFloatingWindowScript { -- cgit v1.2.3 From f2028cd4def82f5f6a52392ff011f6d0fa4aa315 Mon Sep 17 00:00:00 2001 From: JAROWMR Date: Tue, 7 Jan 2025 22:07:32 +0100 Subject: correct naming --- game/CMakeLists.txt | 12 +++---- game/GameScene.cpp | 6 ++-- game/coins/CoinPool.cpp | 13 ------- game/coins/CoinPool.h | 11 ------ game/coins/CoinPoolSubScene.cpp | 13 +++++++ game/coins/CoinPoolSubScene.h | 11 ++++++ game/menus/ButtonNextMainMenuScript.cpp | 40 ---------------------- game/menus/ButtonNextMainMenuScript.h | 15 -------- game/menus/ButtonNextMainMenuSubScript.cpp | 40 ++++++++++++++++++++++ game/menus/ButtonNextMainMenuSubScript.h | 15 ++++++++ game/menus/ButtonSetMainMenuScript.cpp | 21 ------------ game/menus/ButtonSetMainMenuScript.h | 15 -------- game/menus/ButtonSetMainMenuSubScript.cpp | 21 ++++++++++++ game/menus/ButtonSetMainMenuSubScript.h | 15 ++++++++ game/menus/ButtonSetShopScript.cpp | 16 --------- game/menus/ButtonSetShopScript.h | 15 -------- game/menus/ButtonSetShopSubScript.cpp | 16 +++++++++ game/menus/ButtonSetShopSubScript.h | 15 ++++++++ game/menus/ButtonSubScene.cpp | 16 ++++----- .../mainmenu/ButtonTransitionPreviewScript.cpp | 21 ------------ .../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 +++++ 28 files changed, 221 insertions(+), 223 deletions(-) delete mode 100644 game/coins/CoinPool.cpp delete mode 100644 game/coins/CoinPool.h create mode 100644 game/coins/CoinPoolSubScene.cpp create mode 100644 game/coins/CoinPoolSubScene.h delete mode 100644 game/menus/ButtonNextMainMenuScript.cpp delete mode 100644 game/menus/ButtonNextMainMenuScript.h create mode 100644 game/menus/ButtonNextMainMenuSubScript.cpp create mode 100644 game/menus/ButtonNextMainMenuSubScript.h delete mode 100644 game/menus/ButtonSetMainMenuScript.cpp delete mode 100644 game/menus/ButtonSetMainMenuScript.h create mode 100644 game/menus/ButtonSetMainMenuSubScript.cpp create mode 100644 game/menus/ButtonSetMainMenuSubScript.h delete mode 100644 game/menus/ButtonSetShopScript.cpp delete mode 100644 game/menus/ButtonSetShopScript.h create mode 100644 game/menus/ButtonSetShopSubScript.cpp create mode 100644 game/menus/ButtonSetShopSubScript.h 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/coins/CoinPool.cpp') diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index ccafc9b..de10433 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -26,20 +26,20 @@ add_executable(main menus/BannerSubScene.cpp menus/ButtonSubScene.cpp menus/IButtonScript.cpp - menus/ButtonSetShopScript.cpp - menus/ButtonSetMainMenuScript.cpp - menus/ButtonNextMainMenuScript.cpp + menus/ButtonSetShopSubScript.cpp + menus/ButtonSetMainMenuSubScript.cpp + menus/ButtonNextMainMenuSubScript.cpp menus/FloatingWindowSubScene.cpp menus/IFloatingWindowScript.cpp menus/shop/ShopMenuScene.cpp - menus/mainmenu/ButtonTransitionPreviewScript.cpp + menus/mainmenu/ButtonTransitionPreviewSubScript.cpp menus/mainmenu/ITransitionScript.cpp menus/mainmenu/MainMenuScene.cpp - menus/mainmenu/TransitionStartScript.cpp + menus/mainmenu/TransitionStartSubScript.cpp menus/endgame/EndGameSubScene.cpp menus/endgame/EndGameSubScript.cpp coins/CoinSubScene.cpp - coins/CoinPool.cpp + coins/CoinPoolSubScene.cpp coins/CoinSystemScript.cpp coins/CoinScript.cpp hud/HudSubScene.cpp diff --git a/game/GameScene.cpp b/game/GameScene.cpp index fce8206..38ac4b1 100644 --- a/game/GameScene.cpp +++ b/game/GameScene.cpp @@ -2,8 +2,7 @@ #include "Config.h" #include "MoveCameraManualyScript.h" #include "StartGameScript.h" -#include "coins/CoinSubScene.h" -#include "coins/CoinPool.h" +#include "coins/CoinPoolSubScene.h" #include "coins/CoinSystemScript.h" #include "background/BackgroundSubScene.h" @@ -11,7 +10,6 @@ #include "hud/HudSubScene.h" #include "hud/SpeedScript.h" #include "menus/endgame/EndGameSubScene.h" -#include "menus/endgame/EndGameSubScript.h" #include "player/PlayerSubScene.h" #include @@ -81,7 +79,7 @@ void GameScene::load_scene() { start_game_script.add_component().set_script(); //create coin pool - CoinPool coin_system; + CoinPoolSubScene coin_system; coin_system.create_coins(*this); HudSubScene hud; diff --git a/game/coins/CoinPool.cpp b/game/coins/CoinPool.cpp deleted file mode 100644 index 1d2d0de..0000000 --- a/game/coins/CoinPool.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "CoinPool.h" -#include "CoinSubScene.h" - -using namespace crepe; -using namespace std; - -void CoinPool::create_coins(crepe::Scene & scn) { - int amount = 0; - CoinSubScene coin; - while(amount < this->MAXIMUM_AMOUNT){ - amount = coin.create(scn,amount); - } -} diff --git a/game/coins/CoinPool.h b/game/coins/CoinPool.h deleted file mode 100644 index d94c352..0000000 --- a/game/coins/CoinPool.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include - -class CoinPool { -public: - void create_coins(crepe::Scene & scn); -private: - static constexpr int MAXIMUM_AMOUNT = 100; -}; - diff --git a/game/coins/CoinPoolSubScene.cpp b/game/coins/CoinPoolSubScene.cpp new file mode 100644 index 0000000..05f6bfc --- /dev/null +++ b/game/coins/CoinPoolSubScene.cpp @@ -0,0 +1,13 @@ +#include "CoinPoolSubScene.h" +#include "CoinSubScene.h" + +using namespace crepe; +using namespace std; + +void CoinPoolSubScene::create_coins(crepe::Scene & scn) { + int amount = 0; + CoinSubScene coin; + while(amount < this->MAXIMUM_AMOUNT){ + amount = coin.create(scn,amount); + } +} diff --git a/game/coins/CoinPoolSubScene.h b/game/coins/CoinPoolSubScene.h new file mode 100644 index 0000000..7360051 --- /dev/null +++ b/game/coins/CoinPoolSubScene.h @@ -0,0 +1,11 @@ +#pragma once + +#include + +class CoinPoolSubScene { +public: + void create_coins(crepe::Scene & scn); +private: + static constexpr int MAXIMUM_AMOUNT = 100; +}; + diff --git a/game/menus/ButtonNextMainMenuScript.cpp b/game/menus/ButtonNextMainMenuScript.cpp deleted file mode 100644 index 7ebb2cf..0000000 --- a/game/menus/ButtonNextMainMenuScript.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include "ButtonNextMainMenuScript.h" -#include "MenusConfig.h" -#include "ValueBroker.h" - -#include "manager/SaveManager.h" - -#include "../Config.h" - -#include -#include - -using namespace crepe; -using namespace std; - -void ButtonNextMainMenuScript::init(){ - IButtonScript::init(); - this->subscribe([this](const ButtonPressEvent& e) { return this->on_button_press(e); }); -} - -bool ButtonNextMainMenuScript::on_button_press(const ButtonPressEvent& e){ - RefVector audios = this->get_components_by_name("background_music"); - - for (AudioSource & audio : audios) { - audio.stop(); - } - - SaveManager & savemgr = this->get_save_manager(); - - ValueBroker coins = savemgr.get(TOTAL_COINS_RUN,0); - ValueBroker coins_game = savemgr.get(TOTAL_COINS_GAME,0); - savemgr.set(TOTAL_COINS_GAME, coins_game.get()+coins.get()); - - ValueBroker distance = savemgr.get(DISTANCE_RUN,0); - ValueBroker distance_game = savemgr.get(DISTANCE_GAME,0); - if(distance.get() > distance_game.get()) savemgr.set(DISTANCE_GAME, distance.get()); - - this->set_next_scene(MAINMENU_SCENE); - return false; -} - diff --git a/game/menus/ButtonNextMainMenuScript.h b/game/menus/ButtonNextMainMenuScript.h deleted file mode 100644 index b9f70b3..0000000 --- a/game/menus/ButtonNextMainMenuScript.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "IButtonScript.h" - -#include - -class ButtonNextMainMenuScript : public IButtonScript { -public: - void init() override; - bool on_button_press(const crepe::ButtonPressEvent& e); -private: - float velocity = 20; -protected: - bool transition = false; -}; diff --git a/game/menus/ButtonNextMainMenuSubScript.cpp b/game/menus/ButtonNextMainMenuSubScript.cpp new file mode 100644 index 0000000..d6e315e --- /dev/null +++ b/game/menus/ButtonNextMainMenuSubScript.cpp @@ -0,0 +1,40 @@ +#include "ButtonNextMainMenuSubScript.h" +#include "MenusConfig.h" +#include "ValueBroker.h" + +#include "manager/SaveManager.h" + +#include "../Config.h" + +#include +#include + +using namespace crepe; +using namespace std; + +void ButtonNextMainMenuSubScript::init(){ + IButtonScript::init(); + this->subscribe([this](const ButtonPressEvent& e) { return this->on_button_press(e); }); +} + +bool ButtonNextMainMenuSubScript::on_button_press(const ButtonPressEvent& e){ + RefVector audios = this->get_components_by_name("background_music"); + + for (AudioSource & audio : audios) { + audio.stop(); + } + + SaveManager & savemgr = this->get_save_manager(); + + ValueBroker coins = savemgr.get(TOTAL_COINS_RUN,0); + ValueBroker coins_game = savemgr.get(TOTAL_COINS_GAME,0); + savemgr.set(TOTAL_COINS_GAME, coins_game.get()+coins.get()); + + ValueBroker distance = savemgr.get(DISTANCE_RUN,0); + ValueBroker distance_game = savemgr.get(DISTANCE_GAME,0); + if(distance.get() > distance_game.get()) savemgr.set(DISTANCE_GAME, distance.get()); + + this->set_next_scene(MAINMENU_SCENE); + return false; +} + diff --git a/game/menus/ButtonNextMainMenuSubScript.h b/game/menus/ButtonNextMainMenuSubScript.h new file mode 100644 index 0000000..cb5c8ca --- /dev/null +++ b/game/menus/ButtonNextMainMenuSubScript.h @@ -0,0 +1,15 @@ +#pragma once + +#include "IButtonScript.h" + +#include + +class ButtonNextMainMenuSubScript : public IButtonScript { +public: + void init() override; + bool on_button_press(const crepe::ButtonPressEvent& e); +private: + float velocity = 20; +protected: + bool transition = false; +}; diff --git a/game/menus/ButtonSetMainMenuScript.cpp b/game/menus/ButtonSetMainMenuScript.cpp deleted file mode 100644 index 1e4179c..0000000 --- a/game/menus/ButtonSetMainMenuScript.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "ButtonSetMainMenuScript.h" -#include "MenusConfig.h" - -#include -#include - -using namespace crepe; -using namespace std; - -void ButtonSetMainMenuScript::init(){ - IButtonScript::init(); - this->subscribe([this](const ButtonPressEvent& e) { return this->on_button_press(e); }); -} - -bool ButtonSetMainMenuScript::on_button_press(const ButtonPressEvent& e){ - RefVector audios = this->get_components_by_name("background_music"); - - this->set_next_scene(MAINMENU_SCENE); - return false; -} - diff --git a/game/menus/ButtonSetMainMenuScript.h b/game/menus/ButtonSetMainMenuScript.h deleted file mode 100644 index 13a33bf..0000000 --- a/game/menus/ButtonSetMainMenuScript.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "IButtonScript.h" - -#include - -class ButtonSetMainMenuScript : public IButtonScript { -public: - void init() override; - bool on_button_press(const crepe::ButtonPressEvent& e); -private: - float velocity = 20; -protected: - bool transition = false; -}; diff --git a/game/menus/ButtonSetMainMenuSubScript.cpp b/game/menus/ButtonSetMainMenuSubScript.cpp new file mode 100644 index 0000000..2181f44 --- /dev/null +++ b/game/menus/ButtonSetMainMenuSubScript.cpp @@ -0,0 +1,21 @@ +#include "ButtonSetMainMenuSubScript.h" +#include "MenusConfig.h" + +#include +#include + +using namespace crepe; +using namespace std; + +void ButtonSetMainMenuSubScript::init(){ + IButtonScript::init(); + this->subscribe([this](const ButtonPressEvent& e) { return this->on_button_press(e); }); +} + +bool ButtonSetMainMenuSubScript::on_button_press(const ButtonPressEvent& e){ + RefVector audios = this->get_components_by_name("background_music"); + + this->set_next_scene(MAINMENU_SCENE); + return false; +} + diff --git a/game/menus/ButtonSetMainMenuSubScript.h b/game/menus/ButtonSetMainMenuSubScript.h new file mode 100644 index 0000000..40e2c11 --- /dev/null +++ b/game/menus/ButtonSetMainMenuSubScript.h @@ -0,0 +1,15 @@ +#pragma once + +#include "IButtonScript.h" + +#include + +class ButtonSetMainMenuSubScript : public IButtonScript { +public: + void init() override; + bool on_button_press(const crepe::ButtonPressEvent& e); +private: + float velocity = 20; +protected: + bool transition = false; +}; diff --git a/game/menus/ButtonSetShopScript.cpp b/game/menus/ButtonSetShopScript.cpp deleted file mode 100644 index 88639bd..0000000 --- a/game/menus/ButtonSetShopScript.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "ButtonSetShopScript.h" -#include "MenusConfig.h" - -using namespace crepe; -using namespace std; - -void ButtonSetShopScript::init(){ - IButtonScript::init(); - this->subscribe([this](const ButtonPressEvent& e) { return this->on_button_press(e); }); -} - -bool ButtonSetShopScript::on_button_press(const ButtonPressEvent& e){ - this->set_next_scene(SHOP_SCENE); - return false; -} - diff --git a/game/menus/ButtonSetShopScript.h b/game/menus/ButtonSetShopScript.h deleted file mode 100644 index 434abc0..0000000 --- a/game/menus/ButtonSetShopScript.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "IButtonScript.h" - -#include - -class ButtonSetShopScript : public IButtonScript { -public: - void init() override; - bool on_button_press(const crepe::ButtonPressEvent& e); -private: - float velocity = 20; -protected: - bool transition = false; -}; diff --git a/game/menus/ButtonSetShopSubScript.cpp b/game/menus/ButtonSetShopSubScript.cpp new file mode 100644 index 0000000..67005a7 --- /dev/null +++ b/game/menus/ButtonSetShopSubScript.cpp @@ -0,0 +1,16 @@ +#include "ButtonSetShopSubScript.h" +#include "MenusConfig.h" + +using namespace crepe; +using namespace std; + +void ButtonSetShopSubScript::init(){ + IButtonScript::init(); + this->subscribe([this](const ButtonPressEvent& e) { return this->on_button_press(e); }); +} + +bool ButtonSetShopSubScript::on_button_press(const ButtonPressEvent& e){ + this->set_next_scene(SHOP_SCENE); + return false; +} + diff --git a/game/menus/ButtonSetShopSubScript.h b/game/menus/ButtonSetShopSubScript.h new file mode 100644 index 0000000..8edc7bf --- /dev/null +++ b/game/menus/ButtonSetShopSubScript.h @@ -0,0 +1,15 @@ +#pragma once + +#include "IButtonScript.h" + +#include + +class ButtonSetShopSubScript : public IButtonScript { +public: + void init() override; + bool on_button_press(const crepe::ButtonPressEvent& e); +private: + float velocity = 20; +protected: + bool transition = false; +}; diff --git a/game/menus/ButtonSubScene.cpp b/game/menus/ButtonSubScene.cpp index ea0df8a..5f7f2b0 100644 --- a/game/menus/ButtonSubScene.cpp +++ b/game/menus/ButtonSubScene.cpp @@ -1,11 +1,11 @@ #include "ButtonSubScene.h" -#include "ButtonNextMainMenuScript.h" -#include "ButtonSetMainMenuScript.h" -#include "ButtonSetShopScript.h" +#include "ButtonNextMainMenuSubScript.h" +#include "ButtonSetMainMenuSubScript.h" +#include "ButtonSetShopSubScript.h" #include "IButtonScript.h" #include "MenusConfig.h" -#include "mainmenu/ButtonTransitionPreviewScript.h" +#include "mainmenu/ButtonTransitionPreviewSubScript.h" #include "../Config.h" @@ -39,16 +39,16 @@ void ButtonSubScene::btn_text(crepe::GameObject & button_object,const Data & dat void ButtonSubScene::set_script(crepe::GameObject & button_object,const Data & data){ switch (data.script_type) { case ScriptSelect::PREVIEW: - button_object.add_component().set_script(); + button_object.add_component().set_script(); break; case ScriptSelect::SHOP: - button_object.add_component().set_script(); + button_object.add_component().set_script(); break; case ScriptSelect::MAINMENU: - button_object.add_component().set_script(); + button_object.add_component().set_script(); break; case ScriptSelect::NEXT: - button_object.add_component().set_script(); + button_object.add_component().set_script(); break; case ScriptSelect::NONE: button_object.add_component().set_script(); 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