From 8c8ac7adfbe7ce631f597e337aeb22e23befb27e Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Wed, 21 Sep 2022 22:45:52 +1200
Subject: [PATCH] Content changes for engine viewport PR (#11388)

---
 Content.Client/Viewport/ScalingViewport.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Content.Client/Viewport/ScalingViewport.cs b/Content.Client/Viewport/ScalingViewport.cs
index d920444bbd..64a8957b5c 100644
--- a/Content.Client/Viewport/ScalingViewport.cs
+++ b/Content.Client/Viewport/ScalingViewport.cs
@@ -250,7 +250,7 @@ namespace Content.Client.Viewport
 
             EnsureViewportCreated();
 
-            var matrix = Matrix3.Invert(LocalToScreenMatrix());
+            var matrix = Matrix3.Invert(GetLocalToScreenMatrix());
 
             return _viewport!.LocalToWorld(matrix.Transform(coords));
         }
@@ -264,14 +264,20 @@ namespace Content.Client.Viewport
 
             var vpLocal = _viewport!.WorldToLocal(map);
 
-            var matrix = LocalToScreenMatrix();
+            var matrix = GetLocalToScreenMatrix();
 
             return matrix.Transform(vpLocal);
         }
 
-        private Matrix3 LocalToScreenMatrix()
+        public Matrix3 GetWorldToScreenMatrix()
         {
-            DebugTools.AssertNotNull(_viewport);
+            EnsureViewportCreated();
+            return _viewport!.GetWorldToLocalMatrix() * GetLocalToScreenMatrix();
+        }
+
+        public Matrix3 GetLocalToScreenMatrix()
+        {
+            EnsureViewportCreated();
 
             var drawBox = GetDrawBox();
             var scaleFactor = drawBox.Size / (Vector2) _viewport!.Size;