AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-30 00:28:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

NifLoader: create the BumpTexture slot, but don't use it yet

Browse Source
This commit is contained in:
scrawl 2016-02-14 23:29:00 +01:00
parent 4cd4131da9
commit 606758d72f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/nifosg/nifloader.cpp
View File

@ -1230,6 +1230,7 @@ namespace NifOsg
case Nif::NiTexturingProperty::BaseTexture: case Nif::NiTexturingProperty::BaseTexture:
case Nif::NiTexturingProperty::GlowTexture: case Nif::NiTexturingProperty::GlowTexture:
case Nif::NiTexturingProperty::DarkTexture: case Nif::NiTexturingProperty::DarkTexture:
case Nif::NiTexturingProperty::BumpTexture:
case Nif::NiTexturingProperty::DetailTexture: case Nif::NiTexturingProperty::DetailTexture:
break; break;
case Nif::NiTexturingProperty::GlossTexture: case Nif::NiTexturingProperty::GlossTexture:
@ -1237,11 +1238,6 @@ namespace NifOsg
std::cerr << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used." << std::endl; std::cerr << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used." << std::endl;
continue; continue;
} }
case Nif::NiTexturingProperty::BumpTexture:
{
std::cerr << "NiTexturingProperty::BumpTexture in " << mFilename << " not currently used." << std::endl;
continue;
}
case Nif::NiTexturingProperty::DecalTexture: case Nif::NiTexturingProperty::DecalTexture:
{ {
std::cerr << "NiTexturingProperty::DecalTexture in " << mFilename << " not currently used." << std::endl; std::cerr << "NiTexturingProperty::DecalTexture in " << mFilename << " not currently used." << std::endl;
@ -1315,6 +1311,11 @@ namespace NifOsg
texEnv->setSource1_RGB(GL_TEXTURE); texEnv->setSource1_RGB(GL_TEXTURE);
stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON); stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
} }
else if (i == Nif::NiTexturingProperty::BumpTexture)
{
// Set this texture to Off by default since we can't render it with the fixed-function pipeline
stateset->setTextureMode(texUnit, GL_TEXTURE_2D, osg::StateAttribute::OFF);
}
switch (i) switch (i)
{ {