mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 09:23:53 +00:00
Code Issues Releases Wiki Activity

Add const version of World::getAnimation

Browse source
This commit is contained in:
scrawl 2015-12-19 16:02:47 +01:00
parent 51c77c5045
commit 29d0f448b4
5 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwbase/world.hpp
View file

@ -430,6 +430,7 @@ namespace MWBase
/// \todo Probably shouldn't be here
virtual MWRender::Animation* getAnimation(const MWWorld::Ptr &ptr) = 0;
virtual const MWRender::Animation* getAnimation(const MWWorld::ConstPtr &ptr) const = 0;
virtual void reattachPlayerCamera() = 0;
/// \todo this does not belong here

4
apps/openmw/mwmechanics/character.cpp
View file

@ -2114,7 +2114,7 @@ void CharacterController::setActive(bool active)
mAnimation->setActive(active);
}
void CharacterController::setHeadTrackTarget(const MWWorld::Ptr &target)
void CharacterController::setHeadTrackTarget(const MWWorld::ConstPtr &target)
{
mHeadTrackTarget = target;
}
@ -2137,7 +2137,7 @@ void CharacterController::updateHeadTracking(float duration)
osg::Vec3f headPos = mat.getTrans();
osg::Vec3f direction;
if (MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mHeadTrackTarget))
if (const MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mHeadTrackTarget))
{
const osg::Node* node = anim->getNode("Head");
if (node == NULL)

4
apps/openmw/mwmechanics/character.hpp
View file

@ -180,7 +180,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
float mSecondsOfSwimming;
float mSecondsOfRunning;
MWWorld::Ptr mHeadTrackTarget;
MWWorld::ConstPtr mHeadTrackTarget;
float mTurnAnimationThreshold; // how long to continue playing turning animation after actor stopped turning
@ -255,7 +255,7 @@ public:
void setActive(bool active);
/// Make this character turn its head towards \a target. To turn off head tracking, pass an empty Ptr.
void setHeadTrackTarget(const MWWorld::Ptr& target);
void setHeadTrackTarget(const MWWorld::ConstPtr& target);
};
MWWorld::ContainerStoreIterator getActiveWeapon(CreatureStats &stats, MWWorld::InventoryStore &inv, WeaponType *weaptype);

5
apps/openmw/mwworld/worldimp.cpp
View file

@ -2112,6 +2112,11 @@ namespace MWWorld
return mRendering->getAnimation(ptr);
}
const MWRender::Animation* World::getAnimation(const MWWorld::ConstPtr &ptr) const
{
return mRendering->getAnimation(ptr);
}
void World::screenshot(osg::Image* image, int w, int h)
{
mRendering->screenshot(image, w, h);

1
apps/openmw/mwworld/worldimp.hpp
View file

@ -534,6 +534,7 @@ namespace MWWorld
/// \todo Probably shouldn't be here
virtual MWRender::Animation* getAnimation(const MWWorld::Ptr &ptr);
virtual const MWRender::Animation* getAnimation(const MWWorld::ConstPtr &ptr) const;
virtual void reattachPlayerCamera();
/// \todo this does not belong here