[FIX] merge stuff

2021-06-18 15:49:10 +02:00
parent a6c2558e85
commit b04d999a7d
8 changed files with 14 additions and 355 deletions
--- a/src/scenes/game_Over_Scene.cpp
+++ b/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
 {