Renamed RANDOM_M11

cvlnomen · cvlnomen · commit ae8f7566c23e · 2022-07-01T12:05:41.000+02:00
diff --git a/src/ParticleSystem.cpp b/src/ParticleSystem.cpp
@@ -45,7 +45,7 @@ inline void normalizePoint(float x, float y, Pointf* out)
 /**
 A more effect random number getter function, get from ejoy2d.
 */
-inline static float RANDOM_M11(unsigned int* seed)
+inline static float randomM11(unsigned int* seed)
 {
     *seed = *seed * 134775813 + 1;
     union
@@ -92,45 +92,45 @@ void ParticleSystem::addParticles(int count)
     {
         return;
     }
-    uint32_t RANDSEED = std::rand();
+    uint32_t randseed = std::rand();
 
     int start = _particleCount;
     _particleCount += count;
 
     //life
     for (int i = start; i < _particleCount; ++i)
     {
-        float theLife = _life + _lifeVar * RANDOM_M11(&RANDSEED);
+        float theLife = _life + _lifeVar * randomM11(&randseed);
         particle_data_[i].timeToLive = (std::max)(0.0f, theLife);
     }
 
     //position
     for (int i = start; i < _particleCount; ++i)
     {
-        particle_data_[i].posx = _sourcePosition.x + _posVar.x * RANDOM_M11(&RANDSEED);
+        particle_data_[i].posx = _sourcePosition.x + _posVar.x * randomM11(&randseed);
     }
 
     for (int i = start; i < _particleCount; ++i)
     {
-        particle_data_[i].posy = _sourcePosition.y + _posVar.y * RANDOM_M11(&RANDSEED);
+        particle_data_[i].posy = _sourcePosition.y + _posVar.y * randomM11(&randseed);
     }
 
     //color
 #define SET_COLOR(c, b, v)                                                 \
     for (int i = start; i < _particleCount; ++i)                           \
     {                                                                      \
-        particle_data_[i].c = clampf((b) + (v) * RANDOM_M11(&RANDSEED), 0, 1); \
+        particle_data_[i].c = clampf((b) + (v) * randomM11(&randseed), 0, 1); \
     }
 
-    SET_COLOR(colorR, _startColor.r, _startColorVar.r)
-    SET_COLOR(colorG, _startColor.g, _startColorVar.g)
-    SET_COLOR(colorB, _startColor.b, _startColorVar.b)
-    SET_COLOR(colorA, _startColor.a, _startColorVar.a)
+	SET_COLOR(colorR, _startColor.r, _startColorVar.r)
+	SET_COLOR(colorG, _startColor.g, _startColorVar.g)
+	SET_COLOR(colorB, _startColor.b, _startColorVar.b)
+	SET_COLOR(colorA, _startColor.a, _startColorVar.a)
 
-    SET_COLOR(deltaColorR, _endColor.r, _endColorVar.r)
-    SET_COLOR(deltaColorG, _endColor.g, _endColorVar.g)
-    SET_COLOR(deltaColorB, _endColor.b, _endColorVar.b)
-    SET_COLOR(deltaColorA, _endColor.a, _endColorVar.a)
+	SET_COLOR(deltaColorR, _endColor.r, _endColorVar.r)
+	SET_COLOR(deltaColorG, _endColor.g, _endColorVar.g)
+	SET_COLOR(deltaColorB, _endColor.b, _endColorVar.b)
+	SET_COLOR(deltaColorA, _endColor.a, _endColorVar.a)
 
 #define SET_DELTA_COLOR(c, dc)                                                                              \
     for (int i = start; i < _particleCount; ++i)                                                            \
@@ -146,15 +146,15 @@ void ParticleSystem::addParticles(int count)
     //size
     for (int i = start; i < _particleCount; ++i)
     {
-        particle_data_[i].size = _startSize + _startSizeVar * RANDOM_M11(&RANDSEED);
+        particle_data_[i].size = _startSize + _startSizeVar * randomM11(&randseed);
         particle_data_[i].size = (std::max)(0.0f, particle_data_[i].size);
     }
 
     if (_endSize != START_SIZE_EQUAL_TO_END_SIZE)
     {
         for (int i = start; i < _particleCount; ++i)
         {
-            float endSize = _endSize + _endSizeVar * RANDOM_M11(&RANDSEED);
+            float endSize = _endSize + _endSizeVar * randomM11(&randseed);
             endSize = (std::max)(0.0f, endSize);
             particle_data_[i].deltaSize = (endSize - particle_data_[i].size) / particle_data_[i].timeToLive;
         }
@@ -170,11 +170,11 @@ void ParticleSystem::addParticles(int count)
     // rotation
     for (int i = start; i < _particleCount; ++i)
     {
-        particle_data_[i].rotation = _startSpin + _startSpinVar * RANDOM_M11(&RANDSEED);
+        particle_data_[i].rotation = _startSpin + _startSpinVar * randomM11(&randseed);
     }
     for (int i = start; i < _particleCount; ++i)
     {
-        float endA = _endSpin + _endSpinVar * RANDOM_M11(&RANDSEED);
+        float endA = _endSpin + _endSpinVar * randomM11(&randseed);
         particle_data_[i].deltaRotation = (endA - particle_data_[i].rotation) / particle_data_[i].timeToLive;
     }
 
@@ -199,23 +199,23 @@ void ParticleSystem::addParticles(int count)
         // radial accel
         for (int i = start; i < _particleCount; ++i)
         {
-            particle_data_[i].modeA.radialAccel = modeA.radialAccel + modeA.radialAccelVar * RANDOM_M11(&RANDSEED);
+            particle_data_[i].modeA.radialAccel = modeA.radialAccel + modeA.radialAccelVar * randomM11(&randseed);
         }
 
         // tangential accel
         for (int i = start; i < _particleCount; ++i)
         {
-            particle_data_[i].modeA.tangentialAccel = modeA.tangentialAccel + modeA.tangentialAccelVar * RANDOM_M11(&RANDSEED);
+            particle_data_[i].modeA.tangentialAccel = modeA.tangentialAccel + modeA.tangentialAccelVar * randomM11(&randseed);
         }
 
         // rotation is dir
         if (modeA.rotationIsDir)
         {
             for (int i = start; i < _particleCount; ++i)
             {
-                float a = deg2Rad(_angle + _angleVar * RANDOM_M11(&RANDSEED));
+                float a = deg2Rad(_angle + _angleVar * randomM11(&randseed));
                 Vec2 v(cosf(a), sinf(a));
-                float s = modeA.speed + modeA.speedVar * RANDOM_M11(&RANDSEED);
+                float s = modeA.speed + modeA.speedVar * randomM11(&randseed);
                 Vec2 dir = v * s;
                 particle_data_[i].modeA.dirX = dir.x;    //v * s ;
                 particle_data_[i].modeA.dirY = dir.y;
@@ -226,9 +226,9 @@ void ParticleSystem::addParticles(int count)
         {
             for (int i = start; i < _particleCount; ++i)
             {
-                float a = deg2Rad(_angle + _angleVar * RANDOM_M11(&RANDSEED));
+                float a = deg2Rad(_angle + _angleVar * randomM11(&randseed));
                 Vec2 v(cosf(a), sinf(a));
-                float s = modeA.speed + modeA.speedVar * RANDOM_M11(&RANDSEED);
+                float s = modeA.speed + modeA.speedVar * randomM11(&randseed);
                 Vec2 dir = v * s;
                 particle_data_[i].modeA.dirX = dir.x;    //v * s ;
                 particle_data_[i].modeA.dirY = dir.y;
@@ -241,18 +241,18 @@ void ParticleSystem::addParticles(int count)
     {
         for (int i = start; i < _particleCount; ++i)
         {
-            particle_data_[i].modeB.radius = modeB.startRadius + modeB.startRadiusVar * RANDOM_M11(&RANDSEED);
+            particle_data_[i].modeB.radius = modeB.startRadius + modeB.startRadiusVar * randomM11(&randseed);
         }
 
         for (int i = start; i < _particleCount; ++i)
         {
-            particle_data_[i].modeB.angle = deg2Rad(_angle + _angleVar * RANDOM_M11(&RANDSEED));
+            particle_data_[i].modeB.angle = deg2Rad(_angle + _angleVar * randomM11(&randseed));
         }
 
         for (int i = start; i < _particleCount; ++i)
         {
             particle_data_[i].modeB.degreesPerSecond =
-				deg2Rad(modeB.rotatePerSecond + modeB.rotatePerSecondVar * RANDOM_M11(&RANDSEED));
+				deg2Rad(modeB.rotatePerSecond + modeB.rotatePerSecondVar * randomM11(&randseed));
         }
 
         if (modeB.endRadius == START_RADIUS_EQUAL_TO_END_RADIUS)
@@ -266,7 +266,7 @@ void ParticleSystem::addParticles(int count)
         {
             for (int i = start; i < _particleCount; ++i)
             {
-                float endRadius = modeB.endRadius + modeB.endRadiusVar * RANDOM_M11(&RANDSEED);
+                float endRadius = modeB.endRadius + modeB.endRadiusVar * randomM11(&randseed);
                 particle_data_[i].modeB.deltaRadius = (endRadius - particle_data_[i].modeB.radius) / particle_data_[i].timeToLive;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ inline void normalizePoint(float x, float y, Pointf* out)`
`45`	`45`	`/**`
`46`	`46`	`A more effect random number getter function, get from ejoy2d.`
`47`	`47`	`*/`
`48`		`-inline static float RANDOM_M11(unsigned int* seed)`
	`48`	`+inline static float randomM11(unsigned int* seed)`
`49`	`49`	`{`
`50`	`50`	`seed = seed * 134775813 + 1;`
`51`	`51`	`union`
`@@ -92,45 +92,45 @@ void ParticleSystem::addParticles(int count)`
`92`	`92`	`{`
`93`	`93`	`return;`
`94`	`94`	`}`
`95`		`- uint32_t RANDSEED = std::rand();`
	`95`	`+ uint32_t randseed = std::rand();`
`96`	`96`
`97`	`97`	`int start = _particleCount;`
`98`	`98`	`_particleCount += count;`
`99`	`99`
`100`	`100`	`//life`
`101`	`101`	`for (int i = start; i < _particleCount; ++i)`
`102`	`102`	`{`
`103`		`- float theLife = _life + _lifeVar * RANDOM_M11(&RANDSEED);`
	`103`	`+ float theLife = _life + _lifeVar * randomM11(&randseed);`
`104`	`104`	`particle_data_[i].timeToLive = (std::max)(0.0f, theLife);`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`//position`
`108`	`108`	`for (int i = start; i < _particleCount; ++i)`
`109`	`109`	`{`
`110`		`- particle_data_[i].posx = _sourcePosition.x + _posVar.x * RANDOM_M11(&RANDSEED);`
	`110`	`+ particle_data_[i].posx = _sourcePosition.x + _posVar.x * randomM11(&randseed);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`for (int i = start; i < _particleCount; ++i)`
`114`	`114`	`{`
`115`		`- particle_data_[i].posy = _sourcePosition.y + _posVar.y * RANDOM_M11(&RANDSEED);`
	`115`	`+ particle_data_[i].posy = _sourcePosition.y + _posVar.y * randomM11(&randseed);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`//color`
`119`	`119`	`#define SET_COLOR(c, b, v) \`
`120`	`120`	`for (int i = start; i < _particleCount; ++i) \`
`121`	`121`	`{ \`
`122`		`- particle_data_[i].c = clampf((b) + (v) * RANDOM_M11(&RANDSEED), 0, 1); \`
	`122`	`+ particle_data_[i].c = clampf((b) + (v) * randomM11(&randseed), 0, 1); \`
`123`	`123`	`}`
`124`	`124`
`125`		`- SET_COLOR(colorR, _startColor.r, _startColorVar.r)`
`126`		`- SET_COLOR(colorG, _startColor.g, _startColorVar.g)`
`127`		`- SET_COLOR(colorB, _startColor.b, _startColorVar.b)`
`128`		`- SET_COLOR(colorA, _startColor.a, _startColorVar.a)`
	`125`	`+ SET_COLOR(colorR, _startColor.r, _startColorVar.r)`
	`126`	`+ SET_COLOR(colorG, _startColor.g, _startColorVar.g)`
	`127`	`+ SET_COLOR(colorB, _startColor.b, _startColorVar.b)`
	`128`	`+ SET_COLOR(colorA, _startColor.a, _startColorVar.a)`
`129`	`129`
`130`		`- SET_COLOR(deltaColorR, _endColor.r, _endColorVar.r)`
`131`		`- SET_COLOR(deltaColorG, _endColor.g, _endColorVar.g)`
`132`		`- SET_COLOR(deltaColorB, _endColor.b, _endColorVar.b)`
`133`		`- SET_COLOR(deltaColorA, _endColor.a, _endColorVar.a)`
	`130`	`+ SET_COLOR(deltaColorR, _endColor.r, _endColorVar.r)`
	`131`	`+ SET_COLOR(deltaColorG, _endColor.g, _endColorVar.g)`
	`132`	`+ SET_COLOR(deltaColorB, _endColor.b, _endColorVar.b)`
	`133`	`+ SET_COLOR(deltaColorA, _endColor.a, _endColorVar.a)`
`134`	`134`
`135`	`135`	`#define SET_DELTA_COLOR(c, dc) \`
`136`	`136`	`for (int i = start; i < _particleCount; ++i) \`
`@@ -146,15 +146,15 @@ void ParticleSystem::addParticles(int count)`
`146`	`146`	`//size`
`147`	`147`	`for (int i = start; i < _particleCount; ++i)`
`148`	`148`	`{`
`149`		`- particle_data_[i].size = _startSize + _startSizeVar * RANDOM_M11(&RANDSEED);`
	`149`	`+ particle_data_[i].size = _startSize + _startSizeVar * randomM11(&randseed);`
`150`	`150`	`particle_data_[i].size = (std::max)(0.0f, particle_data_[i].size);`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`if (_endSize != START_SIZE_EQUAL_TO_END_SIZE)`
`154`	`154`	`{`
`155`	`155`	`for (int i = start; i < _particleCount; ++i)`
`156`	`156`	`{`
`157`		`- float endSize = _endSize + _endSizeVar * RANDOM_M11(&RANDSEED);`
	`157`	`+ float endSize = _endSize + _endSizeVar * randomM11(&randseed);`
`158`	`158`	`endSize = (std::max)(0.0f, endSize);`
`159`	`159`	`particle_data_[i].deltaSize = (endSize - particle_data_[i].size) / particle_data_[i].timeToLive;`
`160`	`160`	`}`
`@@ -170,11 +170,11 @@ void ParticleSystem::addParticles(int count)`
`170`	`170`	`// rotation`
`171`	`171`	`for (int i = start; i < _particleCount; ++i)`
`172`	`172`	`{`
`173`		`- particle_data_[i].rotation = _startSpin + _startSpinVar * RANDOM_M11(&RANDSEED);`
	`173`	`+ particle_data_[i].rotation = _startSpin + _startSpinVar * randomM11(&randseed);`
`174`	`174`	`}`
`175`	`175`	`for (int i = start; i < _particleCount; ++i)`
`176`	`176`	`{`
`177`		`- float endA = _endSpin + _endSpinVar * RANDOM_M11(&RANDSEED);`
	`177`	`+ float endA = _endSpin + _endSpinVar * randomM11(&randseed);`
`178`	`178`	`particle_data_[i].deltaRotation = (endA - particle_data_[i].rotation) / particle_data_[i].timeToLive;`
`179`	`179`	`}`
`180`	`180`
`@@ -199,23 +199,23 @@ void ParticleSystem::addParticles(int count)`
`199`	`199`	`// radial accel`
`200`	`200`	`for (int i = start; i < _particleCount; ++i)`
`201`	`201`	`{`
`202`		`- particle_data_[i].modeA.radialAccel = modeA.radialAccel + modeA.radialAccelVar * RANDOM_M11(&RANDSEED);`
	`202`	`+ particle_data_[i].modeA.radialAccel = modeA.radialAccel + modeA.radialAccelVar * randomM11(&randseed);`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`// tangential accel`
`206`	`206`	`for (int i = start; i < _particleCount; ++i)`
`207`	`207`	`{`
`208`		`- particle_data_[i].modeA.tangentialAccel = modeA.tangentialAccel + modeA.tangentialAccelVar * RANDOM_M11(&RANDSEED);`
	`208`	`+ particle_data_[i].modeA.tangentialAccel = modeA.tangentialAccel + modeA.tangentialAccelVar * randomM11(&randseed);`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`// rotation is dir`
`212`	`212`	`if (modeA.rotationIsDir)`
`213`	`213`	`{`
`214`	`214`	`for (int i = start; i < _particleCount; ++i)`
`215`	`215`	`{`
`216`		`- float a = deg2Rad(_angle + _angleVar * RANDOM_M11(&RANDSEED));`
	`216`	`+ float a = deg2Rad(_angle + _angleVar * randomM11(&randseed));`
`217`	`217`	`Vec2 v(cosf(a), sinf(a));`
`218`		`- float s = modeA.speed + modeA.speedVar * RANDOM_M11(&RANDSEED);`
	`218`	`+ float s = modeA.speed + modeA.speedVar * randomM11(&randseed);`
`219`	`219`	`Vec2 dir = v * s;`
`220`	`220`	`particle_data_[i].modeA.dirX = dir.x; //v * s ;`
`221`	`221`	`particle_data_[i].modeA.dirY = dir.y;`
`@@ -226,9 +226,9 @@ void ParticleSystem::addParticles(int count)`
`226`	`226`	`{`
`227`	`227`	`for (int i = start; i < _particleCount; ++i)`
`228`	`228`	`{`
`229`		`- float a = deg2Rad(_angle + _angleVar * RANDOM_M11(&RANDSEED));`
	`229`	`+ float a = deg2Rad(_angle + _angleVar * randomM11(&randseed));`
`230`	`230`	`Vec2 v(cosf(a), sinf(a));`
`231`		`- float s = modeA.speed + modeA.speedVar * RANDOM_M11(&RANDSEED);`
	`231`	`+ float s = modeA.speed + modeA.speedVar * randomM11(&randseed);`
`232`	`232`	`Vec2 dir = v * s;`
`233`	`233`	`particle_data_[i].modeA.dirX = dir.x; //v * s ;`
`234`	`234`	`particle_data_[i].modeA.dirY = dir.y;`
`@@ -241,18 +241,18 @@ void ParticleSystem::addParticles(int count)`
`241`	`241`	`{`
`242`	`242`	`for (int i = start; i < _particleCount; ++i)`
`243`	`243`	`{`
`244`		`- particle_data_[i].modeB.radius = modeB.startRadius + modeB.startRadiusVar * RANDOM_M11(&RANDSEED);`
	`244`	`+ particle_data_[i].modeB.radius = modeB.startRadius + modeB.startRadiusVar * randomM11(&randseed);`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`for (int i = start; i < _particleCount; ++i)`
`248`	`248`	`{`
`249`		`- particle_data_[i].modeB.angle = deg2Rad(_angle + _angleVar * RANDOM_M11(&RANDSEED));`
	`249`	`+ particle_data_[i].modeB.angle = deg2Rad(_angle + _angleVar * randomM11(&randseed));`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`for (int i = start; i < _particleCount; ++i)`
`253`	`253`	`{`
`254`	`254`	`particle_data_[i].modeB.degreesPerSecond =`
`255`		`- deg2Rad(modeB.rotatePerSecond + modeB.rotatePerSecondVar * RANDOM_M11(&RANDSEED));`
	`255`	`+ deg2Rad(modeB.rotatePerSecond + modeB.rotatePerSecondVar * randomM11(&randseed));`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`if (modeB.endRadius == START_RADIUS_EQUAL_TO_END_RADIUS)`
`@@ -266,7 +266,7 @@ void ParticleSystem::addParticles(int count)`
`266`	`266`	`{`
`267`	`267`	`for (int i = start; i < _particleCount; ++i)`
`268`	`268`	`{`
`269`		`- float endRadius = modeB.endRadius + modeB.endRadiusVar * RANDOM_M11(&RANDSEED);`
	`269`	`+ float endRadius = modeB.endRadius + modeB.endRadiusVar * randomM11(&randseed);`
`270`	`270`	`particle_data_[i].modeB.deltaRadius = (endRadius - particle_data_[i].modeB.radius) / particle_data_[i].timeToLive;`
`271`	`271`	`}`
`272`	`272`	`}`