mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-18 01:41:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Address OpenSpace PR comments

Browse Source
This commit is contained in:
Malin Ejdbo
2021-02-05 14:14:13 +01:00
parent 08e2c3fb41
commit f65eaaba4d
3 changed files with 61 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/base/rendering/renderablemodel.cpp
View File

@@ -305,22 +305,22 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
));
}
if (geometries.size() > 0) {
if (!geometries.empty()) {
ghoul::modelgeometry::ModelGeometry combinedGeometry =
std::move(*geometries[0].release());
// Combine all models into one ModelGeometry
for (unsigned int i = 1; i < geometries.size(); ++i) {
for (unsigned int m = 0; m < geometries[i]->meshes().size(); ++m) {
for (const ghoul::io::ModelMesh& mesh : geometries[i]->meshes()) {
combinedGeometry.meshes().push_back(
std::move(geometries[i]->meshes()[m])
std::move(mesh)
);
}
for (unsigned int t = 0; t < geometries[i]->textureStorage().size(); ++t) {
combinedGeometry.textureStorage().push_back(
std::move(geometries[i]->textureStorage()[t])
);
for (const ghoul::modelgeometry::ModelGeometry::TextureEntry& texture
: geometries[i]->textureStorage())
{
combinedGeometry.textureStorage().push_back(std::move(texture));
}
}
_geometry = std::make_unique<ghoul::modelgeometry::ModelGeometry>(