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

Jump to bottom

Fix LegacyApproachCircle incorrectly applying scaling factor #27286

Merged
merged 2 commits into from Feb 21, 2024
Merged

Fix LegacyApproachCircle incorrectly applying scaling factor #27286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86e3b59
Fix `LegacyApproachCircle` incorrectly applying scaling factor
peppy Feb 21, 2024
a11a83a
Improve comment regarding scale adjust of approach circles
peppy Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions osu.Game.Rulesets.Osu/Skinning/Default/DefaultApproachCircle.cs
View file
Open in desktop
Expand Up @@ -25,8 +25,9 @@ private void load(TextureStore textures)
{
Texture = textures.Get(@"Gameplay/osu/approachcircle").WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2);

// account for the sprite being used for the default approach circle being taken from stable,
// when hitcircles have 5px padding on each size. this should be removed if we update the sprite.
// In triangles and argon skins, we expanded hitcircles to take up the full 128 px which are clickable,
// but still use the old approach circle sprite. To make it feel correct (ie. disappear as it collides
// with the hitcircle, *not when it overlaps the border*) we need to expand it slightly.
Scale = new Vector2(128 / 118f);
}

Expand Down
5 changes: 0 additions & 5 deletions osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
View file
Open in desktop
Expand Up @@ -8,7 +8,6 @@
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Skinning;
using osuTK;
using osuTK.Graphics;

namespace osu.Game.Rulesets.Osu.Skinning.Legacy
Expand All @@ -26,10 +25,6 @@ private void load(ISkinSource skin)
var texture = skin.GetTexture(@"approachcircle");
Debug.Assert(texture != null);
Texture = texture.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2);

// account for the sprite being used for the default approach circle being taken from stable,
// when hitcircles have 5px padding on each size. this should be removed if we update the sprite.
Scale = new Vector2(128 / 118f);
}

protected override void LoadComplete()
Expand Down