mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 21:35:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'emperorarthur/nif_fix'

Browse Source
This commit is contained in:
Marc Zinnschlag 2014-05-28 11:15:01 +02:00
commit d02f7ac775
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/nif/niffile.hpp
View File

@ -155,6 +155,7 @@ struct KeyListT {
static const int sLinearInterpolation = 1; static const int sLinearInterpolation = 1;
static const int sQuadraticInterpolation = 2; static const int sQuadraticInterpolation = 2;
static const int sTBCInterpolation = 3; static const int sTBCInterpolation = 3;
static const int sXYZInterpolation = 4;
int mInterpolationType; int mInterpolationType;
VecType mKeys; VecType mKeys;
@ -198,6 +199,38 @@ struct KeyListT {
key.mBias = nif->getFloat(); key.mBias = nif->getFloat();
key.mContinuity = nif->getFloat(); key.mContinuity = nif->getFloat();
} }
}
//\FIXME This now reads the correct amount of data in the file, but doesn't actually do anything with it.
else if(mInterpolationType == sXYZInterpolation)
{
if (count != 1)
{
nif->file->fail("count should always be '1' for XYZ_ROTATION_KEY. Retrieved Value: "+Ogre::StringConverter::toString(count));
return;
}
//KeyGroup (see http://niftools.sourceforge.net/doc/nif/NiKeyframeData.html)
//Chomp unknown and possibly unused float
nif->getFloat();
for(size_t i=0;i<3;++i)
{
unsigned int numKeys = nif->getInt();
if(numKeys != 0)
{
int interpolationTypeAgain = nif->getInt();
if( interpolationTypeAgain != sLinearInterpolation)
{
nif->file->fail("XYZ_ROTATION_KEY's KeyGroup keyType must be '1' (Linear Interpolation). Retrieved Value: "+Ogre::StringConverter::toString(interpolationTypeAgain));
return;
}
for(size_t j = 0;j < numKeys;j++)
{
//For now just chomp these
nif->getFloat();
nif->getFloat();
}
}
nif->file->warn("XYZ_ROTATION_KEY read, but not used!");
}
} }
else if (mInterpolationType == 0) else if (mInterpolationType == 0)
{ {