mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-15 23:42:20 +00:00
Code Issues Projects Releases Wiki Activity

Add const version of getAnimation

Browse Source
This commit is contained in:
scrawl 2015-12-18 17:21:51 +01:00
parent 7a4aac1842
commit 7a8a7e3dd6
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/openmw/mwrender/objects.cpp
View File

@ -263,4 +263,13 @@ Animation* Objects::getAnimation(const MWWorld::Ptr &ptr)
return NULL; return NULL;
} }
const Animation* Objects::getAnimation(const MWWorld::ConstPtr &ptr) const
{
PtrAnimationMap::const_iterator iter = mObjects.find(ptr);
if(iter != mObjects.end())
return iter->second;
return NULL;
}
} }

1
apps/openmw/mwrender/objects.hpp
View File

@ -81,6 +81,7 @@ public:
void insertCreature (const MWWorld::Ptr& ptr, const std::string& model, bool weaponsShields); void insertCreature (const MWWorld::Ptr& ptr, const std::string& model, bool weaponsShields);
Animation* getAnimation(const MWWorld::Ptr &ptr); Animation* getAnimation(const MWWorld::Ptr &ptr);
const Animation* getAnimation(const MWWorld::ConstPtr &ptr) const;
bool removeObject (const MWWorld::Ptr& ptr); bool removeObject (const MWWorld::Ptr& ptr);
///< \return found? ///< \return found?

8
apps/openmw/mwrender/renderingmanager.cpp
View File

@ -706,6 +706,14 @@ namespace MWRender
return mObjects->getAnimation(ptr); return mObjects->getAnimation(ptr);
} }
const MWRender::Animation* RenderingManager::getAnimation(const MWWorld::ConstPtr &ptr) const
{
if (mPlayerAnimation.get() && ptr == mPlayerAnimation->getPtr())
return mPlayerAnimation.get();
return mObjects->getAnimation(ptr);
}
MWRender::Animation* RenderingManager::getPlayerAnimation() MWRender::Animation* RenderingManager::getPlayerAnimation()
{ {
return mPlayerAnimation.get(); return mPlayerAnimation.get();

1
apps/openmw/mwrender/renderingmanager.hpp
View File

@ -136,6 +136,7 @@ namespace MWRender
void update(float dt, bool paused); void update(float dt, bool paused);
Animation* getAnimation(const MWWorld::Ptr& ptr); Animation* getAnimation(const MWWorld::Ptr& ptr);
const Animation* getAnimation(const MWWorld::ConstPtr& ptr) const;
Animation* getPlayerAnimation(); Animation* getPlayerAnimation();
void addWaterRippleEmitter(const MWWorld::Ptr& ptr); void addWaterRippleEmitter(const MWWorld::Ptr& ptr);