Browse Source

Light.h: use "inline constexpr" for global consts

1vanK 3 years ago
parent
commit
8ca7d3e495

+ 5 - 5
Source/Urho3D/AngelScript/Generated_GlobalVariables.cpp

@@ -283,13 +283,13 @@ void ASRegisterGeneratedGlobalVariables(asIScriptEngine* engine)
     // static const int MATRIX_CONVERSION_BUFFER_LENGTH | File: ../Container/Str.h
     // static const int MATRIX_CONVERSION_BUFFER_LENGTH | File: ../Container/Str.h
     engine->RegisterGlobalProperty("const int MATRIX_CONVERSION_BUFFER_LENGTH", (void*)&MATRIX_CONVERSION_BUFFER_LENGTH);
     engine->RegisterGlobalProperty("const int MATRIX_CONVERSION_BUFFER_LENGTH", (void*)&MATRIX_CONVERSION_BUFFER_LENGTH);
 
 
-    // static const unsigned MAX_CASCADE_SPLITS | File: ../Graphics/Light.h
-    engine->RegisterGlobalProperty("const uint MAX_CASCADE_SPLITS", (void*)&MAX_CASCADE_SPLITS);
+    // constexpr i32 MAX_CASCADE_SPLITS | File: ../Graphics/Light.h
+    engine->RegisterGlobalProperty("const int MAX_CASCADE_SPLITS", (void*)&MAX_CASCADE_SPLITS);
 
 
     // constexpr i32 MAX_CONSTANT_REGISTERS | File: ../GraphicsAPI/GraphicsDefs.h
     // constexpr i32 MAX_CONSTANT_REGISTERS | File: ../GraphicsAPI/GraphicsDefs.h
     engine->RegisterGlobalProperty("const int MAX_CONSTANT_REGISTERS", (void*)&MAX_CONSTANT_REGISTERS);
     engine->RegisterGlobalProperty("const int MAX_CONSTANT_REGISTERS", (void*)&MAX_CONSTANT_REGISTERS);
 
 
-    // static const int MAX_LIGHT_SPLITS | File: ../Graphics/Light.h
+    // constexpr i32 MAX_LIGHT_SPLITS | File: ../Graphics/Light.h
     engine->RegisterGlobalProperty("const int MAX_LIGHT_SPLITS", (void*)&MAX_LIGHT_SPLITS);
     engine->RegisterGlobalProperty("const int MAX_LIGHT_SPLITS", (void*)&MAX_LIGHT_SPLITS);
 
 
     // static const unsigned MAX_NETWORK_ATTRIBUTES | File: ../Scene/ReplicationState.h
     // static const unsigned MAX_NETWORK_ATTRIBUTES | File: ../Scene/ReplicationState.h
@@ -496,10 +496,10 @@ void ASRegisterGeneratedGlobalVariables(asIScriptEngine* engine)
     // static const int SHADOW_MIN_PIXELS | File: ../Graphics/Renderer.h
     // static const int SHADOW_MIN_PIXELS | File: ../Graphics/Renderer.h
     engine->RegisterGlobalProperty("const int SHADOW_MIN_PIXELS", (void*)&SHADOW_MIN_PIXELS);
     engine->RegisterGlobalProperty("const int SHADOW_MIN_PIXELS", (void*)&SHADOW_MIN_PIXELS);
 
 
-    // static const float SHADOW_MIN_QUANTIZE | File: ../Graphics/Light.h
+    // constexpr float SHADOW_MIN_QUANTIZE | File: ../Graphics/Light.h
     engine->RegisterGlobalProperty("const float SHADOW_MIN_QUANTIZE", (void*)&SHADOW_MIN_QUANTIZE);
     engine->RegisterGlobalProperty("const float SHADOW_MIN_QUANTIZE", (void*)&SHADOW_MIN_QUANTIZE);
 
 
-    // static const float SHADOW_MIN_VIEW | File: ../Graphics/Light.h
+    // constexpr float SHADOW_MIN_VIEW | File: ../Graphics/Light.h
     engine->RegisterGlobalProperty("const float SHADOW_MIN_VIEW", (void*)&SHADOW_MIN_VIEW);
     engine->RegisterGlobalProperty("const float SHADOW_MIN_VIEW", (void*)&SHADOW_MIN_VIEW);
 
 
     // static const String SOUND_AMBIENT | File: ../Audio/AudioDefs.h
     // static const String SOUND_AMBIENT | File: ../Audio/AudioDefs.h

+ 5 - 5
Source/Urho3D/Graphics/Light.h

@@ -24,13 +24,13 @@ enum LightType
     LIGHT_POINT
     LIGHT_POINT
 };
 };
 
 
-static const float SHADOW_MIN_QUANTIZE = 0.1f;
-static const float SHADOW_MIN_VIEW = 1.0f;
-static const int MAX_LIGHT_SPLITS = 6;
+inline constexpr float SHADOW_MIN_QUANTIZE = 0.1f;
+inline constexpr float SHADOW_MIN_VIEW = 1.0f;
+inline constexpr i32 MAX_LIGHT_SPLITS = 6;
 #ifdef DESKTOP_GRAPHICS
 #ifdef DESKTOP_GRAPHICS
-static const unsigned MAX_CASCADE_SPLITS = 4;
+inline constexpr i32 MAX_CASCADE_SPLITS = 4;
 #else
 #else
-static const unsigned MAX_CASCADE_SPLITS = 1;
+inline constexpr i32 MAX_CASCADE_SPLITS = 1;
 #endif
 #endif
 
 
 /// Depth bias parameters. Used both by lights (for shadow mapping) and materials.
 /// Depth bias parameters. Used both by lights (for shadow mapping) and materials.