From 08e2c3fb418a662104d8a22882056a8e8f965f70 Mon Sep 17 00:00:00 2001 From: Malin Ejdbo Date: Fri, 5 Feb 2021 11:17:33 +0100 Subject: [PATCH] Address Ghoul PR comments --- ext/ghoul | 2 +- modules/base/rendering/renderablemodel.cpp | 6 +++--- .../rendering/renderablemodelprojection.cpp | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ext/ghoul b/ext/ghoul index 13a4c05ba8..3a1d641261 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 13a4c05ba8b188c05b4488f738d3d2e748d74e43 +Subproject commit 3a1d641261273c104090779772a95c605f7cd8a0 diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index 609356bc21..911712192c 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -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() { diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp index fed83b5018..574539bbf6 100644 --- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp @@ -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. }