Develop into master #9
@@ -27,6 +27,7 @@
|
|||||||
#include "scenes/scene.h"
|
#include "scenes/scene.h"
|
||||||
#include "scenes/in_Game_Scene.h"
|
#include "scenes/in_Game_Scene.h"
|
||||||
#include "scenes/startup_Scene.h"
|
#include "scenes/startup_Scene.h"
|
||||||
|
#include "scenes/game_Over_Scene.h"
|
||||||
|
|
||||||
#include "computervision/ObjectDetection.h"
|
#include "computervision/ObjectDetection.h"
|
||||||
//#include "computervision/OpenPoseImage.h"
|
//#include "computervision/OpenPoseImage.h"
|
||||||
@@ -112,6 +113,10 @@ int main(void)
|
|||||||
current_scene = new scene::In_Game_Scene();
|
current_scene = new scene::In_Game_Scene();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case scene::Scenes::GAMEOVER:
|
||||||
|
current_scene = new scene::Game_Over_Scene();
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
std::cout << "Wrong return value!!! ->" << std::endl;
|
std::cout << "Wrong return value!!! ->" << std::endl;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ namespace scene
|
|||||||
|
|
||||||
bool hand_mode_gameOver = false;
|
bool hand_mode_gameOver = false;
|
||||||
|
|
||||||
Game_Over_Scene::Game_Over_Scene() {
|
Game_Over_Scene::Game_Over_Scene()
|
||||||
|
{
|
||||||
shaders::EntityShader shader;
|
shaders::EntityShader shader;
|
||||||
shader.Init();
|
shader.Init();
|
||||||
render_engine::renderer::Init(shader);
|
render_engine::renderer::Init(shader);
|
||||||
|
|||||||
@@ -211,7 +211,7 @@ namespace scene
|
|||||||
{
|
{
|
||||||
if (glfwGetKey(window, GLFW_KEY_SPACE) == GLFW_PRESS)
|
if (glfwGetKey(window, GLFW_KEY_SPACE) == GLFW_PRESS)
|
||||||
{
|
{
|
||||||
return_value = scene::Scenes::INGAME;
|
return_value = scene::Scenes::GAMEOVER;
|
||||||
cv::destroyWindow("camera");
|
cv::destroyWindow("camera");
|
||||||
}
|
}
|
||||||
else if (glfwGetKey(window, GLFW_KEY_BACKSPACE) == GLFW_PRESS) {
|
else if (glfwGetKey(window, GLFW_KEY_BACKSPACE) == GLFW_PRESS) {
|
||||||
|
|||||||
Reference in New Issue
Block a user