From 126c402548281f3a97e3a9e0ef60c45147c87fa0 Mon Sep 17 00:00:00 2001 From: JAROWMR Date: Mon, 6 Jan 2025 20:52:39 +0100 Subject: endgamesubscene finished --- game/CMakeLists.txt | 1 + game/GameScene.cpp | 5 + game/coins/CoinSubScene.cpp | 3 - game/coins/CoinSystemScript.cpp | 6 +- game/menus/ButtonSubScene.cpp | 38 +++++-- game/menus/ButtonSubScene.h | 4 +- game/menus/FloatingWindowSubScene.cpp | 178 +++++++++++++++++++++++++++++ game/menus/FloatingWindowSubScene.h | 16 +++ game/menus/MenusConfig.h | 2 +- game/menus/endgame/EndGameSubScene.cpp | 199 ++++++++------------------------- game/menus/endgame/EndGameSubScene.h | 7 +- 11 files changed, 284 insertions(+), 175 deletions(-) create mode 100644 game/menus/FloatingWindowSubScene.cpp create mode 100644 game/menus/FloatingWindowSubScene.h diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index 4c5bd53..9886973 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -27,6 +27,7 @@ add_executable(main menus/IButtonScript.cpp menus/ButtonSetShopScript.cpp menus/ButtonSetMainMenuScript.cpp + menus/FloatingWindowSubScene.cpp menus/shop/ShopMenuScene.cpp menus/mainmenu/ButtonTransitionPreviewScript.cpp menus/mainmenu/ITransitionScript.cpp diff --git a/game/GameScene.cpp b/game/GameScene.cpp index bd12d50..24b4287 100644 --- a/game/GameScene.cpp +++ b/game/GameScene.cpp @@ -10,6 +10,7 @@ #include "hud/HudScript.h" #include "hud/HudSubScene.h" #include "hud/SpeedScript.h" +#include "menus/endgame/EndGameSubScene.h" #include "player/PlayerSubScene.h" #include @@ -133,6 +134,10 @@ void GameScene::load_scene() { .collision_layer = COLL_LAY_MISSILE, }); missile.add_component(vec2(100, 100)); + + + EndGameSubScene test; + test.create(*this); } string GameScene::get_name() const { return "scene1"; } diff --git a/game/coins/CoinSubScene.cpp b/game/coins/CoinSubScene.cpp index 604af78..3914921 100644 --- a/game/coins/CoinSubScene.cpp +++ b/game/coins/CoinSubScene.cpp @@ -5,8 +5,6 @@ #include "api/Rigidbody.h" #include "api/Scene.h" #include "api/AudioSource.h" -#include -#include #include "CoinScript.h" #include "../Config.h" @@ -18,7 +16,6 @@ int CoinSubScene::create(Scene & scn){ static int coin_counter = 0; string unique_name = "coin_" + to_string(coin_counter++); - cout << "new coin: "<< unique_name << endl; GameObject coin = scn.new_object(unique_name.c_str(),"coin",vec2{650,0},0,1); coin.add_component(Rigidbody::Data{ diff --git a/game/coins/CoinSystemScript.cpp b/game/coins/CoinSystemScript.cpp index b77c597..c9c301e 100644 --- a/game/coins/CoinSystemScript.cpp +++ b/game/coins/CoinSystemScript.cpp @@ -5,7 +5,6 @@ #include "api/Sprite.h" #include "api/Transform.h" #include -#include "iostream" using namespace crepe; using namespace std; @@ -239,10 +238,7 @@ void CoinSystemScript::generate_locations(){ std::uniform_real_distribution space_dist(SPAWN_SPACING_MIN, SPAWN_SPACING_MAX); float spacing = space_dist(engine); - - - cout << "selected " << selected_index << std::endl; - cout << "spacing " << spacing << std::endl; + // Call the corresponding function and return the new x position this->system_position += functions[selected_index]({this->system_position,0}); this->system_position += spacing; diff --git a/game/menus/ButtonSubScene.cpp b/game/menus/ButtonSubScene.cpp index d735d08..8574b9b 100644 --- a/game/menus/ButtonSubScene.cpp +++ b/game/menus/ButtonSubScene.cpp @@ -56,7 +56,7 @@ void ButtonSubScene::set_icon(crepe::GameObject & button_object,const Data & dat switch (data.icon_type) { case IconSelect::SHOP: button_object.add_component(Asset("asset/ui/buttonCoinsSmall.png"),Sprite::Data{ - .sorting_in_layer = STARTING_SORTING_IN_LAYER+3, + .sorting_in_layer = STARTING_SORTING_IN_LAYER+3 + data.sorting_layer_offset, .size = ICON_SIZE, .position_offset = data.icon_offset, .world_space = data.worldspace, @@ -64,7 +64,7 @@ void ButtonSubScene::set_icon(crepe::GameObject & button_object,const Data & dat break; case IconSelect::COINS: button_object.add_component(Asset("asset/ui/buttonCoinsSmall.png"),Sprite::Data{ - .sorting_in_layer = STARTING_SORTING_IN_LAYER+3, + .sorting_in_layer = STARTING_SORTING_IN_LAYER+3 + data.sorting_layer_offset, .size = ICON_SIZE, .position_offset = data.icon_offset, .world_space = data.worldspace, @@ -81,17 +81,17 @@ void ButtonSubScene::set_button_overlay(crepe::GameObject & button_object,const this->large_btn_overlay(button_object,data); break; case ButtonSelect::BACK: - this->small_btn_overlay(button_object,data); + this->back_btn_overlay(button_object,data); break; case ButtonSelect::NEXT: - this->small_btn_overlay(button_object,data); + this->next_btn_overlay(button_object,data); break; } } void ButtonSubScene::large_btn_overlay(crepe::GameObject & button_object,const Data & data){ button_object.add_component(Asset("asset/ui/buttonBacking.png"),Sprite::Data{ - .sorting_in_layer = STARTING_SORTING_IN_LAYER+1, + .sorting_in_layer = STARTING_SORTING_IN_LAYER+1 + data.sorting_layer_offset, .size = LARGE_OVERLAY_SIZE, .world_space = data.worldspace, }); @@ -100,15 +100,15 @@ void ButtonSubScene::large_btn_overlay(crepe::GameObject & button_object,const D this->btn_color_side(button_object,SIDE_PANEL_OFFSET,data); } -void ButtonSubScene::small_btn_overlay(crepe::GameObject & button_object,const Data & data){ +void ButtonSubScene::back_btn_overlay(crepe::GameObject & button_object,const Data & data){ button_object.add_component(Asset("asset/ui/backbuttonright.png"),Sprite::Data{ - .sorting_in_layer = STARTING_SORTING_IN_LAYER+1, + .sorting_in_layer = STARTING_SORTING_IN_LAYER+1+ data.sorting_layer_offset, .size = SMALL_OVERLAY_SIZE_RIGHT, .position_offset = {20,0}, .world_space = data.worldspace, }); button_object.add_component(Asset("asset/ui/backbuttonleft.png"),Sprite::Data{ - .sorting_in_layer = STARTING_SORTING_IN_LAYER+1, + .sorting_in_layer = STARTING_SORTING_IN_LAYER+1+ data.sorting_layer_offset, .size = SMALL_OVERLAY_SIZE_LEFT, .position_offset = {-80,0}, .world_space = data.worldspace, @@ -116,16 +116,34 @@ void ButtonSubScene::small_btn_overlay(crepe::GameObject & button_object,const D button_object.add_component