tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Content changes for engine viewport PR (#11388)

Browse Source
This commit is contained in:
Leon Friedrich
2022-09-21 22:45:52 +12:00
committed by GitHub
parent e61c7044ff
commit 8c8ac7adfb
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Client/Viewport/ScalingViewport.cs
View File

@@ -250,7 +250,7 @@ namespace Content.Client.Viewport
EnsureViewportCreated(); EnsureViewportCreated();
var matrix = Matrix3.Invert(LocalToScreenMatrix()); var matrix = Matrix3.Invert(GetLocalToScreenMatrix());
return _viewport!.LocalToWorld(matrix.Transform(coords)); return _viewport!.LocalToWorld(matrix.Transform(coords));
} }
@@ -264,14 +264,20 @@ namespace Content.Client.Viewport
var vpLocal = _viewport!.WorldToLocal(map); var vpLocal = _viewport!.WorldToLocal(map);
var matrix = LocalToScreenMatrix(); var matrix = GetLocalToScreenMatrix();
return matrix.Transform(vpLocal); 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 drawBox = GetDrawBox();
var scaleFactor = drawBox.Size / (Vector2) _viewport!.Size; var scaleFactor = drawBox.Size / (Vector2) _viewport!.Size;