Changeset 896 for cpp/common

Timestamp:

11/30/19 01:30:22 (5 years ago)

Author:

Maciej Komosinski

Message:

Replaced #defined macros for popular random-related operations with functions

Location:

cpp/common

Files:

• nonstd_math.cpp (modified) (1 diff)
• nonstd_math.h (modified) (3 diffs)
• random.h (modified) (2 diffs)

cpp/common/nonstd_math.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
 #include "nonstd_math.h"
 
-RandomGenerator& rndGetInstance()
+RandomGenerator &rndGetInstance()
 {
         static RandomGenerator rnd(0);

cpp/common/nonstd_math.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -21 +21 @@
 //random number generator:
 #include "random.h"
-RandomGenerator& rndGetInstance();
+RandomGenerator &rndGetInstance();
 
-#define rnd01 (rndGetInstance().getDouble())
-#define rnd0N(limit) (rndGetInstance().getDouble()*(limit))
-#define randomN(limit) ((unsigned int)(rndGetInstance().getDouble()*(limit)))
-#define setRandomSeed(seed) rndGetInstance().setSeed(seed)
-#define setRandomRandomSeed() rndGetInstance().randomize()
-
+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 void rndSetSeed(unsigned int seed) { rndGetInstance().setSeed(seed); }
+inline unsigned int rndRandomizeSeed() { return rndGetInstance().randomize(); }
 
 //floating point specific numbers
@@ -66 +64 @@
 void fpExceptDisable();
 
+// std::lerp can be used since c++20 (and has some guaranteed properties probably better than this basic formula) but apparently it is not a template
+template <typename Value, typename Linear> Value universal_lerp(Value a,Value b,Linear t) {return a*(1-t)+b*t;}
+
 #endif
 

cpp/common/random.h

@@ -2 +2 @@
 // Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
+#ifndef _COMMON_RANDOM_H_
+#define _COMMON_RANDOM_H_
 
 #ifdef _MSC_VER
@@ -140 +142 @@
         }
 };
+#endif