Browse Source

Travis CI: API documentation update at 2016-03-10 14:31:49 UTC.
[ci package]

Commit: https://github.com/urho3d/Urho3D/commit/1fba0c80dec4ac5befc1767b9af5478144267c57

Message: Document additive animation blending.

urho3d-travis-ci 9 years ago
parent
commit
4cf41f1346
4 changed files with 30 additions and 2 deletions
  1. 9 0
      Docs/AngelScriptAPI.h
  2. 11 1
      Docs/LuaScriptAPI.dox
  3. 9 0
      Docs/ScriptAPI.dox
  4. 1 1
      Source/Urho3D/.soversion

+ 9 - 0
Docs/AngelScriptAPI.h

@@ -350,6 +350,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 float GetAutoFade(const String&) const;
 float GetAutoFade(const String&) const;
+AnimationBlendMode GetBlendMode(const String&) const;
 float GetFadeTarget(const String&) const;
 float GetFadeTarget(const String&) const;
 float GetFadeTime(const String&) const;
 float GetFadeTime(const String&) const;
 bool GetInterceptNetworkUpdate(const String&) const;
 bool GetInterceptNetworkUpdate(const String&) const;
@@ -390,6 +391,7 @@ void SetAttributeAnimationSpeed(const String&, float);
 void SetAttributeAnimationTime(const String&, float);
 void SetAttributeAnimationTime(const String&, float);
 void SetAttributeAnimationWrapMode(const String&, WrapMode);
 void SetAttributeAnimationWrapMode(const String&, WrapMode);
 bool SetAutoFade(const String&, float);
 bool SetAutoFade(const String&, float);
+bool SetBlendMode(const String&, AnimationBlendMode);
 void SetInterceptNetworkUpdate(const String&, bool);
 void SetInterceptNetworkUpdate(const String&, bool);
 bool SetLayer(const String&, uint8);
 bool SetLayer(const String&, uint8);
 bool SetLooped(const String&, bool);
 bool SetLooped(const String&, bool);
@@ -492,6 +494,7 @@ void SetBoneWeight(uint, float, bool = false);
 // Properties:
 // Properties:
 /* readonly */
 /* readonly */
 Animation animation;
 Animation animation;
+AnimationBlendMode blendMode;
 Array<float> boneWeights;
 Array<float> boneWeights;
 /* readonly */
 /* readonly */
 bool enabled;
 bool enabled;
@@ -13551,6 +13554,12 @@ Texture zoneTexture;
 
 
 // Enumerations
 // Enumerations
 
 
+enum AnimationBlendMode
+{
+ABM_LERP,
+ABM_ADDITIVE,
+};
+
 enum BlendMode
 enum BlendMode
 {
 {
 BLEND_REPLACE,
 BLEND_REPLACE,

+ 11 - 1
Docs/LuaScriptAPI.dox

@@ -381,6 +381,7 @@ Methods:
 - bool SetTime(const String name, float time)
 - bool SetTime(const String name, float time)
 - bool SetWeight(const String name, float weight)
 - bool SetWeight(const String name, float weight)
 - bool SetLooped(const String name, bool enable)
 - bool SetLooped(const String name, bool enable)
+- bool SetBlendMode(const String name, AnimationBlendMode mode)
 - bool SetSpeed(const String name, float speed)
 - bool SetSpeed(const String name, float speed)
 - bool SetAutoFade(const String name, float fadeOutTime)
 - bool SetAutoFade(const String name, float fadeOutTime)
 - bool SetRemoveOnCompletion(const String name, bool removeOnCompletion)
 - bool SetRemoveOnCompletion(const String name, bool removeOnCompletion)
@@ -394,6 +395,7 @@ Methods:
 - float GetTime(const String name) const
 - float GetTime(const String name) const
 - float GetWeight(const String name) const
 - float GetWeight(const String name) const
 - bool IsLooped(const String name) const
 - bool IsLooped(const String name) const
+- AnimationBlendMode GetBlendMode(const String name) const
 - float GetLength(const String name) const
 - float GetLength(const String name) const
 - float GetSpeed(const String name) const
 - float GetSpeed(const String name) const
 - float GetFadeTarget(const String name) const
 - float GetFadeTarget(const String name) const
@@ -447,6 +449,7 @@ Methods:
 - void AddWeight(float delta)
 - void AddWeight(float delta)
 - void AddTime(float delta)
 - void AddTime(float delta)
 - void SetLayer(char layer)
 - void SetLayer(char layer)
+- void SetBlendMode(AnimationBlendMode mode)
 - Animation* GetAnimation() const
 - Animation* GetAnimation() const
 - Bone* GetStartBone() const
 - Bone* GetStartBone() const
 - float GetBoneWeight(const String name) const
 - float GetBoneWeight(const String name) const
@@ -460,6 +463,7 @@ Methods:
 - float GetTime() const
 - float GetTime() const
 - float GetLength() const
 - float GetLength() const
 - char GetLayer() const
 - char GetLayer() const
+- AnimationBlendMode GetBlendMode() const
 
 
 Properties:
 Properties:
 
 
@@ -471,6 +475,7 @@ Properties:
 - float time
 - float time
 - float length (readonly)
 - float length (readonly)
 - char layer
 - char layer
+- AnimationBlendMode blendMode
 
 
 <a name="Class_AnimationTrack"></a>
 <a name="Class_AnimationTrack"></a>
 ### AnimationTrack
 ### AnimationTrack
@@ -7219,6 +7224,11 @@ Properties:
 
 
 \section LuaScriptAPI_Enums Enumerations
 \section LuaScriptAPI_Enums Enumerations
 
 
+### AnimationBlendMode
+
+- int ABM_LERP
+- int ABM_ADDITIVE
+
 ### BlendMode
 ### BlendMode
 
 
 - int BLEND_REPLACE
 - int BLEND_REPLACE
@@ -7365,6 +7375,7 @@ Properties:
 - int FC_ROTATE_Y
 - int FC_ROTATE_Y
 - int FC_LOOKAT_XYZ
 - int FC_LOOKAT_XYZ
 - int FC_LOOKAT_Y
 - int FC_LOOKAT_Y
+- int FC_DIRECTION
 
 
 ### FaceCameraMode
 ### FaceCameraMode
 
 
@@ -7373,7 +7384,6 @@ Properties:
 - int FC_ROTATE_Y
 - int FC_ROTATE_Y
 - int FC_LOOKAT_XYZ
 - int FC_LOOKAT_XYZ
 - int FC_LOOKAT_Y
 - int FC_LOOKAT_Y
-- int FC_DIRECTION
 
 
 ### FileMode
 ### FileMode
 
 

+ 9 - 0
Docs/ScriptAPI.dox

@@ -2774,6 +2774,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - float GetAutoFade(const String&) const
 - float GetAutoFade(const String&) const
+- AnimationBlendMode GetBlendMode(const String&) const
 - float GetFadeTarget(const String&) const
 - float GetFadeTarget(const String&) const
 - float GetFadeTime(const String&) const
 - float GetFadeTime(const String&) const
 - bool GetInterceptNetworkUpdate(const String&) const
 - bool GetInterceptNetworkUpdate(const String&) const
@@ -2814,6 +2815,7 @@ Methods:
 - void SetAttributeAnimationTime(const String&, float)
 - void SetAttributeAnimationTime(const String&, float)
 - void SetAttributeAnimationWrapMode(const String&, WrapMode)
 - void SetAttributeAnimationWrapMode(const String&, WrapMode)
 - bool SetAutoFade(const String&, float)
 - bool SetAutoFade(const String&, float)
+- bool SetBlendMode(const String&, AnimationBlendMode)
 - void SetInterceptNetworkUpdate(const String&, bool)
 - void SetInterceptNetworkUpdate(const String&, bool)
 - bool SetLayer(const String&, uint8)
 - bool SetLayer(const String&, uint8)
 - bool SetLooped(const String&, bool)
 - bool SetLooped(const String&, bool)
@@ -2904,6 +2906,7 @@ Methods:
 Properties:
 Properties:
 
 
 - Animation@ animation // readonly
 - Animation@ animation // readonly
+- AnimationBlendMode blendMode
 - float[] boneWeights
 - float[] boneWeights
 - bool enabled // readonly
 - bool enabled // readonly
 - uint8 layer
 - uint8 layer
@@ -14402,6 +14405,12 @@ Properties:
 
 
 \section ScriptAPI_Enums Enumerations
 \section ScriptAPI_Enums Enumerations
 
 
+### AnimationBlendMode
+
+- ABM_LERP
+- ABM_ADDITIVE
+
+
 ### BlendMode
 ### BlendMode
 
 
 - BLEND_REPLACE
 - BLEND_REPLACE

+ 1 - 1
Source/Urho3D/.soversion

@@ -1 +1 @@
-0.0.197
+0.0.198