Browse Source

Travis CI: API documentation update at 2017-06-10 21:26:46 UTC.
[ci package]

Commit: https://github.com/urho3d/Urho3D/commit/00eb0c6ff0030a905f992a7b7fb0ae55c1e82095

Message: Merge pull request #1979 from eugeneko/master

Add Model metadata support.

urho3d-travis-ci 8 years ago
parent
commit
31f698fa60
4 changed files with 13 additions and 2 deletions
  1. 6 0
      Docs/AngelScriptAPI.h
  2. 1 1
      Docs/LuaScriptAPI.dox
  3. 5 0
      Docs/ScriptAPI.dox
  4. 1 1
      Source/Urho3D/.soversion

+ 6 - 0
Docs/AngelScriptAPI.h

@@ -7296,6 +7296,7 @@ public:
 Model();
 Model();
 Model(const String&in);
 Model(const String&in);
 // Methods:
 // Methods:
+void AddMetadata(const String&, const Variant&);
 Model Clone(const String& = String ( )) const;
 Model Clone(const String& = String ( )) const;
 Geometry GetGeometry(uint, uint) const;
 Geometry GetGeometry(uint, uint) const;
 bool HasSubscribedToEvent(Object, const String&);
 bool HasSubscribedToEvent(Object, const String&);
@@ -7303,6 +7304,8 @@ bool HasSubscribedToEvent(const String&);
 bool Load(File);
 bool Load(File);
 bool Load(VectorBuffer&);
 bool Load(VectorBuffer&);
 bool Load(const String&);
 bool Load(const String&);
+void RemoveAllMetadata();
+void RemoveMetadata(const String&);
 bool Save(File) const;
 bool Save(File) const;
 bool Save(VectorBuffer&) const;
 bool Save(VectorBuffer&) const;
 bool Save(const String&) const;
 bool Save(const String&) const;
@@ -7317,7 +7320,10 @@ BoundingBox boundingBox;
 String category;
 String category;
 Array<Vector3> geometryCenters;
 Array<Vector3> geometryCenters;
 /* readonly */
 /* readonly */
+bool hasMetadata;
+/* readonly */
 uint memoryUse;
 uint memoryUse;
+Array<Variant> metadata;
 String name;
 String name;
 uint numGeometries;
 uint numGeometries;
 Array<uint> numGeometryLodLevels;
 Array<uint> numGeometryLodLevels;

+ 1 - 1
Docs/LuaScriptAPI.dox

@@ -3724,7 +3724,7 @@ Properties:
 - UIElement* window (readonly)
 - UIElement* window (readonly)
 
 
 <a name="Class_Model"></a>
 <a name="Class_Model"></a>
-### Model : Resource
+### Model : ResourceWithMetadata
 
 
 Methods:
 Methods:
 
 

+ 5 - 0
Docs/ScriptAPI.dox

@@ -9074,6 +9074,7 @@ Properties:
 
 
 Methods:
 Methods:
 
 
+- void AddMetadata(const String&, const Variant&)
 - Model@ Clone(const String& = String ( )) const
 - Model@ Clone(const String& = String ( )) const
 - Geometry@ GetGeometry(uint, uint) const
 - Geometry@ GetGeometry(uint, uint) const
 - bool HasSubscribedToEvent(Object@, const String&)
 - bool HasSubscribedToEvent(Object@, const String&)
@@ -9081,6 +9082,8 @@ Methods:
 - bool Load(File@)
 - bool Load(File@)
 - bool Load(VectorBuffer&)
 - bool Load(VectorBuffer&)
 - bool Load(const String&)
 - bool Load(const String&)
+- void RemoveAllMetadata()
+- void RemoveMetadata(const String&)
 - bool Save(File@) const
 - bool Save(File@) const
 - bool Save(VectorBuffer&) const
 - bool Save(VectorBuffer&) const
 - bool Save(const String&) const
 - bool Save(const String&) const
@@ -9094,7 +9097,9 @@ Properties:
 - BoundingBox boundingBox
 - BoundingBox boundingBox
 - String category // readonly
 - String category // readonly
 - Vector3[] geometryCenters
 - Vector3[] geometryCenters
+- bool hasMetadata // readonly
 - uint memoryUse // readonly
 - uint memoryUse // readonly
+- Variant[] metadata
 - String name
 - String name
 - uint numGeometries
 - uint numGeometries
 - uint[] numGeometryLodLevels
 - uint[] numGeometryLodLevels

+ 1 - 1
Source/Urho3D/.soversion

@@ -1 +1 @@
-0.1.69
+0.1.70