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

Use a key list for NiColorData

Browse source
This commit is contained in:
Chris Robinson 2012-07-12 14:33:50 -07:00
parent 3f11b6b1ae
commit 9995dff943
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
components/nif/data.hpp
View file

@ -275,19 +275,11 @@ public:
class NiColorData : public Record class NiColorData : public Record
{ {
public: public:
struct ColorData Vector4KeyList mKeyList;
{
float time;
Ogre::Vector4 rgba;
};
void read(NIFFile *nif) void read(NIFFile *nif)
{ {
int count = nif->getInt(); mKeyList.read(nif);
nif->getInt(); // always 1
// Skip the data
nif->skip(count * 5*sizeof(float));
} }
}; };

2
components/nif/nif_file.hpp
View file

@ -223,6 +223,7 @@ struct KeyT {
}; };
typedef KeyT<float> FloatKey; typedef KeyT<float> FloatKey;
typedef KeyT<Ogre::Vector3> Vector3Key; typedef KeyT<Ogre::Vector3> Vector3Key;
typedef KeyT<Ogre::Vector4> Vector4Key;
typedef KeyT<Ogre::Quaternion> QuaternionKey; typedef KeyT<Ogre::Quaternion> QuaternionKey;
template<typename T, T (NIFFile::*getValue)()> template<typename T, T (NIFFile::*getValue)()>
@ -281,6 +282,7 @@ struct KeyListT {
}; };
typedef KeyListT<float,&NIFFile::getFloat> FloatKeyList; typedef KeyListT<float,&NIFFile::getFloat> FloatKeyList;
typedef KeyListT<Ogre::Vector3,&NIFFile::getVector3> Vector3KeyList; typedef KeyListT<Ogre::Vector3,&NIFFile::getVector3> Vector3KeyList;
typedef KeyListT<Ogre::Vector4,&NIFFile::getVector4> Vector4KeyList;
typedef KeyListT<Ogre::Quaternion,&NIFFile::getQuaternion> QuaternionKeyList; typedef KeyListT<Ogre::Quaternion,&NIFFile::getQuaternion> QuaternionKeyList;
} // Namespace } // Namespace