From e9027cd21fcd223607910a7a481c79c4190f2abc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 20:10:04 +0000 Subject: [PATCH 1/2] Bump ppy.osu.Game from 2024.302.1 to 2024.312.0 Bumps [ppy.osu.Game](https://github.com/ppy/osu) from 2024.302.1 to 2024.312.0. - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.302.1...2024.312.0) --- updated-dependencies: - dependency-name: ppy.osu.Game dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj b/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj index 13a8e097..7075d6a7 100644 --- a/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj +++ b/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj @@ -35,7 +35,7 @@ - + From 4aa19c0b79938b9dce4e1992f1609006cf46d9a1 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Mon, 11 Mar 2024 21:48:32 +0100 Subject: [PATCH 2/2] Fix things --- .../Objects/Drawables/Pieces/StrictHardBeatPiece.cs | 2 +- osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs | 2 +- osu.Game.Rulesets.Tau/UI/Cursor/CursorPiece.cs | 2 +- osu.Game.Rulesets.Tau/UI/Cursor/Paddle.cs | 4 ++-- osu.Game.Rulesets.Tau/UI/Effects/PlayfieldVisualizer.cs | 4 ++-- osu.Game.Rulesets.Tau/UI/TauResumeOverlay.cs | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/osu.Game.Rulesets.Tau/Objects/Drawables/Pieces/StrictHardBeatPiece.cs b/osu.Game.Rulesets.Tau/Objects/Drawables/Pieces/StrictHardBeatPiece.cs index 2e3f324d..2826399e 100644 --- a/osu.Game.Rulesets.Tau/Objects/Drawables/Pieces/StrictHardBeatPiece.cs +++ b/osu.Game.Rulesets.Tau/Objects/Drawables/Pieces/StrictHardBeatPiece.cs @@ -25,7 +25,7 @@ public StrictHardBeatPiece() AngleRange.BindValueChanged(val => { - Current.Value = val.NewValue / 360; + Progress = val.NewValue / 360; Rotation = -(float)(val.NewValue / 2); }, true); } diff --git a/osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs b/osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs index 7a95a695..b5fb664e 100644 --- a/osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs +++ b/osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs @@ -179,7 +179,7 @@ private void load() RelativePositionAxes = Axes.Both, Anchor = Anchor.Centre, Origin = Anchor.Centre, - Current = new BindableDouble(paddedAngleRange / 360), + Progress = paddedAngleRange / 360, InnerRadius = 0.05f, Rotation = (float)(-paddedAngleRange / 2), Y = 0.0035f diff --git a/osu.Game.Rulesets.Tau/UI/Cursor/CursorPiece.cs b/osu.Game.Rulesets.Tau/UI/Cursor/CursorPiece.cs index c7649dfa..793aa06a 100644 --- a/osu.Game.Rulesets.Tau/UI/Cursor/CursorPiece.cs +++ b/osu.Game.Rulesets.Tau/UI/Cursor/CursorPiece.cs @@ -26,7 +26,7 @@ private CircularProgress createProgress(float rotation) RelativeSizeAxes = Axes.Both, Anchor = Anchor.Centre, Origin = Anchor.Centre, - Current = new BindableDouble(0.33f), + Progress = 0.33, InnerRadius = 0.1f, Rotation = rotation }; diff --git a/osu.Game.Rulesets.Tau/UI/Cursor/Paddle.cs b/osu.Game.Rulesets.Tau/UI/Cursor/Paddle.cs index a0920f3e..3810aaf5 100644 --- a/osu.Game.Rulesets.Tau/UI/Cursor/Paddle.cs +++ b/osu.Game.Rulesets.Tau/UI/Cursor/Paddle.cs @@ -27,7 +27,7 @@ public Paddle() RelativeSizeAxes = Axes.Both, Anchor = Anchor.Centre, Origin = Anchor.Centre, - Current = new BindableDouble(), + Progress = 0, InnerRadius = PADDLE_RADIUS }, new HandlePiece() @@ -44,7 +44,7 @@ private void load(TauCachedProperties props) angleRange.BindValueChanged(r => { - paddle.Current.Value = r.NewValue / 360; + paddle.Progress = r.NewValue / 360; paddle.Rotation = (float)(-r.NewValue / 2); }, true); } diff --git a/osu.Game.Rulesets.Tau/UI/Effects/PlayfieldVisualizer.cs b/osu.Game.Rulesets.Tau/UI/Effects/PlayfieldVisualizer.cs index 57fb7daf..75e61552 100644 --- a/osu.Game.Rulesets.Tau/UI/Effects/PlayfieldVisualizer.cs +++ b/osu.Game.Rulesets.Tau/UI/Effects/PlayfieldVisualizer.cs @@ -242,13 +242,13 @@ protected override void Draw(IRenderer renderer) if (data[i] < amplitude_dead_zone) continue; - float rotation = MathUtils.DegreesToRadians((i / (float)bars_per_visualiser * 360) + (j * 360 / (float)visualizer_rounds)); + float rotation = float.DegreesToRadians((i / (float)bars_per_visualiser * 360) + (j * 360 / (float)visualizer_rounds)); float rotationCos = MathF.Cos(rotation); float rotationSin = MathF.Sin(rotation); // taking the cos and sin to the 0..1 range var barPosition = new Vector2((rotationCos / 2) + 0.5f, (rotationSin / 2) + 0.5f) * size; - var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(MathUtils.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, + var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(float.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, bar_length * data[i]); // The distance between the position and the sides of the bar. var bottomOffset = new Vector2(-rotationSin * barSize.X / 2, rotationCos * barSize.X / 2); diff --git a/osu.Game.Rulesets.Tau/UI/TauResumeOverlay.cs b/osu.Game.Rulesets.Tau/UI/TauResumeOverlay.cs index 9e352c7d..9ea68a6c 100644 --- a/osu.Game.Rulesets.Tau/UI/TauResumeOverlay.cs +++ b/osu.Game.Rulesets.Tau/UI/TauResumeOverlay.cs @@ -57,7 +57,7 @@ private void load() RelativeSizeAxes = Axes.Both, Anchor = Anchor.Centre, Origin = Anchor.Centre, - Current = new BindableDouble((angleRange / 360) * 0.25f), + Progress = (angleRange / 360) * 0.25f, ResumeRequested = Resume } }