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

[MERGE] develop into this

Browse Source
This commit is contained in:
Sem van der Hoeven
2021-06-18 15:25:15 +02:00
parent a6fa9514df 982f787d44
commit 1d940fe1db
21 changed files with 461 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
src/scenes/in_Game_Scene.cpp
View File

@@ -1,32 +1,9 @@
#include <iostream>
#include <memory>
#include <GL/glew.h>
#include <GLFW/glfw3.h>
#include "in_Game_Scene.h"
#include "startup_Scene.h"
#include "../entities/main_character.h"
#include "../collision/collision_handler.h"
#include "../gui/gui_interactable.h"
#include "../models/model.h"
#include "../renderEngine/loader.h"
#include "../renderEngine/obj_loader.h"
#include "../renderEngine/renderer.h"
#include "../shaders/entity_shader.h"
#include "../toolbox/toolbox.h"
#include "../entities/house_generator.h"
#include <deque>
#include <functional>
#include <memory>
#include <queue>
#include <opencv2/core/base.hpp>
#include "../computervision/HandDetectRegion.h"
#include "../computervision/ObjectDetection.h"
#define MAX_MODEL_DEQUE_SIZE 6 // max amount of models to load at the same time
#define UPCOMING_MODEL_AMOUNT 4 // how much models should be loaded in front of us
namespace scene
{
std::shared_ptr<entities::MainCharacter>main_character;
@@ -39,11 +16,18 @@ namespace scene
shaders::EntityShader* shader;
shaders::GuiShader* gui_shader;
std::vector<gui::GuiTexture*> guis;
std::vector<std::shared_ptr<gui::GuiTexture>> score_textures;
int furniture_count_old;
int score;
<<<<<<< HEAD
std::vector<computervision::HandDetectRegion*> regions;
=======
float delta_time = 0;
std::vector<computervision::HandDetectRegion> regions;
>>>>>>> develop
computervision::HandDetectRegion reg_left("left", 0, 0, 150, 150), reg_right("right", 0, 0, 150, 150), reg_up("up", 0, 0, 150, 150);
/**
@@ -60,7 +44,23 @@ namespace scene
gui_shader = new shaders::GuiShader();
gui_shader->Init();
score = 0;
for (int i = 0; i <= 9; i++)
{
std::shared_ptr<gui::GuiTexture> score_pointer;
std::string texture_path = "res/";
texture_path += std::to_string(i);
texture_path += ".png";
score_pointer = std::make_unique<gui::GuiTexture>(render_engine::loader::LoadTexture(texture_path), glm::vec2(-0.9f, 0.8f), glm::vec2(0.07, 0.15));
score_textures.push_back(score_pointer);
}
}
/**
* temporary?
* just to make some bounding boxes
@@ -83,26 +83,31 @@ namespace scene
delete house_generator;
}
/**
* @brief loads a new chunk in front of the camera, and deletes the chunk behind the camera.
*
* @param model_pos the amount of models the camera has passed already. This is the rounded result of (z position of camera) / (size of model)
*
*/
void load_chunk(int model_pos)
void In_Game_Scene::SetupHandDetection()
{
static unsigned int furniture_count = 0;
// set up squares according to size of camera input
cv::Mat camera_frame;
static_camera::getCap().read(camera_frame); // get camera frame to know the width and heigth
reg_left.SetMainSkinDetecRegion(true);
reg_right.SetMainSkinDetecRegion(false);
reg_right.SetMainSkinDetecRegion(false);
std::function<void()> callback = [this]() {OnSkinCalibrationCallback(); };
reg_left.SetSkinTimerCallback(callback);
reg_left.SetXPos(10);
reg_left.SetYPos(camera_frame.rows / 2 - reg_left.GetHeight() / 2);
reg_right.SetXPos(camera_frame.cols - 10 - reg_right.GetWidth());
reg_right.SetYPos(camera_frame.rows / 2 - reg_right.GetHeight() / 2);
reg_up.SetXPos(camera_frame.cols / 2 - reg_up.GetWidth() / 2);
reg_up.SetYPos(10);
}
void In_Game_Scene::LoadChunk(int model_pos)
{
static unsigned int furniture_count = 0;
std::cout << "loading model chunk" << std::endl;
if (house_models.size() >= MAX_MODEL_DEQUE_SIZE * furniture_count)
{
@@ -137,10 +142,13 @@ namespace scene
main_character = std::make_shared<entities::MainCharacter>(model_char, glm::vec3(0, -50, -100), glm::vec3(0, 90, 0), 5, char_box);
collision_entities.push_back(main_character);
house_generator = new entities::HouseGenerator();
SetupHandDetection();
// load the first few house models
for (int i = 0; i <= UPCOMING_MODEL_AMOUNT; i++)
{
load_chunk(i);
LoadChunk(i);
}
lights.push_back(entities::Light(glm::vec3(0, 1000, 7000), glm::vec3(5, 5, 5))); // sun
@@ -244,14 +252,21 @@ namespace scene
// Stop rendering the entities
shader->Stop();
DrawScore(score);
}
//updates certain variables
void scene::In_Game_Scene::update(GLFWwindow* window)
{
UpdateDeltaTime();
//camera.Move(window);
<<<<<<< HEAD
update_hand_detection();
main_character->Move(regions);
=======
main_character->Move(window);
>>>>>>> develop
//std::cout << "x get: " << movement.x << "\ny get: " << movement.y << "\nz get: " << movement.z << "\n";
camera->Follow(main_character->GetPosition());
@@ -263,15 +278,22 @@ namespace scene
// if we have passed a model, load a new one and delete the one behind us
if (last_model_pos != model_pos)
{
load_chunk(model_pos + UPCOMING_MODEL_AMOUNT);
LoadChunk(model_pos + UPCOMING_MODEL_AMOUNT);
score += furniture_count_old;
std::cout << "Score: " << score << std::endl;
std::cout << "Funriture_count_old in model (house excluded): " << furniture_count_old << std::endl;
std::cout << "Furniture_count_old in model (house excluded): " << furniture_count_old << std::endl;
}
// remember the position at which the new model was added
last_model_pos = model_pos;
collision::CheckCollisions(collision_entities);
<<<<<<< HEAD
=======
update_hand_detection();
>>>>>>> develop
}
//manages the key input in the game scene
@@ -290,24 +312,14 @@ namespace scene
{
game_state = scene::Game_State::RUNNING;
}
if (glfwGetKey(window, GLFW_KEY_B) == GLFW_PRESS)
{
reg_left.CalibrateBackground();
reg_right.CalibrateBackground();
reg_up.CalibrateBackground();
}
if (glfwGetKey(window, GLFW_KEY_S) == GLFW_PRESS)
{
std::vector<int> tresholds = reg_left.CalculateSkinTresholds();
reg_right.setSkinTresholds(tresholds);
reg_up.setSkinTresholds(tresholds);
}
}
void scene::In_Game_Scene::update_hand_detection()
{
reg_left.UpdateTime(delta_time);
reg_right.UpdateTime(delta_time);
reg_up.UpdateTime(delta_time);
cv::Mat camera_frame;
static_camera::getCap().read(camera_frame);
reg_left.DetectHand(camera_frame);
@@ -317,9 +329,41 @@ namespace scene
cv::imshow("camera", camera_frame);
}
void scene::In_Game_Scene::OnSkinCalibrationCallback()
{
std::cout << "on skin calibration callback" << std::endl;
std::vector<int> tresholds = reg_left.CalculateSkinTresholds();
reg_right.setSkinTresholds(tresholds);
reg_up.setSkinTresholds(tresholds);
}
//renders the models for the pause menu
void In_Game_Scene::render_pause_menu()
{
render_engine::renderer::Render(pause_guis, *gui_shader);
}
void In_Game_Scene::DrawScore(int score)
{
std::vector<int> digits;
score_guis.clear();
toolbox::GetDigitsFromNumber(score, digits);
for (int i = digits.size() - 1; i >= 0; i--)
{
score_textures[digits[i]].get()->position.x = 0.15 * i - 0.9; // place the number at the top left. the numbers are just fine tuned to get the position just right
render_engine::renderer::Render(score_textures[digits[i]], *gui_shader);
}
}
void In_Game_Scene::UpdateDeltaTime()
{
double current_time = glfwGetTime();
static double last_frame_time = current_time;
delta_time = current_time - last_frame_time;
last_frame_time = current_time;
}
}

57
src/scenes/in_Game_Scene.h
View File

@@ -3,6 +3,18 @@
#include <ostream>
#include <vector>
#include <memory>
#include <string>
#include <opencv2/core/base.hpp>
#include <opencv2/imgcodecs.hpp>
#include <opencv2/imgproc.hpp>
#include <GL/glew.h>
#include <GLFW/glfw3.h>
#include <deque>
#include <functional>
#include <queue>
#include <opencv2/core/base.hpp>
#include "startup_Scene.h"
#include "scene.h"
#include "../gui/gui_interactable.h"
#include "../models/model.h"
@@ -11,6 +23,12 @@
#include "../renderEngine/renderer.h"
#include "../shaders/entity_shader.h"
#include "../toolbox/toolbox.h"
#include "../entities/main_character.h"
#include "../collision/collision_handler.h"
#include "../entities/house_generator.h"
#include "../computervision/hand_detect_region.h"
#include "../computervision/object_detection.h"
namespace scene
@@ -53,6 +71,10 @@ namespace scene
std::vector<gui::GuiTexture*> guis;
//pause_guis is a list of components that will be rendered when the game is paused.
std::vector<gui::GuiTexture*> pause_guis;
// list of gui texture that holds the textures for the score
std::vector<std::shared_ptr<gui::GuiTexture>> score_guis;
void UpdateDeltaTime();
/**
* @brief renders the objects/gui models
@@ -60,7 +82,39 @@ namespace scene
* @return void
*/
void render_pause_menu();
/**
* @brief updates the hand detection with the deltatime and checks the hand detection for each region. als updates the camera display
*
*/
void update_hand_detection();
/**
* @brief sets up the hand detection regions and sets the callbacks for the skin calibration.
*
*/
void SetupHandDetection();
/**
* @brief callback that gets called when the left skin detect region timout has been reached. sets the other regions with the skin data from the first region
*
*/
void OnSkinCalibrationCallback();
/**
* @brief draws the score on the screen with the digit resources.
*
* @param score the score to display.
*/
void DrawScore(int score);
/**
* @brief loads a new chunk in front of the camera, and deletes the chunk behind the camera.
*
* @param model_pos the amount of models the camera has passed already. This is the rounded result of (z position of camera) / (size of model)
*
*/
void LoadChunk(int model_pos);
public:
In_Game_Scene();
@@ -97,6 +151,9 @@ namespace scene
* @return void
*/
void onKey(GLFWwindow* window, int key, int scancode, int action, int mods) override;
};
}

4
src/scenes/startup_Scene.cpp
View File

@@ -14,8 +14,8 @@
#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"