Remove redundant qualifiers

pull/3063/head
Andrei Kortunov 4 years ago
parent ac347810ca
commit 0c7ddd3938

@ -861,7 +861,7 @@ namespace SceneUtil
if (ffp) if (ffp)
{ {
initFFP(LightManager::mFFPMaxLights); initFFP(mFFPMaxLights);
return; return;
} }
@ -1044,7 +1044,7 @@ namespace SceneUtil
auto* stateset = getOrCreateStateSet(); auto* stateset = getOrCreateStateSet();
setLightingMethod(LightingMethod::PerObjectUniform); setLightingMethod(LightingMethod::PerObjectUniform);
setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, LightManager::mMaxLightsUpperLimit)); setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, mMaxLightsUpperLimit));
stateset->setAttributeAndModes(new LightManagerStateAttributePerObjectUniform(this), osg::StateAttribute::ON); stateset->setAttributeAndModes(new LightManagerStateAttributePerObjectUniform(this), osg::StateAttribute::ON);
stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights())); stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights()));
@ -1053,7 +1053,7 @@ namespace SceneUtil
void LightManager::initSingleUBO(int targetLights) void LightManager::initSingleUBO(int targetLights)
{ {
setLightingMethod(LightingMethod::SingleUBO); setLightingMethod(LightingMethod::SingleUBO);
setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, LightManager::mMaxLightsUpperLimit)); setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, mMaxLightsUpperLimit));
for (int i = 0; i < 2; ++i) for (int i = 0; i < 2; ++i)
{ {

Loading…
Cancel
Save