From aa9c6a0fbbbfd5117f28f9b3d4ad46c3f5969082 Mon Sep 17 00:00:00 2001
From: Menno <mennobil02@gmail.com>
Date: Fri, 4 Jun 2021 15:54:23 +0200
Subject: [PATCH] [ADDED] comments

---
 src/entities/HouseGenerator.cpp |  8 ++++----
 src/entities/HouseGenerator.h   | 16 +++++++++++++---
 src/scenes/in_Game_Scene.cpp    |  2 --
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/entities/HouseGenerator.cpp b/src/entities/HouseGenerator.cpp
index 7ca82f0..972ceb7 100644
--- a/src/entities/HouseGenerator.cpp
+++ b/src/entities/HouseGenerator.cpp
@@ -27,13 +27,13 @@ namespace entities
 		furniture.push_front(std::make_shared<Entity>(house_model, position, glm::vec3(0, y_rotation, 0), HOUSE_SIZE));
 		
 		// Add furniture
-		models::TexturedModel couch = GetFurnitureModel(Furniture::COUCH);		
-		furniture.push_back(std::make_shared<Entity>(couch, glm::vec3(position.x, position.y + 20, position.z + 10), glm::vec3(0, 0, 0), 1));
+		models::TexturedModel couch = GetFurnitureModel(FurnitureType::COUCH);		
+		furniture.push_back(std::make_shared<Entity>(couch, glm::vec3(position.x, position.y + 20, position.z + 10), glm::vec3(0, 0, 0), HOUSE_SIZE));
 		
 		return furniture;
 	}
 
-	models::TexturedModel HouseGenerator::GetFurnitureModel(Furniture furniture)
+	models::TexturedModel HouseGenerator::GetFurnitureModel(FurnitureType furniture)
 	{
 		const auto found = furniture_models.find(furniture);
 		if (found == furniture_models.end())
@@ -57,6 +57,6 @@ namespace entities
 		models::TexturedModel couch_inside = { couch_inside_model, default_texture };
 		couches.push_back(couch_inside);
 		
-		furniture_models.insert(std::pair<Furniture, std::deque<models::TexturedModel>>(Furniture::COUCH, couches));
+		furniture_models.insert(std::pair<FurnitureType, std::deque<models::TexturedModel>>(FurnitureType::COUCH, couches));
 	}
 }
diff --git a/src/entities/HouseGenerator.h b/src/entities/HouseGenerator.h
index 8198dbf..7495f24 100644
--- a/src/entities/HouseGenerator.h
+++ b/src/entities/HouseGenerator.h
@@ -8,7 +8,7 @@
 
 namespace entities
 {
-	enum class Furniture
+	enum class FurnitureType
 	{
 		COUCH
 	};
@@ -21,7 +21,7 @@ namespace entities
 		models::TexturedModel house_model;
 		models::ModelTexture default_texture;
 		
-		std::map<Furniture, std::deque<models::TexturedModel>> furniture_models;
+		std::map<FurnitureType, std::deque<models::TexturedModel>> furniture_models;
 
 	public:
 		HouseGenerator();
@@ -42,8 +42,18 @@ namespace entities
 		float GetHouseDepth() const { return house_model.raw_model.model_size.x * HOUSE_SIZE; }
 	
 	private:
+		/*
+		 * @brief: This function loads all the 3D furniture models
+		 */
 		void GenerateFurnitureModels();
 
-		models::TexturedModel GetFurnitureModel(Furniture furniture);
+		/*
+		 * @brief: This funtion chooses and returns a random furniture of the given furniture type
+		 *
+		 * @param furniture: The furniture you want to get
+		 *
+		 * @return: The model of the random furniture of the chosen furniture type
+		 */
+		models::TexturedModel GetFurnitureModel(FurnitureType furniture);
 	};
 }
diff --git a/src/scenes/in_Game_Scene.cpp b/src/scenes/in_Game_Scene.cpp
index 18f53d0..3706ab5 100644
--- a/src/scenes/in_Game_Scene.cpp
+++ b/src/scenes/in_Game_Scene.cpp
@@ -74,8 +74,6 @@ namespace scene
 		furniture_count = furniture.size();
 		
 		house_models.insert(house_models.end(), furniture.begin(), furniture.end());
-
-		std::cout << house_models.size() << std::endl;
 	}