aecw/osu-framework
1
0
Fork 0
mirror of https://github.com/SK-la/osu-framework.git synced 2026-03-13 11:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into locmain

Browse Source
This commit is contained in:
LA
2026-02-21 10:28:55 +08:00
parent ce87683106 ca40f0a4d3
commit daf0f11604
3 changed files with 98 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
osu.Framework.Tests/Visual/Drawables/TestSceneAutoSize.cs Normal file
View File

@@ -0,0 +1,93 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Linq;
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Testing;
using osu.Framework.Utils;
using osuTK;
namespace osu.Framework.Tests.Visual.Drawables
{
[HeadlessTest]
public partial class TestSceneAutoSize : TestScene
{
private static readonly object[][] scales = Enumerable.Range(0, 10).Select(i => new object[] { MathF.Pow(10, -i) }).ToArray();
[TestCaseSource(nameof(scales))]
public void TestAlmostZeroXScale(float scale)
{
Container autoSizeContainer = null!;
Container outerContainer;
AddStep("add box", () =>
{
Add(outerContainer = new Container
{
Name = "outer container",
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
RelativePositionAxes = Axes.Both,
Child = autoSizeContainer = new Container
{
Name = "autosize container",
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.Both,
Child = new Box
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(128f),
}
}
});
outerContainer.Scale = new Vector2(scale, 2);
});
AddAssert("autosize container preserves width", () => autoSizeContainer.Width, () => Is.EqualTo(128).Within(Precision.FLOAT_EPSILON));
}
[TestCaseSource(nameof(scales))]
public void TestAlmostZeroYScale(float scale)
{
Container autoSizeContainer = null!;
Container outerContainer;
AddStep("add box", () =>
{
Add(outerContainer = new Container
{
Name = "outer container",
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
RelativePositionAxes = Axes.Both,
Child = autoSizeContainer = new Container
{
Name = "autosize container",
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.Both,
Child = new Box
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(128f),
}
}
});
outerContainer.Scale = new Vector2(2, scale);
});
AddAssert("autosize container preserves height", () => autoSizeContainer.Height, () => Is.EqualTo(128).Within(Precision.FLOAT_EPSILON));
}
}
}

3
osu.Framework/Graphics/BlendingParameters.cs
View File

@@ -238,6 +238,9 @@ namespace osu.Framework.Graphics
return BlendingFactorSrc.OneMinusDstColor;
case BlendingType.OneMinusSrcAlpha:
return BlendingFactorSrc.OneMinusSrcAlpha;
case BlendingType.OneMinusSrcColor:
return BlendingFactorSrc.OneMinusSrcColor;
case BlendingType.SrcAlpha:

4
osu.Framework/Graphics/DrawInfo.cs
View File

@@ -52,8 +52,8 @@ namespace osu.Framework.Graphics
if (scale != Vector2.One)
{
// Zero scale leads to unexpected input and autosize calculations, so it's clamped to a sane value.
if (scale.X == 0) scale.X = Precision.FLOAT_EPSILON;
if (scale.Y == 0) scale.Y = Precision.FLOAT_EPSILON;
if (Math.Abs(scale.X) < Precision.FLOAT_EPSILON) scale.X = Math.Sign(scale.X == 0 ? 1 : scale.X) * Precision.FLOAT_EPSILON;
if (Math.Abs(scale.Y) < Precision.FLOAT_EPSILON) scale.Y = Math.Sign(scale.Y == 0 ? 1 : scale.Y) * Precision.FLOAT_EPSILON;
MatrixExtensions.ScaleFromLeft(ref Matrix, scale);
MatrixExtensions.ScaleFromRight(ref MatrixInverse, Vector2.Divide(Vector2.One, scale));