diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2013-08-15 03:31:49 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-08-15 03:31:49 +0400 |
| commit | 9afae77fedb8a84f4d305ebce81b0cc509a2183b (patch) | |
| tree | c8e747520371df4e3dd00a142419727ef6db60d9 /source/gameengine/Ketsji/BL_Action.h | |
| parent | c8f75fb5b1918a13a722ed39bb8cace1ee5b58b8 (diff) | |
BGE: Finally adding support for additive layer blending.
Currently this is only for the Python API. The logic brick will be updated in a future commit.
Diffstat (limited to 'source/gameengine/Ketsji/BL_Action.h')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Action.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/BL_Action.h b/source/gameengine/Ketsji/BL_Action.h index e4088633e61..e9d09916517 100644 --- a/source/gameengine/Ketsji/BL_Action.h +++ b/source/gameengine/Ketsji/BL_Action.h @@ -34,7 +34,6 @@ #include "MEM_guardedalloc.h" #endif - class BL_Action { private: @@ -64,6 +63,7 @@ private: short m_priority; short m_playmode; + short m_blendmode; short m_ipo_flags; @@ -91,7 +91,8 @@ public: short play_mode, float layer_weight, short ipo_flags, - float playback_speed); + float playback_speed, + short blend_mode); /** * Stop playing the action */ @@ -114,7 +115,7 @@ public: void SetPlayMode(short play_mode); void SetTimes(float start, float end); - enum + enum { ACT_MODE_PLAY = 0, ACT_MODE_LOOP, @@ -124,6 +125,13 @@ public: enum { + ACT_BLEND_BLEND=0, + ACT_BLEND_ADD=1, + ACT_BLEND_MAX, + }; + + enum + { ACT_IPOFLAG_FORCE = 1, ACT_IPOFLAG_LOCAL = 2, ACT_IPOFLAG_ADD = 4, |