asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7904 from tagcup/use_math_prng

Browse source 
Use the common PRNG in 2D particles code.
This commit is contained in:
Rémi Verschelde 2017-02-28 08:17:02 +01:00 committed by GitHub
commit 0f8c6dd382
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scene/2d/particles_2d.cpp
View file

@ -228,21 +228,9 @@ ParticleAttractor2D::ParticleAttractor2D() {
/****************************************/ /****************************************/
_FORCE_INLINE_ static float _rand_from_seed(uint32_t *seed) { _FORCE_INLINE_ static float _rand_from_seed(uint64_t *seed) {
uint32_t r = Math::rand_from_seed(seed);
uint32_t k; return 2.0f * (float)r / (float)Math::RANDOM_MAX - 1.0f;
uint32_t s = (*seed);
if (s == 0)
s = 0x12345987;
k = s / 127773;
s = 16807 * (s - k * 127773) - 2836 * k;
if (s < 0)
s += 2147483647;
(*seed) = s;
float v=((float)((*seed) & 0xFFFFF))/(float)0xFFFFF;
v=v*2.0-1.0;
return v;
} }
void Particles2D::_process_particles(float p_delta) { void Particles2D::_process_particles(float p_delta) {
@ -349,7 +337,7 @@ void Particles2D::_process_particles(float p_delta) {
} }
} }
p.seed=Math::rand() % 12345678; p.seed=Math::rand() % 12345678;
uint32_t rand_seed=p.seed*(i+1); uint64_t rand_seed=p.seed*(i+1);
float angle = Math::deg2rad(param[PARAM_DIRECTION]+_rand_from_seed(&rand_seed)*param[PARAM_SPREAD]); float angle = Math::deg2rad(param[PARAM_DIRECTION]+_rand_from_seed(&rand_seed)*param[PARAM_SPREAD]);
@ -378,7 +366,7 @@ void Particles2D::_process_particles(float p_delta) {
if (!p.active) if (!p.active)
continue; continue;
uint32_t rand_seed=p.seed*(i+1); uint64_t rand_seed=p.seed*(i+1);
Vector2 force; Vector2 force;
@ -537,7 +525,7 @@ void Particles2D::_notification(int p_what) {
else else
ptime=(1.0-ptime)+time_pos; ptime=(1.0-ptime)+time_pos;
uint32_t rand_seed=p.seed*(i+1); uint64_t rand_seed=p.seed*(i+1);
Color color; Color color;

2
scene/2d/particles_2d.h
View file

@ -127,7 +127,7 @@ private:
Vector2 velocity; Vector2 velocity;
float rot; float rot;
float frame; float frame;
uint32_t seed; uint64_t seed;
Particle() { active=false; seed=123465789; rot=0; frame=0;} Particle() { active=false; seed=123465789; rot=0; frame=0;}
}; };