Merge branch 'master' into niels/UI

1 files changed, 16 insertions, 16 deletions

diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 01d82a0..1dada74 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -18,7 +18,9 @@
 #include "api/KeyCodes.h"
 #include "api/Sprite.h"
 #include "api/Transform.h"
+#include "types.h"
 
+#include "EventData.h"
 #include "FontFacade.h"
 
 namespace crepe {
@@ -251,6 +253,20 @@ private:
 	CameraAuxiliaryData cam_aux_data;
 
 private:
+	//! instance of the font_facade
+	FontFacade font_facade{};
+
+public:
+	/**
+	 * \brief Function to Get asset from font_family
+	 * 
+	 * This function uses the FontFacade function to convert a font_family to an asset.
+	 * 
+	 * \param font_family name of the font style that needs to be used (will return an asset with default font path of the font_family doesnt exist)
+	 * 
+	 * \return asset with the font style absolute path
+	 */
+	Asset get_font_from_name(const std::string & font_family);
 	//! variable to store the state of each key (true = pressed, false = not pressed)
 	keyboard_state_t keyboard_state;
 	//! lookup table for converting SDL_SCANCODES to Keycodes
@@ -353,22 +369,6 @@ private:
 		   {SDL_SCANCODE_RALT, Keycode::RIGHT_ALT},
 		   {SDL_SCANCODE_RGUI, Keycode::RIGHT_SUPER},
 		   {SDL_SCANCODE_MENU, Keycode::MENU}};
-
-private:
-	//! instance of the font_facade
-	FontFacade font_facade{};
-
-public:
-	/**
-	 * \brief Function to Get asset from font_family
-	 * 
-	 * This function uses the FontFacade function to convert a font_family to an asset.
-	 * 
-	 * \param font_family name of the font style that needs to be used (will return an asset with default font path of the font_family doesnt exist)
-	 * 
-	 * \return asset with the font style absolute path
-	 */
-	Asset get_font_from_name(const std::string & font_family);
 };
 
 } // namespace crepe