edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add random_angle function

Browse source 
To generate a random angle in the range `[0.0f;2.0f * pi[`. This ensures that the random angle cannot be `2.0f * pi`, which would be identical to the angle `0.0f` and therefore cause the random angle to be less uniformly selected.

Note that this first casts `RAND_MAX` to a `float` and then uses `std::nextafter` to get the next larger `float`. Using `RAND_MAX + 1` would cause an integer overflow on systems where `RAND_MAX == INT_MAX` (e.g. Ubuntu and macOS).
This commit is contained in:
Robert Müller 2023-03-13 00:15:39 +01:00
parent 5e2e1e25e3
commit ea6e267d98
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/base/math.h
View file

@ -9,6 +9,8 @@
using std::clamp;
constexpr float pi = 3.1415926535897932384626433f;
constexpr inline int round_to_int(float f)
{
return f > 0 ? (int)(f + 0.5f) : (int)(f - 0.5f);
@ -30,6 +32,11 @@ inline float random_float()
return rand() / (float)(RAND_MAX);
}
inline float random_angle()
{
return 2.0f * pi * (rand() / std::nextafter((float)RAND_MAX, std::numeric_limits<float>::max()));
}
constexpr int fxpscale = 1 << 10;
// float to fixed
@ -85,8 +92,6 @@ public:
}
};
constexpr float pi = 3.1415926535897932384626433f;
template<typename T>
constexpr inline T minimum(T a, T b)
{

2
src/game/client/components/damageind.cpp
View file

@ -41,7 +41,7 @@ void CDamageInd::Create(vec2 Pos, vec2 Dir)
pItem->m_Pos = Pos;
pItem->m_StartTime = LocalTime();
pItem->m_Dir = Dir * -1;
pItem->m_StartAngle = (random_float() - 1.0f) * 2.0f * pi;
pItem->m_StartAngle = -random_angle();
}
}

14
src/game/client/components/effects.cpp
View file

@ -34,7 +34,7 @@ void CEffects::AirJump(vec2 Pos)
p.m_LifeSpan = 0.5f;
p.m_StartSize = 48.0f;
p.m_EndSize = 0;
p.m_Rot = random_float() * pi * 2;
p.m_Rot = random_angle();
p.m_Rotspeed = pi * 2;
p.m_Gravity = 500;
p.m_Friction = 0.7f;
@ -71,7 +71,7 @@ void CEffects::PowerupShine(vec2 Pos, vec2 Size)
p.m_LifeSpan = 0.5f;
p.m_StartSize = 16.0f;
p.m_EndSize = 0;
p.m_Rot = random_float() * pi * 2;
p.m_Rot = random_angle();
p.m_Rotspeed = pi * 2;
p.m_Gravity = 500;
p.m_Friction = 0.9f;
@ -95,7 +95,7 @@ void CEffects::FreezingFlakes(vec2 Pos, vec2 Size)
p.m_UseAlphaFading = true;
p.m_StartAlpha = 1.0f;
p.m_EndAlpha = 0.0f;
p.m_Rot = random_float() * pi * 2;
p.m_Rot = random_angle();
p.m_Rotspeed = pi;
p.m_Gravity = random_float() * 250.0f;
p.m_Friction = 0.9f;
@ -171,7 +171,7 @@ void CEffects::PlayerSpawn(vec2 Pos)
p.m_LifeSpan = 0.3f + random_float() * 0.3f;
p.m_StartSize = 64.0f + random_float() * 32;
p.m_EndSize = 0;
p.m_Rot = random_float() * pi * 2;
p.m_Rot = random_angle();
p.m_Rotspeed = random_float();
p.m_Gravity = random_float() * -400.0f;
p.m_Friction = 0.7f;
@ -212,7 +212,7 @@ void CEffects::PlayerDeath(vec2 Pos, int ClientID)
p.m_LifeSpan = 0.3f + random_float() * 0.3f;
p.m_StartSize = 24.0f + random_float() * 16;
p.m_EndSize = 0;
p.m_Rot = random_float() * pi * 2;
p.m_Rot = random_angle();
p.m_Rotspeed = (random_float() - 0.5f) * pi;
p.m_Gravity = 800.0f;
p.m_Friction = 0.8f;
@ -243,7 +243,7 @@ void CEffects::Explosion(vec2 Pos)
p.m_LifeSpan = 0.4f;
p.m_StartSize = 150.0f;
p.m_EndSize = 0;
p.m_Rot = random_float() * pi * 2;
p.m_Rot = random_angle();
m_pClient->m_Particles.Add(CParticles::GROUP_EXPLOSIONS, &p);
// add the smoke
@ -273,7 +273,7 @@ void CEffects::HammerHit(vec2 Pos)
p.m_LifeSpan = 0.3f;
p.m_StartSize = 120.0f;
p.m_EndSize = 0;
p.m_Rot = random_float() * pi * 2;
p.m_Rot = random_angle();
m_pClient->m_Particles.Add(CParticles::GROUP_EXPLOSIONS, &p);
if(g_Config.m_SndGame)
m_pClient->m_Sounds.PlayAt(CSounds::CHN_WORLD, SOUND_HAMMER_HIT, 1.0f, Pos);