Unstable v0.1100.0.4 (November 11th 2020)

2020-11-06 20:12:15 +02:00
parent 6b36bf809d
commit b772654326
297 changed files with 12502 additions and 4277 deletions
@@ -328,9 +328,9 @@ namespace Barotrauma
                {
                    previousOffset = offset;
                }
-                                
+
                //how much to zoom out (zoom completely out when offset is 1000)
-                float zoomOutAmount = Math.Min(offset.Length() / 1000.0f, 1.0f);                
+                float zoomOutAmount = GetZoomAmount(offset);        
                //zoom amount when resolution is not taken into account
                float unscaledZoom = MathHelper.Lerp(DefaultZoom, MinZoom, zoomOutAmount);
                //zoom with resolution taken into account (zoom further out on smaller resolutions)
@@ -409,5 +409,15 @@ namespace Barotrauma
            //Vector2 screenCoords = Vector2.Transform(coords, transform);
            return Vector2.Transform(coords, transform);
        }
+
+        private float GetZoomAmount(Vector2 offset)
+        {
+            return Math.Min(offset.Length() / 1000.0f, 1.0f);
+        }
+
+        public float GetZoomAmountFromPrevious()
+        {
+            return GetZoomAmount(previousOffset);
+        }
    }
 }