merge develop in no_clip_bonus

sources/Component/Controllable/ControllableComponent.hpp

@@ -17,6 +17,17 @@ namespace BBM
 	class ControllableComponent : public WAL::Component
 	{	
 		public:
+			enum Layout
+			{
+				NONE,
+				KEYBOARD_0,
+				KEYBOARD_1,
+				GAMEPAD_0,
+				GAMEPAD_1,
+				GAMEPAD_2,
+				GAMEPAD_3
+			};
+
 			//! @brief The X and Z abscis of the movement.
 			Vector2f move;
 			//! @brief input value for jump
@@ -27,6 +38,8 @@ namespace BBM
 			bool pause = false;
 			//! @brief The speed applied to every controllable entities.
 			float speed = .15f;
+			//! @brief The layout used for this controllable.
+			Layout layout = NONE;
 
 			//! @inherit
 			WAL::Component *clone(WAL::Entity &entity) const override;