mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:53:50 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-07-30 10:28:14 +02:00
commit d310753e0f
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
components/nifosg/nifloader.cpp
View file

@ -903,7 +903,7 @@ namespace NifOsg
int uvSet = *it; int uvSet = *it;
if (uvSet >= (int)data->uvlist.size()) if (uvSet >= (int)data->uvlist.size())
{ {
std::cerr << "Warning: using an undefined UV set " << uvSet << " on TriShape " << triShape->name << " in " << mFilename << std::endl; std::cerr << "Warning: using an undefined UV set " << uvSet << " on TriShape \"" << triShape->name << "\" in " << mFilename << std::endl;
continue; continue;
} }
@ -1264,13 +1264,34 @@ namespace NifOsg
{ {
if (texprop->textures[i].inUse) if (texprop->textures[i].inUse)
{ {
if (i != Nif::NiTexturingProperty::BaseTexture switch(i)
&& i != Nif::NiTexturingProperty::GlowTexture
&& i != Nif::NiTexturingProperty::DarkTexture
&& i != Nif::NiTexturingProperty::DetailTexture)
{ {
std::cerr << "Warning: unhandled texture stage " << i << " in " << mFilename << std::endl; //These are handled later on
continue; case Nif::NiTexturingProperty::BaseTexture:
case Nif::NiTexturingProperty::GlowTexture:
case Nif::NiTexturingProperty::DarkTexture:
case Nif::NiTexturingProperty::DetailTexture:
break;
case Nif::NiTexturingProperty::GlossTexture:
{
std::cerr << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used." << std::endl;
continue;
}
case Nif::NiTexturingProperty::BumpTexture:
{
std::cerr << "NiTexturingProperty::BumpTexture in " << mFilename << " not currently used." << std::endl;
continue;
}
case Nif::NiTexturingProperty::DecalTexture:
{
std::cerr << "NiTexturingProperty::DecalTexture in " << mFilename << " not currently used." << std::endl;
continue;
}
default:
{
std::cerr << "Warning: unhandled texture stage " << i << " in " << mFilename << std::endl;
continue;
}
} }
const Nif::NiTexturingProperty::Texture& tex = texprop->textures[i]; const Nif::NiTexturingProperty::Texture& tex = texprop->textures[i];