Merge pull request #2784 from Capostrophic/specular

Disable specular lighting for 4.0.0.2 and earlier files
pull/578/head
Bret Curtis 5 years ago committed by GitHub
commit 7ade0cb2c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1705,7 +1705,8 @@ namespace NifOsg
{ {
osg::StateSet* stateset = node->getOrCreateStateSet(); osg::StateSet* stateset = node->getOrCreateStateSet();
int specFlags = 0; // Specular is disabled by default, even if there's a specular color in the NiMaterialProperty // Specular lighting is enabled by default, but there's a quirk...
int specFlags = 1;
osg::ref_ptr<osg::Material> mat (new osg::Material); osg::ref_ptr<osg::Material> mat (new osg::Material);
mat->setColorMode(hasVertexColors ? osg::Material::AMBIENT_AND_DIFFUSE : osg::Material::OFF); mat->setColorMode(hasVertexColors ? osg::Material::AMBIENT_AND_DIFFUSE : osg::Material::OFF);
@ -1723,6 +1724,7 @@ namespace NifOsg
{ {
case Nif::RC_NiSpecularProperty: case Nif::RC_NiSpecularProperty:
{ {
// Specular property can turn specular lighting off.
specFlags = property->flags; specFlags = property->flags;
break; break;
} }
@ -1806,7 +1808,8 @@ namespace NifOsg
} }
} }
if (specFlags == 0) // While NetImmerse and Gamebryo support specular lighting, Morrowind has its support disabled.
if (mVersion <= Nif::NIFFile::NIFVersion::VER_MW || specFlags == 0)
mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f,0.f,0.f,0.f)); mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f,0.f,0.f,0.f));
// Particles don't have normals, so can't be diffuse lit. // Particles don't have normals, so can't be diffuse lit.

Loading…
Cancel
Save