diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index 74916dcb61..1506b0505c 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -147,8 +147,6 @@ namespace MWRender resourceSystem->getSceneManager()->setNormalHeightMapPattern(Settings::shaders().mNormalHeightMapPattern); resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::shaders().mAutoUseObjectSpecularMaps); resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::shaders().mSpecularMapPattern); - resourceSystem->getSceneManager()->setApplyLightingToEnvMaps( - Settings::shaders().mApplyLightingToEnvironmentMaps); resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(shouldAddMSAAIntermediateTarget()); resourceSystem->getSceneManager()->setAdjustCoverageForAlphaTest( Settings::shaders().mAdjustCoverageForAlphaTest); diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp index 00b4fb9b37..e0f26ada1a 100644 --- a/components/resource/scenemanager.cpp +++ b/components/resource/scenemanager.cpp @@ -497,11 +497,6 @@ namespace Resource mSpecularMapPattern = pattern; } - void SceneManager::setApplyLightingToEnvMaps(bool apply) - { - mApplyLightingToEnvMaps = apply; - } - void SceneManager::setSupportedLightingMethods(const SceneUtil::LightManager::SupportedMethods& supported) { mSupportedLightingMethods = supported; @@ -1225,7 +1220,6 @@ namespace Resource shaderVisitor->setNormalHeightMapPattern(mNormalHeightMapPattern); shaderVisitor->setAutoUseSpecularMaps(mAutoUseSpecularMaps); shaderVisitor->setSpecularMapPattern(mSpecularMapPattern); - shaderVisitor->setApplyLightingToEnvMaps(mApplyLightingToEnvMaps); shaderVisitor->setConvertAlphaTestToAlphaToCoverage(mConvertAlphaTestToAlphaToCoverage); shaderVisitor->setAdjustCoverageForAlphaTest(mAdjustCoverageForAlphaTest); shaderVisitor->setSupportsNormalsRT(mSupportsNormalsRT); diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp index 0be0cc6c65..9ceae7ce23 100644 --- a/components/resource/scenemanager.hpp +++ b/components/resource/scenemanager.hpp @@ -120,8 +120,6 @@ namespace Resource void setSpecularMapPattern(const std::string& pattern); - void setApplyLightingToEnvMaps(bool apply); - void setSupportedLightingMethods(const SceneUtil::LightManager::SupportedMethods& supported); bool isSupportedLightingMethod(SceneUtil::LightingMethod method) const; @@ -256,7 +254,6 @@ namespace Resource SceneUtil::LightManager::SupportedMethods mSupportedLightingMethods; bool mAutoUseNormalMaps = false; bool mAutoUseSpecularMaps = false; - bool mApplyLightingToEnvMaps = false; bool mConvertAlphaTestToAlphaToCoverage = false; bool mAdjustCoverageForAlphaTest = false; bool mSupportsNormalsRT = false; diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp index a9ad457a67..365d9bea83 100644 --- a/components/shader/shadervisitor.cpp +++ b/components/shader/shadervisitor.cpp @@ -197,7 +197,6 @@ namespace Shader , mAllowedToModifyStateSets(true) , mAutoUseNormalMaps(false) , mAutoUseSpecularMaps(false) - , mApplyLightingToEnvMaps(false) , mConvertAlphaTestToAlphaToCoverage(false) , mAdjustCoverageForAlphaTest(false) , mSupportsNormalsRT(false) @@ -897,11 +896,6 @@ namespace Shader mSpecularMapPattern = pattern; } - void ShaderVisitor::setApplyLightingToEnvMaps(bool apply) - { - mApplyLightingToEnvMaps = apply; - } - void ShaderVisitor::setConvertAlphaTestToAlphaToCoverage(bool convert) { mConvertAlphaTestToAlphaToCoverage = convert; diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp index 64bf3446e8..f99650b4e6 100644 --- a/components/shader/shadervisitor.hpp +++ b/components/shader/shadervisitor.hpp @@ -40,8 +40,6 @@ namespace Shader void setSpecularMapPattern(const std::string& pattern); - void setApplyLightingToEnvMaps(bool apply); - void setConvertAlphaTestToAlphaToCoverage(bool convert); void setAdjustCoverageForAlphaTest(bool adjustCoverage); @@ -69,8 +67,6 @@ namespace Shader bool mAutoUseSpecularMaps; std::string mSpecularMapPattern; - bool mApplyLightingToEnvMaps; - bool mConvertAlphaTestToAlphaToCoverage; bool mAdjustCoverageForAlphaTest;