Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix osu!taiko mobile scaling not being accurate #32341

Merged
merged 2 commits into from
Mar 12, 2025
+1 −18
Merged

Fix osu!taiko mobile scaling not being accurate #32341

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54d7a91
Fix osu!taiko mobile scaling not accurate
frenzibyte Mar 12, 2025
7f4f92d
Remove unnecessary DI property
frenzibyte Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// See the LICENCE file in the repository root for full licence text.

using System;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Game.Rulesets.Taiko.Beatmaps;
Expand All @@ -21,9 +19,6 @@ public partial class TaikoPlayfieldAdjustmentContainer : PlayfieldAdjustmentCont

public readonly IBindable<bool> LockPlayfieldAspectRange = new BindableBool(true);

[Resolved]
private OsuGame? osuGame { get; set; }

public TaikoPlayfieldAdjustmentContainer()
{
RelativeSizeAxes = Axes.X;
Expand Down Expand Up @@ -60,19 +55,7 @@ protected override void Update()
// Limit the maximum relative height of the playfield to one-third of available area to avoid it masking out on extreme resolutions.
relativeHeight = Math.Min(relativeHeight, 1f / 3f);

Scale = new Vector2(Math.Max((Parent!.ChildSize.Y / 768f) * (relativeHeight / base_relative_height), 1f));

// on mobile platforms where the base aspect ratio is wider, the taiko playfield
// needs to be scaled down to remain playable.
if (RuntimeInfo.IsMobile && osuGame != null)
{
const float base_aspect_ratio = 1024f / 768f;
float gameAspectRatio = osuGame.ScalingContainerTargetDrawSize.X / osuGame.ScalingContainerTargetDrawSize.Y;
// this magic scale is unexplainable, but required so the playfield doesn't become too zoomed out as the aspect ratio increases.
const float magic_scale = 1.25f;
Scale *= magic_scale * new Vector2(base_aspect_ratio / gameAspectRatio);
}

Scale = new Vector2(Parent!.ChildSize.Y / 768f * (relativeHeight / base_relative_height));
Width = 1 / Scale.X;
}

Expand Down
Loading