basic gui for assigning keybinds

ucpu · Jan 25, 2025 · 4fdc834 · 4fdc834
1 parent 6ddd1eb
commit 4fdc834
Show file tree

Hide file tree

Showing 13 changed files with 166 additions and 68 deletions.
diff --git a/data/cage/texture/keybindAdd.png b/data/cage/texture/keybindAdd.png
diff --git a/data/cage/texture/keybindReset.png b/data/cage/texture/keybindReset.png
diff --git a/data/cage/texture/texture.assets b/data/cage/texture/texture.assets
@@ -5,6 +5,8 @@ srgb = true
 gamma = true
 gui.png
 tooltips.png
+keybindAdd.png
+keybindReset.png
 
 []
 scheme = texture

diff --git a/sources/include/cage-engine/guiBuilder.h b/sources/include/cage-engine/guiBuilder.h
@@ -55,13 +55,13 @@ namespace cage
 			template<StringLiteral Text>
 			BuilderItem tooltip()
 			{
-				(*this)->template value<GuiTooltipComponent>() = GuiTooltipComponent{ .tooltip = detail::guiTooltipText<Text>() };
+				(*this)->template value<GuiTooltipComponent>() = GuiTooltipComponent{ .tooltip = detail::guiTooltipText<0, Text>() };
 				return *this;
 			}
-			template<uint32 TextId>
+			template<uint32 TextId, StringLiteral Text = "">
 			BuilderItem tooltip()
 			{
-				(*this)->template value<GuiTooltipComponent>() = GuiTooltipComponent{ .tooltip = detail::guiTooltipText<TextId>() };
+				(*this)->template value<GuiTooltipComponent>() = GuiTooltipComponent{ .tooltip = detail::guiTooltipText<TextId, Text>() };
 				return *this;
 			}
 

diff --git a/sources/include/cage-engine/guiComponents.h b/sources/include/cage-engine/guiComponents.h
@@ -18,7 +18,7 @@ namespace cage
 	struct CAGE_ENGINE_API GuiSkinIndex
 	{
 		constexpr GuiSkinIndex() = default;
-		constexpr explicit GuiSkinIndex(uint32 index) : index(index){};
+		constexpr explicit GuiSkinIndex(uint32 index) : index(index) {};
 
 		uint32 index = m; // -1 = inherit
 	};
@@ -235,7 +235,7 @@ namespace cage
 		{
 			Real f;
 			sint32 i = 0;
-			Union(){};
+			Union() {};
 		} min, max, step;
 		uint32 cursor = m; // utf32 characters (not bytes)
 		InputTypeEnum type = InputTypeEnum::Text;
@@ -326,17 +326,10 @@ namespace cage
 		CAGE_ENGINE_API void guiDestroyChildrenRecursively(Entity *e);
 		CAGE_ENGINE_API void guiDestroyEntityRecursively(Entity *e);
 
-		template<StringLiteral Text>
+		template<uint32 TextId, StringLiteral Text = "">
 		GuiTooltipComponent::TooltipCallback guiTooltipText()
 		{
-			static constexpr GuiTextComponent txt{ Text.value, 0 };
-			return privat::guiTooltipText(&txt);
-		}
-
-		template<uint32 TextId>
-		GuiTooltipComponent::TooltipCallback guiTooltipText()
-		{
-			static constexpr GuiTextComponent txt{ "", TextId };
+			static constexpr GuiTextComponent txt{ Text.value, TextId };
 			return privat::guiTooltipText(&txt);
 		}
 	}

diff --git a/sources/include/cage-engine/inputs.h b/sources/include/cage-engine/inputs.h
@@ -254,6 +254,10 @@ namespace cage
 		using Param = typename privat::ExtractParam<Func>::Param;
 		return inputFilter<Param>([func](const Param &in) { return func(in); });
 	}
+
+	CAGE_ENGINE_API detail::StringBase<27> getKeyName(uint32 key);
+	CAGE_ENGINE_API detail::StringBase<27> getButtonsNames(MouseButtonsFlags buttons);
+	CAGE_ENGINE_API detail::StringBase<27> getModifiersNames(ModifiersFlags mods);
 }
 
 #endif // guard_inputs_juhgf98ser4g
diff --git a/sources/include/cage-engine/keybinds.h b/sources/include/cage-engine/keybinds.h
@@ -6,10 +6,12 @@
 namespace cage
 {
 	class Ini;
+	class GuiBuilder;
 
 	class CAGE_ENGINE_API Keybind : private Immovable
 	{
 	public:
+		const String &id() const;
 		String name() const;
 		String value(uint32 index = 0) const;
 		bool process(const GenericInput &input) const;
@@ -34,13 +36,26 @@ namespace cage
 	};
 	GCHL_ENUM_BITS(KeybindDevicesFlags);
 
+	enum class KeybindModesFlags : uint32
+	{
+		None = 0,
+		Press = 1 << 0,
+		Repeat = 1 << 1,
+		Double = 1 << 2,
+		Release = 1 << 3,
+		Scroll = 1 << 4,
+		Tick = 1 << 5,
+	};
+	GCHL_ENUM_BITS(KeybindModesFlags);
+
 	struct CAGE_ENGINE_API KeybindCreateConfig
 	{
 		String id;
 		sint32 eventOrder = 0;
 		ModifiersFlags requiredFlags = ModifiersFlags::None;
 		ModifiersFlags forbiddenFlags = ModifiersFlags::Super;
-		KeybindDevicesFlags devices = KeybindDevicesFlags::Keyboard;
+		KeybindDevicesFlags devices = KeybindDevicesFlags::Keyboard | KeybindDevicesFlags::Mouse;
+		KeybindModesFlags modes = KeybindModesFlags::Press;
 	};
 
 	CAGE_ENGINE_API Holder<Keybind> newKeybind(const KeybindCreateConfig &config, const GenericInput &defaults = {}, Delegate<bool(const GenericInput &)> event = {});
@@ -56,6 +71,9 @@ namespace cage
 	}
 	CAGE_ENGINE_API void keybindsDispatchTick();
 
+	CAGE_ENGINE_API void keybindsGuiWidget(GuiBuilder *g, Keybind *keybind);
+	CAGE_ENGINE_API void keybindsGuiTable(GuiBuilder *g, const String &filterPrefix = {});
+
 	CAGE_ENGINE_API Holder<Ini> keybindsExport();
 	CAGE_ENGINE_API void keybindsImport(const Ini *ini);
 }

diff --git a/sources/include/cage-engine/window.h b/sources/include/cage-engine/window.h
@@ -57,6 +57,7 @@ namespace cage
 		Vec2i windowedPosition() const;
 		void windowedPosition(Vec2i pos);
 
+		// opengl
 		void makeCurrent();
 		void makeNotCurrent();
 		void swapBuffers();
@@ -69,6 +70,10 @@ namespace cage
 	};
 
 	CAGE_ENGINE_API Holder<Window> newWindow(const WindowCreateConfig &config);
+
+	CAGE_ENGINE_API detail::StringBase<27> getKeyName(uint32 key);
+	CAGE_ENGINE_API detail::StringBase<27> getButtonsNames(MouseButtonsFlags buttons);
+	CAGE_ENGINE_API detail::StringBase<27> getModifiersNames(ModifiersFlags mods);
 }
 
 #endif
diff --git a/sources/libengine/gui/gui.cpp b/sources/libengine/gui/gui.cpp
@@ -37,7 +37,7 @@ namespace cage
 			[this](Entity *e)
 			{
 				if (e->has<GuiTooltipMarkerComponent>())
-					return this->tooltipRemoved(e);
+					this->tooltipRemoved(e);
 			});
 	}
 

diff --git a/sources/libengine/gui/private.h b/sources/libengine/gui/private.h
@@ -342,7 +342,7 @@ namespace cage
 		void ttMouseMove(input::MouseMove in);
 		void updateTooltips();
 		void clearTooltips();
-		bool tooltipRemoved(Entity *e);
+		void tooltipRemoved(Entity *e);
 
 		explicit GuiImpl(const GuiManagerCreateConfig &config);
 		~GuiImpl();

diff --git a/sources/libengine/gui/tooltips.cpp b/sources/libengine/gui/tooltips.cpp
@@ -260,10 +260,9 @@ namespace cage
 		ttHasMovedSinceLast = false;
 	}
 
-	bool GuiImpl::tooltipRemoved(Entity *e)
+	void GuiImpl::tooltipRemoved(Entity *e)
 	{
 		std::erase_if(ttData, [&](const TooltipData &tt) { return tt.tooltip == e; });
-		return false;
 	}
 
 	namespace