GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'alcoranpaul-Adjusted-minimum-resolution-for-CavnvasScaler'

Browse Source
This commit is contained in:
Wojtek Figat
2024-11-05 11:13:24 +01:00
parent 239ef88f38 77a418de7f
commit 61891da224
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Engine/UI/GUI/CanvasScaler.cs
View File

@@ -99,8 +99,8 @@ namespace FlaxEngine.GUI
private float _scale = 1.0f; private float _scale = 1.0f;
private float _scaleFactor = 1.0f; private float _scaleFactor = 1.0f;
private float _physicalUnitSize = 1.0f; private float _physicalUnitSize = 1.0f;
private Float2 _resolutionMin = new Float2(640, 480); private Float2 _resolutionMin = new Float2(1f, 1f);
private Float2 _resolutionMax = new Float2(7680, 4320); private Float2 _resolutionMax = new Float2(7680f, 4320f);
/// <summary> /// <summary>
/// Gets the current UI scale. Computed based on the setup when performing layout. /// Gets the current UI scale. Computed based on the setup when performing layout.
@@ -246,10 +246,11 @@ namespace FlaxEngine.GUI
#endif #endif
public LinearCurve<float> ResolutionCurve = new LinearCurve<float>(new[] public LinearCurve<float> ResolutionCurve = new LinearCurve<float>(new[]
{ {
new LinearCurve<float>.Keyframe(480, 0.444f), // 480p new LinearCurve<float>.Keyframe(0f, 0f), // 0p
new LinearCurve<float>.Keyframe(720, 0.666f), // 720p new LinearCurve<float>.Keyframe(480f, 0.444f), // 480p
new LinearCurve<float>.Keyframe(1080, 1.0f), // 1080p new LinearCurve<float>.Keyframe(720f, 0.666f), // 720p
new LinearCurve<float>.Keyframe(8640, 8.0f), // 8640p new LinearCurve<float>.Keyframe(1080f, 1.0f), // 1080p
new LinearCurve<float>.Keyframe(8640f, 8.0f), // 8640p
}); });
/// <summary> /// <summary>
@@ -335,7 +336,7 @@ namespace FlaxEngine.GUI
scale = min / value; scale = min / value;
else if (value > max) else if (value > max)
scale = max / value; scale = max / value;
if (ResolutionCurve != null && ResolutionCurve.Keyframes?.Length != 0) if (ResolutionCurve != null && ResolutionCurve.Keyframes?.Length != 0f)
{ {
ResolutionCurve.Evaluate(out var curveScale, value, false); ResolutionCurve.Evaluate(out var curveScale, value, false);
scale *= curveScale; scale *= curveScale;
@@ -364,13 +365,13 @@ namespace FlaxEngine.GUI
dpi = 25.4f; dpi = 25.4f;
break; break;
case PhysicalUnitMode.Inches: case PhysicalUnitMode.Inches:
dpi = 1; dpi = 1f;
break; break;
case PhysicalUnitMode.Points: case PhysicalUnitMode.Points:
dpi = 72; dpi = 72f;
break; break;
case PhysicalUnitMode.Picas: case PhysicalUnitMode.Picas:
dpi = 6; dpi = 6f;
break; break;
} }
return dpi; return dpi;