scripting.h fix + input library

This commit is contained in:
MihailRis
2024-05-05 00:28:30 +03:00
parent f9dd865bee
commit f02edcf15a
12 changed files with 121 additions and 34 deletions
+2
View File
@@ -182,6 +182,8 @@ int Window::initialize(DisplaySettings* settings){
logger.info() << "GL Vendor: " << (char*)vendor;
logger.info() << "GL Renderer: " << (char*)renderer;
logger.info() << "GLFW: " << glfwGetVersionString();
input_util::initialize();
return 0;
}
+47
View File
@@ -1,10 +1,37 @@
#include "input.h"
#include <GLFW/glfw3.h>
#include <unordered_map>
#ifdef _WIN32
#include <windows.h>
#endif // _WIN32
static std::unordered_map<std::string, int> keycodes {
{"enter", GLFW_KEY_ENTER},
{"space", GLFW_KEY_SPACE},
{"backspace", GLFW_KEY_BACKSPACE},
{"caps-lock", GLFW_KEY_CAPS_LOCK},
{"escape", GLFW_KEY_ESCAPE},
{"delete", GLFW_KEY_DELETE},
{"home", GLFW_KEY_HOME},
{"end", GLFW_KEY_END},
{"insert", GLFW_KEY_INSERT},
{"page-down", GLFW_KEY_PAGE_DOWN},
{"page-up", GLFW_KEY_PAGE_UP},
{"left-shift", GLFW_KEY_LEFT_SHIFT},
{"right-shift", GLFW_KEY_RIGHT_SHIFT},
{"left-ctrl", GLFW_KEY_LEFT_CONTROL},
{"right-ctrl", GLFW_KEY_RIGHT_CONTROL},
{"left-alt", GLFW_KEY_LEFT_ALT},
{"right-alt", GLFW_KEY_RIGHT_ALT},
{"left-super", GLFW_KEY_LEFT_SUPER},
{"right-super", GLFW_KEY_RIGHT_SUPER},
{"left", GLFW_KEY_LEFT},
{"right", GLFW_KEY_RIGHT},
{"down", GLFW_KEY_DOWN},
{"up", GLFW_KEY_UP},
};
void Binding::reset(inputtype type, int code) {
this->type = type;
this->code = code;
@@ -18,6 +45,26 @@ void Binding::reset(mousecode code) {
reset(inputtype::mouse, static_cast<int>(code));
}
void input_util::initialize() {
for (int i = 0; i <= 9; i++) {
keycodes[std::to_string(i)] = GLFW_KEY_0+i;
}
for (int i = 0; i < 25; i++) {
keycodes["f"+std::to_string(i)] = GLFW_KEY_F1+i;
}
for (char i = 'a'; i <= 'z'; i++) {
keycodes[std::to_string(i)] = GLFW_KEY_A-'a'+i;
}
}
keycode input_util::keycode_from(const std::string& name) {
const auto& found = keycodes.find(name);
if (found == keycodes.end()) {
return keycode::UNKNOWN;
}
return static_cast<keycode>(found->second);
}
std::string input_util::to_string(keycode code) {
int icode_repr = static_cast<int>(code);
#ifdef _WIN32
+3
View File
@@ -83,6 +83,7 @@ enum class keycode : int {
NUM_LOCK = 282,
LEFT_BRACKET = 91,
RIGHT_BRACKET = 93,
UNKNOWN = -1
};
@@ -102,6 +103,8 @@ inline mousecode MOUSECODES_ALL[] {
};
namespace input_util {
void initialize();
keycode keycode_from(const std::string& name);
/// @return Key label by keycode
std::string to_string(keycode code);
/// @return Mouse button label by keycode
+9
View File
@@ -0,0 +1,9 @@
## Key Names
- space, backspace, tab, enter, caps-lock, escape
- left-ctrl, left-shift, left-alt, left-super
- right-ctrl, right-shift, right-alt, right-alt
- delete, home, end, insert, page-up, page-down
- left, right, down, up
- a..z
- 0..9
- f1..f25