mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-20 09:41:19 -05: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

16
modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
View File

@@ -93,7 +93,7 @@ documentation::Documentation RenderableModelProjection::Documentation() {
KeyGeomModelFile,
new OrVerifier({ new StringVerifier, new StringListVerifier }),
Optional::No,
"The file or files that that is used for rendering this model"
"The file or files that are used for rendering of this model"
},
{
keyProjection,
@@ -160,16 +160,14 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di
// 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) {
combinedGeometry.meshes().push_back(
std::move(geometries[i]->meshes()[m])
);
for (const ghoul::io::ModelMesh& mesh : geometries[i]->meshes()) {
combinedGeometry.meshes().push_back(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>(