Browse Source

Travis CI: API documentation update at 2014-08-27 16:22:36 UTC.
[ci package]

urho3d-travis-ci 11 years ago
parent
commit
c75f56da41
4 changed files with 20 additions and 20 deletions
  1. 4 4
      Docs/AngelScriptAPI.h
  2. 9 9
      Docs/LuaScriptAPI.dox
  3. 6 6
      Docs/ScriptAPI.dox
  4. 1 1
      Source/Engine/.soversion

+ 4 - 4
Docs/AngelScriptAPI.h

@@ -10100,12 +10100,11 @@ float GetAttributeAnimationSpeed(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 TileMapLayer2D GetLayer(uint) const;
-Vector2 IndexToPosition(int, int) const;
 bool Load(File, bool = false);
 bool Load(VectorBuffer&, bool = false);
 bool LoadXML(const XMLElement&, bool = false);
 void MarkNetworkUpdate() const;
-bool PositionToIndex(int&, int&, const Vector2&) const;
+bool PositionToTileIndex(int&, int&, const Vector2&) const;
 void Remove();
 void RemoveInstanceDefault();
 void ResetToDefault();
@@ -10117,6 +10116,7 @@ bool SetAttribute(const String&, const Variant&);
 void SetAttributeAnimation(const String&, ValueAnimation, WrapMode = WM_LOOP, float = 1.0f);
 void SetAttributeAnimationSpeed(const String&, float);
 void SetAttributeAnimationWrapMode(const String&, WrapMode);
+Vector2 TileIndexToPosition(int, int) const;
 
 // Properties:
 bool animationEnabled;
@@ -10180,7 +10180,7 @@ ValueAnimation GetAttributeAnimation(const String&) const;
 float GetAttributeAnimationSpeed(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
-TileObject2D GetObject(uint) const;
+TileMapObject2D GetObject(uint) const;
 Node GetObjectNode(uint) const;
 Tile2D GetTile(int, int) const;
 Node GetTileNode(int, int) const;
@@ -10249,7 +10249,7 @@ int weakRefs;
 int width;
 };
 
-class TileObject2D
+class TileMapObject2D
 {
 // Methods:
 bool HasProperty(const String&) const;

+ 9 - 9
Docs/LuaScriptAPI.dox

@@ -177,7 +177,7 @@ namespace Urho3D
 <a href="#Class_TileMap2D"><b>TileMap2D</b></a>
 <a href="#Class_TileMapInfo2D"><b>TileMapInfo2D</b></a>
 <a href="#Class_TileMapLayer2D"><b>TileMapLayer2D</b></a>
-<a href="#Class_TileObject2D"><b>TileObject2D</b></a>
+<a href="#Class_TileMapObject2D"><b>TileMapObject2D</b></a>
 <a href="#Class_Time"><b>Time</b></a>
 <a href="#Class_TmxFile2D"><b>TmxFile2D</b></a>
 <a href="#Class_ToolTip"><b>ToolTip</b></a>
@@ -5533,8 +5533,8 @@ Methods:
 - const TileMapInfo2D& GetInfo() const
 - unsigned GetNumLayers() const
 - TileMapLayer2D* GetLayer(unsigned index) const
-- Vector2 IndexToPosition(int x, int y) const
-- bool PositionToIndex(const Vector2& position, int x = 0, int y = 0) const
+- Vector2 TileIndexToPosition(int x, int y) const
+- bool PositionToTileIndex(const Vector2& position, int x = 0, int y = 0) const
 
 Properties:
 
@@ -5578,7 +5578,7 @@ Methods:
 - Node* GetTileNode(int x, int y) const
 - Tile2D* GetTile(int x, int y) const
 - unsigned GetNumObjects() const
-- TileObject2D* GetObject(unsigned index) const
+- TileMapObject2D* GetObject(unsigned index) const
 - Node* GetObjectNode(unsigned index) const
 - Node* GetImageNode() const
 
@@ -5592,13 +5592,13 @@ Properties:
 - unsigned numObjects (readonly)
 - Node* imageNode (readonly)
 
-<a name="Class_TileObject2D"></a>
-### TileObject2D
+<a name="Class_TileMapObject2D"></a>
+### TileMapObject2D
 
 
 Methods:
 
-- TileObjectType2D GetObjectType() const
+- TileMapObjectType2D GetObjectType() const
 - const String GetName() const
 - const String GetType() const
 - const Vector2& GetPosition() const
@@ -5612,7 +5612,7 @@ Methods:
 
 Properties:
 
-- TileObjectType2D objectType (readonly)
+- TileMapObjectType2D objectType (readonly)
 - String name (readonly)
 - String type (readonly)
 - Vector2 position (readonly)
@@ -7017,7 +7017,7 @@ Properties:
 - int LT_IMAGE_LAYER
 - int LT_INVALID
 
-### TileObjectType2D
+### TileMapObjectType2D
 
 - int OT_RECTANGLE
 - int OT_ELLIPSE

+ 6 - 6
Docs/ScriptAPI.dox

@@ -2141,7 +2141,7 @@ namespace Urho3D
 <a href="#Class_TileMap2D"><b>TileMap2D</b></a>
 <a href="#Class_TileMapInfo2D"><b>TileMapInfo2D</b></a>
 <a href="#Class_TileMapLayer2D"><b>TileMapLayer2D</b></a>
-<a href="#Class_TileObject2D"><b>TileObject2D</b></a>
+<a href="#Class_TileMapObject2D"><b>TileMapObject2D</b></a>
 <a href="#Class_Time"><b>Time</b></a>
 <a href="#Class_Timer"><b>Timer</b></a>
 <a href="#Class_TmxFile2D"><b>TmxFile2D</b></a>
@@ -10890,12 +10890,11 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - TileMapLayer2D@ GetLayer(uint) const
-- Vector2 IndexToPosition(int, int) const
 - bool Load(File@, bool = false)
 - bool Load(VectorBuffer&, bool = false)
 - bool LoadXML(const XMLElement&, bool = false)
 - void MarkNetworkUpdate() const
-- bool PositionToIndex(int&, int&, const Vector2&) const
+- bool PositionToTileIndex(int&, int&, const Vector2&) const
 - void Remove()
 - void RemoveInstanceDefault()
 - void ResetToDefault()
@@ -10907,6 +10906,7 @@ Methods:
 - void SetAttributeAnimation(const String&, ValueAnimation@, WrapMode = WM_LOOP, float = 1.0f)
 - void SetAttributeAnimationSpeed(const String&, float)
 - void SetAttributeAnimationWrapMode(const String&, WrapMode)
+- Vector2 TileIndexToPosition(int, int) const
 
 Properties:
 
@@ -10958,7 +10958,7 @@ Methods:
 - float GetAttributeAnimationSpeed(const String&) const
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
-- TileObject2D@ GetObject(uint) const
+- TileMapObject2D@ GetObject(uint) const
 - Node@ GetObjectNode(uint) const
 - Tile2D@ GetTile(int, int) const
 - Node@ GetTileNode(int, int) const
@@ -11008,9 +11008,9 @@ Properties:
 - int weakRefs // readonly
 - int width // readonly
 
-<a name="Class_TileObject2D"></a>
+<a name="Class_TileMapObject2D"></a>
 
-### TileObject2D
+### TileMapObject2D
 
 Methods:
 

+ 1 - 1
Source/Engine/.soversion

@@ -1 +1 @@
-0.0.9
+0.0.10