Blunkall-Technologies/Archimedes
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

polymorphic windows

Browse Source
This commit is contained in:
Nathan
2026-02-08 11:57:18 -06:00
parent bad4bd70bc
commit f277dee1f7
4 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/extratools.h
View File

@@ -1,7 +1,7 @@
#ifndef EXTRATOOLS_H #ifndef EXTRATOOLS_H
#define EXTRATOOLS_H #define EXTRATOOLS_H
#include <glm/glm.h> #include <glm/glm.hpp>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <curl/curl.h> #include <curl/curl.h>

36
include/utils/Window/Window.h
View File

@@ -4,8 +4,6 @@
#include "WindowEvents.h" #include "WindowEvents.h"
#include "utils/Renderer/Renderer.h" #include "utils/Renderer/Renderer.h"
#include "WindowGLFW/WindowGLFW.h"
#include "WindowSDL3/WindowSDL3.h"
namespace Archimedes { namespace Archimedes {
@@ -13,34 +11,44 @@ namespace Archimedes {
public: public:
Window(const std::function<void(Event*)>& sendEventFn) : window(this, sendEventFn) {} Window(const std::function<void(Event*)>& sendEventFn) : eventFn(sendEventFn) {}
~Window() {} virtual ~Window() = 0;
bool shouldClose() { return window.shouldClose(); }
void getSize(int& w, int& h) {
window.getSize(w, h);
}
void doFrame() { void doFrame() {
renderer->render(); renderer->render();
window.doFrame(); swapBuffers();
window.pollEvents(); pollEvents();
}
virtual bool shouldClose() = 0;
virtual void swapBuffers() = 0;
virtual void pollEvents() = 0;
virtual void getSize(int& w, int& h) {
w = this->w;
h = this->h;
} }
Renderer* getRenderer() { return renderer; } Renderer* getRenderer() { return renderer; }
void setRenderer(Renderer* r) { renderer = r; } void setRenderer(Renderer* r) { renderer = r; }
WindowImpl& getWindowImpl() { return window; } virtual Window* getWindowImpl() = 0;
protected:
int w, h;
private:
Renderer* renderer; Renderer* renderer;
WindowImpl window; std::function<void(Event*)> eventFn;
}; };
} }

59
include/utils/Window/WindowImpl/WindowGLFW/WindowGLFW.h
View File

@@ -5,7 +5,7 @@
#include "pch.hpp" #include "pch.hpp"
#include "utils/Window/WindowEvents.h" #include "utils/Window/Window.h"
#define GLFW_INCLUDE_NONE #define GLFW_INCLUDE_NONE
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
@@ -13,20 +13,13 @@
namespace Archimedes { namespace Archimedes {
class Window; class WindowGLFW : public Window {
class WindowGLFW {
public: public:
WindowGLFW(Window* p, const std::function<void(Event*)>& sendEvent) { WindowGLFW(const std::function<void(Event*)>& sendEvent) : Window(sendEvent) {
/*if(glfwPlatformSupported(GLFW_PLATFORM_WAYLAND)) { data.window = this;
glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_WAYLAND);
}*/
data.window = p;
data.sendEvent = sendEvent; data.sendEvent = sendEvent;
glfwSetErrorCallback([](int e, const char* m){ glfwSetErrorCallback([](int e, const char* m){
@@ -42,31 +35,31 @@ namespace Archimedes {
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
#endif #endif
w = glfwCreateWindow(640, 480, "Archimedes", NULL, NULL); window = glfwCreateWindow(640, 480, "Archimedes", NULL, NULL);
if(!w) { if(!w) {
std::cout << "glfwCreateWindow failed!\n"; std::cout << "glfwCreateWindow failed!\n";
glfwTerminate(); glfwTerminate();
std::abort(); std::abort();
} }
glfwMakeContextCurrent(w); glfwMakeContextCurrent(window);
glfwSwapInterval(1); glfwSwapInterval(1);
glfwSetWindowUserPointer(w, &data); glfwSetWindowUserPointer(window, &data);
glfwSetWindowSizeCallback(w, [](GLFWwindow* window, int w, int h){ glfwSetWindowSizeCallback(window, [](GLFWwindow* window, int w, int h){
WindowData& d = *(WindowData*) glfwGetWindowUserPointer(window); WindowData& d = *(WindowData*) glfwGetWindowUserPointer(window);
d.sendEvent(new ResizeWindowEvent(w, h)); d.sendEvent(new ResizeWindowEvent(w, h));
}); });
glfwSetWindowCloseCallback(w, [](GLFWwindow* window){ glfwSetWindowCloseCallback(window, [](GLFWwindow* window){
WindowData& d = *(WindowData*) glfwGetWindowUserPointer(window); WindowData& d = *(WindowData*) glfwGetWindowUserPointer(window);
d.sendEvent(new CloseWindowEvent(d.window)); d.sendEvent(new CloseWindowEvent(d.window));
}); });
glfwSetKeyCallback(w, [](GLFWwindow* window, int key, int scancode, int action, int mods){ glfwSetKeyCallback(window, [](GLFWwindow* window, int key, int scancode, int action, int mods){
WindowData& d = *(WindowData*) glfwGetWindowUserPointer(window); WindowData& d = *(WindowData*) glfwGetWindowUserPointer(window);
switch(action) { switch(action) {
@@ -82,7 +75,7 @@ namespace Archimedes {
} }
}); });
glfwSetMouseButtonCallback(w, [](GLFWwindow* window, int button, int action, int mods){ glfwSetMouseButtonCallback(window, [](GLFWwindow* window, int button, int action, int mods){
WindowData& d = *(WindowData*) glfwGetWindowUserPointer(window); WindowData& d = *(WindowData*) glfwGetWindowUserPointer(window);
switch(action) { switch(action) {
@@ -95,13 +88,13 @@ namespace Archimedes {
} }
}); });
glfwSetScrollCallback(w, [](GLFWwindow* window, double dx, double dy){ glfwSetScrollCallback(window, [](GLFWwindow* window, double dx, double dy){
WindowData& d = *(WindowData*) glfwGetWindowUserPointer(window); WindowData& d = *(WindowData*) glfwGetWindowUserPointer(window);
d.sendEvent(new ScrollWindowEvent(dx, dy)); d.sendEvent(new ScrollWindowEvent(dx, dy));
}); });
glfwSetCursorPosCallback(w, [](GLFWwindow* window, double dx, double dy){ glfwSetCursorPosCallback(window, [](GLFWwindow* window, double dx, double dy){
WindowData& d = *(WindowData*) glfwGetWindowUserPointer(window); WindowData& d = *(WindowData*) glfwGetWindowUserPointer(window);
d.sendEvent(new MouseMovedWindowEvent(dx, dy)); d.sendEvent(new MouseMovedWindowEvent(dx, dy));
@@ -113,31 +106,31 @@ namespace Archimedes {
} }
bool shouldClose() { void swapBuffers() override { restoreContext(); glfwSwapBuffers(window); };
return glfwWindowShouldClose(w);
void pollEvents() override { glfwPollEvents(); }
bool shouldClose() override {
return glfwWindowShouldClose(window);
} }
void doFrame() { restoreContext(); glfwSwapBuffers(w); } void restoreContext() { glfwMakeContextCurrent(window); }
void pollEvents() { glfwPollEvents(); } void getSize(int& w, int& h) override {
glfwGetFramebufferSize(window, &w, &h);
void restoreContext() { glfwMakeContextCurrent(w); }
void getSize(int& w, int& h) {
glfwGetFramebufferSize(this->w, &w, &h);
} }
GLFWwindow* getWindow() { return w; } GLFWwindow* getWindow() { return window; }
WindowData data; WindowData data;
virtual WindowGLFW* getWindowImpl() override { return this; }
private: private:
GLFWwindow* w; GLFWwindow* window;
}; };
typedef WindowGLFW WindowImpl;
} }
#endif #endif

56
include/utils/Window/WindowImpl/WindowSDL3/WindowSDL3.h
View File

@@ -5,7 +5,7 @@
#include "pch.hpp" #include "pch.hpp"
#include "utils/Window/WindowEvents.h" #include "utils/Window/Window.h"
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
@@ -17,8 +17,6 @@
namespace Archimedes { namespace Archimedes {
class Window;
static bool EventCallback(void* ptr, SDL_Event* e) { static bool EventCallback(void* ptr, SDL_Event* e) {
WindowData& data = *(WindowData*) ptr; WindowData& data = *(WindowData*) ptr;
@@ -66,13 +64,13 @@ namespace Archimedes {
return true; return true;
} }
class WindowSDL3 { class WindowSDL3 : public Window {
public: public:
WindowSDL3(Window* p, const std::function<void(Event*)>& sendEvent) { WindowSDL3(const std::function<void(Event*)>& sendEvent) : Window(sendEvent) {
data.window = p; data.window = this;
data.sendEvent = sendEvent; data.sendEvent = sendEvent;
if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD)) { if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD)) {
@@ -90,16 +88,16 @@ namespace Archimedes {
SDL_WindowFlags window_flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIDDEN | SDL_WINDOW_HIGH_PIXEL_DENSITY; SDL_WindowFlags window_flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIDDEN | SDL_WINDOW_HIGH_PIXEL_DENSITY;
#endif #endif
w = SDL_CreateWindow("Archimedes", 1280, 720, window_flags); window = SDL_CreateWindow("Archimedes", 1280, 720, window_flags);
if (w == nullptr) if (window == nullptr)
{ {
std::cerr << "Error: SDL_CreateWindow(): " << SDL_GetError() << std::endl; std::cerr << "Error: SDL_CreateWindow(): " << SDL_GetError() << std::endl;
std::abort(); std::abort();
} }
SDL_SetWindowPosition(w, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED); SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
#if RENDERER == 1 #if RENDERER == 1
gl_context = SDL_GL_CreateContext(w); gl_context = SDL_GL_CreateContext(window);
if (gl_context == nullptr) if (gl_context == nullptr)
{ {
@@ -107,12 +105,12 @@ namespace Archimedes {
std::abort(); std::abort();
} }
SDL_GL_MakeCurrent(w, gl_context); SDL_GL_MakeCurrent(window, gl_context);
SDL_GL_SetSwapInterval(1); // Enable vsync SDL_GL_SetSwapInterval(1); // Enable vsync
#endif #endif
SDL_AddEventWatch(EventCallback, &data); SDL_AddEventWatch(EventCallback, &data);
SDL_ShowWindow(w); SDL_ShowWindow(window);
} }
~WindowSDL3() { ~WindowSDL3() {
@@ -120,52 +118,52 @@ namespace Archimedes {
SDL_GL_DestroyContext(gl_context); SDL_GL_DestroyContext(gl_context);
#endif #endif
SDL_RemoveEventWatch(EventCallback, &data); SDL_RemoveEventWatch(EventCallback, &data);
SDL_DestroyWindow(w); SDL_DestroyWindow(window);
SDL_Quit(); SDL_Quit();
} }
bool shouldClose() { return false; } bool shouldClose() override { return false; }
void doFrame() { void swapBuffers() override {
#if RENDERER == 1 #if RENDERER == 1
restoreContext(); restoreContext();
SDL_GL_SwapWindow(w); SDL_GL_SwapWindow(window);
#endif #endif
} }
void pollEvents() { void pollEvents() override {
static SDL_Event e; static SDL_Event e;
while(SDL_PollEvent(&e)) {} while(SDL_PollEvent(&e));
} }
WindowSDL3* getWindowImpl() { return this; };
#if RENDERER == 1 #if RENDERER == 1
void restoreContext() { SDL_GL_MakeCurrent(w, gl_context); } void restoreContext() { SDL_GL_MakeCurrent(window, gl_context); }
#endif #endif
void getSize(int& w, int& h) { void getSize(int& w, int& h) override {
w = this->width; w = this->w;
h = this->height; h = this->h;
} }
void setSize(int& w, int& h) { void setSize(int& w, int& h) {
this->width = w; this->w = w;
this->height = h; this->h = h;
} }
SDL_Window* getWindow() { return w; } SDL_Window* getWindow() { return window; }
#if RENDERER == 1 #if RENDERER == 1
SDL_GLContext getContext() { return gl_context; } SDL_GLContext getContext() { return gl_context; }
#endif #endif
WindowData data; WindowData data;
private: private:
SDL_Window* w; SDL_Window* window;
int width = 0, height = 0;
#if RENDERER == 1 #if RENDERER == 1
SDL_GLContext gl_context; SDL_GLContext gl_context;
#endif #endif
}; };
typedef WindowSDL3 WindowImpl;
} }
#endif #endif