sem/SDBA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] in game scene

Browse Source
This commit is contained in:
Sem van der Hoeven
2021-06-11 10:58:21 +02:00
parent 645c4df494
commit ae9386a811
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.cpp
View File

@@ -44,7 +44,6 @@ static GLFWwindow* window;
scene::Scene* current_scene; scene::Scene* current_scene;
static GLFWwindow* window;
bool points_img_available = false; bool points_img_available = false;
cv::Mat points_img; cv::Mat points_img;

6
src/scenes/in_Game_Scene.cpp
View File

@@ -314,4 +314,10 @@ namespace scene
cv::imshow("camera", camera_frame); 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);
}
} }

5
src/scenes/startup_Scene.cpp
View File

@@ -121,10 +121,11 @@ namespace scene
update(window); update(window);
if (hand_mode) { if (hand_mode) {
cameraFrame = objDetect.readCamera(); cameraFrame = objDetect.ReadCamera();
//Get hand state from camera //Get hand state from camera
bool hand_detection = objDetect.detectHand(cameraFrame); bool detect = false;
bool hand_detection = objDetect.DetectHand(cameraFrame,detect);
if (hand_detection) if (hand_detection)
{ {

1
wk2_fps.vcxproj
View File

@@ -25,7 +25,6 @@
<ClCompile Include="src\computervision\calibration\HandCalibrator.cpp" /> <ClCompile Include="src\computervision\calibration\HandCalibrator.cpp" />
<ClCompile Include="src\computervision\HandDetectRegion.cpp" /> <ClCompile Include="src\computervision\HandDetectRegion.cpp" />
<ClCompile Include="src\scenes\in_Game_Scene.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\MenuTest.cpp" />
<ClCompile Include="src\computervision\async\async_arm_detection.cpp" /> <ClCompile Include="src\computervision\async\async_arm_detection.cpp" />
<ClCompile Include="src\computervision\ObjectDetection.cpp" /> <ClCompile Include="src\computervision\ObjectDetection.cpp" />

8
wk2_fps.vcxproj.filters
View File

@@ -80,9 +80,6 @@
<ClCompile Include="src\computervision\FingerCount.cpp"> <ClCompile Include="src\computervision\FingerCount.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\computervision\FaceDetector.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\computervision\BackgroundRemover.cpp"> <ClCompile Include="src\computervision\BackgroundRemover.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@@ -90,6 +87,8 @@
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\scenes\scene.cpp"> <ClCompile Include="src\scenes\scene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\entities\house_generator.cpp"> <ClCompile Include="src\entities\house_generator.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@@ -164,9 +163,6 @@
<ClInclude Include="src\computervision\FingerCount.h"> <ClInclude Include="src\computervision\FingerCount.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\computervision\FaceDetector.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\computervision\BackgroundRemover.h"> <ClInclude Include="src\computervision\BackgroundRemover.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>