Sfoglia il codice sorgente

Make Drawable::GetNumOccluderTriangles() signed

1vanK 3 anni fa
parent
commit
23863d5651

+ 2 - 2
Source/Urho3D/AngelScript/Generated_Members.h

@@ -17915,8 +17915,8 @@ template <class T> void RegisterMembers_Drawable(asIScriptEngine* engine, const
     // float Drawable::GetMinZ() const
     engine->RegisterObjectMethod(className, "float GetMinZ() const", AS_METHODPR(T, GetMinZ, () const, float), AS_CALL_THISCALL);
 
-    // virtual unsigned Drawable::GetNumOccluderTriangles()
-    engine->RegisterObjectMethod(className, "uint GetNumOccluderTriangles()", AS_METHODPR(T, GetNumOccluderTriangles, (), unsigned), AS_CALL_THISCALL);
+    // virtual i32 Drawable::GetNumOccluderTriangles()
+    engine->RegisterObjectMethod(className, "int GetNumOccluderTriangles()", AS_METHODPR(T, GetNumOccluderTriangles, (), i32), AS_CALL_THISCALL);
 
     // float Drawable::GetShadowDistance() const
     engine->RegisterObjectMethod(className, "float GetShadowDistance() const", AS_METHODPR(T, GetShadowDistance, () const, float), AS_CALL_THISCALL);

+ 3 - 3
Source/Urho3D/Graphics/CustomGeometry.cpp

@@ -124,11 +124,11 @@ Geometry* CustomGeometry::GetLodGeometry(i32 batchIndex, i32 level)
     return batchIndex < geometries_.Size() ? geometries_[batchIndex] : nullptr;
 }
 
-unsigned CustomGeometry::GetNumOccluderTriangles()
+i32 CustomGeometry::GetNumOccluderTriangles()
 {
-    unsigned triangles = 0;
+    i32 triangles = 0;
 
-    for (unsigned i = 0; i < batches_.Size(); ++i)
+    for (i32 i = 0; i < batches_.Size(); ++i)
     {
         Geometry* geometry = GetLodGeometry(i, 0);
         if (!geometry)

+ 1 - 1
Source/Urho3D/Graphics/CustomGeometry.h

@@ -45,7 +45,7 @@ public:
     /// Return the geometry for a specific LOD level.
     Geometry* GetLodGeometry(i32 batchIndex, i32 level) override;
     /// Return number of occlusion geometry triangles.
-    unsigned GetNumOccluderTriangles() override;
+    i32 GetNumOccluderTriangles() override;
     /// Draw to occlusion buffer. Return true if did not run out of triangles.
     bool DrawOcclusion(OcclusionBuffer* buffer) override;
 

+ 1 - 1
Source/Urho3D/Graphics/Drawable.h

@@ -128,7 +128,7 @@ public:
     virtual Geometry* GetLodGeometry(i32 batchIndex, i32 level);
 
     /// Return number of occlusion geometry triangles.
-    virtual unsigned GetNumOccluderTriangles() { return 0; }
+    virtual i32 GetNumOccluderTriangles() { return 0; }
 
     /// Draw to occlusion buffer. Return true if did not run out of triangles.
     virtual bool DrawOcclusion(OcclusionBuffer* buffer);

+ 3 - 3
Source/Urho3D/Graphics/StaticModel.cpp

@@ -149,11 +149,11 @@ Geometry* StaticModel::GetLodGeometry(i32 batchIndex, i32 level)
         return batches_[batchIndex].geometry_;
 }
 
-unsigned StaticModel::GetNumOccluderTriangles()
+i32 StaticModel::GetNumOccluderTriangles()
 {
-    unsigned triangles = 0;
+    i32 triangles = 0;
 
-    for (unsigned i = 0; i < batches_.Size(); ++i)
+    for (i32 i = 0; i < batches_.Size(); ++i)
     {
         Geometry* geometry = GetLodGeometry(i, occlusionLodLevel_);
         if (!geometry)

+ 1 - 1
Source/Urho3D/Graphics/StaticModel.h

@@ -40,7 +40,7 @@ public:
     /// Return the geometry for a specific LOD level.
     Geometry* GetLodGeometry(i32 batchIndex, i32 level) override;
     /// Return number of occlusion geometry triangles.
-    unsigned GetNumOccluderTriangles() override;
+    i32 GetNumOccluderTriangles() override;
     /// Draw to occlusion buffer. Return true if did not run out of triangles.
     bool DrawOcclusion(OcclusionBuffer* buffer) override;
 

+ 3 - 3
Source/Urho3D/Graphics/StaticModelGroup.cpp

@@ -180,14 +180,14 @@ void StaticModelGroup::UpdateBatches(const FrameInfo& frame)
     }
 }
 
-unsigned StaticModelGroup::GetNumOccluderTriangles()
+i32 StaticModelGroup::GetNumOccluderTriangles()
 {
     // Make sure instance transforms are up-to-date
     GetWorldBoundingBox();
 
-    unsigned triangles = 0;
+    i32 triangles = 0;
 
-    for (unsigned i = 0; i < batches_.Size(); ++i)
+    for (i32 i = 0; i < batches_.Size(); ++i)
     {
         Geometry* geometry = GetLodGeometry(i, occlusionLodLevel_);
         if (!geometry)

+ 1 - 1
Source/Urho3D/Graphics/StaticModelGroup.h

@@ -29,7 +29,7 @@ public:
     /// Calculate distance and prepare batches for rendering. May be called from worker thread(s), possibly re-entrantly.
     void UpdateBatches(const FrameInfo& frame) override;
     /// Return number of occlusion geometry triangles.
-    unsigned GetNumOccluderTriangles() override;
+    i32 GetNumOccluderTriangles() override;
     /// Draw to occlusion buffer. Return true if did not run out of triangles.
     bool DrawOcclusion(OcclusionBuffer* buffer) override;
 

+ 1 - 1
Source/Urho3D/Graphics/TerrainPatch.cpp

@@ -151,7 +151,7 @@ Geometry* TerrainPatch::GetLodGeometry(i32 batchIndex, i32 level)
         return geometry_;
 }
 
-unsigned TerrainPatch::GetNumOccluderTriangles()
+i32 TerrainPatch::GetNumOccluderTriangles()
 {
     // Check that the material is suitable for occlusion (default material always is)
     Material* mat = batches_[0].material_;

+ 1 - 1
Source/Urho3D/Graphics/TerrainPatch.h

@@ -37,7 +37,7 @@ public:
     /// Return the geometry for a specific LOD level.
     Geometry* GetLodGeometry(i32 batchIndex, i32 level) override;
     /// Return number of occlusion geometry triangles.
-    unsigned GetNumOccluderTriangles() override;
+    i32 GetNumOccluderTriangles() override;
     /// Draw to occlusion buffer. Return true if did not run out of triangles.
     bool DrawOcclusion(OcclusionBuffer* buffer) override;
     /// Visualize the component as debug geometry.