[FIX] merge stuff
This commit is contained in:
@@ -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
|
||||
{
|
||||
|
||||
@@ -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);
|
||||
|
||||
/**
|
||||
|
||||
@@ -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);
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user