Added a bunch of checks to make sure a normalized zero vector (= NaN, NaN) is not used in any position/velocity/movement calculations. There were at least three places where it was causing problems according to error reports: when a character that can't enter a sub spawns at the center of a hull and when using an underwater scooter or throwing something while the cursor is at the position of the character, but there were tons of other places as well where it may have potentially caused physics errors.

2018-07-31 12:28:04 +03:00
parent d881a7060b
commit d81ee1a27e
13 changed files with 56 additions and 29 deletions
@@ -280,7 +280,9 @@ namespace Barotrauma
                return;
            }

-            SteeringManager.SteeringManual(deltaTime, Vector2.Normalize(SimPosition - selectedAiTarget.SimPosition) * 5);
+            Vector2 escapeDir = Vector2.Normalize(SimPosition - selectedAiTarget.SimPosition);
+            if (!MathUtils.IsValid(escapeDir)) escapeDir = Vector2.UnitY;
+            SteeringManager.SteeringManual(deltaTime, escapeDir * 5);
            SteeringManager.SteeringWander(1.0f);
            SteeringManager.SteeringAvoid(deltaTime, 2f);
        }
@@ -490,8 +492,10 @@ namespace Barotrauma

            if (dist < ConvertUnits.ToSimUnits(500.0f))
            {
+                Vector2 attackDir = Vector2.Normalize(Character.SimPosition - attackPosition);
+                if (!MathUtils.IsValid(attackDir)) attackDir = Vector2.UnitY;
                steeringManager.SteeringSeek(attackPosition, -0.8f);
-                steeringManager.SteeringManual(deltaTime, Vector2.Normalize(Character.SimPosition - attackPosition) * (1.0f - (dist / 500.0f)));
+                steeringManager.SteeringManual(deltaTime, attackDir * (1.0f - (dist / 500.0f)));
            }

            steeringManager.SteeringAvoid(deltaTime, 1.0f);
@@ -63,6 +63,7 @@ namespace Barotrauma
                character.SetInput(InputType.Aim, false, true);

                Vector2 enemyDiff = Vector2.Normalize(enemy.Position - character.Position);
+                if (!MathUtils.IsValid(enemyDiff)) enemyDiff = Rand.Vector(1.0f);
                float weaponAngle = ((weapon.body.Dir == 1.0f) ? weapon.body.Rotation : weapon.body.Rotation - MathHelper.Pi);
                Vector2 weaponDir = new Vector2((float)Math.Cos(weaponAngle), (float)Math.Sin(weaponAngle));

@@ -80,9 +80,9 @@ namespace Barotrauma
            }

            float steeringSpeed = steering.Length();
-            if (steeringSpeed>speed)
+            if (steeringSpeed > speed)
            {
-               steering = Vector2.Normalize(steering) * Math.Abs(speed);
+                steering = Vector2.Normalize(steering) * Math.Abs(speed);
            }

            host.Steering = steering;
@@ -97,12 +97,12 @@ namespace Barotrauma
            targetVel = Vector2.Normalize(targetVel) * speed;
            Vector2 newSteering = targetVel - host.Steering;

-            if (newSteering==Vector2.Zero) return Vector2.Zero;
+            if (newSteering == Vector2.Zero) return Vector2.Zero;

            float steeringSpeed = (newSteering + host.Steering).Length();
            if (steeringSpeed > Math.Abs(speed))
            {
-                newSteering = Vector2.Normalize(newSteering)*Math.Abs(speed);
+                newSteering = Vector2.Normalize(newSteering) * Math.Abs(speed);
            }

            return newSteering;
@@ -151,8 +151,7 @@ namespace Barotrauma
                }
                else
                {
-                    Structure closestStructure = closestBody.UserData as Structure;
-                    if (closestStructure != null)
+                    if (closestBody.UserData is Structure closestStructure)
                    {
                        Vector2 obstaclePosition = Submarine.LastPickedPosition;
                        if (closestStructure.IsHorizontal)
@@ -166,15 +165,17 @@ namespace Barotrauma

                        avoidSteering = Vector2.Normalize(Submarine.LastPickedPosition - obstaclePosition);
                    }
-                    else if (closestBody.UserData is Item)
+                    else if (closestBody.UserData is Item item)
                    {
-                        Item item = (Item)closestBody.UserData;
                        avoidSteering = Vector2.Normalize(Submarine.LastPickedPosition - item.SimPosition);
                    }
                    else
                    {
                        avoidSteering = Vector2.Normalize(host.SimPosition - Submarine.LastPickedPosition);
                    }
+                    //failed to normalize (the obstacle to avoid is at the same position as the character?)
+                    // -> move to a random direction
+                    if (!MathUtils.IsValid(avoidSteering)) avoidSteering = Rand.Vector(1.0f);
                }

            }
@@ -766,10 +766,13 @@ namespace Barotrauma
                //this is preferable to the cost of using continuous collision detection for the character collider
                if (newHull != null)
                {
+                    Vector2 hullDiff = WorldPosition - newHull.WorldPosition;
+                    Vector2 moveDir = hullDiff.LengthSquared() < 0.001f ? Vector2.UnitY : Vector2.Normalize(hullDiff);
+
                    //find a position 32 units away from the hull
                    Vector2? intersection = MathUtils.GetLineRectangleIntersection(
                        newHull.WorldPosition, 
-                        newHull.WorldPosition + Vector2.Normalize(WorldPosition - newHull.WorldPosition) * Math.Max(newHull.Rect.Width, newHull.Rect.Height),
+                        newHull.WorldPosition + moveDir * Math.Max(newHull.Rect.Width, newHull.Rect.Height),
                        new Rectangle(newHull.WorldRect.X - 32, newHull.WorldRect.Y + 32, newHull.WorldRect.Width + 64, newHull.Rect.Height + 64));

                    if (intersection != null)
@@ -1494,7 +1497,7 @@ namespace Barotrauma
            Vector2 force = Vector2.Zero;
            foreach (Gap gap in Gap.GapList)
            {
-                if (gap.Open <= 0.0f || gap.FlowTargetHull != currentHull || gap.LerpedFlowForce == Vector2.Zero) continue;
+                if (gap.Open <= 0.0f || gap.FlowTargetHull != currentHull || gap.LerpedFlowForce.LengthSquared() < 0.01f) continue;

                Vector2 gapPos = gap.SimPosition;
                float dist = Vector2.Distance(limbPos, gapPos);