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.h | |
| 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.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h index 367bf0b82da..da9cc12c76a 100644 --- a/source/gameengine/Ketsji/KX_Scene.h +++ b/source/gameengine/Ketsji/KX_Scene.h @@ -340,6 +340,7 @@ public: */ void LogicBeginFrame(double curtime); void LogicUpdateFrame(double curtime, bool frame); + void UpdateAnimations(double curtime); void LogicEndFrame( @@ -565,6 +566,8 @@ public: void SetPhysicsEnvironment(class PHY_IPhysicsEnvironment* physEnv); void SetGravity(const MT_Vector3& gravity); + + short GetAnimationFPS(); /** * Sets the node tree for this scene. |