Move consts from OcclusionBuffer.h to OcclusionBuffer.cpp

Source/Urho3D/AngelScript/Generated_GlobalVariables.cpp

@@ -403,24 +403,6 @@ void ASRegisterGeneratedGlobalVariables(asIScriptEngine* engine)
     // static const int NUM_OCTANTS | File: ../Graphics/Octree.h
     engine->RegisterGlobalProperty("const int NUM_OCTANTS", (void*)&NUM_OCTANTS);
 
-    // static const int OCCLUSION_DEFAULT_MAX_TRIANGLES | File: ../Graphics/OcclusionBuffer.h
-    engine->RegisterGlobalProperty("const int OCCLUSION_DEFAULT_MAX_TRIANGLES", (void*)&OCCLUSION_DEFAULT_MAX_TRIANGLES);
-
-    // static const int OCCLUSION_FIXED_BIAS | File: ../Graphics/OcclusionBuffer.h
-    engine->RegisterGlobalProperty("const int OCCLUSION_FIXED_BIAS", (void*)&OCCLUSION_FIXED_BIAS);
-
-    // static const int OCCLUSION_MIN_SIZE | File: ../Graphics/OcclusionBuffer.h
-    engine->RegisterGlobalProperty("const int OCCLUSION_MIN_SIZE", (void*)&OCCLUSION_MIN_SIZE);
-
-    // static const float OCCLUSION_RELATIVE_BIAS | File: ../Graphics/OcclusionBuffer.h
-    engine->RegisterGlobalProperty("const float OCCLUSION_RELATIVE_BIAS", (void*)&OCCLUSION_RELATIVE_BIAS);
-
-    // static const float OCCLUSION_X_SCALE | File: ../Graphics/OcclusionBuffer.h
-    engine->RegisterGlobalProperty("const float OCCLUSION_X_SCALE", (void*)&OCCLUSION_X_SCALE);
-
-    // static const float OCCLUSION_Z_SCALE | File: ../Graphics/OcclusionBuffer.h
-    engine->RegisterGlobalProperty("const float OCCLUSION_Z_SCALE", (void*)&OCCLUSION_Z_SCALE);
-
     // static const unsigned PRIORITY_LAST | File: ../Resource/ResourceCache.h
     engine->RegisterGlobalProperty("const uint PRIORITY_LAST", (void*)&PRIORITY_LAST);
 

Source/Urho3D/Graphics/OcclusionBuffer.cpp

@@ -25,6 +25,13 @@ enum ClipMask : unsigned
 };
 URHO3D_FLAGSET(ClipMask, ClipMaskFlags);
 
+static constexpr int OCCLUSION_MIN_SIZE = 8;
+static constexpr int OCCLUSION_DEFAULT_MAX_TRIANGLES = 5000;
+static constexpr float OCCLUSION_RELATIVE_BIAS = 0.00001f;
+static constexpr int OCCLUSION_FIXED_BIAS = 16;
+static constexpr float OCCLUSION_X_SCALE = 65536.0f;
+static constexpr float OCCLUSION_Z_SCALE = 16777216.0f;
+
 void DrawOcclusionBatchWork(const WorkItem* item, i32 threadIndex)
 {
     auto* buffer = reinterpret_cast<OcclusionBuffer*>(item->aux_);
@@ -32,8 +39,9 @@ void DrawOcclusionBatchWork(const WorkItem* item, i32 threadIndex)
     buffer->DrawBatch(batch, threadIndex);
 }
 
-OcclusionBuffer::OcclusionBuffer(Context* context) :
-    Object(context)
+OcclusionBuffer::OcclusionBuffer(Context* context)
+    : Object(context)
+    , maxTriangles_(OCCLUSION_DEFAULT_MAX_TRIANGLES)
 {
 }
 

Source/Urho3D/Graphics/OcclusionBuffer.h

@@ -61,13 +61,6 @@ struct OcclusionBatch
     unsigned drawCount_;
 };
 
-static const int OCCLUSION_MIN_SIZE = 8;
-static const int OCCLUSION_DEFAULT_MAX_TRIANGLES = 5000;
-static const float OCCLUSION_RELATIVE_BIAS = 0.00001f;
-static const int OCCLUSION_FIXED_BIAS = 16;
-static const float OCCLUSION_X_SCALE = 65536.0f;
-static const float OCCLUSION_Z_SCALE = 16777216.0f;
-
 /// Software renderer for occlusion.
 class URHO3D_API OcclusionBuffer : public Object
 {
@@ -173,7 +166,7 @@ private:
     /// Number of rendered triangles.
     unsigned numTriangles_{};
     /// Maximum number of triangles.
-    unsigned maxTriangles_{OCCLUSION_DEFAULT_MAX_TRIANGLES};
+    unsigned maxTriangles_;
     /// Culling mode.
     CullMode cullMode_{CULL_CCW};
     /// Depth hierarchy needs update flag.