From 9fdc2abb4e3f266b2d258e8d47c312b46ff9be44 Mon Sep 17 00:00:00 2001 From: "@clasher113" Date: Mon, 20 Nov 2023 12:30:24 +0200 Subject: [PATCH 1/2] Block render fix --- src/graphics/BlocksRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/graphics/BlocksRenderer.cpp b/src/graphics/BlocksRenderer.cpp index df2b0a42..af421a01 100644 --- a/src/graphics/BlocksRenderer.cpp +++ b/src/graphics/BlocksRenderer.cpp @@ -69,7 +69,7 @@ void BlocksRenderer::face(const vec3& coord, float w, float h, vertex(coord + axisX * w, region.u2, region.v1, lights[1] * tint); vertex(coord + axisX * w + axisY * h, region.u2, region.v2, lights[2] * tint); vertex(coord + axisY * h, region.u1, region.v2, lights[3] * tint); - index(0, 1, 3, 0, 2, 3); + index(0, 1, 3, 1, 2, 3); } void BlocksRenderer::face(const vec3& coord, float w, float h, From 69139c162aea0b98bf38883bccbeb18e28f77ed7 Mon Sep 17 00:00:00 2001 From: "@clasher113" Date: Mon, 20 Nov 2023 12:32:06 +0200 Subject: [PATCH 2/2] Win32 keyname implementation --- src/window/input.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/window/input.cpp b/src/window/input.cpp index cd39a996..93554449 100644 --- a/src/window/input.cpp +++ b/src/window/input.cpp @@ -80,7 +80,17 @@ int keycode::NUM_LOCK = GLFW_KEY_NUM_LOCK; int keycode::LEFT_BRACKET = GLFW_KEY_LEFT_BRACKET; int keycode::RIGHT_BRACKET = GLFW_KEY_RIGHT_BRACKET; +#ifdef _WIN32 +#include +#endif // _WIN32 + const char* keycode::name(int code) { +#ifdef _WIN32 + char name[64]; + int result = GetKeyNameTextA(glfwGetKeyScancode(code) << 16, name, 64); + if (result == NULL) return "Unknown"; + return name; +#else const char* name = glfwGetKeyName(code, glfwGetKeyScancode(code)); if (name == nullptr) { switch (code) { @@ -129,6 +139,7 @@ const char* keycode::name(int code) { } } return name; +#endif // _WIN32 } int mousecode::BUTTON_1 = GLFW_MOUSE_BUTTON_1;