mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Temporally fixed attribute location error for NightLayers layer.

Browse Source
This commit is contained in:
Jonathas Costa
2020-10-15 16:50:27 -04:00
parent df125042bc
commit cde1fa8b5d
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/src/renderableglobe.cpp
+9
View File
@@ -1050,6 +1050,10 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
if (_globalRenderer.updatedSinceLastCall) { if (_globalRenderer.updatedSinceLastCall) {
const std::array<LayerGroup*, LayerManager::NumLayerGroups>& layerGroups = const std::array<LayerGroup*, LayerManager::NumLayerGroups>& layerGroups =
_layerManager.layerGroups(); _layerManager.layerGroups();
using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
_globalRenderer.program->setIgnoreUniformLocationError(IgnoreError::Yes);
_globalRenderer.program->setIgnoreAttributeLocationError(IgnoreError::Yes);
for (size_t i = 0; i < layerGroups.size(); ++i) { for (size_t i = 0; i < layerGroups.size(); ++i) {
const std::string& nameBase = layergroupid::LAYER_GROUP_IDENTIFIERS[i]; const std::string& nameBase = layergroupid::LAYER_GROUP_IDENTIFIERS[i];
_globalRenderer.gpuLayerGroups[i].bind( _globalRenderer.gpuLayerGroups[i].bind(
@@ -1059,6 +1063,8 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
static_cast<int>(i) static_cast<int>(i)
); );
} }
_globalRenderer.program->setIgnoreUniformLocationError(IgnoreError::No);
_globalRenderer.program->setIgnoreAttributeLocationError(IgnoreError::No);
const float dsf = static_cast<float>( const float dsf = static_cast<float>(
_generalProperties.currentLodScaleFactor * _ellipsoid.minimumRadius() _generalProperties.currentLodScaleFactor * _ellipsoid.minimumRadius()
@@ -1074,6 +1080,8 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
if (_localRenderer.updatedSinceLastCall) { if (_localRenderer.updatedSinceLastCall) {
const std::array<LayerGroup*, LayerManager::NumLayerGroups>& layerGroups = const std::array<LayerGroup*, LayerManager::NumLayerGroups>& layerGroups =
_layerManager.layerGroups(); _layerManager.layerGroups();
using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
_localRenderer.program->setIgnoreUniformLocationError(IgnoreError::Yes);
for (size_t i = 0; i < layerGroups.size(); ++i) { for (size_t i = 0; i < layerGroups.size(); ++i) {
const std::string& nameBase = layergroupid::LAYER_GROUP_IDENTIFIERS[i]; const std::string& nameBase = layergroupid::LAYER_GROUP_IDENTIFIERS[i];
_localRenderer.gpuLayerGroups[i].bind( _localRenderer.gpuLayerGroups[i].bind(
@@ -1083,6 +1091,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
static_cast<int>(i) static_cast<int>(i)
); );
} }
_localRenderer.program->setIgnoreUniformLocationError(IgnoreError::No);
const float dsf = static_cast<float>( const float dsf = static_cast<float>(
_generalProperties.currentLodScaleFactor * _ellipsoid.minimumRadius() _generalProperties.currentLodScaleFactor * _ellipsoid.minimumRadius()