[ADDED] comments
This commit is contained in:
@@ -27,13 +27,13 @@ namespace entities
|
|||||||
furniture.push_front(std::make_shared<Entity>(house_model, position, glm::vec3(0, y_rotation, 0), HOUSE_SIZE));
|
furniture.push_front(std::make_shared<Entity>(house_model, position, glm::vec3(0, y_rotation, 0), HOUSE_SIZE));
|
||||||
|
|
||||||
// Add furniture
|
// Add furniture
|
||||||
models::TexturedModel couch = GetFurnitureModel(Furniture::COUCH);
|
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), 1));
|
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;
|
return furniture;
|
||||||
}
|
}
|
||||||
|
|
||||||
models::TexturedModel HouseGenerator::GetFurnitureModel(Furniture furniture)
|
models::TexturedModel HouseGenerator::GetFurnitureModel(FurnitureType furniture)
|
||||||
{
|
{
|
||||||
const auto found = furniture_models.find(furniture);
|
const auto found = furniture_models.find(furniture);
|
||||||
if (found == furniture_models.end())
|
if (found == furniture_models.end())
|
||||||
@@ -57,6 +57,6 @@ namespace entities
|
|||||||
models::TexturedModel couch_inside = { couch_inside_model, default_texture };
|
models::TexturedModel couch_inside = { couch_inside_model, default_texture };
|
||||||
couches.push_back(couch_inside);
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
namespace entities
|
namespace entities
|
||||||
{
|
{
|
||||||
enum class Furniture
|
enum class FurnitureType
|
||||||
{
|
{
|
||||||
COUCH
|
COUCH
|
||||||
};
|
};
|
||||||
@@ -21,7 +21,7 @@ namespace entities
|
|||||||
models::TexturedModel house_model;
|
models::TexturedModel house_model;
|
||||||
models::ModelTexture default_texture;
|
models::ModelTexture default_texture;
|
||||||
|
|
||||||
std::map<Furniture, std::deque<models::TexturedModel>> furniture_models;
|
std::map<FurnitureType, std::deque<models::TexturedModel>> furniture_models;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
HouseGenerator();
|
HouseGenerator();
|
||||||
@@ -42,8 +42,18 @@ namespace entities
|
|||||||
float GetHouseDepth() const { return house_model.raw_model.model_size.x * HOUSE_SIZE; }
|
float GetHouseDepth() const { return house_model.raw_model.model_size.x * HOUSE_SIZE; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
/*
|
||||||
|
* @brief: This function loads all the 3D furniture models
|
||||||
|
*/
|
||||||
void GenerateFurnitureModels();
|
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);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,8 +74,6 @@ namespace scene
|
|||||||
furniture_count = furniture.size();
|
furniture_count = furniture.size();
|
||||||
|
|
||||||
house_models.insert(house_models.end(), furniture.begin(), furniture.end());
|
house_models.insert(house_models.end(), furniture.begin(), furniture.end());
|
||||||
|
|
||||||
std::cout << house_models.size() << std::endl;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user