edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix smoke particles sometimes being stuck inside solid tiles

Browse source 
Nudge the initial position for explosions' smoke particles slightly towards the edge of the closest non-solid tile, if it would otherwise be inside a solid tile, so the smoke particles do not get stuck inside solid tiles on explosion events happening at the edges of tiles but slightly inside them. The physical position of the explosion event is unchanged, so this does not affect physics. The explosion sprite is still rendered at the physical position of the explosion, to preserve the apprearance.
This commit is contained in:
Robert Müller 2024-05-05 22:16:34 +02:00
parent d4e3f6fc01
commit 6cbc85f229
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -257,6 +257,28 @@ void CEffects::Explosion(vec2 Pos, float Alpha)
p.m_StartAlpha = Alpha;
m_pClient->m_Particles.Add(CParticles::GROUP_EXPLOSIONS, &p);
// Nudge position slightly to edge of closest tile so the
// smoke doesn't get stuck inside the tile.
if(Collision()->CheckPoint(Pos))
{
const vec2 DistanceToTopLeft = Pos - vec2(round_truncate(Pos.x / 32), round_truncate(Pos.y / 32)) * 32;
vec2 CheckOffset;
CheckOffset.x = (DistanceToTopLeft.x > 16 ? 32 : -1);
CheckOffset.y = (DistanceToTopLeft.y > 16 ? 32 : -1);
CheckOffset -= DistanceToTopLeft;
for(vec2 Mask : {vec2(1.0f, 0.0f), vec2(0.0f, 1.0f), vec2(1.0f, 1.0f)})
{
const vec2 NewPos = Pos + CheckOffset * Mask;
if(!Collision()->CheckPoint(NewPos))
{
Pos = NewPos;
break;
}
}
}
// add the smoke
for(int i = 0; i < 24; i++)
{