Bladeren bron

Travis CI: API documentation update at 2015-08-05 16:16:10 UTC.
[ci package]

Commit: https://github.com/urho3d/Urho3D/commit/a737bbb671b4909d1c64da129ac1cbd5848ec610

Message: Fix terrain occlusion leaving holes in the occlusion geometry, and being over-aggressive with height reduction, which would result in poor occlusion. Allow to configure terrain number of LOD levels to be less than 4. Allow to configure the LOD level used for terrain occlusion (not recommended to be changed.) Closes #825.

urho3d-travis-ci 10 jaren geleden
bovenliggende
commit
1592c95915
4 gewijzigde bestanden met toevoegingen van 15 en 3 verwijderingen
  1. 2 0
      Docs/AngelScriptAPI.h
  2. 8 2
      Docs/LuaScriptAPI.dox
  3. 4 0
      Docs/ScriptAPI.dox
  4. 1 1
      Source/Urho3D/.soversion

+ 2 - 0
Docs/AngelScriptAPI.h

@@ -10308,6 +10308,7 @@ uint lightMask;
 float lodBias;
 float lodBias;
 Material material;
 Material material;
 uint maxLights;
 uint maxLights;
+uint maxLodLevels;
 /* readonly */
 /* readonly */
 Node node;
 Node node;
 /* readonly */
 /* readonly */
@@ -10319,6 +10320,7 @@ IntVector2 numVertices;
 ObjectAnimation objectAnimation;
 ObjectAnimation objectAnimation;
 bool occludee;
 bool occludee;
 bool occluder;
 bool occluder;
+uint occlusionLodLevel;
 int patchSize;
 int patchSize;
 /* readonly */
 /* readonly */
 Array<TerrainPatch> patches;
 Array<TerrainPatch> patches;

+ 8 - 2
Docs/LuaScriptAPI.dox

@@ -5626,6 +5626,8 @@ Methods:
 
 
 - void SetPatchSize(int size)
 - void SetPatchSize(int size)
 - void SetSpacing(const Vector3& spacing)
 - void SetSpacing(const Vector3& spacing)
+- void SetMaxLodLevels(unsigned levels)
+- void SetOcclusionLodLevel(unsigned level)
 - void SetSmoothing(bool enable)
 - void SetSmoothing(bool enable)
 - bool SetHeightMap(Image* image)
 - bool SetHeightMap(Image* image)
 - void SetMaterial(Material* material)
 - void SetMaterial(Material* material)
@@ -5645,6 +5647,8 @@ Methods:
 - const Vector3& GetSpacing() const
 - const Vector3& GetSpacing() const
 - const IntVector2& GetNumVertices() const
 - const IntVector2& GetNumVertices() const
 - const IntVector2& GetNumPatches() const
 - const IntVector2& GetNumPatches() const
+- unsigned GetMaxLodLevels() const
+- unsigned GetOcclusionLodLevel() const
 - bool GetSmoothing() const
 - bool GetSmoothing() const
 - Image* GetHeightMap() const
 - Image* GetHeightMap() const
 - Material* GetMaterial() const
 - Material* GetMaterial() const
@@ -5673,6 +5677,8 @@ Properties:
 - Vector3& spacing
 - Vector3& spacing
 - IntVector2& numVertices (readonly)
 - IntVector2& numVertices (readonly)
 - IntVector2& numPatches (readonly)
 - IntVector2& numPatches (readonly)
+- unsigned maxLodLevels
+- unsigned occlusionLodLevel
 - bool smoothing
 - bool smoothing
 - Image* heightMap
 - Image* heightMap
 - Material* material
 - Material* material
@@ -5702,7 +5708,7 @@ Methods:
 - void ResetLod()
 - void ResetLod()
 - Geometry* GetGeometry() const
 - Geometry* GetGeometry() const
 - Geometry* GetMaxLodGeometry() const
 - Geometry* GetMaxLodGeometry() const
-- Geometry* GetMinLodGeometry() const
+- Geometry* GetOcclusionGeometry() const
 - VertexBuffer* GetVertexBuffer() const
 - VertexBuffer* GetVertexBuffer() const
 - Terrain* GetOwner() const
 - Terrain* GetOwner() const
 - TerrainPatch* GetNorthPatch() const
 - TerrainPatch* GetNorthPatch() const
@@ -5716,7 +5722,7 @@ Properties:
 
 
 - Geometry* geometry (readonly)
 - Geometry* geometry (readonly)
 - Geometry* maxLodGeometry (readonly)
 - Geometry* maxLodGeometry (readonly)
-- Geometry* minLodGeometry (readonly)
+- Geometry* occlusionGeometry (readonly)
 - VertexBuffer* vertexBuffer (readonly)
 - VertexBuffer* vertexBuffer (readonly)
 - Terrain* owner
 - Terrain* owner
 - TerrainPatch* northPatch (readonly)
 - TerrainPatch* northPatch (readonly)

+ 4 - 0
Docs/ScriptAPI.dox

@@ -1875,6 +1875,7 @@ namespace Urho3D
 - %Material : ResourceRef
 - %Material : ResourceRef
 - %Vertex %Spacing : Vector3
 - %Vertex %Spacing : Vector3
 - %Patch %Size : int
 - %Patch %Size : int
+- %Max %LOD %Levels : int
 - %Smooth %Height %Map : bool
 - %Smooth %Height %Map : bool
 - %Is %Occluder : bool
 - %Is %Occluder : bool
 - %Can %Be %Occluded : bool
 - %Can %Be %Occluded : bool
@@ -1887,6 +1888,7 @@ namespace Urho3D
 - %Light %Mask : int
 - %Light %Mask : int
 - %Shadow %Mask : int
 - %Shadow %Mask : int
 - %Zone %Mask : int
 - %Zone %Mask : int
+- %Occlusion %LOD %level : int
 
 
 ### Text
 ### Text
 - %Name : String
 - %Name : String
@@ -11287,6 +11289,7 @@ Properties:
 - float lodBias
 - float lodBias
 - Material@ material
 - Material@ material
 - uint maxLights
 - uint maxLights
+- uint maxLodLevels
 - Node@ node // readonly
 - Node@ node // readonly
 - uint numAttributes // readonly
 - uint numAttributes // readonly
 - IntVector2 numPatches // readonly
 - IntVector2 numPatches // readonly
@@ -11294,6 +11297,7 @@ Properties:
 - ObjectAnimation@ objectAnimation
 - ObjectAnimation@ objectAnimation
 - bool occludee
 - bool occludee
 - bool occluder
 - bool occluder
+- uint occlusionLodLevel
 - int patchSize
 - int patchSize
 - TerrainPatch@[] patches // readonly
 - TerrainPatch@[] patches // readonly
 - int refs // readonly
 - int refs // readonly

+ 1 - 1
Source/Urho3D/.soversion

@@ -1 +1 @@
-0.0.126
+0.0.127