diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 13:15:55 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 13:15:55 +0400 |
| commit | 9424b1ceff992f420fe6315acabfb7138cd0026e (patch) | |
| tree | 2f19cac8af2ad32852cf9c46cb542e14fabe8d9b /source/gameengine/Ketsji/KX_Scene.cpp | |
| parent | d049a722fea3d150fbfad06ffdbbb5c150717134 (diff) | |
| parent | 43ab8e86247b7889d16d915b4f370ceb618aaad4 (diff) | |
Merging pepper to trunk at revision 39791.
Important note: I used rsync to do the local merge, as "svn merge --reintegrate ^/branches/soc-2011-pepper" doesn't work with our svn server right now!
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 28dc660037c..a49c1bf4b4c 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1502,7 +1502,12 @@ void KX_Scene::LogicBeginFrame(double curtime) m_logicmgr->BeginFrame(curtime, 1.0/KX_KetsjiEngine::GetTicRate()); } - +void KX_Scene::UpdateAnimations(double curtime) +{ + // Update any animations + for (int i=0; i<GetObjectList()->GetCount(); ++i) + ((KX_GameObject*)GetObjectList()->GetValue(i))->UpdateActionManager(curtime); +} void KX_Scene::LogicUpdateFrame(double curtime, bool frame) { @@ -1668,6 +1673,11 @@ double KX_Scene::getSuspendedDelta() return m_suspendeddelta; } +short KX_Scene::GetAnimationFPS() +{ + return m_blenderScene->r.frs_sec; +} + #ifdef USE_BULLET #include "KX_BulletPhysicsController.h" #endif |