Merge branch 'develop' into mergebranch-Jasper

src/scenes/in_Game_Scene.cpp

@@ -1,8 +1,11 @@
 #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"
@@ -10,10 +13,41 @@
 #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;
+	std::deque<entities::Light> lights;
+	std::vector<std::shared_ptr<entities::CollisionEntity>> collision_entities;
+	entities::HouseGenerator* house_generator;
+	std::deque<std::shared_ptr<entities::Entity>> house_models;
+
+	models::RawModel raw_model, raw_model_char;
+	models::ModelTexture texture;
+	shaders::EntityShader* shader;
+	shaders::GuiShader* gui_shader;
+	entities::Camera camera(glm::vec3(0, -50, 0), glm::vec3(0, 0, 0));
+	std::vector<gui::GuiTexture*> guis;
+	
+	int furniture_count_old;
+	int score;
+
+	std::vector<computervision::HandDetectRegion> regions;
+	computervision::HandDetectRegion reg_left("left", 0, 0, 150, 150), reg_right("right", 0, 0, 150, 150), reg_up("up", 0, 0, 150, 150);
+
 	/**
 	 * sets up the first things when the objects has been made
 	 */
@@ -22,11 +56,24 @@ namespace scene
 		camera = new entities::Camera(glm::vec3(0, 0, 0), glm::vec3(0, 0, 0));
 
 		shader = new shaders::EntityShader;
-		shader->Init();	
+		shader->Init();
 		render_engine::renderer::Init(*shader);
 
 		gui_shader = new shaders::GuiShader();
 		gui_shader->Init();
+		score = 0;
+	}
+	/**
+	 * temporary!!!!
+	 * just to make some bounding boxes
+	 */
+	collision::Box create_bounding_box(glm::vec3 size, glm::vec3 pos, int scale) {
+		collision::Box box = collision::Box();
+		box.size.x = size.z* scale;
+		box.size.y = size.y* scale;
+		box.size.z = size.x* scale;
+		box.center_pos = pos;
+		return box;
 	}
 	/**
 	 * deletes certain veriables when the object will be deleted, prevents memory leaks
@@ -36,27 +83,70 @@ namespace scene
 		delete camera;
 		delete shader;
 		delete gui_shader;
+    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)
+	{
+		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.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);
+		std::cout << "loading model chunk" << std::endl;
+		if (house_models.size() >= MAX_MODEL_DEQUE_SIZE * furniture_count)
+		{
+			for (int i = 0; i < furniture_count; i++)
+			{
+				house_models.pop_front();
+			}
+		}
+		int z_offset = model_pos * (house_generator->GetHouseDepth()); // how much "in the distance" we should load the model
+
+		std::deque<std::shared_ptr<entities::Entity>> furniture = house_generator->GenerateHouse(glm::vec3(0, -75, -50 - z_offset), 90);
+		furniture_count = furniture.size();
+		
+		house_models.insert(house_models.end(), furniture.begin(), furniture.end());
+		std::cout << "funriture_count in load chunk (house included): " << furniture_count << std::endl;
+		furniture_count_old = furniture_count -1;
+	}
+	
+  	/**
 	 * starts the game scene, calls the render and update methods in a while loop
 	 */
 	scene::Scenes scene::In_Game_Scene::start(GLFWwindow* window)
 	{
-		raw_model = render_engine::LoadObjModel("res/House.obj");
 		texture = { render_engine::loader::LoadTexture("res/Texture.png") };
 		texture.shine_damper = 10;
 		texture.reflectivity = 0;
-		models::TexturedModel model = { raw_model, texture };
-		
-		int z = 0;
-		for (int i = 0; i < 5; ++i)
+	
+
+		raw_model_char = render_engine::LoadObjModel("res/beeTwo.obj");
+		models::TexturedModel model_char = { raw_model_char, texture };
+		collision::Box char_box = create_bounding_box(raw_model_char.model_size, glm::vec3(0, 0, 0), 1);
+		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();
+		// load the first few house models
+		for (int i = 0; i <= UPCOMING_MODEL_AMOUNT; i++)
 		{
-			entities_to_render.push_back(entities::Entity(model, glm::vec3(0, -50, -50 - z), glm::vec3(0, 90, 0), 20));
-			z += (raw_model.model_size.x * 20);
+			load_chunk(i);
 		}
 
-		lights.push_back(entities::Light(glm::vec3(0, 1000, -7000), glm::vec3(5, 5, 5)));
+		lights.push_back(entities::Light(glm::vec3(0, 1000, 7000), glm::vec3(5, 5, 5))); // sun
 		lights.push_back(entities::Light(glm::vec3(0, 0, -30), glm::vec3(2, 0, 2), glm::vec3(0.0001f, 0.0001f, 0.0001f)));
 		lights.push_back(entities::Light(glm::vec3(0, 0, -200), glm::vec3(0, 2, 0), glm::vec3(0.0001f, 0.0001f, 0.0001f)));
 
@@ -65,11 +155,11 @@ namespace scene
 		button.SetHoverTexture(render_engine::loader::LoadTexture("res/Texture.png"));
 		button.SetClickedTexture(render_engine::loader::LoadTexture("res/Mayo.png"));
 		button.SetOnClickAction([]()
-		{
-			std::cout << "I got clicked on!" << std::endl;
-		});
+			{
+				std::cout << "I got clicked on!" << std::endl;
+			});
 		guis.push_back(&button);
-	
+
 
 		//guis for the pause menu 
 		gui::GuiTexture background(render_engine::loader::LoadTexture("res/background_grey.png"), glm::vec2(0, 0), glm::vec2(1, 1));
@@ -139,14 +229,15 @@ namespace scene
 		//starts the shader and begins to render
 		shader->Start();
 		shader->LoadSkyColor(render_engine::renderer::SKY_COLOR);
-		shader->LoadLights(lights);
-		shader->LoadViewMatrix(*camera);
+		shader->LoadLightsDeque(lights);
+		shader->LoadViewMatrix(camera);
 
-		// Renders each entity in the entities list
-		for (entities::Entity& entity : entities_to_render)
+		for (std::shared_ptr<entities::Entity> model_entity : house_models)
 		{
-			render_engine::renderer::Render(entity, *shader);
+			render_engine::renderer::Render(model_entity, *shader);
 		}
+		
+			render_engine::renderer::Render(*main_character, *shader);
 
 		// Render GUI items
 		//render_engine::renderer::Render(guis, *gui_shader);
@@ -158,20 +249,38 @@ namespace scene
 	//updates certain variables 
 	void scene::In_Game_Scene::update(GLFWwindow* window)
 	{
-		camera->Move(window);
-	}
+		//camera.Move(window);
+		
+		main_character->Move(window);
+		
+		//std::cout << "x get: " << movement.x << "\ny get: " << movement.y << "\nz get: " << movement.z << "\n";
+		camera.Follow(main_character->GetPosition());
 
-	//renders the models for the pause menu
-	void In_Game_Scene::render_pause_menu()
-	{
-		render_engine::renderer::Render(pause_guis, *gui_shader);
+		// calculate where the next house model should be loaded
+		static int last_model_pos = 0;
+		int model_pos = -round(camera.GetPosition().z / (house_generator->GetHouseDepth())); // how much models we have passed, minus because we are moving in the negative z axis
+
+		// 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);
+			score += furniture_count_old;
+			std::cout << "Score: " << score << std::endl;
+			std::cout << "Funriture_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);
+		update_hand_detection();
 	}
 
 	//manages the key input in the game scene
 	void scene::In_Game_Scene::onKey(GLFWwindow* window, int key, int scancode, int action, int mods)
 	{
-		if (glfwGetKey(window, GLFW_KEY_SPACE) == GLFW_PRESS)
+		if (glfwGetKey(window, GLFW_KEY_ESCAPE) == GLFW_PRESS)
 		{
+			cv::destroyWindow("camera");
 			return_value = scene::Scenes::STOP;
 		}
 		if (glfwGetKey(window, GLFW_KEY_P) == GLFW_PRESS)
@@ -182,5 +291,30 @@ 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()
+	{
+		cv::Mat camera_frame;
+		static_camera::getCap().read(camera_frame);
+		reg_left.DetectHand(camera_frame);
+		reg_right.DetectHand(camera_frame);
+		reg_up.DetectHand(camera_frame);
+
+		cv::imshow("camera", camera_frame);
 	}
 }

src/scenes/in_Game_Scene.h

@@ -59,7 +59,7 @@ namespace scene
 		 * @return void
 		 */
 		void render_pause_menu();
-
+		void update_hand_detection();
 	
 	public:
 		In_Game_Scene();

src/scenes/startup_Scene.cpp

@@ -15,6 +15,7 @@
 #include "../toolbox/toolbox.h"
 #include "../computervision/MenuTest.h"
 #include "../computervision/ObjectDetection.h"
+#include "../computervision/HandDetectRegion.h"
 
 
 
@@ -23,6 +24,7 @@ namespace scene
 {
 	shaders::GuiShader* gui_shader1;
 	std::vector<gui::GuiTexture*> guis1;
+  computervision::ObjectDetection objDetect;
 
 	float item_number = 0;
 
@@ -186,6 +188,8 @@ namespace scene
 			if (new_button != NULL)
 				new_button->Update(window);
 		}
+		bool hand_present;
+		objDetect.DetectHand(objDetect.ReadCamera(),hand_present);
 	}
 
 	/**
@@ -196,6 +200,7 @@ namespace scene
 		if (glfwGetKey(window, GLFW_KEY_SPACE) == GLFW_PRESS)
 		{
 			return_value = scene::Scenes::INGAME;
+			cv::destroyWindow("camera");
 		}
 		else if (glfwGetKey(window, GLFW_KEY_BACKSPACE) == GLFW_PRESS) {
 			hand_mode = !hand_mode;