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

sdl event stuff

Browse Source
This commit is contained in:
Nathan
2025-05-05 11:08:07 -05:00
parent 2820387851
commit c2da1944d8
11 changed files with 195 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/utils/Events/BasicEvents.h
View File

@@ -11,9 +11,9 @@ namespace Archimedes {
public:
LoadModuleEvent() {}
LoadModuleEvent() : Event(nullptr) {}
LoadModuleEvent(std::string n) : module(n) {}
LoadModuleEvent(std::string n) : Event(nullptr), module(n) {}
~LoadModuleEvent() {}
@@ -27,9 +27,9 @@ namespace Archimedes {
public:
DoLoadModuleEvent() {}
DoLoadModuleEvent() : Event(nullptr) {}
DoLoadModuleEvent(std::variant<std::string, Module*> n) : module(n) {}
DoLoadModuleEvent(std::variant<std::string, Module*> n) : Event(nullptr), module(n) {}
~DoLoadModuleEvent() {}
@@ -43,9 +43,9 @@ namespace Archimedes {
public:
UnloadModuleEvent() {}
UnloadModuleEvent() : Event(nullptr) {}
UnloadModuleEvent(std::string n) : module(n) {}
UnloadModuleEvent(std::string n) : Event(nullptr), module(n) {}
~UnloadModuleEvent() {}
@@ -58,9 +58,9 @@ namespace Archimedes {
public:
DoUnloadModuleEvent() {}
DoUnloadModuleEvent() : Event(nullptr) {}
DoUnloadModuleEvent(std::string n) : module(n) {}
DoUnloadModuleEvent(std::string n) : Event(nullptr), module(n) {}
~DoUnloadModuleEvent() {}

3
include/utils/Events/Event.h
View File

@@ -9,10 +9,13 @@ namespace Archimedes {
public:
Event(void* ptr) : userData(ptr) {}
virtual ~Event() {}
virtual operator std::string() const = 0;
void* userData;
};
}

12
include/utils/Events/NetworkEvents.h
View File

@@ -12,9 +12,9 @@ namespace Archimedes {
public:
DataRecievedEvent() : msg(nullptr) {}
DataRecievedEvent() : Event(nullptr), msg(nullptr) {}
DataRecievedEvent(ISteamNetworkingMessage* m) : msg(m) {}
DataRecievedEvent(ISteamNetworkingMessage* m) : Event(nullptr), msg(m) {}
~DataRecievedEvent() {
if(msg)
@@ -31,9 +31,9 @@ namespace Archimedes {
public:
DataSentEvent() : msg(nullptr) {}
DataSentEvent() : Event(nullptr), msg(nullptr) {}
DataSentEvent(const void* m, uint32 l) : msg(m), length(l) {}
DataSentEvent(const void* m, uint32 l) : Event(nullptr), msg(m), length(l) {}
operator std::string() const override { return "DataSentEvent"; }
@@ -45,9 +45,9 @@ namespace Archimedes {
public:
ConnectionStatusChangedEvent() : info(nullptr) {}
ConnectionStatusChangedEvent() : Event(nullptr), info(nullptr) {}
ConnectionStatusChangedEvent(SteamNetConnectionStatusChangedCallback_t* i) : info(i) {}
ConnectionStatusChangedEvent(SteamNetConnectionStatusChangedCallback_t* i) : Event(nullptr), info(i) {}
operator std::string() const override { return "ConnectionStatusChangedEvent"; }

8
include/utils/Renderer/RendererOpenGL/RendererOpenGL.h
View File

@@ -1,5 +1,7 @@
#ifdef RENDERER_OPENGL
#undef RENDERER_OPENGL
#if RENDERER == 1
#ifndef RENDERER_OPENGL
#define RENDERER_OPENGL
#include "pch.hpp"
@@ -38,3 +40,5 @@ namespace Archimedes {
}
#endif
#endif

44
include/utils/Window/WindowEvents.h
View File

@@ -19,9 +19,9 @@ namespace Archimedes {
public:
ResizeWindowEvent() : width(0), height(0) {}
ResizeWindowEvent() : Event(nullptr), width(0), height(0) {}
ResizeWindowEvent(int w, int h) : width(w), height(h) {}
ResizeWindowEvent(int w, int h, void* userData = nullptr) : Event(userData), width(w), height(h) {}
~ResizeWindowEvent() {
@@ -37,9 +37,9 @@ namespace Archimedes {
public:
CloseWindowEvent() : window(nullptr) {}
CloseWindowEvent() : Event(nullptr), window(nullptr) {}
CloseWindowEvent(const Window* w) : window(w) {}
CloseWindowEvent(const Window* w, void* userData = nullptr) : Event(userData), window(w) {}
~CloseWindowEvent() {
@@ -54,9 +54,9 @@ namespace Archimedes {
public:
KeyPressedWindowEvent() : key(0), repeat(0) {}
KeyPressedWindowEvent() : Event(nullptr), key(0), repeat(0) {}
KeyPressedWindowEvent(unsigned int k, unsigned int r) : key(k), repeat(r) {}
KeyPressedWindowEvent(unsigned int k, unsigned int r, void* userData = nullptr) : Event(userData), key(k), repeat(r) {}
~KeyPressedWindowEvent() {
@@ -72,9 +72,9 @@ namespace Archimedes {
public:
KeyReleasedWindowEvent() : key(0) {}
KeyReleasedWindowEvent() : Event(nullptr), key(0) {}
KeyReleasedWindowEvent(unsigned int k) : key(k) {}
KeyReleasedWindowEvent(unsigned int k, void* userData = nullptr) : Event(userData), key(k) {}
~KeyReleasedWindowEvent() {
@@ -89,9 +89,9 @@ namespace Archimedes {
public:
MouseButtonPressedWindowEvent() : button(0) {}
MouseButtonPressedWindowEvent() : Event(nullptr), button(0) {}
MouseButtonPressedWindowEvent(unsigned int b) : button(b) {}
MouseButtonPressedWindowEvent(unsigned int b, void* userData = nullptr) : Event(userData), button(b) {}
~MouseButtonPressedWindowEvent() {
@@ -106,9 +106,9 @@ namespace Archimedes {
public:
MouseButtonReleasedWindowEvent() : button(0) {}
MouseButtonReleasedWindowEvent() : Event(nullptr), button(0) {}
MouseButtonReleasedWindowEvent(unsigned int b) : button(b) {}
MouseButtonReleasedWindowEvent(unsigned int b, void* userData = nullptr) : Event(userData), button(b) {}
~MouseButtonReleasedWindowEvent() {
@@ -123,9 +123,9 @@ namespace Archimedes {
public:
ScrollWindowEvent() : dx(0), dy(0) {}
ScrollWindowEvent() : Event(nullptr), dx(0), dy(0) {}
ScrollWindowEvent(double x, double y) : dx(x), dy(y) {}
ScrollWindowEvent(double x, double y, void* userData = nullptr) : Event(userData), dx(x), dy(y) {}
~ScrollWindowEvent() {
@@ -140,9 +140,9 @@ namespace Archimedes {
public:
MouseMovedWindowEvent() : x(0), y(0) {}
MouseMovedWindowEvent() : Event(nullptr), x(0), y(0) {}
MouseMovedWindowEvent(double x, double y) : x(x), y(y) {}
MouseMovedWindowEvent(double x, double y, void* userData = nullptr) : Event(userData), x(x), y(y) {}
~MouseMovedWindowEvent() {
@@ -157,9 +157,9 @@ namespace Archimedes {
public:
FocusedWindowEvent() : window(nullptr) {}
FocusedWindowEvent() : Event(nullptr), window(nullptr) {}
FocusedWindowEvent(const Window* w) : window(w) {}
FocusedWindowEvent(const Window* w, void* userData = nullptr) : Event(userData), window(w) {}
~FocusedWindowEvent() {
@@ -174,9 +174,9 @@ namespace Archimedes {
public:
FocusLostWindowEvent() : window(nullptr) {}
FocusLostWindowEvent() : Event(nullptr), window(nullptr) {}
FocusLostWindowEvent(const Window* w) : window(w) {}
FocusLostWindowEvent(const Window* w, void* userData = nullptr) : Event(userData), window(w) {}
~FocusLostWindowEvent() {
@@ -191,9 +191,9 @@ namespace Archimedes {
public:
MovedWindowEvent() : x(0), y(0) {}
MovedWindowEvent() : Event(nullptr), x(0), y(0) {}
MovedWindowEvent(int x, int y) : x(x), y(y) {}
MovedWindowEvent(int x, int y, void* userData = nullptr) : Event(userData), x(x), y(y) {}
~MovedWindowEvent() {

10
include/utils/Window/WindowGLFW/WindowGLFW.h
View File

@@ -1,7 +1,9 @@
#include "pch.hpp"
#if WINDOW == 1
#ifdef WINDOW_GLFW
#undef WINDOW_GLFW
#ifndef WINDOW_GLFW
#define WINDOW_GLFW
#include "pch.hpp"
#include "utils/Window/WindowEvents.h"
@@ -127,3 +129,5 @@ namespace Archimedes {
}
#endif
#endif

100
include/utils/Window/WindowSDL3/WindowSDL3.h
View File

@@ -1,7 +1,9 @@
#include "pch.hpp"
#if WINDOW == 2
#ifdef WINDOW_SDL3
#undef WINDOW_SDL3
#ifndef WINDOW_SDL3
#define WINDOW_SDL3
#include "pch.hpp"
#include "utils/Window/WindowEvents.h"
@@ -69,52 +71,52 @@ namespace Archimedes {
void doFrame() { restoreContext(); SDL_GL_SwapWindow(w); }
void pollEvents() {
SDL_PollEvent(&e);
void pollEvents() {
while(SDL_PollEvent(&e)) {
switch(e.type) {
switch(e.type) {
case SDL_EVENT_WINDOW_CLOSE_REQUESTED:
case SDL_EVENT_QUIT:
data.sendEvent(new CloseWindowEvent(data.window));
break;
case SDL_EVENT_WINDOW_RESIZED:
width = e.window.data1;
height = e.window.data2;
data.sendEvent(new ResizeWindowEvent(e.window.data1, e.window.data2));
break;
case SDL_EVENT_WINDOW_MOUSE_ENTER:
case SDL_EVENT_WINDOW_FOCUS_GAINED:
data.sendEvent(new FocusedWindowEvent(data.window));
break;
case SDL_EVENT_WINDOW_MOUSE_LEAVE:
case SDL_EVENT_WINDOW_FOCUS_LOST:
data.sendEvent(new FocusLostWindowEvent(data.window));
break;
case SDL_EVENT_KEY_DOWN:
data.sendEvent(new KeyPressedWindowEvent(e.key.key, e.key.repeat ? 1 : 0));
break;
case SDL_EVENT_KEY_UP:
data.sendEvent(new KeyReleasedWindowEvent(e.key.key));
break;
case SDL_EVENT_TEXT_EDITING:
break;
case SDL_EVENT_TEXT_INPUT:
break;
case SDL_EVENT_MOUSE_MOTION:
data.sendEvent(new MouseMovedWindowEvent(e.motion.x, e.motion.y));
break;
case SDL_EVENT_MOUSE_BUTTON_DOWN:
data.sendEvent(new MouseButtonPressedWindowEvent(e.button.button));
break;
case SDL_EVENT_MOUSE_BUTTON_UP:
data.sendEvent(new MouseButtonReleasedWindowEvent(e.button.button));
break;
case SDL_EVENT_MOUSE_WHEEL:
data.sendEvent(new ScrollWindowEvent(e.wheel.x, e.wheel.y));
break;
default:
break;
case SDL_EVENT_WINDOW_CLOSE_REQUESTED:
case SDL_EVENT_QUIT:
data.sendEvent(new CloseWindowEvent(data.window, (void*) &e));
break;
case SDL_EVENT_WINDOW_RESIZED:
width = e.window.data1;
height = e.window.data2;
data.sendEvent(new ResizeWindowEvent(e.window.data1, e.window.data2, (void*) &e));
break;
case SDL_EVENT_WINDOW_MOUSE_ENTER:
case SDL_EVENT_WINDOW_FOCUS_GAINED:
data.sendEvent(new FocusedWindowEvent(data.window, (void*) &e));
break;
case SDL_EVENT_WINDOW_MOUSE_LEAVE:
case SDL_EVENT_WINDOW_FOCUS_LOST:
data.sendEvent(new FocusLostWindowEvent(data.window, (void*) &e));
break;
case SDL_EVENT_KEY_DOWN:
data.sendEvent(new KeyPressedWindowEvent(e.key.key, e.key.repeat ? 1 : 0, (void*) &e));
break;
case SDL_EVENT_KEY_UP:
data.sendEvent(new KeyReleasedWindowEvent(e.key.key, (void*) &e));
break;
case SDL_EVENT_TEXT_EDITING:
break;
case SDL_EVENT_TEXT_INPUT:
break;
case SDL_EVENT_MOUSE_MOTION:
data.sendEvent(new MouseMovedWindowEvent(e.motion.x, e.motion.y, (void*) &e));
break;
case SDL_EVENT_MOUSE_BUTTON_DOWN:
data.sendEvent(new MouseButtonPressedWindowEvent(e.button.button, (void*) &e));
break;
case SDL_EVENT_MOUSE_BUTTON_UP:
data.sendEvent(new MouseButtonReleasedWindowEvent(e.button.button, (void*) &e));
break;
case SDL_EVENT_MOUSE_WHEEL:
data.sendEvent(new ScrollWindowEvent(e.wheel.x, e.wheel.y, (void*) &e));
break;
default:
break;
}
}
}
@@ -143,3 +145,5 @@ namespace Archimedes {
}
#endif
#endif