vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unstable 0.17.7.0

Browse Source
This commit is contained in:
Markus Isberg
2022-04-08 00:34:17 +09:00
parent 95764d1fa8
commit 164d72ae3a
82 changed files with 852 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Particles/Particle.cs
+12 -15
View File
@@ -336,7 +336,7 @@ namespace Barotrauma.Particles
Hull collidedHull = Hull.FindHull(position);
if (collidedHull != null)
{
if (prefab.DeleteOnCollision) return UpdateResult.Delete;
if (prefab.DeleteOnCollision) { return UpdateResult.Delete; }
OnWallCollisionOutside(collidedHull);
}
}
@@ -346,20 +346,10 @@ namespace Barotrauma.Particles
Vector2 collisionNormal = Vector2.Zero;
if (velocity.Y < 0.0f && position.Y - prefab.CollisionRadius * size.Y < hullRect.Y - hullRect.Height)
{
if (prefab.DeleteOnCollision)
{
OnCollision?.Invoke(position, currentHull);
return UpdateResult.Delete;
}
collisionNormal = new Vector2(0.0f, 1.0f);
}
else if (velocity.Y > 0.0f && position.Y + prefab.CollisionRadius * size.Y > hullRect.Y)
{
if (prefab.DeleteOnCollision)
{
OnCollision?.Invoke(position, currentHull);
return UpdateResult.Delete;
}
collisionNormal = new Vector2(0.0f, -1.0f);
}
@@ -379,18 +369,21 @@ namespace Barotrauma.Particles
break;
}
if (prefab.DeleteOnCollision && !gapFound)
{
OnCollision?.Invoke(position, currentHull);
return UpdateResult.Delete;
}
handleCollision(gapFound, collisionNormal);
}
collisionNormal = Vector2.Zero;
if (velocity.X < 0.0f && position.X - prefab.CollisionRadius * size.X < hullRect.X)
{
if (prefab.DeleteOnCollision) { return UpdateResult.Delete; }
collisionNormal = new Vector2(1.0f, 0.0f);
}
else if (velocity.X > 0.0f && position.X + prefab.CollisionRadius * size.X > hullRect.Right)
{
if (prefab.DeleteOnCollision) { return UpdateResult.Delete; }
collisionNormal = new Vector2(-1.0f, 0.0f);
}
@@ -408,7 +401,11 @@ namespace Barotrauma.Particles
gapFound = true;
break;
}
if (prefab.DeleteOnCollision && !gapFound)
{
OnCollision?.Invoke(position, currentHull);
return UpdateResult.Delete;
}
handleCollision(gapFound, collisionNormal);
}
@@ -512,7 +509,7 @@ namespace Barotrauma.Particles
{
Rectangle hullRect = collisionHull.WorldRect;
Vector2 center = new Vector2(hullRect.X + hullRect.Width /2, hullRect.Y - hullRect.Height / 2);
Vector2 center = new Vector2(hullRect.X + hullRect.Width / 2, hullRect.Y - hullRect.Height / 2);
if (position.Y < center.Y)
{