Browse Source

Travis CI: API documentation update at 2015-05-08 09:51:55 UTC.
[ci package]

urho3d-travis-ci 10 years ago
parent
commit
a88a57c6ca
4 changed files with 56 additions and 1 deletions
  1. 8 0
      Docs/AngelScriptAPI.h
  2. 39 0
      Docs/LuaScriptAPI.dox
  3. 8 0
      Docs/ScriptAPI.dox
  4. 1 1
      Source/Urho3D/.soversion

+ 8 - 0
Docs/AngelScriptAPI.h

@@ -7573,6 +7573,7 @@ class RenderPathCommand
 {
 {
 // Methods:
 // Methods:
 void RemoveShaderParameter(const String&);
 void RemoveShaderParameter(const String&);
+void SetOutput(uint, const String&, CubeMapFace = FACE_POSITIVE_X);
 
 
 // Properties:
 // Properties:
 Color clearColor;
 Color clearColor;
@@ -7584,6 +7585,7 @@ bool enabled;
 bool markToStencil;
 bool markToStencil;
 String metadata;
 String metadata;
 uint numOutputs;
 uint numOutputs;
+Array<CubeMapFace> outputFaces;
 Array<String> outputNames;
 Array<String> outputNames;
 String pass;
 String pass;
 String pixelShaderDefines;
 String pixelShaderDefines;
@@ -7625,6 +7627,7 @@ class RenderTargetInfo
 {
 {
 
 
 // Properties:
 // Properties:
+bool cubemap;
 bool enabled;
 bool enabled;
 bool filtered;
 bool filtered;
 uint format;
 uint format;
@@ -7741,6 +7744,8 @@ bool AddPackageFile(const String&, uint = M_MAX_UNSIGNED);
 bool AddResourceDir(const String&, uint = M_MAX_UNSIGNED);
 bool AddResourceDir(const String&, uint = M_MAX_UNSIGNED);
 bool BackgroundLoadResource(const String&, const String&, bool = true);
 bool BackgroundLoadResource(const String&, const String&, bool = true);
 bool Exists(const String&) const;
 bool Exists(const String&) const;
+Resource GetExistingResource(StringHash, const String&);
+Resource GetExistingResource(const String&, const String&);
 File GetFile(const String&);
 File GetFile(const String&);
 String GetPreferredResourceDir(const String&) const;
 String GetPreferredResourceDir(const String&) const;
 Resource GetResource(StringHash, const String&, bool = true);
 Resource GetResource(StringHash, const String&, bool = true);
@@ -13136,6 +13141,9 @@ uint AM_NODEIDVECTOR;
 uint AM_NOEDIT;
 uint AM_NOEDIT;
 Color BLACK;
 Color BLACK;
 Color BLUE;
 Color BLUE;
+uint CLEAR_COLOR;
+uint CLEAR_DEPTH;
+uint CLEAR_STENCIL;
 int CONTROLLER_AXIS_LEFTX;
 int CONTROLLER_AXIS_LEFTX;
 int CONTROLLER_AXIS_LEFTY;
 int CONTROLLER_AXIS_LEFTY;
 int CONTROLLER_AXIS_RIGHTX;
 int CONTROLLER_AXIS_RIGHTX;

+ 39 - 0
Docs/LuaScriptAPI.dox

@@ -142,6 +142,7 @@ namespace Urho3D
 <a href="#Class_RenderPath"><b>RenderPath</b></a>
 <a href="#Class_RenderPath"><b>RenderPath</b></a>
 <a href="#Class_RenderPathCommand"><b>RenderPathCommand</b></a>
 <a href="#Class_RenderPathCommand"><b>RenderPathCommand</b></a>
 <a href="#Class_RenderSurface"><b>RenderSurface</b></a>
 <a href="#Class_RenderSurface"><b>RenderSurface</b></a>
+<a href="#Class_RenderTargetInfo"><b>RenderTargetInfo</b></a>
 <a href="#Class_Renderer"><b>Renderer</b></a>
 <a href="#Class_Renderer"><b>Renderer</b></a>
 <a href="#Class_Resource"><b>Resource</b></a>
 <a href="#Class_Resource"><b>Resource</b></a>
 <a href="#Class_ResourceCache"><b>ResourceCache</b></a>
 <a href="#Class_ResourceCache"><b>ResourceCache</b></a>
@@ -4398,12 +4399,15 @@ Methods:
 - void SetShaderParameter(const String name, const Variant& value)
 - void SetShaderParameter(const String name, const Variant& value)
 - void RemoveShaderParameter(const String name)
 - void RemoveShaderParameter(const String name)
 - void SetNumOutputs(unsigned num)
 - void SetNumOutputs(unsigned num)
+- void SetOutput(unsigned index, const String name, CubeMapFace face)
 - void SetOutputName(unsigned index, const String name)
 - void SetOutputName(unsigned index, const String name)
+- void SetOutputFace(unsigned index, CubeMapFace face)
 - void SetDepthStencilName(const String name)
 - void SetDepthStencilName(const String name)
 - const String GetTextureName(TextureUnit unit) const
 - const String GetTextureName(TextureUnit unit) const
 - const Variant& GetShaderParameter(const String name) const
 - const Variant& GetShaderParameter(const String name) const
 - unsigned GetNumOutputs() const
 - unsigned GetNumOutputs() const
 - const String GetOutputName(unsigned index) const
 - const String GetOutputName(unsigned index) const
+- CubeMapFace GetOutputFace(unsigned index) const
 - const String GetDepthStencilName() const
 - const String GetDepthStencilName() const
 
 
 Properties:
 Properties:
@@ -4464,6 +4468,29 @@ Properties:
 - RenderSurface* linkedRenderTarget
 - RenderSurface* linkedRenderTarget
 - RenderSurface* linkedDepthStencil
 - RenderSurface* linkedDepthStencil
 
 
+<a name="Class_RenderTargetInfo"></a>
+### RenderTargetInfo
+
+
+Methods:
+
+- RenderTargetInfo() (GC)
+- RenderTargetInfo* new()
+- void Load(const XMLElement& element)
+
+Properties:
+
+- String name
+- String tag
+- unsigned format
+- Vector2 size
+- RenderTargetSizeMode sizeMode
+- bool enabled
+- bool cubemap
+- bool filtered
+- bool sRGB
+- bool persistent
+
 <a name="Class_Renderer"></a>
 <a name="Class_Renderer"></a>
 ### Renderer
 ### Renderer
 
 
@@ -4597,6 +4624,7 @@ Methods:
 - void SetFinishBackgroundResourcesMs(int ms)
 - void SetFinishBackgroundResourcesMs(int ms)
 - File* GetFile(const String name)
 - File* GetFile(const String name)
 - Resource* GetResource(const String type, const String name, bool sendEventOnFailure = true)
 - Resource* GetResource(const String type, const String name, bool sendEventOnFailure = true)
+- Resource* GetExistingResource(const String type, const String name)
 - bool BackgroundLoadResource(const String type, const String name, bool sendEventOnFailure = true)
 - bool BackgroundLoadResource(const String type, const String name, bool sendEventOnFailure = true)
 - unsigned GetNumBackgroundLoadResources() const
 - unsigned GetNumBackgroundLoadResources() const
 - const Vector<String>& GetResourceDirs() const
 - const Vector<String>& GetResourceDirs() const
@@ -7298,6 +7326,11 @@ Properties:
 - int RAY_OBB
 - int RAY_OBB
 - int RAY_TRIANGLE
 - int RAY_TRIANGLE
 
 
+### RenderCommandSortMode
+
+- int SORT_FRONTTOBACK
+- int SORT_BACKTOFRONT
+
 ### RenderCommandType
 ### RenderCommandType
 
 
 - int CMD_NONE
 - int CMD_NONE
@@ -7314,6 +7347,12 @@ Properties:
 - int SURFACE_UPDATEVISIBLE
 - int SURFACE_UPDATEVISIBLE
 - int SURFACE_UPDATEALWAYS
 - int SURFACE_UPDATEALWAYS
 
 
+### RenderTargetSizeMode
+
+- int SIZE_ABSOLUTE
+- int SIZE_VIEWPORTDIVISOR
+- int SIZE_VIEWPORTMULTIPLIER
+
 ### ShaderType
 ### ShaderType
 
 
 - int VS
 - int VS

+ 8 - 0
Docs/ScriptAPI.dox

@@ -8889,6 +8889,7 @@ Properties:
 Methods:
 Methods:
 
 
 - void RemoveShaderParameter(const String&)
 - void RemoveShaderParameter(const String&)
+- void SetOutput(uint, const String&, CubeMapFace = FACE_POSITIVE_X)
 
 
 Properties:
 Properties:
 
 
@@ -8901,6 +8902,7 @@ Properties:
 - bool markToStencil
 - bool markToStencil
 - String metadata
 - String metadata
 - uint numOutputs
 - uint numOutputs
+- CubeMapFace[] outputFaces
 - String[] outputNames
 - String[] outputNames
 - String pass
 - String pass
 - String pixelShaderDefines
 - String pixelShaderDefines
@@ -8942,6 +8944,7 @@ Properties:
 
 
 Properties:
 Properties:
 
 
+- bool cubemap
 - bool enabled
 - bool enabled
 - bool filtered
 - bool filtered
 - uint format
 - uint format
@@ -9041,6 +9044,8 @@ Methods:
 - bool AddResourceDir(const String&, uint = M_MAX_UNSIGNED)
 - bool AddResourceDir(const String&, uint = M_MAX_UNSIGNED)
 - bool BackgroundLoadResource(const String&, const String&, bool = true)
 - bool BackgroundLoadResource(const String&, const String&, bool = true)
 - bool Exists(const String&) const
 - bool Exists(const String&) const
+- Resource@ GetExistingResource(StringHash, const String&)
+- Resource@ GetExistingResource(const String&, const String&)
 - File@ GetFile(const String&)
 - File@ GetFile(const String&)
 - String GetPreferredResourceDir(const String&) const
 - String GetPreferredResourceDir(const String&) const
 - Resource@ GetResource(StringHash, const String&, bool = true)
 - Resource@ GetResource(StringHash, const String&, bool = true)
@@ -13779,6 +13784,9 @@ Properties:
 - uint AM_NOEDIT
 - uint AM_NOEDIT
 - Color BLACK
 - Color BLACK
 - Color BLUE
 - Color BLUE
+- uint CLEAR_COLOR
+- uint CLEAR_DEPTH
+- uint CLEAR_STENCIL
 - int CONTROLLER_AXIS_LEFTX
 - int CONTROLLER_AXIS_LEFTX
 - int CONTROLLER_AXIS_LEFTY
 - int CONTROLLER_AXIS_LEFTY
 - int CONTROLLER_AXIS_RIGHTX
 - int CONTROLLER_AXIS_RIGHTX

+ 1 - 1
Source/Urho3D/.soversion

@@ -1 +1 @@
-0.0.97
+0.0.98