Change catcher origin position logic to 1:1 match stable on legacy skin

frenzibyte · Oct 4, 2023 · 3e264ca · 3e264ca
1 parent 63b525a
commit 3e264ca
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/osu.Game.Rulesets.Catch/Skinning/Argon/ArgonCatcher.cs b/osu.Game.Rulesets.Catch/Skinning/Argon/ArgonCatcher.cs
@@ -6,6 +6,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Catch.UI;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Argon
@@ -15,6 +16,7 @@ public partial class ArgonCatcher : CompositeDrawable
         [BackgroundDependencyLoader]
         private void load()
         {
+            Anchor = Anchor.TopCentre;
             RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
@@ -81,5 +83,11 @@ private void load()
                 },
             };
         }
+
+        protected override void Update()
+        {
+            base.Update();
+            OriginPosition = new Vector2(DrawWidth / 2, Catcher.BASE_SIZE * 0.06f);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/DefaultCatcher.cs b/osu.Game.Rulesets.Catch/Skinning/Default/DefaultCatcher.cs
@@ -9,6 +9,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Catch.UI;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
@@ -22,6 +23,7 @@ public partial class DefaultCatcher : CompositeDrawable
 
         public DefaultCatcher()
         {
+            Anchor = Anchor.TopCentre;
             RelativeSizeAxes = Axes.Both;
             InternalChild = sprite = new Sprite
             {
@@ -32,6 +34,15 @@ public DefaultCatcher()
             };
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            // matches stable's origin position since we're using the same catcher sprite.
+            // see LegacyCatcher for more information.
+            OriginPosition = new Vector2(DrawWidth / 2, 16f);
+        }
+
         [BackgroundDependencyLoader]
         private void load(TextureStore store, Bindable<CatcherAnimationState> currentState)
         {

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs
@@ -19,5 +19,14 @@ protected LegacyCatcher()
             // and also a constant 0.7x factor for catcher sprites specifically.
             Scale = new Vector2(0.5f * 0.7f);
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            // stable sets the Y origin position of the catcher to 16px in order for the catching range and OD scaling to align with the top of the catcher's plate in the default skin,
+            // (note that this is is applied pre-scale, i.e. 16px are acted upon in relation to the sprite's original @1x dimensions).
+            OriginPosition = new Vector2(DrawWidth / 2, 16f);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/SkinnableCatcher.cs b/osu.Game.Rulesets.Catch/UI/SkinnableCatcher.cs
@@ -6,7 +6,6 @@
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.Skinning.Default;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -26,8 +25,7 @@ public SkinnableCatcher()
             : base(new CatchSkinComponentLookup(CatchSkinComponents.Catcher), _ => new DefaultCatcher())
         {
             Anchor = Anchor.TopCentre;
-            // Sets the origin to the top of the catcher's plate to allow for correct scaling.
-            OriginPosition = new Vector2(0.5f, 0.0525f) * Catcher.BASE_SIZE;
+            Origin = Anchor.TopCentre;
             CentreComponent = false;
         }
     }