mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 07:06:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 'shininess' into 'master'

Browse source 
Silence OSG shininess limit warnings

See merge request OpenMW/openmw!3725
This commit is contained in:
psi29a 2024-01-06 11:26:40 +00:00
commit 21f177daac
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/nifosg/nifloader.cpp
View file

@ -2599,7 +2599,10 @@ namespace NifOsg
emissiveMult = matprop->mEmissiveMult;
mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->mSpecular, 1.f));
mat->setShininess(osg::Material::FRONT_AND_BACK, matprop->mGlossiness);
// NIFs may provide specular exponents way above OpenGL's limit.
// They can't be used properly, but we don't need OSG to constantly harass us about it.
float glossiness = std::clamp(matprop->mGlossiness, 0.f, 128.f);
mat->setShininess(osg::Material::FRONT_AND_BACK, glossiness);
if (!matprop->mController.empty())
{
@ -2714,7 +2717,8 @@ namespace NifOsg
mat->setAlpha(osg::Material::FRONT_AND_BACK, shaderprop->mAlpha);
mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(shaderprop->mEmissive, 1.f));
mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(shaderprop->mSpecular, 1.f));
mat->setShininess(osg::Material::FRONT_AND_BACK, shaderprop->mGlossiness);
float glossiness = std::clamp(shaderprop->mGlossiness, 0.f, 128.f);
mat->setShininess(osg::Material::FRONT_AND_BACK, glossiness);
emissiveMult = shaderprop->mEmissiveMult;
specStrength = shaderprop->mSpecStrength;
specEnabled = shaderprop->specular();