PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

small fix

Browse Source
This commit is contained in:
MihailRis 2023-11-20 22:32:01 +03:00
parent 0a196b0090
commit 9629135791
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/window/input.cpp
View File

@ -84,12 +84,12 @@ int keycode::RIGHT_BRACKET = GLFW_KEY_RIGHT_BRACKET;
#include <windows.h> #include <windows.h>
#endif // _WIN32 #endif // _WIN32
const char* keycode::name(int code) { const std::string keycode::name(int code) {
#ifdef _WIN32 #ifdef _WIN32
char name[64]; char name[64];
int result = GetKeyNameTextA(glfwGetKeyScancode(code) << 16, name, 64); int result = GetKeyNameTextA(glfwGetKeyScancode(code) << 16, name, 64);
if (result == NULL) return "Unknown"; if (result == NULL) return "Unknown";
return name; return std::string(name);
#else #else
const char* name = glfwGetKeyName(code, glfwGetKeyScancode(code)); const char* name = glfwGetKeyName(code, glfwGetKeyScancode(code));
if (name == nullptr) { if (name == nullptr) {
@ -138,7 +138,7 @@ const char* keycode::name(int code) {
return "Unknown"; return "Unknown";
} }
} }
return name; return std::string(name);
#endif // _WIN32 #endif // _WIN32
} }
@ -146,7 +146,7 @@ int mousecode::BUTTON_1 = GLFW_MOUSE_BUTTON_1;
int mousecode::BUTTON_2 = GLFW_MOUSE_BUTTON_2; int mousecode::BUTTON_2 = GLFW_MOUSE_BUTTON_2;
int mousecode::BUTTON_3 = GLFW_MOUSE_BUTTON_3; int mousecode::BUTTON_3 = GLFW_MOUSE_BUTTON_3;
const char* mousecode::name(int code) { const std::string mousecode::name(int code) {
switch (code) { switch (code) {
case GLFW_MOUSE_BUTTON_1: return "LMB"; case GLFW_MOUSE_BUTTON_1: return "LMB";
case GLFW_MOUSE_BUTTON_2: return "RMB"; case GLFW_MOUSE_BUTTON_2: return "RMB";

8
src/window/input.h
View File

@ -1,6 +1,8 @@
#ifndef WINDOW_INPUT_H_ #ifndef WINDOW_INPUT_H_
#define WINDOW_INPUT_H_ #define WINDOW_INPUT_H_
#include <string>
namespace keycode { namespace keycode {
extern int ENTER; extern int ENTER;
extern int TAB; extern int TAB;
@ -81,7 +83,7 @@ namespace keycode {
extern int LEFT_BRACKET; extern int LEFT_BRACKET;
extern int RIGHT_BRACKET; extern int RIGHT_BRACKET;
extern const char* name(int code); extern const std::string name(int code);
} }
namespace mousecode { namespace mousecode {
@ -89,7 +91,7 @@ namespace mousecode {
extern int BUTTON_2; extern int BUTTON_2;
extern int BUTTON_3; extern int BUTTON_3;
extern const char* name(int code); extern const std::string name(int code);
} }
enum class inputtype { enum class inputtype {
@ -111,7 +113,7 @@ struct Binding {
return state && justChange; return state && justChange;
} }
const char* text() const { const std::string text() const {
switch (type) { switch (type) {
case inputtype::keyboard: return keycode::name(code); case inputtype::keyboard: return keycode::name(code);
case inputtype::mouse: return mousecode::name(code); case inputtype::mouse: return mousecode::name(code);