From 9f8989b96993a5dcca6e8c5ae4f8dd357f9121ef Mon Sep 17 00:00:00 2001 From: Paul Adrian <67833935+alcoranpaul@users.noreply.github.com> Date: Thu, 31 Oct 2024 20:26:02 -0500 Subject: [PATCH 1/2] Set minimum resolution and resolution curve - Set minimum resolution to (1,1) and minimum keyframe of the Resolution Curve to (0,0) - Also added float literals --- Source/Engine/UI/GUI/CanvasScaler.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/Engine/UI/GUI/CanvasScaler.cs b/Source/Engine/UI/GUI/CanvasScaler.cs index abcd97a38..5b7ec9c27 100644 --- a/Source/Engine/UI/GUI/CanvasScaler.cs +++ b/Source/Engine/UI/GUI/CanvasScaler.cs @@ -99,7 +99,7 @@ namespace FlaxEngine.GUI private float _scale = 1.0f; private float _scaleFactor = 1.0f; private float _physicalUnitSize = 1.0f; - private Float2 _resolutionMin = new Float2(640, 480); + private Float2 _resolutionMin = new Float2(1, 1); private Float2 _resolutionMax = new Float2(7680, 4320); /// @@ -246,10 +246,11 @@ namespace FlaxEngine.GUI #endif public LinearCurve ResolutionCurve = new LinearCurve(new[] { - new LinearCurve.Keyframe(480, 0.444f), // 480p - new LinearCurve.Keyframe(720, 0.666f), // 720p - new LinearCurve.Keyframe(1080, 1.0f), // 1080p - new LinearCurve.Keyframe(8640, 8.0f), // 8640p + new LinearCurve.Keyframe(0f, 0f), // 0p + new LinearCurve.Keyframe(480f, 0.444f), // 480p + new LinearCurve.Keyframe(720f, 0.666f), // 720p + new LinearCurve.Keyframe(1080f, 1.0f), // 1080p + new LinearCurve.Keyframe(8640f, 8.0f), // 8640p }); /// From c4c40874e34139189827c7c94ceae26bccfa327b Mon Sep 17 00:00:00 2001 From: Paul Adrian <67833935+alcoranpaul@users.noreply.github.com> Date: Thu, 31 Oct 2024 20:32:01 -0500 Subject: [PATCH 2/2] added more float literals --- Source/Engine/UI/GUI/CanvasScaler.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Engine/UI/GUI/CanvasScaler.cs b/Source/Engine/UI/GUI/CanvasScaler.cs index 5b7ec9c27..f27f906b2 100644 --- a/Source/Engine/UI/GUI/CanvasScaler.cs +++ b/Source/Engine/UI/GUI/CanvasScaler.cs @@ -99,8 +99,8 @@ namespace FlaxEngine.GUI private float _scale = 1.0f; private float _scaleFactor = 1.0f; private float _physicalUnitSize = 1.0f; - private Float2 _resolutionMin = new Float2(1, 1); - private Float2 _resolutionMax = new Float2(7680, 4320); + private Float2 _resolutionMin = new Float2(1f, 1f); + private Float2 _resolutionMax = new Float2(7680f, 4320f); /// /// Gets the current UI scale. Computed based on the setup when performing layout. @@ -336,7 +336,7 @@ namespace FlaxEngine.GUI scale = min / value; else if (value > max) scale = max / value; - if (ResolutionCurve != null && ResolutionCurve.Keyframes?.Length != 0) + if (ResolutionCurve != null && ResolutionCurve.Keyframes?.Length != 0f) { ResolutionCurve.Evaluate(out var curveScale, value, false); scale *= curveScale; @@ -365,13 +365,13 @@ namespace FlaxEngine.GUI dpi = 25.4f; break; case PhysicalUnitMode.Inches: - dpi = 1; + dpi = 1f; break; case PhysicalUnitMode.Points: - dpi = 72; + dpi = 72f; break; case PhysicalUnitMode.Picas: - dpi = 6; + dpi = 6f; break; } return dpi;