voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-08 12:31:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

First iteration. Window create successfull

Browse source
This commit is contained in:
Stepanov Igor 2025-10-04 14:52:26 +03:00
parent d6bf8b25f9
commit 26114b9a59
6 changed files with 355 additions and 393 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -9,6 +9,7 @@ Debug/voxel_engine
/export
/config
/out
/compile_commands.json
/misc
/world

2
CMakeLists.txt
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.11)
project(VoxelEngine)
set(CMAKE_CXX_STANDARD 17)

4
src/CMakeLists.txt
View file

@ -18,7 +18,7 @@ endif()
find_package(ZLIB REQUIRED)
find_package(PNG REQUIRED)
find_package(CURL REQUIRED)
find_package(glfw3 REQUIRED)
find_package(SDL3 REQUIRED)
if(NOT APPLE)
find_package(EnTT REQUIRED)
endif()
@ -65,7 +65,7 @@ target_include_directories(VoxelEngineSrc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(
VoxelEngineSrc
PRIVATE glfw
PRIVATE SDL3::SDL3
OpenGL::GL
GLEW::GLEW
ZLIB::ZLIB

10
src/graphics/core/Shader.cpp
View file

@ -1,23 +1,13 @@
#include "Shader.hpp"
#include <exception>
#include <fstream>
#include <iostream>
#include <sstream>
#include <filesystem>
#include <glm/gtc/type_ptr.hpp>
#include <GL/glew.h>
#include <GLFW/glfw3.h>
#include "coders/GLSLExtension.hpp"
#include "debug/Logger.hpp"
static debug::Logger logger("gl-shader");
namespace fs = std::filesystem;
GLSLExtension* Shader::preprocessor = new GLSLExtension();
Shader* Shader::used = nullptr;

460
src/window/detail/GLFWWindow.cpp → src/window/detail/SDLWindow.cpp
View file

@ -1,25 +1,29 @@
#include "window/Window.hpp"
#include <GL/glew.h>
#include <GLFW/glfw3.h>
#include <unordered_set>
#include <SDL3/SDL_events.h>
#include <SDL3/SDL_init.h>
#include <SDL3/SDL_mouse.h>
#include <SDL3/SDL_oldnames.h>
#include <SDL3/SDL_timer.h>
#include <SDL3/SDL_version.h>
#include <SDL3/SDL_video.h>
#include <SDL3/SDL_clipboard.h>
#include <chrono>
#include <stack>
#include <unordered_set>
#include <vector>
#include <stack>
#include "debug/Logger.hpp"
#include "graphics/core/ImageData.hpp"
#include "graphics/core/Texture.hpp"
#include "settings.hpp"
#include "util/ObjectsKeeper.hpp"
#include "util/platform.hpp"
#include "window/input.hpp"
static debug::Logger logger("window");
static std::unordered_set<std::string> supported_gl_extensions;
static void window_size_callback(GLFWwindow* window, int width, int height);
static void init_gl_extensions_list() {
GLint numExtensions = 0;
@ -118,54 +122,15 @@ static bool initialize_gl(int width, int height) {
const GLubyte* renderer = glGetString(GL_RENDERER);
logger.info() << "GL Vendor: " << reinterpret_cast<const char*>(vendor);
logger.info() << "GL Renderer: " << reinterpret_cast<const char*>(renderer);
logger.info() << "GLFW: " << glfwGetVersionString();
logger.info() << "SDL: " << SDL_GetVersion();
return false;
}
static const char* glfw_error_name(int error) {
switch (error) {
case GLFW_NO_ERROR:
return "no error";
case GLFW_NOT_INITIALIZED:
return "not initialized";
case GLFW_NO_CURRENT_CONTEXT:
return "no current context";
case GLFW_INVALID_ENUM:
return "invalid enum";
case GLFW_INVALID_VALUE:
return "invalid value";
case GLFW_OUT_OF_MEMORY:
return "out of memory";
case GLFW_API_UNAVAILABLE:
return "api unavailable";
case GLFW_VERSION_UNAVAILABLE:
return "version unavailable";
case GLFW_PLATFORM_ERROR:
return "platform error";
case GLFW_FORMAT_UNAVAILABLE:
return "format unavailable";
case GLFW_NO_WINDOW_CONTEXT:
return "no window context";
default:
return "unknown error";
}
}
static void glfw_error_callback(int error, const char* description) {
auto logline = logger.error();
logline << "GLFW error [0x" << std::hex << error << " - "
<< glfw_error_name(error) << "]";
if (description) {
logline << ": " << description;
}
}
inline constexpr short KEYS_BUFFER_SIZE = 1036;
inline constexpr short MOUSE_KEYS_OFFSET = 1024;
static GLFWcursor* standard_cursors[static_cast<int>(CursorShape::LAST) + 1] = {};
class GLFWInput : public Input {
class SDLInput : public Input {
public:
int scroll = 0;
uint currentFrame = 0;
@ -176,7 +141,7 @@ public:
bool keys[KEYS_BUFFER_SIZE] {};
std::unordered_map<Keycode, util::HandlersList<>> keyCallbacks;
GLFWInput(GLFWwindow* window)
SDLInput(SDL_Window* window)
: window(window) {
}
@ -184,40 +149,55 @@ public:
delta.x = 0.0f;
delta.y = 0.0f;
scroll = 0;
currentFrame++;
codepoints.clear();
pressedKeys.clear();
glfwPollEvents();
for (auto& [_, binding] : bindings.getAll()) {
if (!binding.enabled) {
binding.state = false;
continue;
}
binding.justChanged = false;
bool newstate = false;
switch (binding.type) {
case InputType::KEYBOARD:
newstate = pressed(static_cast<Keycode>(binding.code));
SDL_Event event;
while(SDL_PollEvent(&event))
{
switch (event.type) {
case SDL_EVENT_QUIT:
// window->setShouldClose(true);
break;
case InputType::MOUSE:
newstate = clicked(static_cast<Mousecode>(binding.code));
case SDL_EVENT_KEY_DOWN:
break;
case SDL_EVENT_KEY_UP:
break;
case SDL_EVENT_MOUSE_BUTTON_DOWN:
break;
case SDL_EVENT_MOUSE_MOTION:
break;
}
// for (auto& [_, binding] : bindings.getAll()) {
// if (!binding.enabled) {
// binding.state = false;
// continue;
// }
// binding.justChanged = false;
if (newstate) {
if (!binding.state) {
binding.state = true;
binding.justChanged = true;
binding.onactived.notify();
}
} else {
if (binding.state) {
binding.state = false;
binding.justChanged = true;
}
}
// bool newstate = false;
// switch (binding.type) {
// case InputType::KEYBOARD:
// newstate = pressed(static_cast<Keycode>(binding.code));
// break;
// case InputType::MOUSE:
// newstate = clicked(static_cast<Mousecode>(binding.code));
// break;
// }
// if (newstate) {
// if (!binding.state) {
// binding.state = true;
// binding.justChanged = true;
// binding.onactived.notify();
// }
// } else {
// if (binding.state) {
// binding.state = false;
// binding.justChanged = true;
// }
// }
}
}
@ -242,11 +222,12 @@ public:
}
const char* getClipboardText() const override {
return glfwGetClipboardString(window);
/*todo free*/
return SDL_GetClipboardText();
}
void setClipboardText(const char* text) override {
glfwSetClipboardString(window, text);
SDL_SetClipboardText(text);
}
int getScroll() override {
@ -286,11 +267,7 @@ public:
void toggleCursor() override {
cursorDrag = false;
if (cursorLocked) {
glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
} else {
glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
}
SDL_SetWindowMouseGrab(window, cursorLocked);
cursorLocked = !cursorLocked;
}
@ -325,22 +302,24 @@ public:
return codepoints;
}
private:
GLFWwindow* window;
SDL_Window* window;
bool cursorLocked = false;
bool cursorDrag = false;
glm::vec2 delta;
glm::vec2 cursor;
};
static_assert(!std::is_abstract<GLFWInput>());
static_assert(!std::is_abstract<SDLInput>());
class GLFWWindow : public Window {
class WindowSdlImpl final : public Window {
public:
GLFWInput& input;
SDLInput& input;
DisplaySettings* settings;
GLFWWindow(
GLFWInput& glfwInput,
GLFWwindow* window,
WindowSdlImpl(
SDLInput& glfwInput,
SDL_Window* window,
SDL_GLContext context,
DisplaySettings* settings,
int width,
int height
@ -348,22 +327,20 @@ public:
: Window({width, height}),
input(glfwInput),
settings(settings),
window(window) {
window(window),
glcontext(context) {
}
~GLFWWindow() {
for (int i = 0; i <= static_cast<int>(CursorShape::LAST); i++) {
glfwDestroyCursor(standard_cursors[i]);
}
glfwTerminate();
~WindowSdlImpl() override {
SDL_GL_DestroyContext(glcontext);
}
double time() override {
return glfwGetTime();
return SDL_GetTicks();
}
void swapBuffers() override {
glfwSwapBuffers(window);
SDL_GL_SwapWindow(window);
resetScissor();
if (framerate > 0) {
auto elapsedTime = time() - prevSwap;
@ -378,65 +355,44 @@ public:
}
bool isMaximized() const override {
return glfwGetWindowAttrib(window, GLFW_MAXIMIZED);
return (SDL_GetWindowFlags(window) & SDL_WINDOW_MAXIMIZED) != 0;
}
bool isFocused() const override {
return glfwGetWindowAttrib(window, GLFW_FOCUSED);
Uint32 flags = SDL_GetWindowFlags(window);
return (flags & SDL_WINDOW_INPUT_FOCUS) != 0 || (flags & SDL_WINDOW_MOUSE_FOCUS) != 0;
}
bool isIconified() const override {
return glfwGetWindowAttrib(window, GLFW_ICONIFIED);
return (SDL_GetWindowFlags(window) & SDL_WINDOW_MINIMIZED) != 0;
}
bool isShouldClose() const override {
return glfwWindowShouldClose(window);
bool isShouldClose() const override
{
return toClose;
}
void setShouldClose(bool flag) override {
glfwSetWindowShouldClose(window, flag);
void setShouldClose(bool flag) override
{
toClose = flag;
}
void setCursor(CursorShape shape) override {
if (cursor == shape) {
return;
}
cursor = shape;
// NULL cursor is valid for GLFW
glfwSetCursor(window, standard_cursors[static_cast<int>(shape)]);
// if (cursor == shape) {
// return;
// }
// cursor = shape;
// // NULL cursor is valid for GLFW
// glfwSetCursor(window, standard_cursors[static_cast<int>(shape)]);
}
void toggleFullscreen() override {
fullscreen = !fullscreen;
GLFWmonitor* monitor = glfwGetPrimaryMonitor();
const GLFWvidmode* mode = glfwGetVideoMode(monitor);
if (input.isCursorLocked()){
input.toggleCursor();
if (!SDL_SetWindowFullscreen(window, fullscreen)) {
// SDL_Log("Failed to toggle fullscreen: %s", SDL_GetError());
}
if (fullscreen) {
glfwGetWindowPos(window, &posX, &posY);
glfwSetWindowMonitor(
window, monitor, 0, 0, mode->width, mode->height, mode->refreshRate
);
} else {
glfwSetWindowMonitor(
window,
nullptr,
posX,
posY,
settings->width.get(),
settings->height.get(),
GLFW_DONT_CARE
);
window_size_callback(window, settings->width.get(), settings->height.get());
}
double xPos, yPos;
glfwGetCursorPos(window, &xPos, &yPos);
input.setCursorPosition(xPos, yPos);
}
bool isFullscreen() const override {
@ -445,16 +401,33 @@ public:
void setIcon(const ImageData* image) override {
if (image == nullptr) {
glfwSetWindowIcon(window, 0, nullptr);
SDL_SetWindowIcon(window, nullptr);
return;
}
GLFWimage icon {
static_cast<int>(image->getWidth()),
static_cast<int>(image->getHeight()),
image->getData()};
glfwSetWindowIcon(window, 1, &icon);
// Create SDL_Surface from ImageData
SDL_Surface* iconSurface = SDL_CreateSurface(
image->getWidth(),
image->getHeight(),
SDL_PIXELFORMAT_RGBA32 // Adjust format based on your ImageData
);
if (!iconSurface) {
// SDL_Log("Failed to create surface for window icon: %s", SDL_GetError());
return;
}
memcpy(iconSurface->pixels, image->getData(),
image->getWidth() * image->getHeight() * 4);
if (!SDL_SetWindowIcon(window, iconSurface)) {
// SDL_Log("Failed to set window icon: %s", SDL_GetError());
}
SDL_DestroySurface(iconSurface);
}
void setSize(int width, int height) {
glViewport(0, 0, width, height);
size = {width, height};
@ -534,15 +507,17 @@ public:
void setFramerate(int framerate) override {
if ((framerate != -1) != (this->framerate != -1)) {
glfwSwapInterval(framerate == -1);
SDL_GL_SetSwapInterval(framerate == -1);
}
this->framerate = framerate;
}
private:
GLFWwindow* window;
SDL_Window* window;
SDL_GLContext glcontext;
CursorShape cursor = CursorShape::ARROW;
bool fullscreen = false;
bool toClose = false;
int framerate = -1;
std::stack<glm::vec4> scissorStack;
glm::vec4 scissorArea;
@ -550,86 +525,85 @@ private:
int posX = 0;
int posY = 0;
};
static_assert(!std::is_abstract<GLFWWindow>());
static void mouse_button_callback(GLFWwindow* window, int button, int action, int) {
auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
handler->input.onMouseCallback(button, action == GLFW_PRESS);
}
// static void mouse_button_callback(GLFWwindow* window, int button, int action, int) {
// auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
// handler->input.onMouseCallback(button, action == GLFW_PRESS);
// }
static void character_callback(GLFWwindow* window, unsigned int codepoint) {
auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
handler->input.codepoints.push_back(codepoint);
}
// static void character_callback(GLFWwindow* window, unsigned int codepoint) {
// auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
// handler->input.codepoints.push_back(codepoint);
// }
static void key_callback(
GLFWwindow* window, int key, int /*scancode*/, int action, int /*mode*/
) {
auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
auto& input = handler->input;
if (key == GLFW_KEY_UNKNOWN) {
return;
}
if (action == GLFW_PRESS) {
input.onKeyCallback(key, true);
// static void key_callback(
// GLFWwindow* window, int key, int /*scancode*/, int action, int /*mode*/
// ) {
// auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
// auto& input = handler->input;
// if (key == GLFW_KEY_UNKNOWN) {
// return;
// }
// if (action == GLFW_PRESS) {
// input.onKeyCallback(key, true);
} else if (action == GLFW_RELEASE) {
input.onKeyCallback(key, false);
} else if (action == GLFW_REPEAT) {
input.onKeyCallback(key, true);
}
}
// } else if (action == GLFW_RELEASE) {
// input.onKeyCallback(key, false);
// } else if (action == GLFW_REPEAT) {
// input.onKeyCallback(key, true);
// }
// }
static void window_size_callback(GLFWwindow* window, int width, int height) {
auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
if (width && height) {
handler->setSize(width, height);
}
handler->resetScissor();
}
// static void window_size_callback(GLFWwindow* window, int width, int height) {
// auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
// if (width && height) {
// handler->setSize(width, height);
// }
// handler->resetScissor();
// }
static void scroll_callback(GLFWwindow* window, double, double yoffset) {
auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
handler->input.scroll += yoffset;
}
// static void scroll_callback(GLFWwindow* window, double, double yoffset) {
// auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
// handler->input.scroll += yoffset;
// }
static void cursor_pos_callback(GLFWwindow* window, double xpos, double ypos) {
auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
handler->input.setCursorPosition(xpos, ypos);
}
// static void cursor_pos_callback(GLFWwindow* window, double xpos, double ypos) {
// auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
// handler->input.setCursorPosition(xpos, ypos);
// }
static void iconify_callback(GLFWwindow* window, int iconified) {
auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
if (handler->isFullscreen() && iconified == 0) {
GLFWmonitor* monitor = glfwGetPrimaryMonitor();
const GLFWvidmode* mode = glfwGetVideoMode(monitor);
glfwSetWindowMonitor(
window, monitor, 0, 0, mode->width, mode->height, mode->refreshRate
);
}
}
// static void iconify_callback(GLFWwindow* window, int iconified) {
// auto handler = static_cast<GLFWWindow*>(glfwGetWindowUserPointer(window));
// if (handler->isFullscreen() && iconified == 0) {
// GLFWmonitor* monitor = glfwGetPrimaryMonitor();
// const GLFWvidmode* mode = glfwGetVideoMode(monitor);
// glfwSetWindowMonitor(
// window, monitor, 0, 0, mode->width, mode->height, mode->refreshRate
// );
// }
// }
static void create_standard_cursors() {
for (int i = 0; i <= static_cast<int>(CursorShape::LAST); i++) {
int cursor = GLFW_ARROW_CURSOR + i;
// GLFW 3.3 does not support some cursors
if (GLFW_VERSION_MAJOR <= 3 && GLFW_VERSION_MINOR <= 3 &&
cursor > GLFW_VRESIZE_CURSOR) {
break;
}
standard_cursors[i] = glfwCreateStandardCursor(cursor);
}
}
// static void create_standard_cursors() {
// for (int i = 0; i <= static_cast<int>(CursorShape::LAST); i++) {
// int cursor = GLFW_ARROW_CURSOR + i;
// // GLFW 3.3 does not support some cursors
// if (GLFW_VERSION_MAJOR <= 3 && GLFW_VERSION_MINOR <= 3 &&
// cursor > GLFW_VRESIZE_CURSOR) {
// break;
// }
// standard_cursors[i] = glfwCreateStandardCursor(cursor);
// }
// }
static void setup_callbacks(GLFWwindow* window) {
glfwSetKeyCallback(window, key_callback);
glfwSetMouseButtonCallback(window, mouse_button_callback);
glfwSetCursorPosCallback(window, cursor_pos_callback);
glfwSetWindowSizeCallback(window, window_size_callback);
glfwSetCharCallback(window, character_callback);
glfwSetScrollCallback(window, scroll_callback);
glfwSetWindowIconifyCallback(window, iconify_callback);
}
// static void setup_callbacks(GLFWwindow* window) {
// glfwSetKeyCallback(window, key_callback);
// glfwSetMouseButtonCallback(window, mouse_button_callback);
// glfwSetCursorPosCallback(window, cursor_pos_callback);
// glfwSetWindowSizeCallback(window, window_size_callback);
// glfwSetCharCallback(window, character_callback);
// glfwSetScrollCallback(window, scroll_callback);
// glfwSetWindowIconifyCallback(window, iconify_callback);
// }
std::tuple<
std::unique_ptr<Window>,
@ -638,35 +612,34 @@ std::tuple<
int width = settings->width.get();
int height = settings->height.get();
glfwSetErrorCallback(glfw_error_callback);
if (glfwInit() == GLFW_FALSE) {
logger.error() << "failed to initialize GLFW";
if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_EVENTS)) {
logger.error() << "failed to initialize SDL";
return {nullptr, nullptr};
}
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
#if GLFW_VERSION_MAJOR >= 3 && GLFW_VERSION_MINOR >= 4
// see issue #465
glfwWindowHint(GLFW_SCALE_FRAMEBUFFER, GL_FALSE);
#endif
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
// #if GLFW_VERSION_MAJOR >= 3 && GLFW_VERSION_MINOR >= 4
// // see issue #465
// // glfwWindowHint(GLFW_SCALE_FRAMEBUFFER, GL_FALSE);
// #endif
#ifdef __APPLE__
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
glfwWindowHint(GLFW_COCOA_RETINA_FRAMEBUFFER, GLFW_FALSE);
// glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
// glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
// glfwWindowHint(GLFW_COCOA_RETINA_FRAMEBUFFER, GLFW_FALSE);
#else
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_ANY_PROFILE);
// glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_ANY_PROFILE);
#endif
glfwWindowHint(GLFW_RESIZABLE, GL_TRUE);
glfwWindowHint(GLFW_SAMPLES, settings->samples.get());
// glfwWindowHint(GLFW_RESIZABLE, GL_TRUE);
// glfwWindowHint(GLFW_SAMPLES, settings->samples.get());
auto window = glfwCreateWindow(width, height, title.c_str(), nullptr, nullptr);
auto window = SDL_CreateWindow(title.c_str(), width, height, SDL_WINDOW_OPENGL);
if (window == nullptr) {
logger.error() << "failed to create GLFW window";
glfwTerminate();
return {nullptr, nullptr};
}
glfwMakeContextCurrent(window);
SDL_GLContext glcontext = SDL_GL_CreateContext(window);
SDL_GL_MakeCurrent(window, glcontext);
glewExperimental = GL_TRUE;
@ -679,7 +652,7 @@ std::tuple<
} else {
logger.error() << "failed to initialize GLEW:\n"
<< glewGetErrorString(glewErr);
glfwTerminate();
SDL_DestroyWindow(window);
return {nullptr, nullptr};
}
}
@ -704,26 +677,25 @@ std::tuple<
Texture::MAX_RESOLUTION = maxTextureSize[0];
logger.info() << "max texture size is " << Texture::MAX_RESOLUTION;
}
setup_callbacks(window);
// setup_callbacks(window);
glfwSwapInterval(1);
SDL_GL_SetSwapInterval(1);
input_util::initialize();
create_standard_cursors();
// create_standard_cursors();
glm::vec2 scale;
glfwGetMonitorContentScale(glfwGetPrimaryMonitor(), &scale.x, &scale.y);
// SDL_SetDisplayContentScale(SDL_GetPrimaryDisplay(), &scale.x, &scale.y);
logger.info() << "monitor content scale: " << scale.x << "x" << scale.y;
if (initialize_gl(width, height)) {
glfwTerminate();
return {nullptr, nullptr};
}
auto inputPtr = std::make_unique<GLFWInput>(window);
auto windowPtr = std::make_unique<GLFWWindow>(
*inputPtr, window, settings, width, height
auto inputPtr = std::make_unique<SDLInput>(window);
auto windowPtr = std::make_unique<WindowSdlImpl>(
*inputPtr, window, glcontext, settings, width, height
);
glfwSetWindowUserPointer(window, windowPtr.get());
// glfwSetWindowUserPointer(window, windowPtr.get());
return {std::move(windowPtr), std::move(inputPtr)};
}

271
src/window/input.cpp
View file

@ -1,56 +1,60 @@
#include "input.hpp"
#include "debug/Logger.hpp"
#include "util/stringutil.hpp"
#include "data/dv.hpp"
#include <GLFW/glfw3.h>
#include <unordered_map>
#include <SDL3/SDL.h>
#include <SDL3/SDL_events.h>
#include <SDL3/SDL_keycode.h>
#include <SDL3/SDL_mouse.h>
#include <SDL3/SDL_oldnames.h>
#include "debug/Logger.hpp"
#include "data/dv.hpp"
#include "util/stringutil.hpp"
#ifdef _WIN32
#include <windows.h>
#endif // _WIN32
static debug::Logger logger("input");
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},
{"tab", GLFW_KEY_TAB},
{"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},
{"grave-accent", GLFW_KEY_GRAVE_ACCENT},
{"left", GLFW_KEY_LEFT},
{"right", GLFW_KEY_RIGHT},
{"down", GLFW_KEY_DOWN},
{"up", GLFW_KEY_UP},
static std::unordered_map<std::string, std::uint64_t> keycodes {
{"enter", SDLK_RETURN },
{"space", SDLK_SPACE },
{"backspace", SDLK_BACKSPACE },
{"caps-lock", SDLK_CAPSLOCK },
{"escape", SDLK_ESCAPE },
{"delete", SDLK_DELETE },
{"home", SDLK_HOME },
{"end", SDLK_END },
{"tab", SDLK_TAB },
{"insert", SDLK_INSERT },
{"page-down", SDLK_PAGEDOWN },
{"page-up", SDLK_PAGEUP },
{"left-shift", SDLK_LSHIFT },
{"right-shift", SDLK_RSHIFT },
{"left-ctrl", SDLK_LCTRL },
{"right-ctrl", SDLK_RCTRL},
{"left-alt", SDLK_LALT },
{"right-alt", SDLK_RALT },
{"left-super", 0 /*todo*/ },
{"right-super", 0 /*todo*/ },
{"grave-accent", SDLK_GRAVE },
{"left", SDLK_LEFT },
{"right", SDLK_RIGHT },
{"down", SDLK_DOWN },
{"up", SDLK_UP },
};
static std::unordered_map<std::string, int> mousecodes {
{"left", GLFW_MOUSE_BUTTON_1},
{"right", GLFW_MOUSE_BUTTON_2},
{"middle", GLFW_MOUSE_BUTTON_3},
{"side1", GLFW_MOUSE_BUTTON_4},
{"side2", GLFW_MOUSE_BUTTON_5},
{"side3", GLFW_MOUSE_BUTTON_6},
{"side4", GLFW_MOUSE_BUTTON_7},
{"side5", GLFW_MOUSE_BUTTON_8},
SDL_Event s;
static std::unordered_map<std::string, std::uint32_t> mousecodes {
{"left", SDL_BUTTON_LEFT },
{"right", SDL_BUTTON_RIGHT },
{"middle", SDL_BUTTON_MIDDLE },
{"side1", SDL_BUTTON_MASK(4) /*todo*/},
{"side2", SDL_BUTTON_MASK(5) /*todo*/},
{"side3", SDL_BUTTON_MASK(6) /*todo*/},
{"side4", SDL_BUTTON_MASK(7) /*todo*/},
{"side5", SDL_BUTTON_MASK(8) /*todo*/},
};
static std::unordered_map<int, std::string> keynames {};
@ -86,14 +90,14 @@ void Binding::reset(Mousecode code) {
}
void input_util::initialize() {
for (int i = 0; i <= 9; i++) {
keycodes[std::to_string(i)] = GLFW_KEY_0 + i;
for (std::uint32_t i = 0; i <= 9; i++) {
keycodes[std::to_string(i)] = SDLK_0 + i;
}
for (int i = 0; i < 25; i++) {
keycodes["f" + std::to_string(i + 1)] = GLFW_KEY_F1 + i;
for (std::uint32_t i = 0; i < 25; i++) {
keycodes["f" + std::to_string(i + 1)] = SDLK_F1 + i;
}
for (char i = 'a'; i <= 'z'; i++) {
keycodes[std::string({i})] = GLFW_KEY_A - 'a' + i;
keycodes[std::string({i})] = SDLK_A - 'a' + i;
}
for (const auto& entry : keycodes) {
keynames[entry.second] = entry.first;
@ -120,96 +124,91 @@ Mousecode input_util::mousecode_from(const std::string& name) {
}
std::string input_util::to_string(Keycode code) {
int icode_repr = static_cast<int>(code);
const char* name =
glfwGetKeyName(icode_repr, glfwGetKeyScancode(icode_repr));
if (name == nullptr) {
switch (icode_repr) {
case GLFW_KEY_TAB:
return "Tab";
case GLFW_KEY_LEFT_CONTROL:
return "Left Ctrl";
case GLFW_KEY_RIGHT_CONTROL:
return "Right Ctrl";
case GLFW_KEY_LEFT_ALT:
return "Left Alt";
case GLFW_KEY_RIGHT_ALT:
return "Right Alt";
case GLFW_KEY_LEFT_SHIFT:
return "Left Shift";
case GLFW_KEY_RIGHT_SHIFT:
return "Right Shift";
case GLFW_KEY_CAPS_LOCK:
return "Caps-Lock";
case GLFW_KEY_SPACE:
return "Space";
case GLFW_KEY_ESCAPE:
return "Esc";
case GLFW_KEY_ENTER:
return "Enter";
case GLFW_KEY_UP:
return "Up";
case GLFW_KEY_DOWN:
return "Down";
case GLFW_KEY_LEFT:
return "Left";
case GLFW_KEY_RIGHT:
return "Right";
case GLFW_KEY_BACKSPACE:
return "Backspace";
case GLFW_KEY_F1:
return "F1";
case GLFW_KEY_F2:
return "F2";
case GLFW_KEY_F3:
return "F3";
case GLFW_KEY_F4:
return "F4";
case GLFW_KEY_F5:
return "F5";
case GLFW_KEY_F6:
return "F6";
case GLFW_KEY_F7:
return "F7";
case GLFW_KEY_F8:
return "F8";
case GLFW_KEY_F9:
return "F9";
case GLFW_KEY_F10:
return "F10";
case GLFW_KEY_F11:
return "F11";
case GLFW_KEY_F12:
return "F12";
case GLFW_KEY_DELETE:
return "Delete";
case GLFW_KEY_HOME:
return "Home";
case GLFW_KEY_END:
return "End";
case GLFW_KEY_LEFT_SUPER:
return "Left Super";
case GLFW_KEY_RIGHT_SUPER:
return "Right Super";
case GLFW_KEY_PAGE_UP:
return "Page Up";
case GLFW_KEY_PAGE_DOWN:
return "Page Down";
case GLFW_KEY_INSERT:
return "Insert";
case GLFW_KEY_PRINT_SCREEN:
return "Print Screen";
case GLFW_KEY_NUM_LOCK:
return "Num Lock";
case GLFW_KEY_MENU:
return "Menu";
case GLFW_KEY_PAUSE:
return "Pause";
default:
return "Unknown";
}
SDL_Scancode scancode = static_cast<SDL_Scancode>(code);
switch (scancode) {
case SDLK_TAB:
return "Tab";
case SDL_SCANCODE_LCTRL:
return "Left Ctrl";
case SDL_SCANCODE_RCTRL:
return "Right Ctrl";
case SDL_SCANCODE_LALT:
return "Left Alt";
case SDL_SCANCODE_RALT:
return "Right Alt";
case SDL_SCANCODE_LSHIFT:
return "Left Shift";
case SDL_SCANCODE_RSHIFT:
return "Right Shift";
case SDL_SCANCODE_CAPSLOCK:
return "Caps-Lock";
case SDL_SCANCODE_SPACE:
return "Space";
case SDL_SCANCODE_ESCAPE:
return "Esc";
case SDL_SCANCODE_RETURN:
return "Enter";
case SDL_SCANCODE_UP:
return "Up";
case SDL_SCANCODE_DOWN:
return "Down";
case SDL_SCANCODE_LEFT:
return "Left";
case SDL_SCANCODE_RIGHT:
return "Right";
case SDL_SCANCODE_BACKSPACE:
return "Backspace";
case SDL_SCANCODE_F1:
return "F1";
case SDL_SCANCODE_F2:
return "F2";
case SDL_SCANCODE_F3:
return "F3";
case SDL_SCANCODE_F4:
return "F4";
case SDL_SCANCODE_F5:
return "F5";
case SDL_SCANCODE_F6:
return "F6";
case SDL_SCANCODE_F7:
return "F7";
case SDL_SCANCODE_F8:
return "F8";
case SDL_SCANCODE_F9:
return "F9";
case SDL_SCANCODE_F10:
return "F10";
case SDL_SCANCODE_F11:
return "F11";
case SDL_SCANCODE_F12:
return "F12";
case SDL_SCANCODE_DELETE:
return "Delete";
case SDL_SCANCODE_HOME:
return "Home";
case SDL_SCANCODE_END:
return "End";
case SDL_SCANCODE_LGUI:
return "Left Super";
case SDL_SCANCODE_RGUI:
return "Right Super";
case SDL_SCANCODE_PAGEUP:
return "Page Up";
case SDL_SCANCODE_PAGEDOWN:
return "Page Down";
case SDL_SCANCODE_INSERT:
return "Insert";
case SDL_SCANCODE_PRINTSCREEN:
return "Print Screen";
case SDL_SCANCODE_NUMLOCKCLEAR:
return "Num Lock";
case SDL_SCANCODE_APPLICATION:
return "Menu";
case SDL_SCANCODE_PAUSE:
return "Pause";
default:
return "Unknown";
}
return std::string(name);
}
std::string input_util::to_string(Mousecode code) {