zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-27 16:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

button componenent now a templated class

Browse Source
This commit is contained in:
arthur.jamet
2021-06-07 15:56:52 +02:00
parent 5bba1f68e8
commit 37dbfa7fa7
5 changed files with 40 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
-1
View File
@@ -67,7 +67,6 @@ set(SOURCES
sources/Component/Collision/CollisionComponent.hpp
sources/System/Collision/CollisionSystem.hpp
sources/System/Collision/CollisionSystem.cpp
sources/Component/Button/ButtonComponent.cpp
sources/Component/Button/ButtonComponent.hpp
sources/System/MenuControllable/MenuControllableSystem.cpp
sources/System/MenuControllable/MenuControllableSystem.hpp
sources/Component/Button/ButtonComponent.cpp
-29
View File
@@ -1,29 +0,0 @@
//
// Created by Louis Auzuret on 06/03/21.
//
#include "ButtonComponent.hpp"
namespace BBM
{
ButtonComponent::ButtonComponent(WAL::Entity &entity)
: WAL::Component(entity), onIdle(), onHover(), onClick()
{ }
WAL::Component *ButtonComponent::clone(WAL::Entity &entity) const
{
return new ButtonComponent(entity, onIdle, onHover, onClick, onHold);
}
ButtonComponent::ButtonComponent(WAL::Entity &entity, WAL::Callback<WAL::Entity &> idleCallback,
WAL::Callback<WAL::Entity &> hoverCallback, WAL::Callback<WAL::Entity &> clickCallback, WAL::Callback<WAL::Entity &> holdCallback)
: WAL::Component(entity),
onIdle(idleCallback),
onHover(hoverCallback),
onClick(clickCallback),
onHold(holdCallback)
{ }
void ButtonComponent::emptyButtonCallback(WAL::Entity &)
{ }
}
sources/Component/Button/ButtonComponent.hpp
+25 -21
View File
@@ -10,40 +10,44 @@
namespace BBM
{
class ButtonComponent : public WAL::Component
enum ButtonComponentType { IDLE, CLICK, HOVER };
template<enum ButtonComponentType T>
class ButtonComponent: public WAL::Component
{
public:
//! @brief onIdle callback
WAL::Callback<WAL::Entity &> onIdle;
//! @brief onHover callback
WAL::Callback<WAL::Entity &> onHover;
//! @brief onClick callback, when the mouse button is released
WAL::Callback<WAL::Entity &> onClick;
//! @brief onHold callback, when the mouse button is pressed
WAL::Callback<WAL::Entity &> onHold;
//! @brief onEvent callback
WAL::Callback<WAL::Entity &> onEvent;
//! @inherit
WAL::Component *clone(WAL::Entity &entity) const override;
WAL::Component *clone(WAL::Entity &entity) const override
{
return new ButtonComponent(entity, onEvent);
}
//! @brief Initialize a new Button component.
explicit ButtonComponent(WAL::Entity &entity);
explicit ButtonComponent(WAL::Entity &entity)
: WAL::Component(entity), onEvent()
{ }
//! @brief Constructor with the 3 callback
ButtonComponent(WAL::Entity &entity, WAL::Callback<WAL::Entity &> idleCallback, WAL::Callback<WAL::Entity &> hoverCallback,
WAL::Callback<WAL::Entity &> clickCallback, WAL::Callback<WAL::Entity &> holdCallback);
ButtonComponent(WAL::Entity &entity, WAL::Callback<WAL::Entity &> callback)
: WAL::Component(entity),
onEvent(callback)
{ }
//! @brief A Controllable component is copy constructable.
ButtonComponent(const ButtonComponent &) = default;
ButtonComponent(const ButtonComponent<T> &) = default;
//! @brief default destructor
~ButtonComponent() override = default;
//! @brief A Button component default assign operator
ButtonComponent &operator=(const ButtonComponent &) = default;
ButtonComponent<T> &operator=(const ButtonComponent<T> &) = default;
//! @brief Empty button callback
static void emptyButtonCallback(WAL::Entity &);
static void emptyButtonCallback(WAL::Entity &)
{ }
};
}
typedef ButtonComponent<IDLE> OnIdleComponent;
typedef ButtonComponent<CLICK> OnClickComponent;
typedef ButtonComponent<HOVER> OnHoverComponent;
}
sources/Runner/Runner.cpp
+10 -39
View File
@@ -80,16 +80,14 @@ namespace BBM
scene->addEntity("text_prompt")
.addComponent<PositionComponent>(1920 / 5, 1080 - 180, 0)
.addComponent<Drawable2DComponent, RAY2D::Text>("Press any button to continue", 70, RAY::Vector2(), WHITE)
.addComponent<ButtonComponent>([](WAL::Entity &entity)
.addComponent<OnIdleComponent>([](WAL::Entity &entity)
{
entity.getComponent<Drawable2DComponent>().drawable->setColor(WHITE);
},
[](WAL::Entity &entity)
})
.addComponent<OnHoverComponent>([](WAL::Entity &entity)
{
entity.getComponent<Drawable2DComponent>().drawable->setColor(ORANGE);
},
ButtonComponent::emptyButtonCallback,
ButtonComponent::emptyButtonCallback);
});
//needed material
//music
//sound
@@ -112,51 +110,24 @@ namespace BBM
scene->addEntity("play button")
.addComponent<PositionComponent>(1920 / 2.5, 1080 - 540, 0)
.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_new_game.png")
.addComponent<ButtonComponent>([](WAL::Entity &entity)
.addComponent<OnIdleComponent>([](WAL::Entity &entity)
{
RAY::Texture *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
texture->use("assets/buttons/button_new_game.png");
}, [](WAL::Entity &entity)
})
.addComponent<OnHoverComponent>([](WAL::Entity &entity)
{
RAY::Texture *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
texture->use("assets/buttons/button_new_game_hovered.png");
},
ButtonComponent::emptyButtonCallback,
ButtonComponent::emptyButtonCallback);
});
scene->addEntity("settings button")
.addComponent<PositionComponent>(1920 / 2.5, 1080 - 360, 0)
.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_settings.png")
.addComponent<ButtonComponent>([](WAL::Entity &entity)
{
RAY::Texture *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
texture->use("assets/buttons/button_settings.png");
}, [](WAL::Entity &entity)
{
RAY::Texture *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
texture->use("assets/buttons/button_settings_hovered.png");
},
ButtonComponent::emptyButtonCallback,
ButtonComponent::emptyButtonCallback);
.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_settings.png");
scene->addEntity("exit button")
.addComponent<PositionComponent>(1920 / 2.5, 1080 - 180, 0)
.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_exit.png")
.addComponent<ButtonComponent>([](WAL::Entity &entity)
{
RAY::Texture *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
texture->use("assets/buttons/button_exit.png");
}, [](WAL::Entity &entity)
{
RAY::Texture *texture = dynamic_cast<RAY::Texture *>(entity.getComponent<Drawable2DComponent>().drawable.get());
texture->use("assets/buttons/button_exit_hovered.png");
},
ButtonComponent::emptyButtonCallback,
ButtonComponent::emptyButtonCallback);
.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_exit.png");
//needed material
//music
//sound
sources/System/MenuControllable/MenuControllableSystem.cpp
+5 -4
View File
@@ -37,7 +37,7 @@ namespace BBM
move = controllable.move;
select = controllable.bomb;
auto &buttons = wal.scene->view<ButtonComponent>();
auto &buttons = wal.scene->view<OnClickComponent>();
ssize_t index = 0;
//std::sort(buttons.begin(), buttons.end(),
//[](WAL::Entity &first, WAL::Entity &second) {
@@ -48,13 +48,14 @@ namespace BBM
//});
updateButtonIndex(buttons.size());
for (auto &button : buttons) {
auto &buttonEntity = static_cast<WAL::Entity &>(button);
if (index++ == _buttonIndex) {
button.get<ButtonComponent>().onHover(button);
buttonEntity.getComponent<OnHoverComponent>().onEvent(button);
if (select)
button.get<ButtonComponent>().onClick(button);
button.get<OnClickComponent>().onEvent(button);
continue;
}
button.get<ButtonComponent>().onIdle(button);
buttonEntity.getComponent<OnIdleComponent>().onEvent(button);
}
}