mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-03 10:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Correctly reset uniform values when changing labels (closes #812)

Browse Source
This commit is contained in:
Alexander Bock
2019-05-18 17:09:49 -06:00
parent d0e9170658
commit e03bf6fc2e
1 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
modules/globebrowsing/src/renderableglobe.cpp
View File

@@ -645,6 +645,50 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask
}
void RenderableGlobe::update(const UpdateData& data) {
if (_localRenderer.program->isDirty()) {
_localRenderer.program->rebuildFromFile();
_localRenderer.program->setUniform("xSegments", _grid.xSegments);
if (_debugProperties.showHeightResolution) {
_localRenderer.program->setUniform(
"vertexResolution",
glm::vec2(_grid.xSegments, _grid.ySegments)
);
}
ghoul::opengl::updateUniformLocations(
*_localRenderer.program,
_localRenderer.uniformCache,
{ "skirtLength", "p01", "p11", "p00", "p10", "patchNormalModelSpace",
"patchNormalCameraSpace" }
);
}
if (_globalRenderer.program->isDirty()) {
_globalRenderer.program->rebuildFromFile();
_globalRenderer.program->setUniform("xSegments", _grid.xSegments);
if (_debugProperties.showHeightResolution) {
_globalRenderer.program->setUniform(
"vertexResolution",
glm::vec2(_grid.xSegments, _grid.ySegments)
);
}
// Ellipsoid Radius (Model Space)
_globalRenderer.program->setUniform(
"radiiSquared",
glm::vec3(_ellipsoid.radii() * _ellipsoid.radii())
);
ghoul::opengl::updateUniformLocations(
*_globalRenderer.program,
_globalRenderer.uniformCache,
{ "skirtLength", "minLatLon", "lonLatScalingFactor" }
);
}
setBoundingSphere(static_cast<float>(
_ellipsoid.maximumRadius() * data.modelTransform.scale
));
@@ -739,6 +783,12 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&) {
);
}
const float dsf = static_cast<float>(
_generalProperties.lodScaleFactor * _ellipsoid.minimumRadius()
);
_globalRenderer.program->setUniform("distanceScaleFactor", dsf);
_globalRenderer.updatedSinceLastCall = false;
}
@@ -755,6 +805,11 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&) {
);
}
const float dsf = static_cast<float>(
_generalProperties.lodScaleFactor * _ellipsoid.minimumRadius()
);
_localRenderer.program->setUniform("distanceScaleFactor", dsf);
_localRenderer.updatedSinceLastCall = false;
}