zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-28 00:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

menu navigation, adding images

Browse Source
This commit is contained in:
Bluub
2021-06-07 10:28:00 +02:00
parent ef1aabdb07 e624a2f7fe
commit 19cd80a3ff
72 changed files with 1517 additions and 743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/System/MenuControllable/MenuControllableSystem.cpp
+20 -22
View File
@@ -5,16 +5,14 @@
#include <algorithm>
#include "Component/Button/ButtonComponent.hpp"
#include "Component/Position/PositionComponent.hpp"
#include "System/MenuControllable/MenuControllableSystem.hpp"
#include "System/MenuControllable/MenuControllableSystem.hpp"
#include "Component/Controllable/ControllableComponent.hpp"
#include "Entity/Entity.hpp"
namespace BBM
{
MenuControllableSystem::MenuControllableSystem()
: WAL::System({
typeid(ControllableComponent)
})
MenuControllableSystem::MenuControllableSystem(WAL::Wal &wal)
: System(wal), wal(wal)
{}
void MenuControllableSystem::updateButtonIndex(int length)
@@ -28,9 +26,9 @@ namespace BBM
}
void MenuControllableSystem::onFixedUpdate(WAL::Entity &entity)
void MenuControllableSystem::onFixedUpdate(WAL::ViewEntity<ControllableComponent> &entity)
{
auto &controllable = entity.getComponent<ControllableComponent>();
auto &controllable = entity.get<ControllableComponent>();
move = controllable.move;
select = controllable.bomb;
@@ -38,24 +36,24 @@ namespace BBM
void MenuControllableSystem::onSelfUpdate(void)
{
auto buttons = ecs.view<<ButtonComponent>(entities);
auto &buttons = wal.scene->view<ButtonComponent>();
ssize_t index = 0;
std::sort(buttons.begin(), buttons.end(),
[](WAL::Entity &first, WAL::Entity &second) {
auto &posA = first.getComponent<PositionComponent>();
auto &posB = second.getComponent<PositionComponent>();
return (posA.position.y < posB.position.y);
});
updateButtonIndex(buttons.length);
auto currentButton = buttons[_buttonIndex].getComponent<ButtonComponent>();
currentButton.onSelected();
if (select)
currentButton.onClick();
//std::sort(buttons.begin(), buttons.end(),
//[](WAL::Entity &first, WAL::Entity &second) {
// auto &posA = first.getComponent<PositionComponent>();
// auto &posB = second.getComponent<PositionComponent>();
//
// return (posA.position.y < posB.position.y);
//});
updateButtonIndex(buttons.size());
for (auto &button : buttons) {
if (index++ == _buttonIndex)
if (index++ == _buttonIndex) {
button.get<ButtonComponent>().onHover(button);
if (select)
button.get<ButtonComponent>().onClick(button);
continue;
button.onIdle();
}
button.get<ButtonComponent>().onIdle(button);
}
}
}
sources/System/MenuControllable/MenuControllableSystem.hpp
+9 -4
View File
@@ -4,16 +4,21 @@
#pragma once
#include "Component/Controllable/ControllableComponent.hpp"
#include "Models/Vector2.hpp"
#include "System/System.hpp"
namespace BBM
{
//! @brief A system to handle Controllable entities in a menu.
class MenuControllableSystem : public WAL::System
class MenuControllableSystem : public WAL::System<ControllableComponent>
{
private:
//! @brief reference to wal
WAL::Wal &wal;
//! @brief index of the current button selected
unsigned _buttonIndex = 0;
int _buttonIndex = 0;
//! @brief move vector
Vector2f move;
@@ -32,10 +37,10 @@ namespace BBM
void onSelfUpdate(void) override;
//! @inherit
void onFixedUpdate(WAL::Entity &entity) override;
void onFixedUpdate(WAL::ViewEntity<ControllableComponent> &entities) override;
//! @brief A default constructor
MenuControllableSystem();
MenuControllableSystem(WAL::Wal &wal);
//! @brief A MenuControllable system is not copy constructable
MenuControllableSystem(const MenuControllableSystem &) = delete;
//! @brief A default destructor