[FIX] merge stuff

src/entities/main_character.cpp

@@ -100,4 +100,9 @@ namespace entities
 		last_frame_time = current_time;
 		return delt_time;
 	}
+
+	bool MainCharacter::GetOnCollide()
+	{
+		return is_playing;
+	}
 }

src/entities/main_character.h

@@ -2,7 +2,7 @@
 
 #include "collision_entity.h"
 #include "../shaders/entity_shader.h"
-#include "../computervision/HandDetectRegion.h"
+#include "../computervision/hand_detect_region.h"
 
 namespace entities
 {
@@ -36,6 +36,8 @@ namespace entities
 
 		void OnCollide(const collision::Collision& collision) override;
 
+		bool GetOnCollide();
+
 		double UpdateDelta();
 	};
 }

src/main.cpp

@@ -30,7 +30,7 @@
 #include "scenes/loading_Scene.h"
 #include "model_Storage.h"
 
-#include "computervision/ObjectDetection.h"
+#include "computervision/object_detection.h"
 #include "scenes/game_Over_Scene.h"
 #include "entities/collision_entity.h"
 #include "computervision/object_detection.h"

src/scenes/game_Over_Scene.cpp

@@ -14,8 +14,10 @@
 #include "../gui/gui_interactable.h"
 #include "../toolbox/toolbox.h"
 #include "../computervision/MenuTest.h"
-#include "../computervision/ObjectDetection.h"
-#include "../computervision/HandDetectRegion.h"
+#include "../computervision/object_detection.h"
+#include "../computervision/hand_detect_region.h"
+#include <opencv2/highgui.hpp>
+#include "../computervision/object_detection.h"
 
 namespace scene
 {

src/scenes/in_Game_Scene.cpp

@@ -27,7 +27,7 @@ namespace scene
 
 	float delta_time = 0;
 
-	std::vector<computervision::HandDetectRegion> regions;
+	std::vector<computervision::HandDetectRegion*> regions;
 	computervision::HandDetectRegion reg_left("left", 0, 0, 150, 150), reg_right("right", 0, 0, 150, 150), reg_up("up", 0, 0, 150, 150);
 
 	/**

src/scenes/in_Game_Scene.h

@@ -150,13 +150,6 @@ namespace scene
 		 * @return void
 		 */
 		void onKey(GLFWwindow* window, int key, int scancode, int action, int mods) override;
-	
-		/**
-		* @brief: This method renders the score points onto the game window
-		* @param score: Score to show
-		*/
-		void DrawScore(int score);
-
 	};
 }