From d0d5935ae10a09236255d811f2671e01b0789873 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Mon, 7 Jun 2021 11:52:03 +0200 Subject: [PATCH] some things for the menu scene --- sources/Models/GameState.hpp | 2 +- sources/Runner/Runner.cpp | 59 ++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/sources/Models/GameState.hpp b/sources/Models/GameState.hpp index 63b52ca6..ab075fd2 100644 --- a/sources/Models/GameState.hpp +++ b/sources/Models/GameState.hpp @@ -27,7 +27,7 @@ namespace BBM //! @brief The currently loaded scene - SceneID currentScene = TitleScreenScene; + SceneID currentScene = MainMenuScene; //! @brief The list of loaded scenes. std::unordered_map _loadedScenes = {}; diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp index 7ee9b295..c254eafc 100644 --- a/sources/Runner/Runner.cpp +++ b/sources/Runner/Runner.cpp @@ -99,34 +99,37 @@ namespace BBM std::shared_ptr loadMainMenuScene() { auto scene = std::make_shared(); - scene->addEntity("first button") - .addComponent(10, 10, 10) - .addComponent(RAY::Vector2(0, 0), RAY::Vector2(100, 10), RED) - .addComponent([](WAL::Entity &entity) - { - entity.getComponent().drawable->setColor(RED); - }, - [](WAL::Entity &entity) - { - entity.getComponent().drawable->setColor(GREEN); - }, + + scene->addEntity("background") + .addComponent() + .addComponent("assets/plain_menu_background.png"); + scene->addEntity("logo") + .addComponent(1920 / 3, 180, 0) + .addComponent("assets/logo_small.png"); + scene->addEntity("play button") + .addComponent(1920 / 2.5, 1080 - 540, 0) + .addComponent("assets/buttons/button_new_game.png") + .addComponent( + ButtonComponent::emptyButtonCallback, + ButtonComponent::emptyButtonCallback, + ButtonComponent::emptyButtonCallback, + ButtonComponent::emptyButtonCallback); + scene->addEntity("settings button") + .addComponent(1920 / 2.5, 1080 - 360, 0) + .addComponent("assets/buttons/button_settings.png") + .addComponent( + ButtonComponent::emptyButtonCallback, + ButtonComponent::emptyButtonCallback, + ButtonComponent::emptyButtonCallback, + ButtonComponent::emptyButtonCallback); + scene->addEntity("exit button") + .addComponent(1920 / 2.5, 1080 - 180, 0) + .addComponent("assets/buttons/button_exit.png") + .addComponent( + ButtonComponent::emptyButtonCallback, + ButtonComponent::emptyButtonCallback, ButtonComponent::emptyButtonCallback, ButtonComponent::emptyButtonCallback); - - //scene->addEntity("snd button") - // .addComponent(10, 50, 50) - // .addComponent(RAY::Vector2(0, 0), RAY::Vector2(100, 10), RED) - // .addComponent( - // [](WAL::Entity &entity) - // { - // entity.getComponent().drawable->setColor(RED); - // }, - // [](WAL::Entity &entity) - // { - // entity.getComponent().drawable->setColor(GREEN); - // }, - // ButtonComponent::emptyButtonCallback, - // ButtonComponent::emptyButtonCallback); //needed material //play button //play button assets @@ -134,8 +137,6 @@ namespace BBM //settings button assets //quit button //quit button assets - //plain background - //logo //music //sound return scene; @@ -205,7 +206,7 @@ namespace BBM WAL::Wal wal; addSystems(wal); enableRaylib(wal); - wal.scene = loadTitleScreenScene(); + wal.scene = loadMainMenuScene(); try { wal.run(updateState);