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

Fixing #255

Browse Source
This commit is contained in:
Zoe Roux
2021-06-20 12:32:42 +02:00
parent e397a5898a
commit cddeeaf3f9
5 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/System/MenuControllable/MenuControllableSystem.cpp
+19 -18
View File
@@ -18,13 +18,14 @@ namespace BBM
{
MenuControllableSystem::MenuControllableSystem(WAL::Wal &wal)
: System(wal),
_currentButton(), _oldMousePosition(-1, -1)
_oldMousePosition(-1, -1),
currentButton()
{
}
void MenuControllableSystem::_updateCurrentButton(bool selected, Vector2f move)
{
auto &buttonComponent = this->_currentButton->getComponent<OnClickComponent>();
auto &buttonComponent = this->currentButton->getComponent<OnClickComponent>();
WAL::Entity *newButton = nullptr;
if (move.y > 0 && buttonComponent._up)
@@ -44,12 +45,12 @@ namespace BBM
}
if (newButton) {
this->_currentButton->getComponent<OnIdleComponent>().onEvent(*this->_currentButton, this->_wal);
this->_currentButton = newButton;
this->_currentButton->getComponent<OnHoverComponent>().onEvent(*this->_currentButton, this->_wal);
this->currentButton->getComponent<OnIdleComponent>().onEvent(*this->currentButton, this->_wal);
this->currentButton = newButton;
this->currentButton->getComponent<OnHoverComponent>().onEvent(*this->currentButton, this->_wal);
}
if (selected)
this->_currentButton->getComponent<OnClickComponent>().onEvent(*this->_currentButton, this->_wal);
this->currentButton->getComponent<OnClickComponent>().onEvent(*this->currentButton, this->_wal);
}
bool MenuControllableSystem::_mouseOnButton(const Vector2f &mousePos, WAL::ViewEntity<OnClickComponent, OnHoverComponent, OnIdleComponent, PositionComponent, Drawable2DComponent> &entity) const
@@ -83,16 +84,16 @@ namespace BBM
if (this->_oldMousePosition == Vector2f(-1, -1))
this->_oldMousePosition = relativeMousePos;
if (this->_currentButton && this->_currentButton->_scene.getID() != this->_wal.getScene()->getID()) {
this->_currentButton->getComponent<OnIdleComponent>().onEvent(*this->_currentButton, this->_wal);
this->_currentButton = nullptr;
if (this->currentButton && this->currentButton->_scene.getID() != this->_wal.getScene()->getID()) {
this->currentButton->getComponent<OnIdleComponent>().onEvent(*this->currentButton, this->_wal);
this->currentButton = nullptr;
return;
}
if (this->_currentButton == nullptr && buttons.size()) {
this->_currentButton = &(*buttons.front());
this->_currentButton->getComponent<OnHoverComponent>().onEvent(*this->_currentButton, this->_wal);
if (this->currentButton == nullptr && buttons.size()) {
this->currentButton = &(*buttons.front());
this->currentButton->getComponent<OnHoverComponent>().onEvent(*this->currentButton, this->_wal);
}
if (!this->_currentButton)
if (!this->currentButton)
return;
for (auto &[_, controllable]: controllableView)
if (controllable.move.x || controllable.move.y || controllable.bomb) {
@@ -104,12 +105,12 @@ namespace BBM
this->_oldMousePosition = relativeMousePos;
for (auto &entity: buttons) {
if (_mouseOnButton(relativeMousePos, entity)) {
if (this->_currentButton)
this->_currentButton->getComponent<OnIdleComponent>().onEvent(*this->_currentButton, this->_wal);
this->_currentButton = &(*entity);
this->_currentButton->getComponent<OnHoverComponent>().onEvent(*this->_currentButton, this->_wal);
if (this->currentButton)
this->currentButton->getComponent<OnIdleComponent>().onEvent(*this->currentButton, this->_wal);
this->currentButton = &(*entity);
this->currentButton->getComponent<OnHoverComponent>().onEvent(*this->currentButton, this->_wal);
if (RAYControl::Mouse::isPressed(RAYControl::Mouse::Button::MOUSE_BUTTON_LEFT))
this->_currentButton->getComponent<OnClickComponent>().onEvent(*this->_currentButton, this->_wal);
this->currentButton->getComponent<OnClickComponent>().onEvent(*this->currentButton, this->_wal);
}
}
}
sources/System/MenuControllable/MenuControllableSystem.hpp
+3 -3
View File
@@ -17,9 +17,6 @@ namespace BBM
class MenuControllableSystem : public WAL::System<>
{
private:
//! @brief index of the current button selected
WAL::Entity *_currentButton;
//! @brief position of the mouse at the precedent scene (to know which controller event to watch)
Vector2f _oldMousePosition;
@@ -30,6 +27,9 @@ namespace BBM
//! @return true if mouse on entity
bool _mouseOnButton(const Vector2f &mousePos, WAL::ViewEntity<OnClickComponent, OnHoverComponent, OnIdleComponent, PositionComponent, Drawable2DComponent> &entity) const;
public:
//! @brief index of the current button selected
WAL::Entity *currentButton;
//! @brief time (in millisecond) since last check
std::chrono::time_point<std::chrono::steady_clock> now;
//! @inherit