mirror of
https://github.com/OpenMW/openmw.git
synced 2026-05-06 07:56:40 -04:00
Merge branch 'mcpnameforthissettingsucks' into 'master'
Remove dead code See merge request OpenMW/openmw!5231
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user