remap keys that are unknown to gltf

ucpu · Feb 4, 2025 · 0abad94 · 0abad94
1 parent 46df434
commit 0abad94
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/sources/libcore/mesh/exportGltf.cpp b/sources/libcore/mesh/exportGltf.cpp
@@ -45,8 +45,8 @@ namespace cage
 				detail::StringBase<20> attribute;
 
 				// accessor
-				detail::StringBase<50> min;
-				detail::StringBase<50> max;
+				detail::StringBase<100> min;
+				detail::StringBase<100> max;
 				detail::StringBase<20> type;
 				uint32 componentType = 0;
 				uint32 count = 0;

diff --git a/sources/libengine/window/window.cpp b/sources/libengine/window/window.cpp
@@ -260,10 +260,15 @@ namespace cage
 			impl->eventsQueue.push(input::WindowClose{ impl });
 		}
 
-		void windowKeyCallback(GLFWwindow *w, int key, int, int action, int mods)
+		void windowKeyCallback(GLFWwindow *w, int key, int scan, int action, int mods)
 		{
 			if (key == GLFW_KEY_UNKNOWN)
-				return;
+			{
+				if (scan < 0 || scan > 1'000'000)
+					return;
+				static_assert(GLFW_KEY_LAST < 10'000);
+				key = 10'000 + scan;
+			}
 
 			WindowImpl *impl = (WindowImpl *)glfwGetWindowUserPointer(w);
 			ModifiersFlags ms = getKeyModifiers(mods);
@@ -917,10 +922,15 @@ namespace cage
 			case GLFW_KEY_KP_ENTER:
 				return "Ent";
 		}
-		const auto s = glfwGetKeyName(key, 0);
-		if (!s)
-			return "???";
-		return unicodeTransformString(String(s), UnicodeTransformConfig{ UnicodeTransformEnum::Titlecase });
+		uint32 scan = 0;
+		if (key >= 10'000)
+		{
+			scan = key - 10'000;
+			key = GLFW_KEY_UNKNOWN;
+		};
+		if (const auto s = glfwGetKeyName(key, scan))
+			return unicodeTransformString(String(s), UnicodeTransformConfig{ UnicodeTransformEnum::Titlecase });
+		return Stringizer() + (sint32)key + ":" + (sint32)scan;
 	}
 
 	detail::StringBase<27> getButtonsNames(MouseButtonsFlags buttons)