diff --git a/src/main.cpp b/src/main.cpp index fe1c2c3..be9e1bc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -44,7 +44,6 @@ static GLFWwindow* window; scene::Scene* current_scene; -static GLFWwindow* window; bool points_img_available = false; cv::Mat points_img; diff --git a/src/scenes/in_Game_Scene.cpp b/src/scenes/in_Game_Scene.cpp index d3bc911..0ddaad9 100644 --- a/src/scenes/in_Game_Scene.cpp +++ b/src/scenes/in_Game_Scene.cpp @@ -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); + } } diff --git a/src/scenes/startup_Scene.cpp b/src/scenes/startup_Scene.cpp index 33f7d5e..7a8852d 100644 --- a/src/scenes/startup_Scene.cpp +++ b/src/scenes/startup_Scene.cpp @@ -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) { diff --git a/wk2_fps.vcxproj b/wk2_fps.vcxproj index e94f7ca..f9065d6 100644 --- a/wk2_fps.vcxproj +++ b/wk2_fps.vcxproj @@ -25,7 +25,6 @@ - diff --git a/wk2_fps.vcxproj.filters b/wk2_fps.vcxproj.filters index 95623e9..fad9c5f 100644 --- a/wk2_fps.vcxproj.filters +++ b/wk2_fps.vcxproj.filters @@ -80,9 +80,6 @@ Source Files - - Source Files - Source Files @@ -90,6 +87,8 @@ Source Files + Source Files + Source Files @@ -164,9 +163,6 @@ Header Files - - Header Files - Header Files