mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-30 02:56:44 +00:00
Code Issues Releases Wiki Activity

Add a method to update an Animation's Ptr object

Browse source
This commit is contained in:
Chris Robinson 2013-02-23 10:12:36 -08:00
parent a2eaec7878
commit d208422ca7
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwrender/actors.cpp
View file

@ -169,6 +169,7 @@ void Actors::updateObjectCell(const MWWorld::Ptr &ptr)
{ {
Animation *anim = iter->second; Animation *anim = iter->second;
mAllActors.erase(iter); mAllActors.erase(iter);
anim->updatePtr(ptr);
mAllActors[ptr] = anim; mAllActors[ptr] = anim;
} }
} }

5
apps/openmw/mwrender/animation.cpp
View file

@ -169,6 +169,11 @@ void Animation::setLooping(bool loop)
mLooping = loop; mLooping = loop;
} }
void Animation::updatePtr(const MWWorld::Ptr &ptr)
{
mPtr = ptr;
}
void Animation::calcAnimVelocity() void Animation::calcAnimVelocity()
{ {

3
apps/openmw/mwrender/animation.hpp
View file

@ -49,7 +49,6 @@ protected:
* bone names) are positioned identically. */ * bone names) are positioned identically. */
void updateSkeletonInstance(const Ogre::SkeletonInstance *skelsrc, Ogre::SkeletonInstance *skel); void updateSkeletonInstance(const Ogre::SkeletonInstance *skelsrc, Ogre::SkeletonInstance *skel);
/* Updates the animation to the specified time, and returns the movement /* Updates the animation to the specified time, and returns the movement
* vector since the last update or reset. */ * vector since the last update or reset. */
Ogre::Vector3 updatePosition(float time); Ogre::Vector3 updatePosition(float time);
@ -78,6 +77,8 @@ public:
void setController(MWMechanics::CharacterController *controller); void setController(MWMechanics::CharacterController *controller);
void updatePtr(const MWWorld::Ptr &ptr);
bool hasAnimation(const std::string &anim); bool hasAnimation(const std::string &anim);
// Specifies the axis' to accumulate on. Non-accumulated axis will just // Specifies the axis' to accumulate on. Non-accumulated axis will just