Turret rotation fix, CharacterInventory networking bugfixes, prevent limbs clipping with other colliders when mirroring, fixed mantis animations, better looking explosions, spark effect when overvoltage breaks an item

2015-09-04 21:56:39 +03:00
parent 2f08dcf3f9
commit 0cbcdd0b03
35 changed files with 393 additions and 262 deletions
@@ -434,16 +434,13 @@ namespace FarseerPhysics.Collision
        /// <param name="a">The first AABB.</param>
        /// <param name="b">The second AABB.</param>
        /// <returns>True if they are overlapping.</returns>
+
        public static bool TestOverlap(ref AABB a, ref AABB b)
        {
-            Vector2 d1 = b.LowerBound - a.UpperBound;
-            Vector2 d2 = a.LowerBound - b.UpperBound;
-
-            if (d1.X > 0.0f || d1.Y > 0.0f)
-                return false;
-
-            if (d2.X > 0.0f || d2.Y > 0.0f)
-                return false;
+            if (b.LowerBound.X - a.UpperBound.X > 0.0f ||
+                b.LowerBound.Y - a.UpperBound.Y > 0.0f ||
+                a.LowerBound.X - b.UpperBound.X > 0.0f ||
+                a.LowerBound.Y - b.UpperBound.Y > 0.0f) return false;

            return true;
        }