[Add] Pointsystem works

* feature/number-from-images:
  [ADD] convert number to digits

enc_temp_folder/e14e1bac1d366a32333657ac3b22e523/house_generator.cpp

@@ -1,340 +0,0 @@
-#include "house_generator.h"
-
-#include <functional>
-#include <iostream>
-
-#include "../renderEngine/obj_loader.h"
-#include "../renderEngine/Loader.h"
-#include "../toolbox/toolbox.h"
-#include "collision_entity.h"
-
-namespace entities
-{
-	HouseGenerator::HouseGenerator()
-	{
-		models::RawModel raw_model = render_engine::LoadObjModel("res/HouseNew.obj");
-		default_texture = { render_engine::loader::LoadTexture("res/Texture.png") };
-		default_texture.shine_damper = 10;
-		house_model = { raw_model, default_texture };
-
-		GenerateFurnitureModels();
-	}
-
-	const FurniturePiece* HouseGenerator::GetRandomFurniturePiece()
-	{
-		FurnitureType random_type = FurnitureType(toolbox::Random(0, furniture_models.size() - 1));
-
-		for(std::deque<FurnitureModel>::iterator it = furniture_models.begin(); it != furniture_models.end(); ++it)
-		{
-			if(it->furniture.type == random_type)
-			{
-				return &it->furniture;
-			}
-		}
-		
-		return nullptr;
-	}
-	
-	std::deque<std::shared_ptr<Entity>> HouseGenerator::GenerateHouse(const glm::vec3& position, float y_rotation)
-	{
-		std::deque<std::shared_ptr<Entity>> furniture;
-
-		// Add house
-		furniture.push_front(std::make_shared<Entity>(house_model, position, glm::vec3(0, y_rotation, 0), HOUSE_SIZE));
-		int house_size = house_model.raw_model.model_size.x * HOUSE_SIZE;
-		int offset_x = house_model.raw_model.model_size.z * (HOUSE_SIZE/2);
-		int offset_z = house_model.raw_model.model_size.x *( HOUSE_SIZE/2);
-		double multiplier_x = house_size/2;
-		double multiplier_z = house_size / 3;
-		
-		for (int z = 1; z < 4; z++) {
-			for (int x = 1; x < 3; x++)
-			{
-				//if (toolbox::Random(0, 100) < 50) {
-						const FurniturePiece* furniture_piece = GetRandomFurniturePiece();
-						models::TexturedModel model = GetFurnitureModel(furniture_piece);
-						//if (//check of size van furniture nog past in huidige grid vlakje, of ie geen 2 size op t laatste vakje neerzet) {
-						glm::vec3 model_pos = glm::vec3(position.x + (x * multiplier_x) - (multiplier_x/2) - offset_x, position.y, position.z + (z * multiplier_z) - (multiplier_z / 2) + offset_z);
-
-						collision::Box model_box = { model_pos, model.raw_model.model_size };
-						model_box.SetRotation(-90);
-						furniture.push_back(std::make_shared<CollisionEntity>(model, model_pos, glm::vec3(0, -90, 0), HOUSE_SIZE, model_box));
-					//}
-					//}
-				}
-			}
-
-		return furniture;
-		
-		/*
-		// Add furniture
-		models::TexturedModel couch = GetFurnitureModel(FurnitureType::COUCH);
-		glm::vec3 couch_pos = glm::vec3(position.x + 200, position.y, position.z + 10);
-		collision::Box couch_box = { couch_pos, couch.raw_model.model_size };
-		couch_box.SetRotation(-90);
-		furniture.push_back(std::make_shared<CollisionEntity>(couch, couch_pos, glm::vec3(0, -90, 0), HOUSE_SIZE * 2, couch_box));
-
-		models::TexturedModel table = GetFurnitureModel(FurnitureType::TABLE);
-		glm::vec3 table_pos = glm::vec3(position.x - 30, position.y, position.z);
-		collision::Box table_box = { table_pos, table.raw_model.model_size };
-		furniture.push_back(std::make_shared<CollisionEntity>(table, table_pos, glm::vec3(0, 0, 0), HOUSE_SIZE * 1.3, table_box));
-
-		models::TexturedModel chair = GetFurnitureModel(FurnitureType::CHAIR);
-		glm::vec3 chair_pos = glm::vec3(position.x - 50, position.y, position.z + 220);
-		collision::Box chair_box = { chair_pos, chair.raw_model.model_size };
-		furniture.push_back(std::make_shared<CollisionEntity>(chair, chair_pos, glm::vec3(0, 0, 0), HOUSE_SIZE, chair_box));
-
-		models::TexturedModel plant = GetFurnitureModel(FurnitureType::PLANT);
-		glm::vec3 plant_pos = glm::vec3(position.x - 50, position.y, position.z + 220);
-		collision::Box plant_box = { plant_pos, plant.raw_model.model_size };
-		furniture.push_back(std::make_shared<CollisionEntity>(plant, plant_pos, glm::vec3(0, 0, 0), HOUSE_SIZE, plant_box));
-
-		models::TexturedModel guitar = GetFurnitureModel(FurnitureType::GUITAR);
-		glm::vec3 guitar_pos = glm::vec3(position.x - 50, position.y, position.z + 220);
-		collision::Box guitar_box = { guitar_pos, guitar.raw_model.model_size };
-		furniture.push_back(std::make_shared<CollisionEntity>(guitar, guitar_pos, glm::vec3(0, 0, 0), HOUSE_SIZE, guitar_box));
-		
-		models::TexturedModel bookshelf = GetFurnitureModel(FurnitureType::BOOKSHELF);
-		glm::vec3 bookshelf_pos = glm::vec3(position.x - 50, position.y, position.z + 220);
-		collision::Box bookshelf_box = { bookshelf_pos, bookshelf.raw_model.model_size };
-		furniture.push_back(std::make_shared<CollisionEntity>(bookshelf, bookshelf_pos, glm::vec3(0, 0, 0), HOUSE_SIZE, bookshelf_box));
-
-		models::TexturedModel lamp = GetFurnitureModel(FurnitureType::LAMP);
-		glm::vec3 lamp_pos = glm::vec3(position.x - 50, position.y, position.z + 220);
-		collision::Box lamp_box = { lamp_pos, lamp.raw_model.model_size };
-		furniture.push_back(std::make_shared<CollisionEntity>(lamp, lamp_pos, glm::vec3(0, 0, 0), HOUSE_SIZE, lamp_box));
-
-		models::TexturedModel ceiling_object = GetFurnitureModel(FurnitureType::CEILING_OBJECTS);
-		glm::vec3 ceiling_object_pos = glm::vec3(position.x - 50, position.y, position.z + 220);
-		collision::Box ceiling_object_box = { ceiling_object_pos, ceiling_object.raw_model.model_size };
-		furniture.push_back(std::make_shared<CollisionEntity>(ceiling_object, ceiling_object_pos, glm::vec3(0, 0, 0), HOUSE_SIZE, ceiling_object_box));
-
-		models::TexturedModel misc = GetFurnitureModel(FurnitureType::MISC);
-		glm::vec3 misc_pos = glm::vec3(position.x - 50, position.y, position.z + 220);
-		collision::Box misc_box = { misc_pos, misc.raw_model.model_size };
-		furniture.push_back(std::make_shared<CollisionEntity>(misc, misc_pos, glm::vec3(0, 0, 0), HOUSE_SIZE, misc_box));
-		*/
-		
-	}
-
-	models::TexturedModel HouseGenerator::GetFurnitureModel(const FurniturePiece* furniture)
-	{
-		std::deque<models::TexturedModel> *furniture_list = nullptr;
-		
-		for (std::deque<FurnitureModel>::iterator it = furniture_models.begin(); it != furniture_models.end(); ++it)
-		{
-			if(it->furniture.type == furniture->type)
-			{
-				furniture_list = &it->texture;
-			}
-		}
-		
-		if (furniture_list == nullptr)
-		{
-			std::cerr << "OH NEEEEEEEEEEEEEEE";
-		}
-		
-		const int modelNumber = toolbox::Random(0, furniture_list->size() - 1);
-		
-		return furniture_list->at(modelNumber);
-		
-		//return {};
-	}
-
-	void HouseGenerator::GenerateFurnitureModels()
-	{
-		// Couches
-		std::deque<models::TexturedModel> couches;
-		
-		models::RawModel couch_inside_model = render_engine::LoadObjModel("res/couchThree.obj");
-		models::TexturedModel couch_inside = { couch_inside_model, default_texture };
-		couches.push_back(couch_inside);
-
-		models::RawModel couch_inside_model2 = render_engine::LoadObjModel("res/Coach.obj");
-		models::TexturedModel couch_inside2 = { couch_inside_model2, default_texture };
-		couches.push_back(couch_inside2);
-
-		models::RawModel couch_inside_model3 = render_engine::LoadObjModel("res/lawnBenchOne.obj");
-		models::TexturedModel couch_inside3 = { couch_inside_model3, default_texture };
-		couches.push_back(couch_inside3);
-
-		FurnitureModel couch;
-		couch.furniture = {
-		FurnitureType::COUCH, 2 };
-		couch.texture = couches;
-		
-		furniture_models.push_back(couch);
-
-		// Tables
-		std::deque<models::TexturedModel> tables;
-
-		models::RawModel table_model1 = render_engine::LoadObjModel("res/tableOne.obj");
-		models::TexturedModel table1 = { table_model1, default_texture };
-		tables.push_back(table1);
-
-		models::RawModel table_model2 = render_engine::LoadObjModel("res/tableTwo.obj");
-		models::TexturedModel table2 = { table_model2, default_texture };
-		tables.push_back(table2);
-
-		models::RawModel table_model3 = render_engine::LoadObjModel("res/bureauOne.obj");
-		models::TexturedModel table3 = { table_model3, default_texture };
-		tables.push_back(table3);
-		
-		FurnitureModel table;
-		table.furniture = {
-		FurnitureType::TABLE, 2 };
-		table.texture = tables;
-		
-		furniture_models.push_back(table);
-
-		// Chairs
-		std::deque<models::TexturedModel> chairs;
-
-		models::RawModel chair_model1 = render_engine::LoadObjModel("res/launchchair.obj");
-		models::TexturedModel chair1 = { chair_model1, default_texture };
-		chairs.push_back(chair1);
-
-		models::RawModel chair_model2 = render_engine::LoadObjModel("res/lawnChairOne.obj");
-		models::TexturedModel chair2 = { chair_model2, default_texture };
-		chairs.push_back(chair2);
-
-		models::RawModel chair_model3 = render_engine::LoadObjModel("res/ugly_chair.obj");
-		models::TexturedModel chair3 = { chair_model3, default_texture };
-		chairs.push_back(chair3);
-
-		FurnitureModel chair;
-		chair.furniture = {
-		FurnitureType::CHAIR, 1 };
-		chair.texture = chairs;
-
-		furniture_models.push_back(chair);
-
-		// Plants
-		std::deque<models::TexturedModel> plants;
-
-		models::RawModel plant_model1 = render_engine::LoadObjModel("res/plantOne.obj");
-		models::TexturedModel plant1 = { plant_model1, default_texture };
-		plants.push_back(plant1);
-
-		models::RawModel plant_model2 = render_engine::LoadObjModel("res/plantTwo.obj");
-		models::TexturedModel plant2 = { plant_model2, default_texture };
-		plants.push_back(plant2);
-
-		models::RawModel plant_model3 = render_engine::LoadObjModel("res/plantThree.obj");
-		models::TexturedModel plant3 = { plant_model3, default_texture };
-		plants.push_back(plant3);
-
-		FurnitureModel plant;
-		plant.furniture = {
-		FurnitureType::PLANT, 1 };
-		plant.texture = plants;
-
-		furniture_models.push_back(plant);
-
-		// Guitars
-		std::deque<models::TexturedModel> guitars;
-
-		models::RawModel guitar_model1 = render_engine::LoadObjModel("res/guitarOne.obj");
-		models::TexturedModel guitar1 = { guitar_model1, default_texture };
-		guitars.push_back(guitar1);
-
-		models::RawModel guitar_model2 = render_engine::LoadObjModel("res/guitarTwo.obj");
-		models::TexturedModel guitar2 = { guitar_model2, default_texture };
-		guitars.push_back(guitar2);
-
-		FurnitureModel guitar;
-		guitar.furniture = {
-		FurnitureType::GUITAR, 1 };
-		guitar.texture = guitars;
-
-		furniture_models.push_back(guitar);
-
-		// Bookshelves
-		std::deque<models::TexturedModel> bookshelves;
-
-		models::RawModel bookshelf_model1 = render_engine::LoadObjModel("res/bookShelfOne.obj");
-		models::TexturedModel bookshelf1 = { bookshelf_model1, default_texture };
-		bookshelves.push_back(bookshelf1);
-
-		models::RawModel bookshelf_model2 = render_engine::LoadObjModel("res/bookShelfTwo.obj");
-		models::TexturedModel bookshelf2 = { bookshelf_model2, default_texture };
-		bookshelves.push_back(bookshelf2);
-
-		models::RawModel bookshelf_model3 = render_engine::LoadObjModel("res/bookShelfThree.obj");
-		models::TexturedModel bookshelf3 = { bookshelf_model3, default_texture };
-		bookshelves.push_back(bookshelf3);
-
-		FurnitureModel bookshelf;
-		bookshelf.furniture = {
-		FurnitureType::BOOKSHELF, 1 };
-		bookshelf.texture = bookshelves;
-
-		furniture_models.push_back(bookshelf);
-
-		// Lamps
-		std::deque<models::TexturedModel>lamps;
-
-		models::RawModel lamp_model1 = render_engine::LoadObjModel("res/lampOne.obj");
-		models::TexturedModel lamp1 = { lamp_model1, default_texture };
-		lamps.push_back(lamp1);
-
-		models::RawModel lamp_model2 = render_engine::LoadObjModel("res/lampTwo.obj");
-		models::TexturedModel lamp2 = { lamp_model2, default_texture };
-		lamps.push_back(lamp2);
-
-		FurnitureModel lamp;
-		lamp.furniture = {
-		FurnitureType::LAMP, 1 };
-		lamp.texture = lamps;
-
-		furniture_models.push_back(lamp);
-
-		// Ceiling objects
-		std::deque<models::TexturedModel>ceiling_Objects;
-
-		models::RawModel ceiling_Obj_model1 = render_engine::LoadObjModel("res/ceilingFan.obj");
-		models::TexturedModel ceiling_Obj1 = { ceiling_Obj_model1, default_texture };
-		ceiling_Objects.push_back(ceiling_Obj1);
-
-		models::RawModel ceiling_Obj_model2 = render_engine::LoadObjModel("res/ceilingFanTwo.obj");
-		models::TexturedModel ceiling_Obj2 = { ceiling_Obj_model2, default_texture };
-		ceiling_Objects.push_back(ceiling_Obj2);
-
-		models::RawModel ceiling_Obj_model3 = render_engine::LoadObjModel("res/ceilingLampOne.obj");
-		models::TexturedModel ceiling_Obj3 = { ceiling_Obj_model3, default_texture };
-		ceiling_Objects.push_back(ceiling_Obj3);
-
-		models::RawModel ceiling_Obj_model4 = render_engine::LoadObjModel("res/ceilingLampTwo.obj");
-		models::TexturedModel ceiling_Obj4 = { ceiling_Obj_model4, default_texture };
-		ceiling_Objects.push_back(ceiling_Obj4);
-
-		FurnitureModel ceiling_object;
-		ceiling_object.furniture = {
-		FurnitureType::CEILING_OBJECTS, 1 };
-		ceiling_object.texture = ceiling_Objects;
-
-		furniture_models.push_back(ceiling_object);
-
-		// Miscs
-		std::deque<models::TexturedModel> miscs;
-
-		models::RawModel misc_model1 = render_engine::LoadObjModel("res/tv.obj");
-		models::TexturedModel misc1 = { misc_model1, default_texture };
-		miscs.push_back(misc1);
-
-		models::RawModel misc_model2 = render_engine::LoadObjModel("res/radio.obj");
-		models::TexturedModel misc2 = { misc_model2, default_texture };
-		miscs.push_back(misc2);
-
-		models::RawModel misc_model3 = render_engine::LoadObjModel("res/Flowerpot.obj");
-		models::TexturedModel misc3 = { misc_model3, default_texture };
-		miscs.push_back(misc3);
-
-		FurnitureModel misc;
-		misc.furniture = {
-		FurnitureType::MISC, 1 };
-		misc.texture = miscs;
-
-		furniture_models.push_back(misc);		
-	}
-}

src/entities/house_generator.cpp

@@ -20,78 +20,23 @@ namespace entities
 		GenerateFurnitureModels();
 	}
 
-	const FurniturePiece* HouseGenerator::GetRandomFurniturePiece()
-	{
-		FurnitureType random_type = FurnitureType::CEILING_OBJECTS;
-		while (random_type == FurnitureType::CEILING_OBJECTS ) {
-			random_type = FurnitureType(toolbox::Random(0, furniture_models.size() - 1));
-		}
-
-		for (std::deque<FurnitureModel>::iterator it = furniture_models.begin(); it != furniture_models.end(); ++it)
-		{
-			if (it->furniture.type == random_type)
-			{
-				return &it->furniture;
-			}
-		}
-
-		return nullptr;
-	}
-
-	const FurniturePiece* HouseGenerator::GetFurniturePiece(FurnitureType type)
-	{
-		for (std::deque<FurnitureModel>::iterator it = furniture_models.begin(); it != furniture_models.end(); ++it)
-		{
-			if (it->furniture.type == type)
-			{
-				return &it->furniture;
-			}
-		}
-		return nullptr;
-	}
-
 	std::deque<std::shared_ptr<Entity>> HouseGenerator::GenerateHouse(const glm::vec3& position, float y_rotation)
 	{
 		std::deque<std::shared_ptr<Entity>> furniture;
 
 		// Add house
 		furniture.push_front(std::make_shared<Entity>(house_model, position, glm::vec3(0, y_rotation, 0), HOUSE_SIZE));
-		int house_size_x = house_model.raw_model.model_size.x * HOUSE_SIZE;
-		int house_size_y = house_model.raw_model.model_size.x * HOUSE_SIZE;
-		int house_size_z = house_model.raw_model.model_size.x * HOUSE_SIZE;
 
-		int offset_x = house_model.raw_model.model_size.z * (HOUSE_SIZE / 2);
-		int offset_z = house_model.raw_model.model_size.x * (HOUSE_SIZE / 2);
-		double multiplier_x = house_size_x / 4;
-		double multiplier_z = house_size_z / 3;
-
-		for (int z = 1; z < 4; z++) {
-			for (int x = 1; x < 4; x++)
-			{
-				//if (toolbox::Random(0, 100) < 90) {
-					const FurniturePiece* furniture_piece = GetRandomFurniturePiece();
-					if (furniture_piece->type != FurnitureType::CEILING_OBJECTS) {
-						models::TexturedModel model = GetFurnitureModel(furniture_piece);
-						//if (!(furniture_piece->size > 1 && x > 1)) {
-							glm::vec3 model_pos = glm::vec3(position.x + (x * multiplier_x) - (multiplier_x / 2) - offset_x, position.y, position.z + (z * multiplier_z) - (multiplier_z / 2) + offset_z);
-
-							collision::Box model_box = { model_pos, model.raw_model.model_size };
-							model_box.SetRotation(-90);
-							furniture.push_back(std::make_shared<CollisionEntity>(model, model_pos, glm::vec3(0, -90, 0), HOUSE_SIZE, model_box));
-						}
-					//}
-				//}
-			}
+		for(int i = 0; i<toolbox::Random(1,4);i++)
+		{
+			FurnitureType type = FurnitureType(toolbox::Random(0, furniture_models.size() - 1));
+			models::TexturedModel model = GetFurnitureModel(type);
+			glm::vec3 model_pos = glm::vec3(position.x, position.y, position.z);
+			collision::Box model_box = { model_pos, model.raw_model.model_size };
+			model_box.SetRotation(-90);
+			furniture.push_back(std::make_shared<CollisionEntity>(model, model_pos, glm::vec3(0, -90, 0), HOUSE_SIZE * 2, model_box));
 		}
-
-		models::TexturedModel model = GetFurnitureModel(GetFurniturePiece(FurnitureType::CEILING_OBJECTS));
-		glm::vec3 model_pos = glm::vec3(position.x, position.y + (house_size_y/5 *3), position.z);
-		collision::Box model_box = { model_pos, model.raw_model.model_size };
-		model_box.SetRotation(-90);
-		furniture.push_back(std::make_shared<CollisionEntity>(model, model_pos, glm::vec3(0, -90, 0), HOUSE_SIZE, model_box));
-
-		return furniture;
-
+		
 		/*
 		// Add furniture
 		models::TexturedModel couch = GetFurnitureModel(FurnitureType::COUCH);
@@ -119,7 +64,7 @@ namespace entities
 		glm::vec3 guitar_pos = glm::vec3(position.x - 50, position.y, position.z + 220);
 		collision::Box guitar_box = { guitar_pos, guitar.raw_model.model_size };
 		furniture.push_back(std::make_shared<CollisionEntity>(guitar, guitar_pos, glm::vec3(0, 0, 0), HOUSE_SIZE, guitar_box));
-
+		
 		models::TexturedModel bookshelf = GetFurnitureModel(FurnitureType::BOOKSHELF);
 		glm::vec3 bookshelf_pos = glm::vec3(position.x - 50, position.y, position.z + 220);
 		collision::Box bookshelf_box = { bookshelf_pos, bookshelf.raw_model.model_size };
@@ -140,38 +85,29 @@ namespace entities
 		collision::Box misc_box = { misc_pos, misc.raw_model.model_size };
 		furniture.push_back(std::make_shared<CollisionEntity>(misc, misc_pos, glm::vec3(0, 0, 0), HOUSE_SIZE, misc_box));
 		*/
-
+		return furniture;
 	}
 
-	models::TexturedModel HouseGenerator::GetFurnitureModel(const FurniturePiece* furniture)
+	models::TexturedModel HouseGenerator::GetFurnitureModel(FurnitureType furniture)
 	{
-		std::deque<models::TexturedModel>* furniture_list = nullptr;
-
-		for (std::deque<FurnitureModel>::iterator it = furniture_models.begin(); it != furniture_models.end(); ++it)
-		{
-			if (it->furniture.type == furniture->type)
-			{
-				furniture_list = &it->texture;
-			}
-		}
-
-		if (furniture_list == nullptr)
+		const auto found = furniture_models.find(furniture);
+		if (found == furniture_models.end())
 		{
 			std::cerr << "OH NEEEEEEEEEEEEEEE";
 		}
+		
+		auto models = found->second;
 
-		const int modelNumber = toolbox::Random(0, furniture_list->size() - 1);
-
-		return furniture_list->at(modelNumber);
-
-		//return {};
+		const int modelNumber = toolbox::Random(0, models.size() - 1);
+		
+		return models[modelNumber];
 	}
 
 	void HouseGenerator::GenerateFurnitureModels()
 	{
 		// Couches
 		std::deque<models::TexturedModel> couches;
-
+		
 		models::RawModel couch_inside_model = render_engine::LoadObjModel("res/couchThree.obj");
 		models::TexturedModel couch_inside = { couch_inside_model, default_texture };
 		couches.push_back(couch_inside);
@@ -183,13 +119,8 @@ namespace entities
 		models::RawModel couch_inside_model3 = render_engine::LoadObjModel("res/lawnBenchOne.obj");
 		models::TexturedModel couch_inside3 = { couch_inside_model3, default_texture };
 		couches.push_back(couch_inside3);
-
-		FurnitureModel couch;
-		couch.furniture = {
-		FurnitureType::COUCH, 2 };
-		couch.texture = couches;
-
-		furniture_models.push_back(couch);
+		
+		furniture_models.insert(std::pair<FurnitureType, std::deque<models::TexturedModel>>(FurnitureType::COUCH, couches));
 
 		// Tables
 		std::deque<models::TexturedModel> tables;
@@ -205,13 +136,8 @@ namespace entities
 		models::RawModel table_model3 = render_engine::LoadObjModel("res/bureauOne.obj");
 		models::TexturedModel table3 = { table_model3, default_texture };
 		tables.push_back(table3);
-
-		FurnitureModel table;
-		table.furniture = {
-		FurnitureType::TABLE, 2 };
-		table.texture = tables;
-
-		furniture_models.push_back(table);
+		
+		furniture_models.insert(std::pair<FurnitureType, std::deque<models::TexturedModel>>(FurnitureType::TABLE, tables));
 
 		// Chairs
 		std::deque<models::TexturedModel> chairs;
@@ -228,12 +154,8 @@ namespace entities
 		models::TexturedModel chair3 = { chair_model3, default_texture };
 		chairs.push_back(chair3);
 
-		FurnitureModel chair;
-		chair.furniture = {
-		FurnitureType::CHAIR, 1 };
-		chair.texture = chairs;
+		furniture_models.insert(std::pair<FurnitureType, std::deque<models::TexturedModel>>(FurnitureType::CHAIR, chairs));
 
-		furniture_models.push_back(chair);
 
 		// Plants
 		std::deque<models::TexturedModel> plants;
@@ -249,13 +171,8 @@ namespace entities
 		models::RawModel plant_model3 = render_engine::LoadObjModel("res/plantThree.obj");
 		models::TexturedModel plant3 = { plant_model3, default_texture };
 		plants.push_back(plant3);
-
-		FurnitureModel plant;
-		plant.furniture = {
-		FurnitureType::PLANT, 1 };
-		plant.texture = plants;
-
-		furniture_models.push_back(plant);
+		
+		furniture_models.insert(std::pair<FurnitureType, std::deque<models::TexturedModel>>(FurnitureType::PLANT, plants));
 
 		// Guitars
 		std::deque<models::TexturedModel> guitars;
@@ -267,13 +184,8 @@ namespace entities
 		models::RawModel guitar_model2 = render_engine::LoadObjModel("res/guitarTwo.obj");
 		models::TexturedModel guitar2 = { guitar_model2, default_texture };
 		guitars.push_back(guitar2);
-
-		FurnitureModel guitar;
-		guitar.furniture = {
-		FurnitureType::GUITAR, 1 };
-		guitar.texture = guitars;
-
-		furniture_models.push_back(guitar);
+		
+		furniture_models.insert(std::pair<FurnitureType, std::deque<models::TexturedModel>>(FurnitureType::GUITAR, guitars));
 
 		// Bookshelves
 		std::deque<models::TexturedModel> bookshelves;
@@ -290,12 +202,7 @@ namespace entities
 		models::TexturedModel bookshelf3 = { bookshelf_model3, default_texture };
 		bookshelves.push_back(bookshelf3);
 
-		FurnitureModel bookshelf;
-		bookshelf.furniture = {
-		FurnitureType::BOOKSHELF, 1 };
-		bookshelf.texture = bookshelves;
-
-		furniture_models.push_back(bookshelf);
+		furniture_models.insert(std::pair<FurnitureType, std::deque<models::TexturedModel>>(FurnitureType::BOOKSHELF, bookshelves));
 
 		// Lamps
 		std::deque<models::TexturedModel>lamps;
@@ -307,13 +214,8 @@ namespace entities
 		models::RawModel lamp_model2 = render_engine::LoadObjModel("res/lampTwo.obj");
 		models::TexturedModel lamp2 = { lamp_model2, default_texture };
 		lamps.push_back(lamp2);
-
-		FurnitureModel lamp;
-		lamp.furniture = {
-		FurnitureType::LAMP, 1 };
-		lamp.texture = lamps;
-
-		furniture_models.push_back(lamp);
+		
+		furniture_models.insert(std::pair<FurnitureType, std::deque<models::TexturedModel>>(FurnitureType::LAMP, lamps));
 
 		// Ceiling objects
 		std::deque<models::TexturedModel>ceiling_Objects;
@@ -333,13 +235,8 @@ namespace entities
 		models::RawModel ceiling_Obj_model4 = render_engine::LoadObjModel("res/ceilingLampTwo.obj");
 		models::TexturedModel ceiling_Obj4 = { ceiling_Obj_model4, default_texture };
 		ceiling_Objects.push_back(ceiling_Obj4);
-
-		FurnitureModel ceiling_object;
-		ceiling_object.furniture = {
-		FurnitureType::CEILING_OBJECTS, 1 };
-		ceiling_object.texture = ceiling_Objects;
-
-		furniture_models.push_back(ceiling_object);
+		
+		furniture_models.insert(std::pair<FurnitureType, std::deque<models::TexturedModel>>(FurnitureType::CEILING_OBJECTS, ceiling_Objects));
 
 		// Miscs
 		std::deque<models::TexturedModel> miscs;
@@ -356,11 +253,6 @@ namespace entities
 		models::TexturedModel misc3 = { misc_model3, default_texture };
 		miscs.push_back(misc3);
 
-		FurnitureModel misc;
-		misc.furniture = {
-		FurnitureType::MISC, 1 };
-		misc.texture = miscs;
-
-		furniture_models.push_back(misc);
+		furniture_models.insert(std::pair<FurnitureType, std::deque<models::TexturedModel>>(FurnitureType::MISC, miscs));
 	}
 }

src/entities/house_generator.h

@@ -20,24 +20,6 @@ namespace entities
 		CEILING_OBJECTS,
 		MISC
 	};
-	struct FurniturePiece
-	{
-		FurnitureType type;
-		int size;
-	};
-
-	struct FurnitureModel
-	{
-		FurniturePiece furniture;
-		std::deque<models::TexturedModel> texture;
-
-		bool operator<(FurnitureModel a)
-		{
-			return true;
-		}
-	};
-
-	
 	
 	class HouseGenerator
 	{
@@ -47,11 +29,11 @@ namespace entities
 		models::TexturedModel house_model;
 		models::ModelTexture default_texture;
 		
-		//std::map<FurniturePiece, std::deque<models::TexturedModel>> furniture_models;
-		std::deque<FurnitureModel> furniture_models;
+		std::map<FurnitureType, std::deque<models::TexturedModel>> furniture_models;
+
 	public:
 		HouseGenerator();
-		
+
 		/*
 		 * @brief: This function generates a house with furniture at the given position and rotation
 		 *
@@ -68,9 +50,6 @@ namespace entities
 		float GetHouseDepth() const { return house_model.raw_model.model_size.x * HOUSE_SIZE; }
 	
 	private:
-		const FurniturePiece* GetRandomFurniturePiece();
-		const FurniturePiece* GetFurniturePiece(FurnitureType type);
-
 		/*
 		 * @brief: This function loads all the 3D furniture models
 		 */
@@ -83,6 +62,6 @@ namespace entities
 		 *
 		 * @return: The model of the random furniture of the chosen furniture type
 		 */
-		models::TexturedModel GetFurnitureModel(const FurniturePiece* furniture);
+		models::TexturedModel GetFurnitureModel(FurnitureType furniture);
 	};
 }

src/gui/gui_element.h

@@ -19,7 +19,7 @@ namespace gui
 	 */
 	struct GuiTexture
 	{
-		GLuint texture;
+		int texture;
 		glm::vec2 position;
 		glm::vec2 scale;
 

src/renderEngine/Renderer.cpp

@@ -121,5 +121,87 @@ namespace render_engine
 
 			shader.Stop();
 		}
+
+		void Render(std::vector<std::shared_ptr<gui::GuiTexture>>& guis, shaders::GuiShader& shader)
+		{
+			shader.Start();
+
+			// Enable the VAO and the positions VBO
+			glBindVertexArray(quad.vao_id);
+			glEnableVertexAttribArray(0);
+
+			// Enable alpha blending (for transparency in the texture)
+			glEnable(GL_BLEND);
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+			// Disable depth testing to textures with transparency can overlap
+			glDisable(GL_DEPTH_TEST);
+
+			// Render each gui to the screen
+			for (std::shared_ptr<gui::GuiTexture> gui : guis)
+			{
+				// Bind the texture of the gui to the shader
+				glActiveTexture(GL_TEXTURE0);
+				glBindTexture(GL_TEXTURE_2D, gui->texture);
+
+				glm::mat4 matrix = toolbox::CreateModelMatrix(gui->position, gui->scale);
+				shader.LoadModelMatrix(matrix);
+
+				glDrawArrays(GL_TRIANGLE_STRIP, 0, quad.vertex_count);
+
+				std::cout << "in render method, gui x value: " << gui.get()->scale.x << std::endl;
+			}
+
+			// Enable depth test again
+			glEnable(GL_DEPTH_TEST);
+
+			// Disable alpha blending
+			glDisable(GL_BLEND);
+
+			// Disable the VBO and VAO
+			glDisableVertexAttribArray(0);
+			glBindVertexArray(0);
+
+			shader.Stop();
+		}
+
+		void Render(std::shared_ptr<gui::GuiTexture>& gui, shaders::GuiShader& shader)
+		{
+			shader.Start();
+
+			// Enable the VAO and the positions VBO
+			glBindVertexArray(quad.vao_id);
+			glEnableVertexAttribArray(0);
+
+			// Enable alpha blending (for transparency in the texture)
+			glEnable(GL_BLEND);
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+			// Disable depth testing to textures with transparency can overlap
+			glDisable(GL_DEPTH_TEST);
+
+			// Render each gui to the screen
+			// Bind the texture of the gui to the shader
+			glActiveTexture(GL_TEXTURE0);
+			glBindTexture(GL_TEXTURE_2D, gui->texture);
+
+			glm::mat4 matrix = toolbox::CreateModelMatrix(gui->position, gui->scale);
+			shader.LoadModelMatrix(matrix);
+
+			glDrawArrays(GL_TRIANGLE_STRIP, 0, quad.vertex_count);
+
+
+			// Enable depth test again
+			glEnable(GL_DEPTH_TEST);
+
+			// Disable alpha blending
+			glDisable(GL_BLEND);
+
+			// Disable the VBO and VAO
+			glDisableVertexAttribArray(0);
+			glBindVertexArray(0);
+
+			shader.Stop();
+		}
 	}
 }

src/renderEngine/Renderer.h

@@ -40,5 +40,22 @@ namespace render_engine
 			@param shade: The shader the GUI textures need to be rendered with
 		 */
 		void Render(std::vector<gui::GuiTexture*>& guis, shaders::GuiShader& shader);
+
+		/*
+		* @brief: renders guis elements from a shared pointer vector
+		* 
+		* @param  guis: List with GUI textures to render
+		* @param sahde: The shader to use
+		*/
+		void Render(std::vector<std::shared_ptr<gui::GuiTexture>>& guis, shaders::GuiShader& shader);
+
+
+		/*
+		 * @brief renders 1 gui element.
+		 *
+		 * @param gui: the texture to render
+		 * @param shader: the shader to use
+		 */
+		void Render(std::shared_ptr<gui::GuiTexture>& gui, shaders::GuiShader& shader);
 	}
 }

src/scenes/in_Game_Scene.cpp

@@ -21,12 +21,12 @@
 #include <opencv2/core/base.hpp>
 #include "../computervision/HandDetectRegion.h"
 #include "../computervision/ObjectDetection.h"
+#include <string>
 
 #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,6 +39,7 @@ 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;
@@ -60,7 +61,26 @@ 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);
+
+			std::cout << "Add to score_pointer: " << texture_path << std::endl;
+		}
+
+		std::cout << "Size textures: " << score_textures.size() << std::endl;
+		
 	}
+
 	/**
 	 * temporary!!!!
 	 * just to make some bounding boxes
@@ -241,13 +261,14 @@ namespace scene
 
 		// Stop rendering the entities
 		shader->Stop();
+
+		DrawScore(score);
 	}
 
 	//updates certain variables 
 	void scene::In_Game_Scene::update(GLFWwindow* window)
 	{
 		//camera.Move(window);
-
 		main_character->Move(window);
 
 		//std::cout << "x get: " << movement.x << "\ny get: " << movement.y << "\nz get: " << movement.z << "\n";
@@ -263,13 +284,16 @@ namespace scene
 			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;
+			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);
 		update_hand_detection();
+	
+
 	}
 
 	//manages the key input in the game scene
@@ -320,4 +344,22 @@ namespace scene
 	{
 		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);
+
+		std::cout << "Digits size: " << digits.size() << std::endl;
+
+		for (int i = digits.size()-1; i >= 0; i--)
+		{
+			std::cout << "Digit in digits: " << i << std::endl;
+			score_textures[digits[i]].get()->position.x = 0.15 * i -0.9;
+			render_engine::renderer::Render(score_textures[digits[i]], *gui_shader);
+
+		}
+	}
 }

src/scenes/in_Game_Scene.h

@@ -11,6 +11,9 @@
 #include "../renderEngine/renderer.h"
 #include "../shaders/entity_shader.h"
 #include "../toolbox/toolbox.h"
+#include <opencv2/core/base.hpp>
+#include <opencv2/imgcodecs.hpp>
+#include <opencv2/imgproc.hpp>
 
 
 namespace scene
@@ -54,6 +57,8 @@ namespace scene
 		//pause_guis is a list of components that will be rendered when the game is paused.
 		std::vector<gui::GuiTexture*> pause_guis;
 
+		std::vector<std::shared_ptr<gui::GuiTexture>> score_guis;
+
 		/**
 		 * @brief renders the objects/gui models
 		 * @param 
@@ -97,6 +102,9 @@ namespace scene
 		 * @return void
 		 */
 		void onKey(GLFWwindow* window, int key, int scancode, int action, int mods) override;
+	
+		void DrawScore(int score);
+
 	};
 }
 

src/scenes/loading_Scene.cpp

@@ -1,47 +0,0 @@
-#include "loading_Scene.h"
-#include "../renderEngine/Renderer.h"
-#include "../renderEngine/Loader.h"
-#include "../gui/gui_element.h"
-
-namespace scene
-{
-	
-	Loading_Scene::Loading_Scene()
-	{
-		gui_shader = new shaders::GuiShader();
-		gui_shader->Init();
-	}
-
-	Loading_Scene::~Loading_Scene()
-	{
-		delete gui_shader;
-	}
-
-	Scenes Loading_Scene::start(GLFWwindow* window)
-	{
-		render();
-		return Scenes::STARTUP;
-	}
-
-	void Loading_Scene::render()
-	{
-		/*render_engine::renderer::Prepare();
-		
-		gui::GuiTexture loading_image = { render_engine::loader::LoadTexture("res/menu_item_start1.png"),
-			glm::vec2(0,0),glm::vec2(1,1) };
-		
-		std::vector<gui::GuiTexture*> image_list;
-		image_list.push_back(&loading_image);
-		
-		render_engine::renderer::Render(image_list, *gui_shader);*/
-	}
-
-	void Loading_Scene::update(GLFWwindow* window)
-	{
-	}
-
-	
-	void Loading_Scene::onKey(GLFWwindow* window, int key, int scancode, int action, int mods)
-	{
-	}
-}

src/scenes/loading_Scene.h

@@ -1,63 +0,0 @@
-#pragma once
-#pragma once
-#include "scene.h"
-#include "../gui/gui_element.h"
-#include "../shaders/gui_shader.h"
-
-namespace scene
-{
-	extern GLFWwindow* window;
-	
-
-	class Loading_Scene : public scene::Scene
-	{
-	private:
-		//return_value is an enum that is necessary for the scene switching. Whenever this changes, the scene will change to a different scene.
-		scene::Scenes return_value = scene::Scenes::LOADING;
-		shaders::GuiShader* gui_shader;
-
-
-	public:
-		/**
-		 * @brief Constructor of the class Startup_Scene
-		 *
-		 */
-		Loading_Scene();
-
-		~Loading_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/scenes/scene.h

@@ -11,7 +11,6 @@ namespace scene {
 	 */
 	enum class Scenes
 	{
-		LOADING,
 		STARTUP,
 		INGAME,
 		GAMEOVER,

src/scenes/startup_Scene.cpp

@@ -211,7 +211,6 @@ namespace scene
 	{
 		if (glfwGetKey(window, GLFW_KEY_SPACE) == GLFW_PRESS)
 		{
-
 			return_value = scene::Scenes::INGAME;
 			cv::destroyWindow("camera");
 		}

src/toolbox/toolbox.cpp

@@ -1,6 +1,6 @@
 #include <ctime>
 #include "toolbox.h"
-
+#include <iostream>
 namespace toolbox
 {
 	glm::mat4 CreateModelMatrix(glm::vec2 translation, glm::vec2 scale)
@@ -56,4 +56,12 @@ namespace toolbox
 		}
 		return min + rand() % ((max + 1) - min);
 	}
+
+	void GetDigitsFromNumber(int number, std::vector<int>& result_vector)
+	{
+		if (number >= 10)
+			GetDigitsFromNumber(number / 10, result_vector);
+
+		result_vector.push_back(number % 10);
+	}
 }

src/toolbox/toolbox.h

@@ -2,6 +2,7 @@
 
 #include "../entities/camera.h"
 #include <glm/gtc/matrix_transform.hpp>
+#include <vector>
 
 namespace toolbox
 {
@@ -78,4 +79,13 @@ namespace toolbox
 	 * @return: The random number
 	 */
 	int Random(const int min, const int max);
+
+
+	/**
+	 * @brief gets the separate digits from the number.
+	 * 
+	 * @param number the number to get the digits from
+	 * @param result_vector the vector to hold the individual digits.
+	 */
+	void GetDigitsFromNumber(int number, std::vector<int>& result_vector);
 }

wk2_fps.vcxproj

@@ -40,7 +40,6 @@
     <ClCompile Include="src\renderEngine\loader.cpp" />
     <ClCompile Include="src\renderEngine\obj_loader.cpp" />
     <ClCompile Include="src\renderEngine\renderer.cpp" />
-    <ClCompile Include="src\scenes\loading_Scene.cpp" />
     <ClCompile Include="src\scenes\scene.cpp" />
     <ClCompile Include="src\shaders\gui_shader.cpp" />
     <ClCompile Include="src\shaders\shader_program.cpp" />
@@ -57,7 +56,6 @@
     <ClInclude Include="src\computervision\calibration\StaticSkinTreshold.h" />
     <ClInclude Include="src\computervision\HandDetectRegion.h" />
     <ClInclude Include="src\scenes\in_Game_Scene.h" />
-    <ClInclude Include="src\scenes\loading_Scene.h" />
     <ClInclude Include="src\scenes\scene.h" />
     <ClInclude Include="src\computervision\async\async_arm_detection.h" />
     <ClInclude Include="src\computervision\async\StaticCameraInstance.h" />

wk2_fps.vcxproj.filters

@@ -28,7 +28,6 @@
     <ClCompile Include="src\entities\house_generator.cpp" />
     <ClCompile Include="src\computervision\MenuTest.cpp" />
     <ClCompile Include="src\scenes\scene.cpp" />
-    <ClCompile Include="src\scenes\loading_Scene.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\entities\Camera.cpp">
@@ -149,7 +148,6 @@
     <ClInclude Include="src\toolbox\Timer.h" />
     <ClInclude Include="src\toolbox\toolbox.h" />
     <ClInclude Include="src\scenes\startup_Scene.h" />
-    <ClInclude Include="src\scenes\loading_Scene.h" />
   </ItemGroup>
   <ItemGroup>
     <Xml Include="res\haarcascade_frontalface_alt.xml" />