Browse Source

Travis CI: API documentation update at 2015-04-21 12:40:12 UTC.
[ci package]

urho3d-travis-ci 10 years ago
parent
commit
6424fa00c7
4 changed files with 25 additions and 41 deletions
  1. 2 5
      Docs/AngelScriptAPI.h
  2. 10 7
      Docs/LuaScriptAPI.dox
  3. 12 28
      Docs/ScriptAPI.dox
  4. 1 1
      Source/Urho3D/.soversion

+ 2 - 5
Docs/AngelScriptAPI.h

@@ -223,6 +223,7 @@ bool castShadows;
 /* readonly */
 String category;
 Color color;
+Material customMaterial;
 float drawDistance;
 bool enabled;
 /* readonly */
@@ -254,7 +255,6 @@ uint shadowMask;
 float speed;
 Sprite2D sprite;
 bool temporary;
-Texture2D texture;
 /* readonly */
 StringHash type;
 /* readonly */
@@ -3747,7 +3747,6 @@ Array<AttributeInfo> attributeInfos;
 Array<Variant> attributes;
 /* readonly */
 StringHash baseType;
-BlendMode blendMode;
 /* readonly */
 BoundingBox boundingBox;
 bool castShadows;
@@ -3778,7 +3777,6 @@ int refs;
 float shadowDistance;
 uint shadowMask;
 bool temporary;
-Texture2D texture;
 /* readonly */
 StringHash type;
 /* readonly */
@@ -6717,7 +6715,6 @@ float shadowDistance;
 uint shadowMask;
 Sprite2D sprite;
 bool temporary;
-Texture2D texture;
 /* readonly */
 StringHash type;
 /* readonly */
@@ -9524,6 +9521,7 @@ bool castShadows;
 /* readonly */
 String category;
 Color color;
+Material customMaterial;
 float drawDistance;
 bool enabled;
 /* readonly */
@@ -9553,7 +9551,6 @@ float shadowDistance;
 uint shadowMask;
 Sprite2D sprite;
 bool temporary;
-Texture2D texture;
 /* readonly */
 StringHash type;
 /* readonly */

+ 10 - 7
Docs/LuaScriptAPI.dox

@@ -1838,19 +1838,13 @@ Methods:
 
 - void SetLayer(int layer)
 - void SetOrderInLayer(int orderInLayer)
-- void SetTexture(Texture2D* texture)
-- void SetBlendMode(BlendMode mode)
 - int GetLayer() const
 - int GetOrderInLayer() const
-- Texture2D* GetTexture() const
-- BlendMode GetBlendMode() const
 
 Properties:
 
 - int layer
 - int orderInLayer
-- Texture2D* texture
-- BlendMode blendMode
 
 <a name="Class_DropDownList"></a>
 ### DropDownList : Menu
@@ -3770,14 +3764,17 @@ Properties:
 Methods:
 
 - void SetEffect(ParticleEffect2D* effect)
-- ParticleEffect2D* GetEffect() const
 - void SetSprite(Sprite2D* sprite)
+- void SetBlendMode(BlendMode blendMode)
+- ParticleEffect2D* GetEffect() const
 - Sprite2D* GetSprite() const
+- BlendMode GetBlendMode() const
 
 Properties:
 
 - ParticleEffect2D* effect
 - Sprite2D* sprite
+- BlendMode blendMode
 
 <a name="Class_Pass"></a>
 ### Pass : RefCounted
@@ -5232,6 +5229,7 @@ Properties:
 Methods:
 
 - void SetSprite(Sprite2D* sprite)
+- void SetBlendMode(BlendMode mode)
 - void SetFlip(bool flipX, bool flipY)
 - void SetFlipX(bool flipX)
 - void SetFlipY(bool flipY)
@@ -5239,23 +5237,28 @@ Methods:
 - void SetAlpha(float alpha)
 - void SetUseHotSpot(bool useHotSpot)
 - void SetHotSpot(const Vector2& hotspot)
+- void SetCustomMaterial(Material* customMaterial)
 - Sprite2D* GetSprite() const
+- BlendMode GetBlendMode() const
 - bool GetFlipX() const
 - bool GetFlipY() const
 - const Color& GetColor() const
 - float GetAlpha() const
 - bool GetUseHotSpot() const
 - const Vector2& GetHotSpot() const
+- Material* GetCustomMaterial() const
 
 Properties:
 
 - Sprite2D* sprite
+- BlendMode blendMode
 - bool flipX
 - bool flipY
 - Color& color
 - float alpha
 - bool useHotSpot
 - Vector2 hotSpot
+- Material* customMaterial
 
 <a name="Class_StringHash"></a>
 ### StringHash

+ 12 - 28
Docs/ScriptAPI.dox

@@ -705,17 +705,13 @@ namespace Urho3D
 
 ### AnimatedSprite2D
 - %Is %Enabled : bool
-- %Flip X : bool
-- %Flip Y : bool
-- %Color : Color
 - %Layer : int
 - %Order %in %Layer : int
 - %Blend %Mode : int
-- %Max %Lights : int
-- %View %Mask : int
-- %Light %Mask : int
-- %Shadow %Mask : int
-- %Zone %Mask : int
+- %Flip X : bool
+- %Flip Y : bool
+- %Color : Color
+- %Custom %material : ResourceRef
 - %Speed : float
 - %Animation %Set : ResourceRef
 - %Animation : String
@@ -1435,16 +1431,11 @@ namespace Urho3D
 
 ### ParticleEmitter2D
 - %Is %Enabled : bool
-- %Particle %Effect : ResourceRef
-- %Sprite : ResourceRef
 - %Layer : int
 - %Order %in %Layer : int
+- %Particle %Effect : ResourceRef
+- %Sprite : ResourceRef
 - %Blend %Mode : int
-- %Max %Lights : int
-- %View %Mask : int
-- %Light %Mask : int
-- %Shadow %Mask : int
-- %Zone %Mask : int
 
 ### PhysicsWorld
 - %Gravity : Vector3
@@ -1770,18 +1761,14 @@ namespace Urho3D
 
 ### StaticSprite2D
 - %Is %Enabled : bool
+- %Layer : int
+- %Order %in %Layer : int
 - %Sprite : ResourceRef
+- %Blend %Mode : int
 - %Flip X : bool
 - %Flip Y : bool
 - %Color : Color
-- %Layer : int
-- %Order %in %Layer : int
-- %Blend %Mode : int
-- %Max %Lights : int
-- %View %Mask : int
-- %Light %Mask : int
-- %Shadow %Mask : int
-- %Zone %Mask : int
+- %Custom %material : ResourceRef
 
 ### Terrain
 - %Is %Enabled : bool
@@ -2454,6 +2441,7 @@ Properties:
 - bool castShadows
 - String category // readonly
 - Color color
+- Material@ customMaterial
 - float drawDistance
 - bool enabled
 - bool enabledEffective // readonly
@@ -2479,7 +2467,6 @@ Properties:
 - float speed
 - Sprite2D@ sprite
 - bool temporary
-- Texture2D@ texture
 - StringHash type // readonly
 - String typeName // readonly
 - bool useHotSpot
@@ -5506,7 +5493,6 @@ Properties:
 - AttributeInfo[] attributeInfos // readonly
 - Variant[] attributes
 - StringHash baseType // readonly
-- BlendMode blendMode
 - BoundingBox boundingBox // readonly
 - bool castShadows
 - String category // readonly
@@ -5529,7 +5515,6 @@ Properties:
 - float shadowDistance
 - uint shadowMask
 - bool temporary
-- Texture2D@ texture
 - StringHash type // readonly
 - String typeName // readonly
 - uint viewMask
@@ -8054,7 +8039,6 @@ Properties:
 - uint shadowMask
 - Sprite2D@ sprite
 - bool temporary
-- Texture2D@ texture
 - StringHash type // readonly
 - String typeName // readonly
 - uint viewMask
@@ -10525,6 +10509,7 @@ Properties:
 - bool castShadows
 - String category // readonly
 - Color color
+- Material@ customMaterial
 - float drawDistance
 - bool enabled
 - bool enabledEffective // readonly
@@ -10548,7 +10533,6 @@ Properties:
 - uint shadowMask
 - Sprite2D@ sprite
 - bool temporary
-- Texture2D@ texture
 - StringHash type // readonly
 - String typeName // readonly
 - bool useHotSpot

+ 1 - 1
Source/Urho3D/.soversion

@@ -1 +1 @@
-0.0.89
+0.0.90