From 06a7a2d3bfda0cebfbccf50b1e45c644fa701344 Mon Sep 17 00:00:00 2001
From: Bluub <louis.auzuret@gmail.com>
Date: Thu, 3 Jun 2021 14:47:27 +0200
Subject: [PATCH] menu controllable but still needs view

---
 .../MenuControllableSystem.cpp                | 43 +++++++++++++------
 .../MenuControllableSystem.hpp                | 16 +++++++
 2 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/sources/System/MenuControllable/MenuControllableSystem.cpp b/sources/System/MenuControllable/MenuControllableSystem.cpp
index 88ed6231..c0aa8b3b 100644
--- a/sources/System/MenuControllable/MenuControllableSystem.cpp
+++ b/sources/System/MenuControllable/MenuControllableSystem.cpp
@@ -3,8 +3,9 @@
 //
 
 #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"
 
@@ -16,10 +17,29 @@ namespace BBM
 		})
 	{}
 
+	void MenuControllableSystem::updateButtonIndex(int length)
+	{
+		_buttonIndex -= (move.y > 0);
+		_buttonIndex += (move.y < 0);
+		if (_buttonIndex < 0)
+			_buttonIndex = length - 1;
+		if (_buttonIndex == length)
+			_buttonIndex = 0;
+		
+	}
+
 	void MenuControllableSystem::onFixedUpdate(WAL::Entity &entity)
 	{
 		auto &controllable = entity.getComponent<ControllableComponent>();
-		auto buttons = ecs.view<<Button>(entities);
+
+		move = controllable.move;
+		select = controllable.bomb;
+	}
+
+	void MenuControllableSystem::onSelfUpdate(void)
+	{
+		auto buttons = ecs.view<<ButtonComponent>(entities);
+		ssize_t index = 0;
 		std::sort(buttons.begin(), buttons.end(),
 		[](WAL::Entity &first, WAL::Entity &second) {
 			auto &posA = first.getComponent<PositionComponent>();
@@ -27,18 +47,15 @@ namespace BBM
 
 			return (posA.position.y < posB.position.y);
 		});
-		_buttonIndex -= (controllable.move.y > 0);
-		_buttonIndex += (controllable.move.y < 0);
-		if (_buttonIndex < 0)
-			_buttonIndex = buttons.length() - 1;
-		_buttonIndex %= buttons.length();
-		auto currentButton = buttons[_buttonIndex].getComponent<Button>();
+		updateButtonIndex(buttons.length);
+		auto currentButton = buttons[_buttonIndex].getComponent<ButtonComponent>();
 		currentButton.onSelected();
-		if (controllable.bomb)
+		if (select)
 			currentButton.onClick();
-		std::for_each_n(buttons.begin(), _buttonIndex,
-		[](WAL::Entity &curr) {
-			curr.getComponent<Button>().onIdle();
-		});
+		for (auto &button : buttons) {
+			if (index++ == _buttonIndex)
+				continue;
+			button.onIdle();
+		}
 	}
 }
\ No newline at end of file
diff --git a/sources/System/MenuControllable/MenuControllableSystem.hpp b/sources/System/MenuControllable/MenuControllableSystem.hpp
index 5167cf57..8051730c 100644
--- a/sources/System/MenuControllable/MenuControllableSystem.hpp
+++ b/sources/System/MenuControllable/MenuControllableSystem.hpp
@@ -12,8 +12,24 @@ namespace BBM
 	class MenuControllableSystem : public WAL::System
 	{
 	private:
+		//! @brief index of the current button selected
 		unsigned _buttonIndex = 0;
+
+		//! @brief move vector
+		Vector2f move;
+
+		//! @brief Select action
+		bool select = false;
+
+		//! @brief Cancel action
+		bool cancel = false;
+
+		//! @brief update button index
+		//! @param length length of the button set
+		void updateButtonIndex(int length);
 	public:
+		//! @inherit
+		void onSelfUpdate(void) override;
 
 		//! @inherit
 		void onFixedUpdate(WAL::Entity &entity) override;