Normalize scale in both axis and remove per axis scale

osudroid · Mar 5, 2025 · b8a8f7b · b8a8f7b
1 parent d1e278e
commit b8a8f7b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 19 deletions.
diff --git a/assets/one-one.png b/assets/one-one.png
diff --git a/src/com/reco1l/osu/hud/GameplayHUD.kt b/src/com/reco1l/osu/hud/GameplayHUD.kt
@@ -214,7 +214,6 @@ class GameplayHUD : Container(), IGameplayEvents {
 
     private fun loadEditModeAssets() {
         ResourceManager.getInstance().loadHighQualityAsset("delete", "delete.png")
-        ResourceManager.getInstance().loadHighQualityAsset("oneone", "one-one.png")
         ResourceManager.getInstance().loadHighQualityAsset("restore", "restore.png")
     }
 

diff --git a/src/com/reco1l/osu/hud/HUDElement.kt b/src/com/reco1l/osu/hud/HUDElement.kt
@@ -87,7 +87,7 @@ abstract class HUDElement : Container(), IGameplayEvents {
 
         anchor = data.anchor
         origin = data.origin
-        setScale(data.scale.x, data.scale.y)
+        setScale(data.scale)
         setPosition(data.position.x, data.position.y)
 
         // When the element is restored it's usually selected so we need to update the connection line.
@@ -104,7 +104,7 @@ abstract class HUDElement : Container(), IGameplayEvents {
         type = this::class,
         anchor = anchor,
         origin = origin,
-        scale = scale,
+        scale = (mScaleX + mScaleY) / 2f,
         position = Vec2(x, y)
     )
 

diff --git a/src/com/reco1l/osu/hud/HUDSkinData.kt b/src/com/reco1l/osu/hud/HUDSkinData.kt
@@ -30,15 +30,15 @@ data class HUDSkinData(val elements: List<HUDElementSkinData>) {
                     type = HUDAccuracyCounter::class,
                     anchor = Anchor.TopRight,
                     origin = Anchor.TopRight,
-                    scale = Vec2(0.6f * 0.96f),
+                    scale = 0.6f * 0.96f,
                     position = Vec2(-17f, 9f)
                 ),
                 HUDElementSkinData(
                     type = HUDComboCounter::class,
                     anchor = Anchor.BottomLeft,
                     origin = Anchor.BottomLeft,
                     position = Vec2(10f, -10f),
-                    scale = Vec2(1.28f)
+                    scale = 1.28f
                 ),
                 HUDElementSkinData(
                     type = HUDPieSongProgress::class,
@@ -54,7 +54,7 @@ data class HUDSkinData(val elements: List<HUDElementSkinData>) {
                     type = HUDScoreCounter::class,
                     anchor = Anchor.TopRight,
                     origin = Anchor.TopRight,
-                    scale = Vec2(0.96f),
+                    scale = 0.96f,
                     position = Vec2(-10f, 0f)
                 )
             )
@@ -70,8 +70,7 @@ data class HUDSkinData(val elements: List<HUDElementSkinData>) {
                     put("y", it.position.y)
                     put("anchor", Anchor.getName(it.anchor))
                     put("origin", Anchor.getName(it.origin))
-                    put("scaleX", it.scale.x)
-                    put("scaleY", it.scale.y)
+                    put("scale", it.scale)
                 }
             }
         }
@@ -90,10 +89,7 @@ data class HUDSkinData(val elements: List<HUDElementSkinData>) {
                     ),
                     anchor = Anchor.getFromName(element.optString("anchor", "Center")),
                     origin = Anchor.getFromName(element.optString("origin", "Center")),
-                    scale = Vec2(
-                        element.optDouble("scaleX", 1.0).toFloat(),
-                        element.optDouble("scaleY", 1.0).toFloat()
-                    )
+                    scale = element.optDouble("scale", 1.0).toFloat(),
                 )
             }.filterNotNull()
         )
@@ -128,5 +124,5 @@ data class HUDElementSkinData(
     /**
      * The scale applied to the element.
      */
-    val scale: Vec2 = Vec2.One
+    val scale: Float = 1f
 )
diff --git a/src/com/reco1l/osu/hud/editor/HUDElementOverlay.kt b/src/com/reco1l/osu/hud/editor/HUDElementOverlay.kt
@@ -46,10 +46,6 @@ class HUDElementOverlay(private val element: HUDElement) : ConstraintContainer()
             }
         })
 
-        attachChild(Button("oneone") {
-            element.setScale((element.scaleX + element.scaleY) / 2f)
-        })
-
         attachChild(Button("restore") {
             element.restore()
         })
@@ -181,8 +177,10 @@ class HUDElementOverlay(private val element: HUDElement) : ConstraintContainer()
                 val deltaScaleX = deltaX / element.widthScaled
                 val deltaScaleY = deltaY / element.heightScaled
 
-                element.scaleX = (element.scaleX + deltaScaleX).coerceIn(0.5f, 5f)
-                element.scaleY = (element.scaleY + deltaScaleY).coerceIn(0.5f, 5f)
+                val scaleX = (element.scaleX + deltaScaleX).coerceIn(0.5f, 5f)
+                val scaleY = (element.scaleY + deltaScaleY).coerceIn(0.5f, 5f)
+
+                element.setScale((scaleX + scaleY) / 2f)
                 return true
             }