mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-28 16:09:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small fix and update ghoul

Browse Source
This commit is contained in:
Malin Ejdbo
2021-02-08 13:32:38 +01:00
parent f65eaaba4d
commit 51f02dc738
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: 3a1d641261...6560b217b3

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

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

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

@@ -154,20 +154,23 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di
));
}
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 (const ghoul::io::ModelMesh& mesh : geometries[i]->meshes()) {
combinedGeometry.meshes().push_back(std::move(mesh));
for (unsigned int m = 0; m < geometries[i]->meshes().size(); ++m) {
combinedGeometry.meshes().push_back(
std::move(geometries[i]->meshes()[m])
);
}
for (const ghoul::modelgeometry::ModelGeometry::TextureEntry& texture
: geometries[i]->textureStorage())
for (unsigned int t = 0; t < geometries[i]->textureStorage().size(); ++t)
{
combinedGeometry.textureStorage().push_back(std::move(texture));
combinedGeometry.textureStorage().push_back(
std::move(geometries[i]->textureStorage()[t])
);
}
}
_geometry = std::make_unique<ghoul::modelgeometry::ModelGeometry>(