[FIX] fixed the loading scene, everything runs correctly now

This commit is contained in:
Jasper
2021-06-18 14:53:16 +02:00
parent 06a6930c58
commit ad2d651d41
8 changed files with 158 additions and 374 deletions

View File

@@ -6,6 +6,7 @@ std::mutex singleton::Model_Storage::mutex;
singleton::Model_Storage::~Model_Storage()
{
std::cout << "DELETING...." << std::endl;
delete instance;
}
@@ -57,7 +58,7 @@ void singleton::Model_Storage::add_lamp(models::TexturedModel lamp)
lamps.push_back(lamp);
}
void singleton::Model_Storage::addd_ceiling_object(models::TexturedModel co)
void singleton::Model_Storage::add_ceiling_object(models::TexturedModel co)
{
ceiling_objects.push_back(co);
}
@@ -67,6 +68,11 @@ void singleton::Model_Storage::add_misc(models::TexturedModel misc)
miscs.push_back(misc);
}
void singleton::Model_Storage::add_furniture_model(FurnitureModel model)
{
furniture_models.push_back(model);
}
/**
* getters
*/
@@ -116,6 +122,11 @@ std::deque<models::TexturedModel> singleton::Model_Storage::get_all_miscs()
return miscs;
}
std::deque<singleton::FurnitureModel> singleton::Model_Storage::get_all_furniture_models()
{
return furniture_models;
}
models::TexturedModel singleton::Model_Storage::get_couch(int index)
{
return couches[index];
@@ -161,6 +172,11 @@ models::TexturedModel singleton::Model_Storage::get_misc(int index)
return miscs[index];
}
singleton::FurnitureModel singleton::Model_Storage::get_furniture_model(int index)
{
return furniture_models[index];
}
//getters for default variables
models::TexturedModel singleton::Model_Storage::get_house_model()