Minor naming updates

AcademySoftwareFoundation · Dec 23, 2023 · 86c89ce · 86c89ce
1 parent 12ef1d8
commit 86c89ce
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/source/MaterialXRender/LightHandler.h b/source/MaterialXRender/LightHandler.h
@@ -103,13 +103,13 @@ class MX_RENDER_API LightHandler
  }
 
  /// Set the environment radiance map for the pre-convolved environment lighting model.
- void setEnvRadianceMapPreConvolved(ImagePtr map)
+ void setEnvPreConvolvedMap(ImagePtr map)
  {
  _envRadianceMapPreConvolved = map;
  }
 
  /// Return the environment radiance map for the pre-convolved environment lighting model.
- ImagePtr getEnvRadianceMapPreConvolved() const
+ ImagePtr getEnvPreConvolvedMap() const
  {
  return _envRadianceMapPreConvolved;
  }

diff --git a/source/MaterialXRenderGlsl/GlslProgram.cpp b/source/MaterialXRenderGlsl/GlslProgram.cpp
@@ -582,7 +582,7 @@ void GlslProgram::bindLighting(LightHandlerPtr lightHandler, ImageHandlerPtr ima
  if (lightHandler->getIndirectLighting())
  {
  envRadiance = lightHandler->getUsePreConvolvedEnvLighting() ?
- lightHandler->getEnvRadianceMapPreConvolved() :
+ lightHandler->getEnvPreConvolvedMap() :
  lightHandler->getEnvRadianceMap();
  }
  else

diff --git a/source/MaterialXRenderMsl/MslPipelineStateObject.mm b/source/MaterialXRenderMsl/MslPipelineStateObject.mm
@@ -594,7 +594,7 @@ int GetStrideOfMetalType(MTLDataType type)
  // Bind environment lights.
  ImageMap envLights =
  {
- { HW::ENV_RADIANCE, lightHandler->getUsePreConvolvedEnvLighting() ? lightHandler->getEnvRadianceMapPreConvolved() : lightHandler->getEnvRadianceMap() },
+ { HW::ENV_RADIANCE, lightHandler->getUsePreConvolvedEnvLighting() ? lightHandler->getEnvPreConvolvedMap() : lightHandler->getEnvRadianceMap() },
  { HW::ENV_IRRADIANCE, lightHandler->getEnvIrradianceMap() }
  };
  for (const auto& env : envLights)

diff --git a/source/MaterialXView/RenderPipelineGL.cpp b/source/MaterialXView/RenderPipelineGL.cpp
@@ -116,7 +116,7 @@ void GLRenderPipeline::convolveEnvironment()
  auto& lightHandler = _viewer->_lightHandler;
  auto& imageHandler = _viewer->_imageHandler;
 
- if (lightHandler->getEnvRadianceMapPreConvolved())
+ if (lightHandler->getEnvPreConvolvedMap())
  {
  return;
  }
@@ -186,7 +186,7 @@ void GLRenderPipeline::convolveEnvironment()
  glViewport(0, 0, _viewer->m_fbsize[0], _viewer->m_fbsize[1]);
  glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
 
- lightHandler->setEnvRadianceMapPreConvolved(outTex);
+ lightHandler->setEnvPreConvolvedMap(outTex);
 }
 
 mx::ImagePtr GLRenderPipeline::getShadowMap(int shadowMapSize)

diff --git a/source/MaterialXView/RenderPipelineMetal.mm b/source/MaterialXView/RenderPipelineMetal.mm
@@ -161,7 +161,7 @@
  auto& lightHandler = _viewer->_lightHandler;
  auto& imageHandler = _viewer->_imageHandler;
 
- if (lightHandler->getEnvRadianceMapPreConvolved())
+ if (lightHandler->getEnvPreConvolvedMap())
  {
  return;
  }
@@ -243,7 +243,7 @@
 
  MTL_POP_FRAMEBUFFER();
 
- lightHandler->setEnvRadianceMapPreConvolved(outTex);
+ lightHandler->setEnvPreConvolvedMap(outTex);
 }
 
 mx::ImagePtr MetalRenderPipeline::getShadowMap(int shadowMapSize)

diff --git a/source/MaterialXView/Viewer.cpp b/source/MaterialXView/Viewer.cpp
@@ -485,12 +485,12 @@ void Viewer::loadEnvironmentLight()
 
  // Release any existing environment maps and store the new ones.
  _imageHandler->releaseRenderResources(_lightHandler->getEnvRadianceMap());
- _lightHandler->setEnvRadianceMapPreConvolved(nullptr);
- _imageHandler->releaseRenderResources(_lightHandler->getEnvRadianceMapPreConvolved());
+ _imageHandler->releaseRenderResources(_lightHandler->getEnvPreConvolvedMap());
  _imageHandler->releaseRenderResources(_lightHandler->getEnvIrradianceMap());
 
  _lightHandler->setEnvRadianceMap(envRadianceMap);
  _lightHandler->setEnvIrradianceMap(envIrradianceMap);
+ _lightHandler->setEnvPreConvolvedMap(nullptr);
 
  // Look for a light rig using an expected filename convention.
  if (!_splitDirectLight)