teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Remove RTTI usage in NIF reader.

Browse source
This commit is contained in:
dreamer-dead 2014-06-05 18:53:12 +04:00
parent 1b9b275f30
commit e772bb88da
1 changed files with 66 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
components/nif/niffile.hpp
View file

@ -113,24 +113,24 @@ public:
}; };
/// Get a given record /// Get a given record
Record *getRecord(size_t index) Record *getRecord(size_t index) const
{ {
Record *res = records.at(index); Record *res = records.at(index);
assert(res != NULL); assert(res != NULL);
return res; return res;
} }
/// Number of records /// Number of records
size_t numRecords() { return records.size(); } size_t numRecords() const { return records.size(); }
/// Get a given root /// Get a given root
Record *getRoot(size_t index=0) Record *getRoot(size_t index=0) const
{ {
Record *res = roots.at(index); Record *res = roots.at(index);
assert(res != NULL); assert(res != NULL);
return res; return res;
} }
/// Number of roots /// Number of roots
size_t numRoots() { return roots.size(); } size_t numRoots() const { return roots.size(); }
}; };
@ -163,45 +163,33 @@ struct KeyListT {
void read(NIFStream *nif, bool force=false) void read(NIFStream *nif, bool force=false)
{ {
assert(nif);
size_t count = nif->getInt(); size_t count = nif->getInt();
if(count == 0 && !force) if(count == 0 && !force)
return; return;
mInterpolationType = nif->getInt(); mInterpolationType = nif->getInt();
mKeys.resize(count); mKeys.resize(count);
NIFStream &nifReference = *nif;
if(mInterpolationType == sLinearInterpolation) if(mInterpolationType == sLinearInterpolation)
{ {
for(size_t i = 0;i < count;i++) for(size_t i = 0;i < count;i++)
{ {
KeyT<T> &key = mKeys[i]; readTimeAndValue(nifReference, mKeys[i]);
key.mTime = nif->getFloat();
key.mValue = (nif->*getValue)();
} }
} }
else if(mInterpolationType == sQuadraticInterpolation) else if(mInterpolationType == sQuadraticInterpolation)
{ {
for(size_t i = 0;i < count;i++) for(size_t i = 0;i < count;i++)
{ {
KeyT<T> &key = mKeys[i]; readQuadratic(nifReference, mKeys[i]);
key.mTime = nif->getFloat();
key.mValue = (nif->*getValue)();
if( typeid(Ogre::Quaternion) != typeid(T) )
{
key.mForwardValue = (nif->*getValue)();
key.mBackwardValue = (nif->*getValue)();
}
} }
} }
else if(mInterpolationType == sTBCInterpolation) else if(mInterpolationType == sTBCInterpolation)
{ {
for(size_t i = 0;i < count;i++) for(size_t i = 0;i < count;i++)
{ {
KeyT<T> &key = mKeys[i]; readTBC(nifReference, mKeys[i]);
key.mTime = nif->getFloat();
key.mValue = (nif->*getValue)();
key.mTension = nif->getFloat();
key.mBias = 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. //\FIXME This now reads the correct amount of data in the file, but doesn't actually do anything with it.
@ -212,30 +200,8 @@ struct KeyListT {
nif->file->fail("count should always be '1' for XYZ_ROTATION_KEY. Retrieved Value: "+Ogre::StringConverter::toString(count)); nif->file->fail("count should always be '1' for XYZ_ROTATION_KEY. Retrieved Value: "+Ogre::StringConverter::toString(count));
return; return;
} }
//KeyGroup (see http://niftools.sourceforge.net/doc/nif/NiKeyframeData.html) readXYZ(nifReference);
//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)
{ {
if (count != 0) if (count != 0)
@ -244,6 +210,61 @@ struct KeyListT {
else else
nif->file->fail("Unhandled interpolation type: "+Ogre::StringConverter::toString(mInterpolationType)); nif->file->fail("Unhandled interpolation type: "+Ogre::StringConverter::toString(mInterpolationType));
} }
private:
static void readTimeAndValue(NIFStream &nif, KeyT<T> &key)
{
key.mTime = nif.getFloat();
key.mValue = (nif.*getValue)();
}
static void readQuadratic(NIFStream &nif, KeyT<Ogre::Quaternion> &key)
{
readTimeAndValue(nif, key);
}
template <typename U>
static void readQuadratic(NIFStream &nif, KeyT<U> &key)
{
readTimeAndValue(nif, key);
key.mForwardValue = (nif.*getValue)();
key.mBackwardValue = (nif.*getValue)();
}
static void readTBC(NIFStream &nif, KeyT<T> &key)
{
readTimeAndValue(nif, key);
key.mTension = nif.getFloat();
key.mBias = nif.getFloat();
key.mContinuity = nif.getFloat();
}
static void readXYZ(NIFStream &nif)
{
//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)
{
const unsigned int numKeys = nif.getInt();
if(numKeys != 0)
{
const 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!");
}
}
}; };
typedef KeyListT<float,&NIFStream::getFloat> FloatKeyList; typedef KeyListT<float,&NIFStream::getFloat> FloatKeyList;
typedef KeyListT<Ogre::Vector3,&NIFStream::getVector3> Vector3KeyList; typedef KeyListT<Ogre::Vector3,&NIFStream::getVector3> Vector3KeyList;