diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-11-06 07:53:41 +0300 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-11-06 07:53:41 +0300 |
| commit | ce4b232f8c1f0879111027c0e754dd5cd014891d (patch) | |
| tree | 25cb247c28bb3e7df2f279eb0ab694cc38920820 /source/gameengine/Converter/BL_ActionActuator.h | |
| parent | e9017926c90e71544798bd14a543043cdff824d7 (diff) | |
Fix the action actuator (bug #1699)
Diffstat (limited to 'source/gameengine/Converter/BL_ActionActuator.h')
| -rw-r--r-- | source/gameengine/Converter/BL_ActionActuator.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h index bf030b5861f..0c1eb780bcb 100644 --- a/source/gameengine/Converter/BL_ActionActuator.h +++ b/source/gameengine/Converter/BL_ActionActuator.h @@ -55,8 +55,8 @@ public: m_blendframe(0), m_lastpos(0, 0, 0), m_flag(0), - m_starttime (starttime), - m_endtime(endtime) , + m_startframe (starttime), + m_endframe(endtime) , m_localtime(starttime), m_lastUpdate(-1), m_playtype(playtype), @@ -74,6 +74,8 @@ public: virtual bool Update(double curtime, bool frame); CValue* GetReplica(); void ProcessReplica(); + + void SetBlendTime (float newtime); KX_PYMETHOD_DOC(BL_ActionActuator,SetAction); KX_PYMETHOD_DOC(BL_ActionActuator,SetBlendin); @@ -97,7 +99,6 @@ public: KX_PYMETHOD_DOC(BL_ActionActuator,SetType); virtual PyObject* _getattr(const STR_String& attr); - void SetBlendTime (float newtime); enum ActionActType { @@ -109,13 +110,23 @@ public: }; protected: + + void SetStartTime(float curtime); + void SetLocalTime(float curtime); + bool ClampLocalTime(); + float m_blendframe; MT_Point3 m_lastpos; int m_flag; + /** The frame this action starts */ + float m_startframe; + /** The frame this action ends */ + float m_endframe; + /** The time this action started */ float m_starttime; - float m_startWallTime; - float m_endtime; + /** The current time of the action */ float m_localtime; + float m_lastUpdate; short m_playtype; float m_blendin; @@ -127,7 +138,7 @@ protected: struct bPose* m_userpose; STR_String m_propname; struct bAction *m_action; - + }; enum { |