fix: cap landscape control size to preserve ABXY layout
This commit is contained in:
@@ -21,8 +21,8 @@ android {
|
||||
applicationId = "org.neslite.app"
|
||||
minSdk = 28
|
||||
targetSdk = 36
|
||||
versionCode = 9013
|
||||
versionName = "0.9.13"
|
||||
versionCode = 9014
|
||||
versionName = "0.9.14"
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
||||
ndk {
|
||||
|
||||
@@ -40,7 +40,10 @@ internal fun computeVirtualGamepadGeometry(
|
||||
val usableWidth = (w - leftInset - rightInset).coerceAtLeast(1f)
|
||||
val gameWidth = min(usableWidth, h * 4f / 3f)
|
||||
val sideWidth = ((usableWidth - gameWidth) / 2f).coerceAtLeast(1f)
|
||||
val baseRadius = min(min(h * 0.095f, sideWidth * 0.16f), maxRadius)
|
||||
// The camera-side inset may differ after a 180° landscape flip. Without a
|
||||
// height cap the wider side area enlarges every button and changes the
|
||||
// ABXY diamond even though the phone's physical size has not changed.
|
||||
val baseRadius = min(min(h * 0.0475f, sideWidth * 0.16f), maxRadius)
|
||||
val faceRadius = baseRadius * 1.50f
|
||||
val dpadRadius = faceRadius * dpadScale.coerceIn(0.85f, 1.50f)
|
||||
val menuRadius = baseRadius * 0.60f * 1.30f
|
||||
|
||||
@@ -7,7 +7,7 @@ class BuildIdentityTest {
|
||||
@Test
|
||||
fun debugBuildUsesTheDocumentedIdentity() {
|
||||
assertEquals("org.neslite.app.debug", BuildConfig.APPLICATION_ID)
|
||||
assertEquals("0.9.13-debug", BuildConfig.VERSION_NAME)
|
||||
assertEquals(9013, BuildConfig.VERSION_CODE)
|
||||
assertEquals("0.9.14-debug", BuildConfig.VERSION_NAME)
|
||||
assertEquals(9014, BuildConfig.VERSION_CODE)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ class VirtualGamepadLayoutTest {
|
||||
val height = 1256f
|
||||
val gameWidth = minOf(width, height * 4f / 3f)
|
||||
val sideWidth = (width - gameWidth) / 2f
|
||||
val previousPrimaryRadius = minOf(height * 0.095f, sideWidth * 0.16f, 126f)
|
||||
val previousPrimaryRadius = minOf(height * 0.0475f, sideWidth * 0.16f, 126f)
|
||||
val geometry = computeVirtualGamepadGeometry(width, height, maxRadius = 126f, dpadScale = 1.18f)
|
||||
|
||||
assertEquals(previousPrimaryRadius * 1.50f * 1.18f, geometry.up.radius, 0.01f)
|
||||
@@ -152,7 +152,7 @@ class VirtualGamepadLayoutTest {
|
||||
val right = geometry(cameraRight.gameplay, cameraRight.gameplayRightShift)
|
||||
val movement = 128f
|
||||
val usableSide = (2760f - 320f - 1256f * 4f / 3f) / 2f
|
||||
val originalRadius = minOf(1256f * 0.095f, usableSide * 0.16f, 126f)
|
||||
val originalRadius = minOf(1256f * 0.0475f, usableSide * 0.16f, 126f)
|
||||
assertEquals(originalRadius * 1.50f * 1.18f, left.up.radius, 0.01f)
|
||||
assertEquals(originalRadius * 1.50f, left.faceA.radius, 0.01f)
|
||||
assertEquals(originalRadius * 0.60f * 1.30f, left.select.radius, 0.01f)
|
||||
@@ -188,6 +188,36 @@ class VirtualGamepadLayoutTest {
|
||||
assertTrue(geometry.reset.x + geometry.reset.radius <= 2760f)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun cameraSideChangeDoesNotEnlargeButtonsOrDistortAbxyDiamond() {
|
||||
val reference = computeVirtualGamepadGeometry(
|
||||
width = 2760f,
|
||||
height = 1256f,
|
||||
maxRadius = 126f,
|
||||
safeLeft = 172f,
|
||||
safeRight = 172f,
|
||||
dpadScale = 1.18f,
|
||||
)
|
||||
val flipped = computeVirtualGamepadGeometry(
|
||||
width = 2760f,
|
||||
height = 1256f,
|
||||
maxRadius = 126f,
|
||||
safeLeft = 48f,
|
||||
safeRight = 48f,
|
||||
screenShift = 47f,
|
||||
dpadScale = 1.18f,
|
||||
)
|
||||
|
||||
assertEquals(reference.up.radius, flipped.up.radius, 1f)
|
||||
assertEquals(reference.faceA.radius, flipped.faceA.radius, 1f)
|
||||
assertEquals(reference.select.radius, flipped.select.radius, 1f)
|
||||
assertEquals(reference.pause.radius, flipped.pause.radius, 1f)
|
||||
assertEquals(reference.faceB.x - reference.faceA.x, flipped.faceB.x - flipped.faceA.x, 1f)
|
||||
assertEquals(reference.faceA.x - reference.faceX.x, flipped.faceA.x - flipped.faceX.x, 1f)
|
||||
assertEquals(reference.faceA.y - reference.faceY.y, flipped.faceA.y - flipped.faceY.y, 2f)
|
||||
assertTrue(flipped.faceB.x + flipped.faceB.radius < 2760f)
|
||||
}
|
||||
|
||||
private fun distance(first: VirtualControl, second: VirtualControl): Float =
|
||||
hypot(first.x - second.x, first.y - second.y)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user