Changeset 1298 for cpp/common

Timestamp:

03/29/24 23:30:34 (4 weeks ago)

Author:

Maciej Komosinski

Message:

Introduced overloads for rndUint() with size_t and int arguments to avoid numerous type casts in sources

Location:

cpp/common

Files:

• nonstd_math.cpp (modified) (4 diffs)
• nonstd_math.h (modified) (3 diffs)

cpp/common/nonstd_math.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2023  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -8 +8 @@
 #include <sstream>
 #include <algorithm> // std::min()
+#include <common/log.h>
+
+
+unsigned int rndUint(int limit_exclusive)
+{
+        if (limit_exclusive < 0) 
+        { 
+                logPrintf("", "rndUint", LOG_ERROR, "rndUint(negative: %d)", limit_exclusive);
+                return 0;
+        }
+        else return rndUint((unsigned int)limit_exclusive);
+}
+
 
 RandomGenerator &rndGetInstance()
@@ -125 +138 @@
 #include <fenv.h>
 
+#ifdef __CYGWIN__ //since my cygwin update in 2024 (g++ (GCC) 11.4.0), these two are no longer found:
+ #define feenableexcept(x)
+ #define fedisableexcept(x)
+#endif
+
 namespace fpExcept
 { 
@@ -203 +221 @@
 
 #endif
+

cpp/common/nonstd_math.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -9 +9 @@
 #ifdef _MSC_VER
  #define _USE_MATH_DEFINES //after this is defined, the next #include <math.h> or <cmath> will define M_PI etc.
- #include <math.h> //w vc2008 dzia�a�o tu <cmath>, ale w vc2010 juz nie bo "co�" (jaki� inny .h stl'a?) includuje wcze�niej <cmath> bez _USE_MATH_DEFINES, a <cmath> includuje <math.h> (ale tylko raz bo ma "include guards" jak kazdy .h)
+ #include <math.h> //in vc2008, <cmath> worked here, but no longer in vc2010 because "something" (some other .h from stl?) earlier includes <cmath> without _USE_MATH_DEFINES, and <cmath> includes <math.h> (just once because it has "include guards" like any other .h)
  #include <float.h>
  //#define isnan(x) _isnan(x) //since 2014 we use std::isnan()
  #define finite(x) _finite(x)
-#else //m.in. __BORLANDC__
+#else //e.g. __BORLANDC__
  #include <math.h>
 #endif
@@ -25 +25 @@
 inline double rndDouble(double limit_exclusive) { return rndGetInstance().getDouble() * limit_exclusive; }
 inline unsigned int rndUint(unsigned int limit_exclusive) { return (unsigned int)(rndGetInstance().getDouble() * limit_exclusive); } //returns random from 0..limit_exclusive-1
+inline unsigned int rndUint(size_t limit_exclusive) {return rndUint((unsigned int)limit_exclusive);} //just an overload with size_t argument
+unsigned int rndUint(int limit_exclusive); //just an overload with int argument
 inline void rndSetSeed(unsigned int seed) { rndGetInstance().setSeed(seed); }
 inline unsigned int rndRandomizeSeed() { return rndGetInstance().randomize(); }