Browse Source

Add min/max consts for i8, u8, i16, u16, i32, u32

1vanK 3 years ago
parent
commit
7cabebe883

+ 36 - 0
Source/Urho3D/AngelScript/Generated_GlobalVariables.cpp

@@ -340,30 +340,66 @@ void ASRegisterGeneratedGlobalVariables(asIScriptEngine* engine)
     // constexpr float M_MAX_FOV | File: ../Math/MathDefs.h
     // constexpr float M_MAX_FOV | File: ../Math/MathDefs.h
     engine->RegisterGlobalProperty("const float M_MAX_FOV", (void*)&M_MAX_FOV);
     engine->RegisterGlobalProperty("const float M_MAX_FOV", (void*)&M_MAX_FOV);
 
 
+    // constexpr i16 M_MAX_I16 | File: ../Math/MathDefs.h
+    engine->RegisterGlobalProperty("const int16 M_MAX_I16", (void*)&M_MAX_I16);
+
+    // constexpr i32 M_MAX_I32 | File: ../Math/MathDefs.h
+    engine->RegisterGlobalProperty("const int M_MAX_I32", (void*)&M_MAX_I32);
+
     // constexpr i64 M_MAX_I64 | File: ../Math/MathDefs.h
     // constexpr i64 M_MAX_I64 | File: ../Math/MathDefs.h
     engine->RegisterGlobalProperty("const int64 M_MAX_I64", (void*)&M_MAX_I64);
     engine->RegisterGlobalProperty("const int64 M_MAX_I64", (void*)&M_MAX_I64);
 
 
+    // constexpr i8 M_MAX_I8 | File: ../Math/MathDefs.h
+    engine->RegisterGlobalProperty("const int8 M_MAX_I8", (void*)&M_MAX_I8);
+
     // constexpr i32 M_MAX_INT | File: ../Math/MathDefs.h
     // constexpr i32 M_MAX_INT | File: ../Math/MathDefs.h
     engine->RegisterGlobalProperty("const int M_MAX_INT", (void*)&M_MAX_INT);
     engine->RegisterGlobalProperty("const int M_MAX_INT", (void*)&M_MAX_INT);
 
 
+    // constexpr u16 M_MAX_U16 | File: ../Math/MathDefs.h
+    engine->RegisterGlobalProperty("const uint16 M_MAX_U16", (void*)&M_MAX_U16);
+
+    // constexpr u32 M_MAX_U32 | File: ../Math/MathDefs.h
+    engine->RegisterGlobalProperty("const uint M_MAX_U32", (void*)&M_MAX_U32);
+
     // constexpr u64 M_MAX_U64 | File: ../Math/MathDefs.h
     // constexpr u64 M_MAX_U64 | File: ../Math/MathDefs.h
     engine->RegisterGlobalProperty("const uint64 M_MAX_U64", (void*)&M_MAX_U64);
     engine->RegisterGlobalProperty("const uint64 M_MAX_U64", (void*)&M_MAX_U64);
 
 
+    // constexpr u8 M_MAX_U8 | File: ../Math/MathDefs.h
+    engine->RegisterGlobalProperty("const uint8 M_MAX_U8", (void*)&M_MAX_U8);
+
     // constexpr u32 M_MAX_UNSIGNED | File: ../Math/MathDefs.h
     // constexpr u32 M_MAX_UNSIGNED | File: ../Math/MathDefs.h
     engine->RegisterGlobalProperty("const uint M_MAX_UNSIGNED", (void*)&M_MAX_UNSIGNED);
     engine->RegisterGlobalProperty("const uint M_MAX_UNSIGNED", (void*)&M_MAX_UNSIGNED);
 
 
+    // constexpr i16 M_MIN_I16 | File: ../Math/MathDefs.h
+    engine->RegisterGlobalProperty("const int16 M_MIN_I16", (void*)&M_MIN_I16);
+
+    // constexpr i32 M_MIN_I32 | File: ../Math/MathDefs.h
+    engine->RegisterGlobalProperty("const int M_MIN_I32", (void*)&M_MIN_I32);
+
     // constexpr i64 M_MIN_I64 | File: ../Math/MathDefs.h
     // constexpr i64 M_MIN_I64 | File: ../Math/MathDefs.h
     engine->RegisterGlobalProperty("const int64 M_MIN_I64", (void*)&M_MIN_I64);
     engine->RegisterGlobalProperty("const int64 M_MIN_I64", (void*)&M_MIN_I64);
 
 
+    // constexpr i8 M_MIN_I8 | File: ../Math/MathDefs.h
+    engine->RegisterGlobalProperty("const int8 M_MIN_I8", (void*)&M_MIN_I8);
+
     // constexpr i32 M_MIN_INT | File: ../Math/MathDefs.h
     // constexpr i32 M_MIN_INT | File: ../Math/MathDefs.h
     engine->RegisterGlobalProperty("const int M_MIN_INT", (void*)&M_MIN_INT);
     engine->RegisterGlobalProperty("const int M_MIN_INT", (void*)&M_MIN_INT);
 
 
     // constexpr float M_MIN_NEARCLIP | File: ../Math/MathDefs.h
     // constexpr float M_MIN_NEARCLIP | File: ../Math/MathDefs.h
     engine->RegisterGlobalProperty("const float M_MIN_NEARCLIP", (void*)&M_MIN_NEARCLIP);
     engine->RegisterGlobalProperty("const float M_MIN_NEARCLIP", (void*)&M_MIN_NEARCLIP);
 
 
+    // constexpr u16 M_MIN_U16 | File: ../Math/MathDefs.h
+    engine->RegisterGlobalProperty("const uint16 M_MIN_U16", (void*)&M_MIN_U16);
+
+    // constexpr u32 M_MIN_U32 | File: ../Math/MathDefs.h
+    engine->RegisterGlobalProperty("const uint M_MIN_U32", (void*)&M_MIN_U32);
+
     // constexpr u64 M_MIN_U64 | File: ../Math/MathDefs.h
     // constexpr u64 M_MIN_U64 | File: ../Math/MathDefs.h
     engine->RegisterGlobalProperty("const uint64 M_MIN_U64", (void*)&M_MIN_U64);
     engine->RegisterGlobalProperty("const uint64 M_MIN_U64", (void*)&M_MIN_U64);
 
 
+    // constexpr u8 M_MIN_U8 | File: ../Math/MathDefs.h
+    engine->RegisterGlobalProperty("const uint8 M_MIN_U8", (void*)&M_MIN_U8);
+
     // constexpr u32 M_MIN_UNSIGNED | File: ../Math/MathDefs.h
     // constexpr u32 M_MIN_UNSIGNED | File: ../Math/MathDefs.h
     engine->RegisterGlobalProperty("const uint M_MIN_UNSIGNED", (void*)&M_MIN_UNSIGNED);
     engine->RegisterGlobalProperty("const uint M_MIN_UNSIGNED", (void*)&M_MIN_UNSIGNED);
 
 

+ 25 - 7
Source/Urho3D/Math/MathDefs.h

@@ -24,19 +24,37 @@ namespace Urho3D
 #undef M_PI
 #undef M_PI
 inline constexpr float M_PI = 3.14159265358979323846264338327950288f;
 inline constexpr float M_PI = 3.14159265358979323846264338327950288f;
 inline constexpr float M_HALF_PI = M_PI * 0.5f;
 inline constexpr float M_HALF_PI = M_PI * 0.5f;
+
+// TODO: remove this
 inline constexpr i32 M_MIN_INT = 0x80000000;
 inline constexpr i32 M_MIN_INT = 0x80000000;
 inline constexpr i32 M_MAX_INT = 0x7FFFFFFF;
 inline constexpr i32 M_MAX_INT = 0x7FFFFFFF;
 inline constexpr u32 M_MIN_UNSIGNED = 0x00000000;
 inline constexpr u32 M_MIN_UNSIGNED = 0x00000000;
 inline constexpr u32 M_MAX_UNSIGNED = 0xFFFFFFFF;
 inline constexpr u32 M_MAX_UNSIGNED = 0xFFFFFFFF;
-inline constexpr i64 M_MIN_I64 = 0x8000000000000000;
-inline constexpr i64 M_MAX_I64 = 0x7FFFFFFFFFFFFFFF;
-inline constexpr u64 M_MIN_U64 = 0;
-inline constexpr u64 M_MAX_U64 = 0xFFFFFFFFFFFFFFFF;
 
 
+inline constexpr i8 M_MIN_I8 = 0x80; // -128
+inline constexpr i8 M_MAX_I8 = 0x7F; // 127
+inline constexpr u8 M_MIN_U8 = 0x00;
+inline constexpr u8 M_MAX_U8 = 0xFF; // 255
+
+inline constexpr i16 M_MIN_I16 = 0x8000; // -32768
+inline constexpr i16 M_MAX_I16 = 0x7FFF; // 32767
+inline constexpr u16 M_MIN_U16 = 0x0000;
+inline constexpr u16 M_MAX_U16 = 0xFFFF; // 65535
+
+inline constexpr i32 M_MIN_I32 = 0x80000000; // -2147483648
+inline constexpr i32 M_MAX_I32 = 0x7FFFFFFF; // 2147483647
+inline constexpr u32 M_MIN_U32 = 0x00000000;
+inline constexpr u32 M_MAX_U32 = 0xFFFFFFFF; // 4294967295
+
+inline constexpr i64 M_MIN_I64 = 0x8000000000000000; // -9223372036854775808
+inline constexpr i64 M_MAX_I64 = 0x7FFFFFFFFFFFFFFF; // 9223372036854775807
+inline constexpr u64 M_MIN_U64 = 0x0000000000000000;
+inline constexpr u64 M_MAX_U64 = 0xFFFFFFFFFFFFFFFF; // 18446744073709551615
+
+inline constexpr i16 M_I16_MASK_ALL_BITS = 0xFFFF; // -1
 inline constexpr u16 M_U16_MASK_ALL_BITS = 0xFFFF;
 inline constexpr u16 M_U16_MASK_ALL_BITS = 0xFFFF;
-inline constexpr i16 M_I16_MASK_ALL_BITS = -1;
-inline constexpr u32 M_U32_MASK_ALL_BITS = M_MAX_UNSIGNED;
-inline constexpr i32 M_I32_MASK_ALL_BITS = -1;
+inline constexpr i32 M_I32_MASK_ALL_BITS = 0xFFFFFFFF; // -1
+inline constexpr u32 M_U32_MASK_ALL_BITS = 0xFFFFFFFF;
 
 
 inline constexpr float M_EPSILON = 0.000001f;
 inline constexpr float M_EPSILON = 0.000001f;
 inline constexpr float M_LARGE_EPSILON = 0.00005f;
 inline constexpr float M_LARGE_EPSILON = 0.00005f;