[MERGE] merged feature/improve-hand-detection into feature/Start-scene correctly

src/scenes/startup_Scene.cpp

@@ -8,6 +8,7 @@
 #include "../renderEngine/obj_loader.h"
 #include "../renderEngine/renderer.h"
 #include "../shaders/entity_shader.h"
+#include "../gui/gui_interactable.h"
 #include "../toolbox/toolbox.h"
 
 
@@ -74,7 +75,6 @@ namespace scene
 				gui::Button* new_button = ConvertGuiTextureToButton(button);
 				if(new_button != NULL)
 				new_button->Update(window);
-				
 			}
 			
 	

src/scenes/startup_Scene.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "scene.h"
-#include "../gui/gui_interactable.h"
+#include "../gui/gui_element.h"
 
 namespace scene
 {
@@ -13,7 +13,6 @@ namespace scene
 
 	public:
 		Startup_Scene();
-		gui::Button* ConvertGuiTextureToButton(gui::GuiTexture* texture);
 		Scenes start(GLFWwindow* window) override;
 		void render() override;
 		void update(GLFWwindow* window) override;