[FIX] merge stuff

This commit is contained in:
Sem van der Hoeven
2021-06-18 15:49:10 +02:00
parent a6c2558e85
commit b04d999a7d
8 changed files with 14 additions and 355 deletions

View File

@@ -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
{

View File

@@ -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);
/**

View File

@@ -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);
};
}