[FIX] in game scene
This commit is contained in:
@@ -44,7 +44,6 @@ static GLFWwindow* window;
|
||||
|
||||
scene::Scene* current_scene;
|
||||
|
||||
static GLFWwindow* window;
|
||||
bool points_img_available = false;
|
||||
cv::Mat points_img;
|
||||
|
||||
|
||||
@@ -314,4 +314,10 @@ namespace scene
|
||||
|
||||
cv::imshow("camera", camera_frame);
|
||||
}
|
||||
|
||||
//renders the models for the pause menu
|
||||
void In_Game_Scene::render_pause_menu()
|
||||
{
|
||||
render_engine::renderer::Render(pause_guis, *gui_shader);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -121,10 +121,11 @@ namespace scene
|
||||
update(window);
|
||||
|
||||
if (hand_mode) {
|
||||
cameraFrame = objDetect.readCamera();
|
||||
cameraFrame = objDetect.ReadCamera();
|
||||
|
||||
//Get hand state from camera
|
||||
bool hand_detection = objDetect.detectHand(cameraFrame);
|
||||
bool detect = false;
|
||||
bool hand_detection = objDetect.DetectHand(cameraFrame,detect);
|
||||
|
||||
if (hand_detection)
|
||||
{
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
<ClCompile Include="src\computervision\calibration\HandCalibrator.cpp" />
|
||||
<ClCompile Include="src\computervision\HandDetectRegion.cpp" />
|
||||
<ClCompile Include="src\scenes\in_Game_Scene.cpp" />
|
||||
<ClCompile Include="src\computervision\FaceDetector.cpp" />
|
||||
<ClCompile Include="src\computervision\MenuTest.cpp" />
|
||||
<ClCompile Include="src\computervision\async\async_arm_detection.cpp" />
|
||||
<ClCompile Include="src\computervision\ObjectDetection.cpp" />
|
||||
|
||||
@@ -80,9 +80,6 @@
|
||||
<ClCompile Include="src\computervision\FingerCount.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\computervision\FaceDetector.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\computervision\BackgroundRemover.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
@@ -90,6 +87,8 @@
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\scenes\scene.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\entities\house_generator.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
@@ -164,9 +163,6 @@
|
||||
<ClInclude Include="src\computervision\FingerCount.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\computervision\FaceDetector.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\computervision\BackgroundRemover.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
|
||||
Reference in New Issue
Block a user