Address review

Author: Capostrophic

apps/openmw/mwrender/renderingmanager.cpp

@@ -274,7 +274,6 @@ namespace MWRender
             mPostProcessor->getTexture(PostProcessor::Tex_OpaqueDepth, 1));
         resourceSystem->getSceneManager()->setSupportsNormalsRT(mPostProcessor->getSupportsNormalsRT());
         resourceSystem->getSceneManager()->setWeatherParticleOcclusion(Settings::shaders().mWeatherParticleOcclusion);
-        resourceSystem->getSceneManager()->setParticlePointLighting(Settings::shaders().mParticlePointLighting);
 
         // water goes after terrain for correct waterculling order
         mWater = std::make_unique<Water>(

components/resource/scenemanager.cpp

@@ -1206,7 +1206,6 @@ namespace Resource
         shaderVisitor->setAdjustCoverageForAlphaTest(mAdjustCoverageForAlphaTest);
         shaderVisitor->setSupportsNormalsRT(mSupportsNormalsRT);
         shaderVisitor->setWeatherParticleOcclusion(mWeatherParticleOcclusion);
-        shaderVisitor->setParticlePointLighting(mParticlePointLighting);
         return shaderVisitor;
     }
 }

components/resource/scenemanager.hpp

@@ -221,8 +221,6 @@ namespace Resource
 
         void setWeatherParticleOcclusion(bool value) { mWeatherParticleOcclusion = value; }
 
-        void setParticlePointLighting(bool value) { mParticlePointLighting = value; }
-
     private:
         osg::ref_ptr<Shader::ShaderVisitor> createShaderVisitor(const std::string& shaderPrefix = "objects");
         osg::ref_ptr<osg::Node> loadErrorMarker();
@@ -257,7 +255,6 @@ namespace Resource
         bool mAdjustCoverageForAlphaTest = false;
         bool mSupportsNormalsRT = false;
         bool mWeatherParticleOcclusion = false;
-        bool mParticlePointLighting = true;
         bool mUnRefImageDataAfterApply = false;
 
         SceneManager(const SceneManager&) = delete;

components/sceneutil/clusteredlighting.hpp

@@ -1,5 +1,5 @@
-#ifndef OPENMW_COMPONENTS_SCENEUTIL_CLUSTERED_H
-#define OPENMW_COMPONENTS_SCENEUTIL_CLUSTERED_H
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_CLUSTEREDLIGHTING_HPP
+#define OPENMW_COMPONENTS_SCENEUTIL_CLUSTEREDLIGHTING_HPP
 
 #include <cstdint>
 #include <osg/Vec4f>

components/shader/shadervisitor.hpp

@@ -47,8 +47,6 @@ namespace Shader
 
         void setWeatherParticleOcclusion(bool value) { mWeatherParticleOcclusion = value; }
 
-        void setParticlePointLighting(bool value) { mParticlePointLighting = value; }
-
         void apply(osg::Node& node) override;
 
         void apply(osg::Drawable& drawable) override;
@@ -74,7 +72,6 @@ namespace Shader
 
         bool mSupportsNormalsRT;
         bool mWeatherParticleOcclusion = false;
-        bool mParticlePointLighting = true;
 
         ShaderManager& mShaderManager;
         Resource::ImageManager& mImageManager;