mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 17:09:41 +00:00
Code Issues Releases Wiki Activity

Update keygroup/morph loading

Browse source
This commit is contained in:
Alexei Kotov 2023-09-06 00:32:04 +03:00
parent efe1c66536
commit 5b8f574be3
1 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
components/nif/nifkey.hpp
View file

@ -49,7 +49,9 @@ namespace Nif
using ValueType = T; using ValueType = T;
using KeyType = KeyT<T>; using KeyType = KeyT<T>;
unsigned int mInterpolationType = InterpolationType_Unknown; std::string mFrameName;
float mLegacyWeight;
uint32_t mInterpolationType = InterpolationType_Unknown;
MapType mKeys; MapType mKeys;
// Read in a KeyGroup (see http://niftools.sourceforge.net/doc/nif/NiKeyframeData.html) // Read in a KeyGroup (see http://niftools.sourceforge.net/doc/nif/NiKeyframeData.html)
@ -57,21 +59,25 @@ namespace Nif
{ {
assert(nif); assert(nif);
if (morph && nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 106)) if (morph)
nif->getString(); // Frame name
if (morph && nif->getVersion() > NIFStream::generateVersion(10, 1, 0, 0))
{ {
if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 104) if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 106))
&& nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 2) && nif->getBethVersion() < 10) nif->read(mFrameName);
nif->getFloat(); // Legacy weight
return; if (nif->getVersion() > NIFStream::generateVersion(10, 1, 0, 0))
{
if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 104)
&& nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 2) && nif->getBethVersion() < 10)
nif->read(mLegacyWeight);
return;
}
} }
size_t count = nif->getUInt(); uint32_t count;
nif->read(count);
if (count != 0 || morph) if (count != 0 || morph)
mInterpolationType = nif->getUInt(); nif->read(mInterpolationType);
KeyType key = {}; KeyType key = {};
@ -79,7 +85,8 @@ namespace Nif
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
float time = nif->getFloat(); float time;
nif->read(time);
readValue(*nif, key); readValue(*nif, key);
mKeys[time] = key; mKeys[time] = key;
} }
@ -88,7 +95,8 @@ namespace Nif
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
float time = nif->getFloat(); float time;
nif->read(time);
readQuadratic(*nif, key); readQuadratic(*nif, key);
mKeys[time] = key; mKeys[time] = key;
} }
@ -97,7 +105,8 @@ namespace Nif
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
float time = nif->getFloat(); float time;
nif->read(time);
readTBC(*nif, key); readTBC(*nif, key);
mKeys[time] = key; mKeys[time] = key;
} }
@ -134,16 +143,16 @@ namespace Nif
static void readTBC(NIFStream& nif, KeyT<T>& key) static void readTBC(NIFStream& nif, KeyT<T>& key)
{ {
readValue(nif, key); readValue(nif, key);
/*key.mTension = */ nif.getFloat(); /*key.mTension = */ nif.get<float>();
/*key.mBias = */ nif.getFloat(); /*key.mBias = */ nif.get<float>();
/*key.mContinuity = */ nif.getFloat(); /*key.mContinuity = */ nif.get<float>();
} }
}; };
using FloatKeyMap = KeyMapT<float, &NIFStream::getFloat>; using FloatKeyMap = KeyMapT<float, &NIFStream::get<float>>;
using Vector3KeyMap = KeyMapT<osg::Vec3f, &NIFStream::getVector3>; using Vector3KeyMap = KeyMapT<osg::Vec3f, &NIFStream::get<osg::Vec3f>>;
using Vector4KeyMap = KeyMapT<osg::Vec4f, &NIFStream::getVector4>; using Vector4KeyMap = KeyMapT<osg::Vec4f, &NIFStream::get<osg::Vec4f>>;
using QuaternionKeyMap = KeyMapT<osg::Quat, &NIFStream::getQuaternion>; using QuaternionKeyMap = KeyMapT<osg::Quat, &NIFStream::get<osg::Quat>>;
using ByteKeyMap = KeyMapT<char, &NIFStream::getChar>; using ByteKeyMap = KeyMapT<char, &NIFStream::get<char>>;
using FloatKeyMapPtr = std::shared_ptr<FloatKeyMap>; using FloatKeyMapPtr = std::shared_ptr<FloatKeyMap>;
using Vector3KeyMapPtr = std::shared_ptr<Vector3KeyMap>; using Vector3KeyMapPtr = std::shared_ptr<Vector3KeyMap>;