From 8174d5f4ac931b0f7b31685dcc675bafb6bcb542 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Mon, 7 Jun 2021 12:33:37 +0200 Subject: [PATCH] add clock --- sources/Runner/Runner.cpp | 21 ++++++------------- .../MenuControllableSystem.cpp | 14 +++++++++---- .../MenuControllableSystem.hpp | 3 +++ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp index 205e6d58..476feadc 100644 --- a/sources/Runner/Runner.cpp +++ b/sources/Runner/Runner.cpp @@ -100,6 +100,9 @@ namespace BBM { auto scene = std::make_shared(); + scene->addEntity("Control entity") + .addComponent() + .addComponent(); scene->addEntity("background") .addComponent() .addComponent("assets/plain_menu_background.png"); @@ -121,9 +124,7 @@ namespace BBM image->use("assets/buttons/button_new_game_hovered.png"); }, ButtonComponent::emptyButtonCallback, - ButtonComponent::emptyButtonCallback) - .addComponent() - .addComponent(); + ButtonComponent::emptyButtonCallback); scene->addEntity("settings button") .addComponent(1920 / 2.5, 1080 - 360, 0) .addComponent("assets/buttons/button_settings.png") @@ -139,9 +140,7 @@ namespace BBM image->use("assets/buttons/button_settings_hovered.png"); }, ButtonComponent::emptyButtonCallback, - ButtonComponent::emptyButtonCallback) - .addComponent() - .addComponent(); + ButtonComponent::emptyButtonCallback); scene->addEntity("exit button") .addComponent(1920 / 2.5, 1080 - 180, 0) .addComponent("assets/buttons/button_exit.png") @@ -157,16 +156,8 @@ namespace BBM image->use("assets/buttons/button_exit_hovered.png"); }, ButtonComponent::emptyButtonCallback, - ButtonComponent::emptyButtonCallback) - .addComponent() - .addComponent(); + ButtonComponent::emptyButtonCallback); //needed material - //play button - //play button assets - //settings button - //settings button assets - //quit button - //quit button assets //music //sound return scene; diff --git a/sources/System/MenuControllable/MenuControllableSystem.cpp b/sources/System/MenuControllable/MenuControllableSystem.cpp index aa6e5831..b46d5a8b 100644 --- a/sources/System/MenuControllable/MenuControllableSystem.cpp +++ b/sources/System/MenuControllable/MenuControllableSystem.cpp @@ -28,14 +28,15 @@ namespace BBM void MenuControllableSystem::onFixedUpdate(WAL::ViewEntity &entity) { + auto lastTick = std::chrono::steady_clock::now(); + + if (lastTick - this->_now < std::chrono::milliseconds(100)) + return; + this->_now = lastTick; auto &controllable = entity.get(); move = controllable.move; select = controllable.bomb; - } - - void MenuControllableSystem::onSelfUpdate(void) - { auto &buttons = wal.scene->view(); ssize_t index = 0; //std::sort(buttons.begin(), buttons.end(), @@ -56,4 +57,9 @@ namespace BBM button.get().onIdle(button); } } + + void MenuControllableSystem::onSelfUpdate(void) + { + + } } \ No newline at end of file diff --git a/sources/System/MenuControllable/MenuControllableSystem.hpp b/sources/System/MenuControllable/MenuControllableSystem.hpp index 89ee6b12..7212fd2d 100644 --- a/sources/System/MenuControllable/MenuControllableSystem.hpp +++ b/sources/System/MenuControllable/MenuControllableSystem.hpp @@ -32,6 +32,9 @@ namespace BBM //! @brief update button index //! @param length length of the button set void updateButtonIndex(int length); + + //! @brief time (in mili second) since last check + std::chrono::milliseconds _now; public: //! @inherit void onSelfUpdate(void) override;