[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

@@ -113,7 +113,8 @@ namespace scene
}
int z_offset = model_pos * (house_generator->GetHouseDepth()); // how much "in the distance" we should load the model
std::deque<std::shared_ptr<entities::Entity>> furniture = house_generator->GenerateHouse(glm::vec3(0, -75, -50 - z_offset), 90);
std::deque<std::shared_ptr<entities::Entity>> furniture;
house_generator->GenerateHouse(&furniture, glm::vec3(0, -75, -50 - z_offset), 90);
furniture_count = furniture.size();
house_models.insert(house_models.end(), furniture.begin(), furniture.end());
@@ -212,7 +213,7 @@ namespace scene
}
shader->CleanUp();
gui_shader->CleanUp();
render_engine::loader::CleanUp();
//render_engine::loader::CleanUp();
return return_value;
}