mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 17:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Address Ghoul PR comments

Browse Source
This commit is contained in:
Malin Ejdbo
2021-02-05 11:17:33 +01:00
parent 1502e75c43
commit 08e2c3fb41
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: 13a4c05ba8...3a1d641261

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

@@ -441,9 +441,9 @@ void RenderableModel::initializeGL() {
ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
float maximumDistanceSquared = 0;
_geometry->initialize(maximumDistanceSquared);
setBoundingSphere(glm::sqrt(maximumDistanceSquared));
_geometry->initialize();
_geometry->calculateBoundingRadius();
setBoundingSphere(glm::sqrt(_geometry->boundingRadius()));
}
void RenderableModel::deinitializeGL() {

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

@@ -250,8 +250,7 @@ void RenderableModelProjection::initializeGL() {
_projectionComponent.initializeGL();
float bs = boundingSphere();
float temp = 0.f;
_geometry->initialize(temp);
_geometry->initialize();
setBoundingSphere(bs); // ignore bounding sphere set by geometry.
}