diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2011-07-03 05:59:17 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-07-03 05:59:17 +0400 |
| commit | 5f4f75c51a511f4f190c16eedfc4c04c3b9aa387 (patch) | |
| tree | 9c226d26639fdeb1c4b546183f4178979e7b93cb /source/gameengine/Ketsji/BL_Action.h | |
| parent | 8c3f2923fdc0626d4c2e7f6307c1ec4fd0e8c7f3 (diff) | |
BGE Animations: Adding in layer weights to allow for layer blending.
Diffstat (limited to 'source/gameengine/Ketsji/BL_Action.h')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Action.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source/gameengine/Ketsji/BL_Action.h b/source/gameengine/Ketsji/BL_Action.h index d9a2187540e..f03a22a81cd 100644 --- a/source/gameengine/Ketsji/BL_Action.h +++ b/source/gameengine/Ketsji/BL_Action.h @@ -58,12 +58,13 @@ private: float m_blendframe; float m_blendstart; + float m_layer_weight; + float m_speed; short m_priority; short m_playmode; - short m_blendmode; short m_ipo_flags; @@ -84,7 +85,7 @@ public: short priority, float blendin, short play_mode, - short blend_mode, + float layer_weight, short ipo_flags, float playback_speed); void Stop(); @@ -107,13 +108,6 @@ public: enum { - ACT_BLEND_NONE = 0, - ACT_BLEND_MIX, - ACT_BLEND_MAX, - }; - - enum - { ACT_IPOFLAG_FORCE = 1, ACT_IPOFLAG_LOCAL = 2, ACT_IPOFLAG_ADD = 4, |