From f15dc43e9dcbb7bd4daffd51d1558e49cc9d648f Mon Sep 17 00:00:00 2001 From: Micah Acinapura Date: Fri, 31 Jan 2020 10:31:41 -0500 Subject: [PATCH] uniform cleanup --- modules/globebrowsing/src/renderableglobe.cpp | 2 -- modules/globebrowsing/src/ringscomponent.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp index 84b2578442..44fb3d6041 100644 --- a/modules/globebrowsing/src/renderableglobe.cpp +++ b/modules/globebrowsing/src/renderableglobe.cpp @@ -1333,7 +1333,6 @@ void RenderableGlobe::renderChunkGlobally(const Chunk& chunk, const RenderData& glBindTexture(GL_TEXTURE_2D, shadowData.shadowDepthTexture); program.setUniform("shadowMapTexture", shadowMapUnit); - //program.setUniform("nShadowSamples", _generalProperties.nShadowSamples); program.setUniform("zFightingPercentage", _generalProperties.zFightingPercentage); } @@ -1461,7 +1460,6 @@ void RenderableGlobe::renderChunkLocally(const Chunk& chunk, const RenderData& d glBindTexture(GL_TEXTURE_2D, shadowData.shadowDepthTexture); program.setUniform("shadowMapTexture", shadowMapUnit); - //program.setUniform("nShadowSamples", _generalProperties.nShadowSamples); program.setUniform("zFightingPercentage", _generalProperties.zFightingPercentage); } diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp index a920af6b59..65801085cf 100644 --- a/modules/globebrowsing/src/ringscomponent.cpp +++ b/modules/globebrowsing/src/ringscomponent.cpp @@ -326,7 +326,7 @@ void RingsComponent::draw(const RenderData& data, _shader->setUniform(_uniformCache.nightFactor, _nightFactor); _shader->setUniform(_uniformCache.sunPosition, _sunPosition); _shader->setUniform(_uniformCache.zFightingPercentage, _zFightingPercentage); - + ringTextureUnit.activate(); _texture->bind(); _shader->setUniform(_uniformCache.ringTexture, ringTextureUnit);