save

4 files changed, 125 insertions, 114 deletions

diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index d3e99af..d222e51 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -2,9 +2,12 @@
 // TODO discussing the location of these events
 
 #include <string>
+#include <unordered_map>
+
 
 #include "KeyCodes.h"
 #include "types.h"
+
 namespace crepe {
 
 /**
@@ -22,6 +25,7 @@ public:
 
 	//! The key that was pressed.
 	Keycode key = Keycode::NONE;
+	keyboard_state_t keyboard_state;
 };
 
 /**
@@ -31,6 +35,7 @@ class KeyReleaseEvent : public Event {
 public:
 	//! The key that was released.
 	Keycode key = Keycode::NONE;
+	keyboard_state_t keyboard_state;
 };
 
 /**
diff --git a/src/crepe/api/KeyCodes.h b/src/crepe/api/KeyCodes.h
index f704fbb..4a3bf57 100644
--- a/src/crepe/api/KeyCodes.h
+++ b/src/crepe/api/KeyCodes.h
@@ -1,4 +1,7 @@
 #pragma once
+
+#include <unordered_map>
+
 namespace crepe {
 //! Enumeration for mouse button inputs, including standard and extended buttons.
 enum class MouseButton {
@@ -153,4 +156,6 @@ typedef enum {
 	//! Not actually a key instead its the amount of keycodes there are for array indexing
 	NUM_KEYCODES = 512,
 } Keycode;
+
+typedef std::unordered_map<Keycode, bool> keyboard_state_t;
 } // namespace crepe
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 75ad0e8..d70a7bb 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -77,118 +77,14 @@ SDLContext::~SDLContext() {
 }
 
 Keycode SDLContext::sdl_to_keycode(SDL_Scancode sdl_key) {
-	static const std::array<Keycode, SDL_NUM_SCANCODES> LOOKUP_TABLE = [] {
-		std::array<Keycode, SDL_NUM_SCANCODES> table{};
-		table.fill(Keycode::NONE);
-
-		// Map all SDL scancodes to Keycodes
-		table[SDL_SCANCODE_SPACE] = Keycode::SPACE;
-		table[SDL_SCANCODE_APOSTROPHE] = Keycode::APOSTROPHE;
-		table[SDL_SCANCODE_COMMA] = Keycode::COMMA;
-		table[SDL_SCANCODE_MINUS] = Keycode::MINUS;
-		table[SDL_SCANCODE_PERIOD] = Keycode::PERIOD;
-		table[SDL_SCANCODE_SLASH] = Keycode::SLASH;
-		table[SDL_SCANCODE_0] = Keycode::D0;
-		table[SDL_SCANCODE_1] = Keycode::D1;
-		table[SDL_SCANCODE_2] = Keycode::D2;
-		table[SDL_SCANCODE_3] = Keycode::D3;
-		table[SDL_SCANCODE_4] = Keycode::D4;
-		table[SDL_SCANCODE_5] = Keycode::D5;
-		table[SDL_SCANCODE_6] = Keycode::D6;
-		table[SDL_SCANCODE_7] = Keycode::D7;
-		table[SDL_SCANCODE_8] = Keycode::D8;
-		table[SDL_SCANCODE_9] = Keycode::D9;
-		table[SDL_SCANCODE_SEMICOLON] = Keycode::SEMICOLON;
-		table[SDL_SCANCODE_EQUALS] = Keycode::EQUAL;
-		table[SDL_SCANCODE_A] = Keycode::A;
-		table[SDL_SCANCODE_B] = Keycode::B;
-		table[SDL_SCANCODE_C] = Keycode::C;
-		table[SDL_SCANCODE_D] = Keycode::D;
-		table[SDL_SCANCODE_E] = Keycode::E;
-		table[SDL_SCANCODE_F] = Keycode::F;
-		table[SDL_SCANCODE_G] = Keycode::G;
-		table[SDL_SCANCODE_H] = Keycode::H;
-		table[SDL_SCANCODE_I] = Keycode::I;
-		table[SDL_SCANCODE_J] = Keycode::J;
-		table[SDL_SCANCODE_K] = Keycode::K;
-		table[SDL_SCANCODE_L] = Keycode::L;
-		table[SDL_SCANCODE_M] = Keycode::M;
-		table[SDL_SCANCODE_N] = Keycode::N;
-		table[SDL_SCANCODE_O] = Keycode::O;
-		table[SDL_SCANCODE_P] = Keycode::P;
-		table[SDL_SCANCODE_Q] = Keycode::Q;
-		table[SDL_SCANCODE_R] = Keycode::R;
-		table[SDL_SCANCODE_S] = Keycode::S;
-		table[SDL_SCANCODE_T] = Keycode::T;
-		table[SDL_SCANCODE_U] = Keycode::U;
-		table[SDL_SCANCODE_V] = Keycode::V;
-		table[SDL_SCANCODE_W] = Keycode::W;
-		table[SDL_SCANCODE_X] = Keycode::X;
-		table[SDL_SCANCODE_Y] = Keycode::Y;
-		table[SDL_SCANCODE_Z] = Keycode::Z;
-		table[SDL_SCANCODE_LEFTBRACKET] = Keycode::LEFT_BRACKET;
-		table[SDL_SCANCODE_BACKSLASH] = Keycode::BACKSLASH;
-		table[SDL_SCANCODE_RIGHTBRACKET] = Keycode::RIGHT_BRACKET;
-		table[SDL_SCANCODE_GRAVE] = Keycode::GRAVE_ACCENT;
-		table[SDL_SCANCODE_ESCAPE] = Keycode::ESCAPE;
-		table[SDL_SCANCODE_RETURN] = Keycode::ENTER;
-		table[SDL_SCANCODE_TAB] = Keycode::TAB;
-		table[SDL_SCANCODE_BACKSPACE] = Keycode::BACKSPACE;
-		table[SDL_SCANCODE_INSERT] = Keycode::INSERT;
-		table[SDL_SCANCODE_DELETE] = Keycode::DELETE;
-		table[SDL_SCANCODE_RIGHT] = Keycode::RIGHT;
-		table[SDL_SCANCODE_LEFT] = Keycode::LEFT;
-		table[SDL_SCANCODE_DOWN] = Keycode::DOWN;
-		table[SDL_SCANCODE_UP] = Keycode::UP;
-		table[SDL_SCANCODE_PAGEUP] = Keycode::PAGE_UP;
-		table[SDL_SCANCODE_PAGEDOWN] = Keycode::PAGE_DOWN;
-		table[SDL_SCANCODE_HOME] = Keycode::HOME;
-		table[SDL_SCANCODE_END] = Keycode::END;
-		table[SDL_SCANCODE_CAPSLOCK] = Keycode::CAPS_LOCK;
-		table[SDL_SCANCODE_SCROLLLOCK] = Keycode::SCROLL_LOCK;
-		table[SDL_SCANCODE_NUMLOCKCLEAR] = Keycode::NUM_LOCK;
-		table[SDL_SCANCODE_PRINTSCREEN] = Keycode::PRINT_SCREEN;
-		table[SDL_SCANCODE_PAUSE] = Keycode::PAUSE;
-		table[SDL_SCANCODE_F1] = Keycode::F1;
-		table[SDL_SCANCODE_F2] = Keycode::F2;
-		table[SDL_SCANCODE_F3] = Keycode::F3;
-		table[SDL_SCANCODE_F4] = Keycode::F4;
-		table[SDL_SCANCODE_F5] = Keycode::F5;
-		table[SDL_SCANCODE_F6] = Keycode::F6;
-		table[SDL_SCANCODE_F7] = Keycode::F7;
-		table[SDL_SCANCODE_F8] = Keycode::F8;
-		table[SDL_SCANCODE_F9] = Keycode::F9;
-		table[SDL_SCANCODE_F10] = Keycode::F10;
-		table[SDL_SCANCODE_F11] = Keycode::F11;
-		table[SDL_SCANCODE_F12] = Keycode::F12;
-		table[SDL_SCANCODE_KP_0] = Keycode::KP0;
-		table[SDL_SCANCODE_KP_1] = Keycode::KP1;
-		table[SDL_SCANCODE_KP_2] = Keycode::KP2;
-		table[SDL_SCANCODE_KP_3] = Keycode::KP3;
-		table[SDL_SCANCODE_KP_4] = Keycode::KP4;
-		table[SDL_SCANCODE_KP_5] = Keycode::KP5;
-		table[SDL_SCANCODE_KP_6] = Keycode::KP6;
-		table[SDL_SCANCODE_KP_7] = Keycode::KP7;
-		table[SDL_SCANCODE_KP_8] = Keycode::KP8;
-		table[SDL_SCANCODE_KP_9] = Keycode::KP9;
-		table[SDL_SCANCODE_LSHIFT] = Keycode::LEFT_SHIFT;
-		table[SDL_SCANCODE_LCTRL] = Keycode::LEFT_CONTROL;
-		table[SDL_SCANCODE_LALT] = Keycode::LEFT_ALT;
-		table[SDL_SCANCODE_LGUI] = Keycode::LEFT_SUPER;
-		table[SDL_SCANCODE_RSHIFT] = Keycode::RIGHT_SHIFT;
-		table[SDL_SCANCODE_RCTRL] = Keycode::RIGHT_CONTROL;
-		table[SDL_SCANCODE_RALT] = Keycode::RIGHT_ALT;
-		table[SDL_SCANCODE_RGUI] = Keycode::RIGHT_SUPER;
-		table[SDL_SCANCODE_MENU] = Keycode::MENU;
+	auto it = LOOKUP_TABLE.find(sdl_key);
+    if (it != LOOKUP_TABLE.end()) {
+        return it->second;
+    }
 
-		return table;
-	}();
-	if (sdl_key < 0 || sdl_key >= SDL_NUM_SCANCODES) {
-		return Keycode::NONE;
-	}
-	return LOOKUP_TABLE[sdl_key];
+    return Keycode::NONE;
 }
-std::array<bool, Keycode::NUM_KEYCODES> SDLContext::get_keyboard_state() {
+keyboard_state_t SDLContext::get_keyboard_state() {
 	// Array to hold the key states (true if pressed, false if not)
 	std::array<bool, Keycode::NUM_KEYCODES> keyState{};
 	SDL_PumpEvents();
@@ -198,11 +94,11 @@ std::array<bool, Keycode::NUM_KEYCODES> SDLContext::get_keyboard_state() {
 		Keycode key = sdl_to_keycode(static_cast<SDL_Scancode>(i));
 
 		if (key != Keycode::NONE) {
-			keyState[key] = current_state[i] != 0;
+			keyboard_state[key] = current_state[i] != 0;
 		}
 	}
 
-	return keyState;
+	return keyboard_state;
 }
 
 MouseButton SDLContext::sdl_to_mousebutton(Uint8 sdl_button) {
@@ -403,6 +299,7 @@ std::vector<SDLContext::EventData> SDLContext::get_events() {
 				transfer_event.data.key_data = KeyData{
 					.key = sdl_to_keycode(event.key.keysym.scancode),
 					.key_repeat = event.key.repeat != 0,
+					.keyboard_state = this->get_keyboard_state(),
 				};
 				event_list.push_back(transfer_event);
 			}
@@ -414,6 +311,7 @@ std::vector<SDLContext::EventData> SDLContext::get_events() {
 				transfer_event.data.key_data = KeyData{
 					.key = sdl_to_keycode(event.key.keysym.scancode),
 					.key_repeat = false,
+					.keyboard_state = this->get_keyboard_state(),
 				};
 				event_list.push_back(transfer_event);
 			}
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index d7af226..feb51f4 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -10,6 +10,7 @@
 #include <functional>
 #include <memory>
 #include <string>
+#include <unordered_map>
 
 #include "api/Camera.h"
 #include "api/Color.h"
@@ -129,11 +130,11 @@ public:
 	 * specific key defined in the `Keycode` enum, and the value indicates whether
 	 * the key is currently pressed (true) or not pressed (false).
 	 *
-	 * \return A `std::array<bool, Keycode::NUM_KEYCODES>` representing the state of
+	 * \return A `keyboard_state_t` representing the state of
 	 *         each key on the keyboard, where `true` means the key is pressed, and
 	 *         `false` means it is not pressed.
 	 */
-	std::array<bool, Keycode::NUM_KEYCODES> get_keyboard_state();
+	keyboard_state_t get_keyboard_state();
 	/**
 	 * \brief Gets the singleton instance of SDLContext.
 	 * \return Reference to the SDLContext instance.
@@ -294,6 +295,108 @@ private:
 	 * - this is defined in this class because get_events() needs this information aswell
 	 */
 	CameraAuxiliaryData cam_aux_data;
+private: 
+	keyboard_state_t keyboard_state;
+	const std::unordered_map<SDL_Scancode, Keycode> LOOKUP_TABLE = {
+        {SDL_SCANCODE_SPACE, Keycode::SPACE},
+        {SDL_SCANCODE_APOSTROPHE, Keycode::APOSTROPHE},
+        {SDL_SCANCODE_COMMA, Keycode::COMMA},
+        {SDL_SCANCODE_MINUS, Keycode::MINUS},
+        {SDL_SCANCODE_PERIOD, Keycode::PERIOD},
+        {SDL_SCANCODE_SLASH, Keycode::SLASH},
+        {SDL_SCANCODE_0, Keycode::D0},
+        {SDL_SCANCODE_1, Keycode::D1},
+        {SDL_SCANCODE_2, Keycode::D2},
+        {SDL_SCANCODE_3, Keycode::D3},
+        {SDL_SCANCODE_4, Keycode::D4},
+        {SDL_SCANCODE_5, Keycode::D5},
+        {SDL_SCANCODE_6, Keycode::D6},
+        {SDL_SCANCODE_7, Keycode::D7},
+        {SDL_SCANCODE_8, Keycode::D8},
+        {SDL_SCANCODE_9, Keycode::D9},
+        {SDL_SCANCODE_SEMICOLON, Keycode::SEMICOLON},
+        {SDL_SCANCODE_EQUALS, Keycode::EQUAL},
+        {SDL_SCANCODE_A, Keycode::A},
+        {SDL_SCANCODE_B, Keycode::B},
+        {SDL_SCANCODE_C, Keycode::C},
+        {SDL_SCANCODE_D, Keycode::D},
+        {SDL_SCANCODE_E, Keycode::E},
+        {SDL_SCANCODE_F, Keycode::F},
+        {SDL_SCANCODE_G, Keycode::G},
+        {SDL_SCANCODE_H, Keycode::H},
+        {SDL_SCANCODE_I, Keycode::I},
+        {SDL_SCANCODE_J, Keycode::J},
+        {SDL_SCANCODE_K, Keycode::K},
+        {SDL_SCANCODE_L, Keycode::L},
+        {SDL_SCANCODE_M, Keycode::M},
+        {SDL_SCANCODE_N, Keycode::N},
+        {SDL_SCANCODE_O, Keycode::O},
+        {SDL_SCANCODE_P, Keycode::P},
+        {SDL_SCANCODE_Q, Keycode::Q},
+        {SDL_SCANCODE_R, Keycode::R},
+        {SDL_SCANCODE_S, Keycode::S},
+        {SDL_SCANCODE_T, Keycode::T},
+        {SDL_SCANCODE_U, Keycode::U},
+        {SDL_SCANCODE_V, Keycode::V},
+        {SDL_SCANCODE_W, Keycode::W},
+        {SDL_SCANCODE_X, Keycode::X},
+        {SDL_SCANCODE_Y, Keycode::Y},
+        {SDL_SCANCODE_Z, Keycode::Z},
+        {SDL_SCANCODE_LEFTBRACKET, Keycode::LEFT_BRACKET},
+        {SDL_SCANCODE_BACKSLASH, Keycode::BACKSLASH},
+        {SDL_SCANCODE_RIGHTBRACKET, Keycode::RIGHT_BRACKET},
+        {SDL_SCANCODE_GRAVE, Keycode::GRAVE_ACCENT},
+        {SDL_SCANCODE_ESCAPE, Keycode::ESCAPE},
+        {SDL_SCANCODE_RETURN, Keycode::ENTER},
+        {SDL_SCANCODE_TAB, Keycode::TAB},
+        {SDL_SCANCODE_BACKSPACE, Keycode::BACKSPACE},
+        {SDL_SCANCODE_INSERT, Keycode::INSERT},
+        {SDL_SCANCODE_DELETE, Keycode::DELETE},
+        {SDL_SCANCODE_RIGHT, Keycode::RIGHT},
+        {SDL_SCANCODE_LEFT, Keycode::LEFT},
+        {SDL_SCANCODE_DOWN, Keycode::DOWN},
+        {SDL_SCANCODE_UP, Keycode::UP},
+        {SDL_SCANCODE_PAGEUP, Keycode::PAGE_UP},
+        {SDL_SCANCODE_PAGEDOWN, Keycode::PAGE_DOWN},
+        {SDL_SCANCODE_HOME, Keycode::HOME},
+        {SDL_SCANCODE_END, Keycode::END},
+        {SDL_SCANCODE_CAPSLOCK, Keycode::CAPS_LOCK},
+        {SDL_SCANCODE_SCROLLLOCK, Keycode::SCROLL_LOCK},
+        {SDL_SCANCODE_NUMLOCKCLEAR, Keycode::NUM_LOCK},
+        {SDL_SCANCODE_PRINTSCREEN, Keycode::PRINT_SCREEN},
+        {SDL_SCANCODE_PAUSE, Keycode::PAUSE},
+        {SDL_SCANCODE_F1, Keycode::F1},
+        {SDL_SCANCODE_F2, Keycode::F2},
+        {SDL_SCANCODE_F3, Keycode::F3},
+        {SDL_SCANCODE_F4, Keycode::F4},
+        {SDL_SCANCODE_F5, Keycode::F5},
+        {SDL_SCANCODE_F6, Keycode::F6},
+        {SDL_SCANCODE_F7, Keycode::F7},
+        {SDL_SCANCODE_F8, Keycode::F8},
+        {SDL_SCANCODE_F9, Keycode::F9},
+        {SDL_SCANCODE_F10, Keycode::F10},
+        {SDL_SCANCODE_F11, Keycode::F11},
+        {SDL_SCANCODE_F12, Keycode::F12},
+        {SDL_SCANCODE_KP_0, Keycode::KP0},
+        {SDL_SCANCODE_KP_1, Keycode::KP1},
+        {SDL_SCANCODE_KP_2, Keycode::KP2},
+        {SDL_SCANCODE_KP_3, Keycode::KP3},
+        {SDL_SCANCODE_KP_4, Keycode::KP4},
+        {SDL_SCANCODE_KP_5, Keycode::KP5},
+        {SDL_SCANCODE_KP_6, Keycode::KP6},
+        {SDL_SCANCODE_KP_7, Keycode::KP7},
+        {SDL_SCANCODE_KP_8, Keycode::KP8},
+        {SDL_SCANCODE_KP_9, Keycode::KP9},
+        {SDL_SCANCODE_LSHIFT, Keycode::LEFT_SHIFT},
+        {SDL_SCANCODE_LCTRL, Keycode::LEFT_CONTROL},
+        {SDL_SCANCODE_LALT, Keycode::LEFT_ALT},
+        {SDL_SCANCODE_LGUI, Keycode::LEFT_SUPER},
+        {SDL_SCANCODE_RSHIFT, Keycode::RIGHT_SHIFT},
+        {SDL_SCANCODE_RCTRL, Keycode::RIGHT_CONTROL},
+        {SDL_SCANCODE_RALT, Keycode::RIGHT_ALT},
+        {SDL_SCANCODE_RGUI, Keycode::RIGHT_SUPER},
+        {SDL_SCANCODE_MENU, Keycode::MENU}
+    };
 };
 
 } // namespace crepe