[ADD] deque method

src/computervision/MenuTest.cpp

@@ -1,25 +0,0 @@
-#include "MenuTest.h"
-#include <iostream>
-
-namespace computervision 
-{
-	int menu_item_array[4] = { 1, 2, 3, 4 };
-	float item_number = 0;
-
-	MenuTest::MenuTest(void) {
-		
-	}
-
-	int MenuTest::GetMenuItem(bool hand_state) {
-		item_number += 0.20f;
-
-		
-		int temp_item_number = item_number;
-		//If temp_item_number is equal to the size of the array, set item_number bac to zero to loop through the array again
-		if (temp_item_number == sizeof(menu_item_array) / sizeof(menu_item_array[0])) {
-			item_number = 0;
-		}
-
-		return menu_item_array[temp_item_number];
-	}
-}

src/computervision/MenuTest.h

@@ -1,18 +0,0 @@
-
-namespace computervision
-{
-	class MenuTest {
-	public:
-		/**
-		 * @brief Constructor for the class MenuTest, loads in array with menu items
-		 *
-		 */
-		MenuTest(void);
-		/**
-		 * @brief Returns the itemnumber in an array 
-		 * 
-		 * @param input_bool is either true or false, depending on the recognized hand gesture
-		 */
-		int GetMenuItem(bool input_bool);
-	};
-}

src/computervision/ObjectDetection.cpp

@@ -59,10 +59,10 @@ namespace computervision
 		putText(cameraFrame,hand_text, Point(10, 75), FONT_HERSHEY_PLAIN, 2.0, Scalar(255, 0, 255),3);
 		imshow("camera", cameraFrame);
 
-		//imshow("output", frameOut);
-		//imshow("foreground", foreground);
-		//imshow("handMask", handMask);
-		//imshow("handDetection", fingerCountDebug);
+	/*	imshow("output", frameOut);
+		imshow("foreground", foreground);
+		imshow("handMask", handMask);
+		imshow("handDetection", fingerCountDebug);*/
 
 		int key = waitKey(1);
 

src/gui/gui_element.h

@@ -5,11 +5,6 @@
 
 namespace gui
 {
-	//Represents the type of the entitie
-	enum class GuiType{
-		LABEL, BUTTON
-	};
-
 	/*
 	 * Structure for representing a gui item to display on the screen
 	 *
@@ -23,12 +18,9 @@ namespace gui
 		glm::vec2 position;
 		glm::vec2 scale;
 
-		virtual GuiType GetType() {
-			return GuiType::LABEL;
-		}
 		GuiTexture(int texture, glm::vec2 position, glm::vec2 scale): texture(texture), position(position), scale(scale)
 		{
-			scale.x /= (WINDOW_WIDTH / WINDOW_HEIGHT);
+			scale.x /= (WINDOW_WIDTH / WINDOW_HEIGT);
 		}
 	};
 }

src/gui/gui_interactable.cpp

@@ -2,8 +2,6 @@
 #include <GLFW/glfw3.h>
 #include "gui_interactable.h"
 
-#include <iostream>
-
 namespace gui
 {
 	InteractableGui::InteractableGui(int default_texture, glm::vec2 position, glm::vec2 scale)
@@ -43,47 +41,14 @@ namespace gui
 		}
 	}
 
-	void InteractableGui::ForceClick( int mouseButton)
-	{
-		if(mouseButton == GLFW_MOUSE_BUTTON_LEFT)
-		{
-			if (clicked_texture != 0)
-			{
-				texture = clicked_texture;
-			}
-			else
-			{
-				texture = default_texture;
-			}
-
-			if (!is_clicking)
-			{
-				OnClick();
-				is_clicking = true;
-			}
-		}
-		else
-		{
-			if (is_clicking)
-			{
-				is_clicking = false;
-			}
-		}
-		
-	}
-	
 	bool InteractableGui::IsHoveringAbove(GLFWwindow* window)
 	{
 		double x_pos, y_pos;
 		glfwGetCursorPos(window, &x_pos, &y_pos);
-		//std::cout << "Cursor pos in method: " << x_pos <<"::" <<  y_pos << std::endl;
 
 		const float x_rel = (x_pos / SCALED_WIDTH / DEFAULT_WIDTH) * 2.0f - 1.0f;
 		const float y_rel = -((y_pos / SCALED_HEIGHT / DEFAULT_HEIGHT) * 2.0f - 1.0f);
 
-		//std::cout << "x_rel And y_rel in method: " << x_rel << "::" << y_rel << std::endl;
-
-
 		if (x_rel >= minXY.x && x_rel <= maxXY.x &&
 			y_rel >= minXY.y && y_rel <= maxXY.y)
 		{

src/gui/gui_interactable.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <iostream>
 #include <glm/gtc/matrix_transform.hpp>
 #include "../toolbox/toolbox.h"
 #include "gui_element.h"
@@ -33,14 +32,6 @@ namespace gui
 		 */
 		void Update(GLFWwindow* window);
 
-		/*
-		 * @brief: Call this function when you want to perform a mouseclick
-		 *
-		 * @param mousebutton: mouseButton you want to perform the click on
-		 */
-		void ForceClick(int mouseButton);
-
-		
 		/*
 		 * @brief: This function gets called when the InteractabeGui is clicked
 		 */
@@ -59,10 +50,7 @@ namespace gui
 		/*
 		 * @brief: This function sets the texture of the InteractableGUI for when the InteractableGUI is clicked
 		 */
-		void SetClickedTexture(int texture)
-		{
-			clicked_texture = texture;
-		}
+		void SetClickedTexture(int texture) { clicked_texture = texture; }
 
 		/*
 		 * @brief: This function sets the texture of the InteractableGUI for when the mouse is hovering above the InteractableGUI
@@ -116,10 +104,6 @@ namespace gui
 		 */
 		void SetOnExitAction(void (*fun)()) { on_exit_action = fun; }
 
-		GuiType GetType() override {
-			return GuiType::BUTTON;
-		}
-
 	protected:
 		void OnClick() override { if (on_click_action != nullptr) on_click_action(); }
 		void OnEnter() override { if (on_enter_action != nullptr) on_enter_action(); }

src/main.cpp

@@ -7,8 +7,6 @@
 
 #include "stb_image.h"
 #include <ostream>
-#include <stdlib.h>
-#include <iostream>
 
 #include <opencv2/core.hpp>
 #include <opencv2/videoio.hpp>
@@ -25,6 +23,8 @@
 #include "scenes/in_Game_Scene.h"
 #include "scenes/startup_Scene.h"
 
+#include "computervision/ObjectDetection.h"
+
 #pragma comment(lib, "glfw3.lib")
 #pragma comment(lib, "glew32s.lib")
 #pragma comment(lib, "opengl32.lib")
@@ -32,7 +32,6 @@
 static double UpdateDelta();
 
 static GLFWwindow* window;
-
 scene::Scene* current_scene;
 
 int main(void)
@@ -40,7 +39,7 @@ int main(void)
 #pragma region OPENGL_SETTINGS
 	if (!glfwInit())
 		throw "Could not inditialize glwf";
-	window = glfwCreateWindow(WINDOW_WIDTH, WINDOW_HEIGHT, "SDBA", NULL, NULL);
+	window = glfwCreateWindow(WINDOW_WIDTH, WINDOW_HEIGT, "SDBA", NULL, NULL);
 	if (!window)
 	{
 		glfwTerminate();
@@ -65,9 +64,6 @@ int main(void)
         });
 
     bool window_open = true;
-
-	
-
 	// Main game loop
 	while (!glfwWindowShouldClose(window) && window_open)
 	{
@@ -86,21 +82,14 @@ int main(void)
                 current_scene = new scene::Startup_Scene();
                 break;
 
-		
             case scene::Scenes::INGAME:
                 current_scene = new scene::In_Game_Scene();
                 break;
-                
+
             default:
                 std::cout << "Wrong return value!!! ->" << std::endl;
                 break;
         }
-        
-		// Finish up
-		//shader.Stop();
-		glfwSwapBuffers(window);
-		glfwPollEvents();
-           
 	}
 
 	// Clean up -> preventing memory leaks!!!

src/renderEngine/Renderer.cpp

@@ -26,7 +26,7 @@ namespace render_engine
 			glCullFace(GL_BACK);
 			
 			const glm::mat4 projectionMatrix = 
-				glm::perspective(glm::radians(FOV), (WINDOW_WIDTH / WINDOW_HEIGHT), NEAR_PLANE, FAR_PLANE);
+				glm::perspective(glm::radians(FOV), (WINDOW_WIDTH / WINDOW_HEIGT), NEAR_PLANE, FAR_PLANE);
 
 			// Load the projectionmatrix into the shader
 			shader.Start();

src/scenes/in_Game_Scene.cpp

@@ -10,46 +10,80 @@
 #include "../renderEngine/renderer.h"
 #include "../shaders/entity_shader.h"
 #include "../toolbox/toolbox.h"
+#include <deque>
+
+#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::vector<entities::Entity> entities;
-	std::vector<entities::Light> lights;
+	std::deque<entities::Entity> house_models;
+	std::deque<entities::Light> lights;
+	std::deque<entities::Entity> trees;
+
 	models::RawModel raw_model;
 	models::ModelTexture texture;
-	shaders::EntityShader *shader;
-	shaders::GuiShader *gui_shader;
+	shaders::EntityShader* shader;
+	shaders::GuiShader* gui_shader;
 	entities::Camera camera(glm::vec3(0, 0, 0), glm::vec3(0, 0, 0));
 	std::vector<gui::GuiTexture*> guis;
 
-	
+	models::TexturedModel model;
+	models::TexturedModel tree;
+
+
 	In_Game_Scene::In_Game_Scene()
 	{
 		shader = new shaders::EntityShader;
-		shader->Init();	
+		shader->Init();
 		render_engine::renderer::Init(*shader);
 
 		gui_shader = new shaders::GuiShader();
 		gui_shader->Init();
 	}
 
+	/**
+	 * @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)
+	{
+		std::cout << "loading model chunk" << std::endl;
+		if (house_models.size() >= MAX_MODEL_DEQUE_SIZE)
+		{
+			house_models.pop_back();
+			trees.pop_back();
+		}
+		int z_offset = model_pos * (model.raw_model.model_size.x * 20); // how much "in the distance" we should load the model
+		house_models.push_front(entities::Entity(model, glm::vec3(0, -50, -50 - z_offset), glm::vec3(0, 90, 0), 20));
+
+		trees.push_front(entities::Entity(tree, glm::vec3(0, 0, -50 - z_offset), glm::vec3(0, 90, 0), 3));
+	}
+
+
 	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 };
+		model = { raw_model, texture };
+
+		models::RawModel raw_tree_model = render_engine::LoadObjModel("res/Tree.obj");
+		models::ModelTexture tree_texture = { render_engine::loader::LoadTexture("res/TreeTexture.png") };
+		tree = { raw_tree_model, tree_texture };
 		
-		int z = 0;
-		for (int i = 0; i < 5; ++i)
+
+		// load the first few house models
+		for (int i = 0; i <= UPCOMING_MODEL_AMOUNT; i++)
 		{
-			entities.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)));
 
@@ -58,11 +92,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);
-	
+
 
 		while (return_value == scene::Scenes::INGAME)
 		{
@@ -86,13 +120,17 @@ namespace scene
 
 		shader->Start();
 		shader->LoadSkyColor(render_engine::renderer::SKY_COLOR);
-		shader->LoadLights(lights);
+		shader->LoadLightsDeque(lights);
 		shader->LoadViewMatrix(camera);
 
-		// Renders each entity in the entities list
-		for (entities::Entity& entity : entities)
+		for (entities::Entity& model_entity : house_models)
 		{
-			render_engine::renderer::Render(entity, *shader);
+			render_engine::renderer::Render(model_entity, *shader);
+		}
+
+		for (entities::Entity& tree_entity : trees)
+		{
+			render_engine::renderer::Render(tree_entity, *shader);
 		}
 
 		// Render GUI items
@@ -105,6 +143,18 @@ namespace scene
 	void scene::In_Game_Scene::update(GLFWwindow* window)
 	{
 		camera.Move(window);
+
+		// calculate where the next house model should be loaded
+		static int last_model_pos = 0;
+		int model_pos = -round(camera.GetPosition().z / (model.raw_model.model_size.x * 20)); // 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);
+		}
+		// remember the position at which the new model was added
+		last_model_pos = model_pos;
 	}
 
 	void scene::In_Game_Scene::onKey(GLFWwindow* window, int key, int scancode, int action, int mods)

src/scenes/startup_Scene.cpp

@@ -2,183 +2,32 @@
 #include <GLFW/glfw3.h>
 #include <map>
 #include "startup_Scene.h"
-#include <iostream>
-#include <opencv2/core/mat.hpp>
-
-#include "../models/model.h"
-#include "../renderEngine/loader.h"
-#include "../renderEngine/obj_loader.h"
-#include "../renderEngine/renderer.h"
-#include "../shaders/entity_shader.h"
-#include "../gui/gui_interactable.h"
-#include "../toolbox/toolbox.h"
-#include "../computervision/MenuTest.h"
-#include "../computervision/ObjectDetection.h"
-
-
-
 
 namespace scene
 {
-	shaders::GuiShader* gui_shader1;
-	std::vector<gui::GuiTexture*> guis1;
-
-	float item_number = 0;
-
-	bool hand_mode = false;
-
-	Startup_Scene::Startup_Scene() {
-		shaders::EntityShader shader;
-		shader.Init();
-		render_engine::renderer::Init(shader);
-		shader.CleanUp();
-
-		gui_shader1 = new shaders::GuiShader();
-		gui_shader1->Init();
-	}
-
-	gui::Button* ConvertGuiTextureToButton(gui::GuiTexture* texture) {
-		if (texture != NULL)
-			if (texture->GetType() == gui::GuiType::BUTTON) {
-				
-				gui::Button* button = (gui::Button*)texture;
-				return button;
-			}
-			else {
-				return NULL;
-			}
-	}
-
-	/*gui::InteractableGui* ConvertGuiTextureToInteractableGui(gui::GuiTexture* texture) {
-		if (texture != NULL)
-			if (texture->GetType() == gui::GuiType::BUTTON) {
-				return (gui::InteractableGui*)texture;
-			}
-			else {
-				return NULL;
-			}
-
-	}*/
-
-	gui::GuiTexture* GetMenuItem(bool hand_state) {
-		if(hand_state)
-		item_number += 0.20f;
-
-		int temp_item_number = item_number;
-		
-		//If temp_item_number is equal to the size of the array, set item_number bac to zero to loop through the array again
-		if (temp_item_number == guis1.size()) {
-			item_number = 0;
-			temp_item_number = 0;
-		}
-		std::cout << guis1[temp_item_number]->texture << std::endl;
-		return guis1[temp_item_number];
-	}
 
 	scene::Scenes scene::Startup_Scene::start(GLFWwindow *window)
 	{
-		// GUI stuff
-		gui::Button button_start(render_engine::loader::LoadTexture("res/menu_item_start1.png"), glm::vec2(0.0f, 0.6f), glm::vec2(0.25f, 0.25f));
-		button_start.SetHoverTexture(render_engine::loader::LoadTexture("res/menu_item_start1_hover.png"));
-		button_start.SetClickedTexture(render_engine::loader::LoadTexture("res/menu_item_start1_click.png"));
-		button_start.SetOnClickAction([]()
-			{
-				std::cout << "Clicked on button: Start!" << std::endl;
-				
-			});
-		guis1.push_back(&button_start);
-
-		gui::Button button_calibrate(render_engine::loader::LoadTexture("res/menu_item_calibrate1.png"), glm::vec2(0.0f, 0.0f), glm::vec2(0.25f, 0.25f));
-		button_calibrate.SetHoverTexture(render_engine::loader::LoadTexture("res/menu_item_calibrate1_hover.png"));
-		button_calibrate.SetClickedTexture(render_engine::loader::LoadTexture("res/menu_item_calibrate1_click.png"));
-		button_calibrate.SetOnClickAction([]()
-			{
-				std::cout << "Clicked on button: Calibrate!" << std::endl;
-
-			});
-		guis1.push_back(&button_calibrate);
-
-		gui::Button button_quit(render_engine::loader::LoadTexture("res/menu_item_quit1.png"), glm::vec2(0.0f, -0.6f), glm::vec2(0.25f, 0.25f));
-		button_quit.SetHoverTexture(render_engine::loader::LoadTexture("res/menu_item_quit1_hover.png"));
-		button_quit.SetClickedTexture(render_engine::loader::LoadTexture("res/menu_item_quit1_click.png"));
-		button_quit.SetOnClickAction([]()
-			{
-				std::cout << "Clicked on button: Quit!" << std::endl;
-			});
-		guis1.push_back(&button_quit);
-
-		computervision::ObjectDetection objDetect;
-		cv::Mat cameraFrame;
-		gui::GuiTexture* chosen_item = NULL; //This is the selected menu_item
-		bool hand_closed = false; //Flag to prevent multiple button presses
-		
 		while (return_value == scene::Scenes::STARTUP)
 		{
 			render();
 			update(window);
-			
-			if (hand_mode) {
-				cameraFrame = objDetect.readCamera();
-
-				//Get hand state from camera
-				bool hand_detection = objDetect.detectHand(cameraFrame);
-
-				if (hand_detection)
-				{
-					hand_closed = false;
-					std::cout << "hand is opened" << std::endl;
-
-					//Loop through menu items
-					chosen_item = GetMenuItem(true);
-
-					gui::Button* new_button = ConvertGuiTextureToButton(chosen_item);
-					if (new_button != NULL) {
-						const float x_pos = (chosen_item->position.x + 1.0) * WINDOW_WIDTH / 2;
-						const float y_pos = (1.0 - chosen_item->position.y) * WINDOW_HEIGHT / 2;
-
-						//Set cursor to location of selected menu_item
-						glfwSetCursorPos(window, x_pos, y_pos);
-					}
-				}
-				else if (!hand_detection)
-				{
-					std::cout << "hand is closed" << std::endl;
-
-					//Gets selected menu_item
-					chosen_item = GetMenuItem(false);
-					gui::Button* new_button = ConvertGuiTextureToButton(chosen_item);
-
-					if (new_button != NULL && !hand_closed) {
-						//Run function click
-						new_button->ForceClick(GLFW_MOUSE_BUTTON_LEFT);
-						hand_closed = true;
-					}
-				}
-			}
 
 			glfwSwapBuffers(window);
 			glfwPollEvents();
 		}
-		gui_shader1->CleanUp();
-		render_engine::loader::CleanUp();
+
 		return return_value;
 	}
 
 	void scene::Startup_Scene::render() 
 	{
-		render_engine::renderer::Prepare();
 
-		// Render GUI items
-		render_engine::renderer::Render(guis1, *gui_shader1);
 	}
 
 	void scene::Startup_Scene::update(GLFWwindow* window)
 	{
-		for (gui::GuiTexture* button : guis1) {
-			gui::Button* new_button = ConvertGuiTextureToButton(button);
-			if (new_button != NULL)
-				new_button->Update(window);
-		}
+
 	}
 
 	void scene::Startup_Scene::onKey(GLFWwindow* window, int key, int scancode, int action, int mods)
@@ -187,8 +36,5 @@ namespace scene
 		{
 			return_value = scene::Scenes::INGAME;
 		}
-		else if (glfwGetKey(window, GLFW_KEY_BACKSPACE) == GLFW_PRESS) {
-			hand_mode = !hand_mode;
-		}
 	}
 }

src/scenes/startup_Scene.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "scene.h"
-#include "../gui/gui_element.h"
+#include <map>
 
 namespace scene
 {
@@ -12,42 +12,9 @@ namespace scene
 		scene::Scenes return_value = scene::Scenes::STARTUP;
 
 	public:
-		/**
-		 * @brief Constructor of the class Startup_Scene
-		 * 
-		 */
-		Startup_Scene();
-
-		/**
-		 * @brief 
-		 * 
-		 * @param window
-		 * @return 
-		 */
 		Scenes start(GLFWwindow* window) override;
-
-		/**
-		 * @brief 
-		 * 
-		 */
 		void render() override;
-
-		/**
-		 * @brief This method updates all the components on the window
-		 * 
-		 * @param window Window it updates
-		 */
 		void update(GLFWwindow* window) override;
-
-		/**
-		 * @brief Listener for key events
-		 * 
-		 * @param window Window it listens to for key events
-		 * @param key Key of event that is activated
-		 * @param scancode Code of Key
-		 * @param action 
-		 * @param mods
-		 */
 		void onKey(GLFWwindow* window, int key, int scancode, int action, int mods) override;
 	};
 }

src/shaders/entity_shader.cpp

@@ -1,5 +1,6 @@
 #include "entity_shader.h"
 #include "../toolbox/toolbox.h"
+#include <deque>
 
 namespace shaders
 {
@@ -160,6 +161,25 @@ namespace shaders
 		}
 	}
 
+	void EntityShader::LoadLightsDeque(std::deque<entities::Light>& lights) const
+	{
+		for (int i = 0; i < MAX_LIGHTS; ++i)
+		{
+			if (i < lights.size())
+			{
+				LoadVector(location_light_position[i], lights[i].GetPosition());
+				LoadVector(location_light_color[i], lights[i].GetColor());
+				LoadVector(location_light_attenuation[i], lights[i].GetAttenuation());
+			}
+			else
+			{
+				LoadVector(location_light_position[i], glm::vec3(0, 0, 0));
+				LoadVector(location_light_color[i], glm::vec3(0, 0, 0));
+				LoadVector(location_light_attenuation[i], glm::vec3(1, 0, 0));
+			}
+		}
+	}
+
 	void EntityShader::LoadShineVariables(float shine_damper, float reflectivity) const
 	{
 		LoadFloat(location_shine_damper, shine_damper);

src/shaders/entity_shader.h

@@ -2,6 +2,7 @@
 
 #include <glm/gtc/matrix_transform.hpp>
 #include <vector>
+#include <deque>
 #include "shader_program.h"
 #include "../entities/camera.h"
 #include "../entities/light.h"
@@ -58,6 +59,13 @@ namespace shaders
 		 */
 		void LoadLights(std::vector<entities::Light>& lights) const;
 
+		/**
+		 * @brief loads some lights contained in a deque.
+		 * 
+		 * @param lights the deque containing the lights to load
+		 */
+		void LoadLightsDeque(std::deque<entities::Light>& lights) const;
+
 		/*
 		 * @brief: A method to load the the shine variables from a model into the shader
 		 *

src/toolbox/toolbox.h

@@ -11,10 +11,10 @@ namespace toolbox
 
 		// Change these macros to change the window size
 		#define WINDOW_WIDTH 1400.0f
-		#define WINDOW_HEIGHT 800.0f
+		#define WINDOW_HEIGT 800.0f
 
 		#define SCALED_WIDTH (WINDOW_WIDTH/DEFAULT_WIDTH)
-		#define SCALED_HEIGHT (WINDOW_HEIGHT/DEFAULT_HEIGHT)
+		#define SCALED_HEIGHT (WINDOW_HEIGT/DEFAULT_HEIGHT)
 	//
 	
 	/*

wk2_fps.vcxproj

@@ -22,7 +22,6 @@
     <ClCompile Include="src\collision\collision_handler.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\ObjectDetection.cpp" />
     <ClCompile Include="src\computervision\SkinDetector.cpp" />
     <ClCompile Include="src\computervision\FingerCount.cpp" />
@@ -49,7 +48,6 @@
     <ClInclude Include="src\computervision\FaceDetector.h" />
     <ClInclude Include="src\computervision\FingerCount.h" />
     <ClInclude Include="src\computervision\BackgroundRemover.h" />
-    <ClInclude Include="src\computervision\MenuTest.h" />
     <ClInclude Include="src\computervision\SkinDetector.h" />
     <ClInclude Include="src\computervision\ObjectDetection.h" />
     <ClInclude Include="src\entities\camera.h" />

wk2_fps.vcxproj.filters

@@ -75,9 +75,6 @@
     <ClCompile Include="src\computervision\BackgroundRemover.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\computervision\MenuTest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\entities\Camera.h">
@@ -158,9 +155,6 @@
     <ClInclude Include="src\toolbox\Timer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\computervision\MenuTest.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="res\haarcascade_frontalface_alt.xml" />