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

Share keyframe data in NIF resource (Fixes #908)

Browse source
This commit is contained in:
scrawl 2014-08-23 19:45:08 +02:00
parent 2b407a9995
commit 1a8acac40a
1 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
components/nifogre/ogrenifloader.cpp
View file

@ -391,9 +391,10 @@ public:
class Value : public NodeTargetValue<Ogre::Real>, public ValueInterpolator class Value : public NodeTargetValue<Ogre::Real>, public ValueInterpolator
{ {
private: private:
Nif::QuaternionKeyList mRotations; const Nif::QuaternionKeyList* mRotations;
Nif::Vector3KeyList mTranslations; const Nif::Vector3KeyList* mTranslations;
Nif::FloatKeyList mScales; const Nif::FloatKeyList* mScales;
Nif::NIFFilePtr mNif; // Hold a SharedPtr to make sure key lists stay valid
using ValueInterpolator::interpKey; using ValueInterpolator::interpKey;
@ -421,31 +422,33 @@ public:
} }
public: public:
Value(Ogre::Node *target, const Nif::NiKeyframeData *data) /// @note The NiKeyFrameData must be valid as long as this KeyframeController exists.
Value(Ogre::Node *target, const Nif::NIFFilePtr& nif, const Nif::NiKeyframeData *data)
: NodeTargetValue<Ogre::Real>(target) : NodeTargetValue<Ogre::Real>(target)
, mRotations(data->mRotations) , mRotations(&data->mRotations)
, mTranslations(data->mTranslations) , mTranslations(&data->mTranslations)
, mScales(data->mScales) , mScales(&data->mScales)
, mNif(nif)
{ } { }
virtual Ogre::Quaternion getRotation(float time) const virtual Ogre::Quaternion getRotation(float time) const
{ {
if(mRotations.mKeys.size() > 0) if(mRotations->mKeys.size() > 0)
return interpKey(mRotations.mKeys, time); return interpKey(mRotations->mKeys, time);
return mNode->getOrientation(); return mNode->getOrientation();
} }
virtual Ogre::Vector3 getTranslation(float time) const virtual Ogre::Vector3 getTranslation(float time) const
{ {
if(mTranslations.mKeys.size() > 0) if(mTranslations->mKeys.size() > 0)
return interpKey(mTranslations.mKeys, time); return interpKey(mTranslations->mKeys, time);
return mNode->getPosition(); return mNode->getPosition();
} }
virtual Ogre::Vector3 getScale(float time) const virtual Ogre::Vector3 getScale(float time) const
{ {
if(mScales.mKeys.size() > 0) if(mScales->mKeys.size() > 0)
return Ogre::Vector3(interpKey(mScales.mKeys, time)); return Ogre::Vector3(interpKey(mScales->mKeys, time));
return mNode->getScale(); return mNode->getScale();
} }
@ -457,12 +460,12 @@ public:
virtual void setValue(Ogre::Real time) virtual void setValue(Ogre::Real time)
{ {
if(mRotations.mKeys.size() > 0) if(mRotations->mKeys.size() > 0)
mNode->setOrientation(interpKey(mRotations.mKeys, time)); mNode->setOrientation(interpKey(mRotations->mKeys, time));
if(mTranslations.mKeys.size() > 0) if(mTranslations->mKeys.size() > 0)
mNode->setPosition(interpKey(mTranslations.mKeys, time)); mNode->setPosition(interpKey(mTranslations->mKeys, time));
if(mScales.mKeys.size() > 0) if(mScales->mKeys.size() > 0)
mNode->setScale(Ogre::Vector3(interpKey(mScales.mKeys, time))); mNode->setScale(Ogre::Vector3(interpKey(mScales->mKeys, time)));
} }
}; };
@ -932,7 +935,7 @@ class NIFObjectLoader
} }
static void createNodeControllers(const std::string &name, Nif::ControllerPtr ctrl, ObjectScenePtr scene, int animflags) static void createNodeControllers(const Nif::NIFFilePtr& nif, const std::string &name, Nif::ControllerPtr ctrl, ObjectScenePtr scene, int animflags)
{ {
do { do {
if (ctrl->flags & Nif::NiNode::ControllerFlag_Active) if (ctrl->flags & Nif::NiNode::ControllerFlag_Active)
@ -966,7 +969,7 @@ class NIFObjectLoader
Ogre::ControllerValueRealPtr srcval((animflags&Nif::NiNode::AnimFlag_AutoPlay) ? Ogre::ControllerValueRealPtr srcval((animflags&Nif::NiNode::AnimFlag_AutoPlay) ?
Ogre::ControllerManager::getSingleton().getFrameTimeSource() : Ogre::ControllerManager::getSingleton().getFrameTimeSource() :
Ogre::ControllerValueRealPtr()); Ogre::ControllerValueRealPtr());
Ogre::ControllerValueRealPtr dstval(OGRE_NEW KeyframeController::Value(trgtbone, key->data.getPtr())); Ogre::ControllerValueRealPtr dstval(OGRE_NEW KeyframeController::Value(trgtbone, nif, key->data.getPtr()));
KeyframeController::Function* function = OGRE_NEW KeyframeController::Function(key, (animflags&Nif::NiNode::AnimFlag_AutoPlay)); KeyframeController::Function* function = OGRE_NEW KeyframeController::Function(key, (animflags&Nif::NiNode::AnimFlag_AutoPlay));
scene->mMaxControllerLength = std::max(function->mStopTime, scene->mMaxControllerLength); scene->mMaxControllerLength = std::max(function->mStopTime, scene->mMaxControllerLength);
Ogre::ControllerFunctionRealPtr func(function); Ogre::ControllerFunctionRealPtr func(function);
@ -1019,7 +1022,7 @@ class NIFObjectLoader
} }
static void createObjects(const std::string &name, const std::string &group, static void createObjects(const Nif::NIFFilePtr& nif, const std::string &name, const std::string &group,
Ogre::SceneNode *sceneNode, const Nif::Node *node, Ogre::SceneNode *sceneNode, const Nif::Node *node,
ObjectScenePtr scene, int flags, int animflags, int partflags) ObjectScenePtr scene, int flags, int animflags, int partflags)
{ {
@ -1076,7 +1079,7 @@ class NIFObjectLoader
} }
if(!node->controller.empty()) if(!node->controller.empty())
createNodeControllers(name, node->controller, scene, animflags); createNodeControllers(nif, name, node->controller, scene, animflags);
if(node->recType == Nif::RC_NiCamera) if(node->recType == Nif::RC_NiCamera)
{ {
@ -1101,7 +1104,7 @@ class NIFObjectLoader
for(size_t i = 0;i < children.length();i++) for(size_t i = 0;i < children.length();i++)
{ {
if(!children[i].empty()) if(!children[i].empty())
createObjects(name, group, sceneNode, children[i].getPtr(), scene, flags, animflags, partflags); createObjects(nif, name, group, sceneNode, children[i].getPtr(), scene, flags, animflags, partflags);
} }
} }
} }
@ -1148,7 +1151,7 @@ public:
// Create a base skeleton entity if this NIF needs one // Create a base skeleton entity if this NIF needs one
createSkelBase(name, group, sceneNode->getCreator(), node, scene); createSkelBase(name, group, sceneNode->getCreator(), node, scene);
} }
createObjects(name, group, sceneNode, node, scene, flags, 0, 0); createObjects(nif, name, group, sceneNode, node, scene, flags, 0, 0);
} }
static void loadKf(Ogre::Skeleton *skel, const std::string &name, static void loadKf(Ogre::Skeleton *skel, const std::string &name,
@ -1205,7 +1208,7 @@ public:
Ogre::Bone *trgtbone = skel->getBone(strdata->string); Ogre::Bone *trgtbone = skel->getBone(strdata->string);
Ogre::ControllerValueRealPtr srcval; Ogre::ControllerValueRealPtr srcval;
Ogre::ControllerValueRealPtr dstval(OGRE_NEW KeyframeController::Value(trgtbone, key->data.getPtr())); Ogre::ControllerValueRealPtr dstval(OGRE_NEW KeyframeController::Value(trgtbone, nif, key->data.getPtr()));
Ogre::ControllerFunctionRealPtr func(OGRE_NEW KeyframeController::Function(key, false)); Ogre::ControllerFunctionRealPtr func(OGRE_NEW KeyframeController::Function(key, false));
ctrls.push_back(Ogre::Controller<Ogre::Real>(srcval, dstval, func)); ctrls.push_back(Ogre::Controller<Ogre::Real>(srcval, dstval, func));