feat: enlarge virtual controls and reposition actions

This commit is contained in:
2026-09-12 23:15:16 +08:00
parent 19cc49c099
commit 3cfa3c2266
14 changed files with 73 additions and 44 deletions
@@ -753,21 +753,6 @@ class MainActivity : ComponentActivity(), InputManager.InputDeviceListener {
),
)
addView(
LinearLayout(context).apply {
orientation = LinearLayout.HORIZONTAL
background = roundedBackground(Color.argb(120, 34, 39, 49), dp(10).toFloat())
setPadding(dp(3), dp(3), dp(3), dp(3))
libraryRailButton = railButton("≡", "游戏列表", ::openLibraryPage)
addView(libraryRailButton)
addView(railButton("+", "导入游戏", ::openImportPage))
addView(railButton("⚙", "设置", ::showSettings))
},
FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, dp(44), Gravity.START or Gravity.TOP).apply {
leftMargin = dp(8)
topMargin = dp(8)
},
)
}
addView(
mainScreen,
@@ -776,6 +761,21 @@ class MainActivity : ComponentActivity(), InputManager.InputDeviceListener {
ViewGroup.LayoutParams.MATCH_PARENT,
),
)
addView(
LinearLayout(context).apply {
orientation = LinearLayout.HORIZONTAL
background = roundedBackground(Color.argb(120, 34, 39, 49), dp(10).toFloat())
setPadding(dp(3), dp(3), dp(3), dp(3))
libraryRailButton = railButton("≡", "游戏列表", ::openLibraryPage)
addView(libraryRailButton)
addView(railButton("+", "导入游戏", ::openImportPage))
addView(railButton("⚙", "设置", ::showSettings))
},
FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, dp(44), Gravity.START or Gravity.TOP).apply {
leftMargin = dp(6)
topMargin = dp(8)
},
)
overlayScreen = FrameLayout(context).apply {
visibility = View.GONE
@@ -30,15 +30,17 @@ internal fun computeVirtualGamepadGeometry(
val h = height.coerceAtLeast(1f)
val gameWidth = min(w, h * 4f / 3f)
val sideWidth = ((w - gameWidth) / 2f).coerceAtLeast(1f)
val radius = min(min(h * 0.095f, sideWidth * 0.16f), maxRadius)
val menuRadius = radius * 0.60f
val utilityRadius = radius * 0.58f
val baseRadius = min(min(h * 0.095f, sideWidth * 0.16f), maxRadius)
val radius = baseRadius * 1.50f
val menuRadius = baseRadius * 0.60f * 1.30f
val utilityRadius = baseRadius * 0.58f * 1.30f
val dpadX = sideWidth * 0.50f
val dpadY = h * 0.61f
val dpadGap = radius * 1.42f
val dpadGap = radius
val faceX = w - sideWidth * 0.50f
val faceY = h * 0.54f
val faceGap = radius * 1.85f
val faceGapX = radius * 1.06f
val faceGapY = radius * 1.70f
val gameEdgeGap = radius * 0.25f
return VirtualGamepadGeometry(
gameLeft = sideWidth,
@@ -48,10 +50,10 @@ internal fun computeVirtualGamepadGeometry(
left = VirtualControl(dpadX - dpadGap, dpadY, radius),
right = VirtualControl(dpadX + dpadGap, dpadY, radius),
select = VirtualControl(sideWidth - menuRadius - gameEdgeGap, h * 0.89f, menuRadius),
faceY = VirtualControl(faceX, faceY - faceGap, radius),
faceB = VirtualControl(faceX + faceGap, faceY, radius),
faceA = VirtualControl(faceX, faceY + faceGap, radius),
faceX = VirtualControl(faceX - faceGap, faceY, radius),
faceY = VirtualControl(faceX, faceY - faceGapY, radius),
faceB = VirtualControl(faceX + faceGapX, faceY, radius),
faceA = VirtualControl(faceX, faceY + faceGapY, radius),
faceX = VirtualControl(faceX - faceGapX, faceY, radius),
start = VirtualControl(w - sideWidth + menuRadius + gameEdgeGap, h * 0.89f, menuRadius),
pause = VirtualControl(w - sideWidth * 0.72f, h * 0.13f, utilityRadius),
reset = VirtualControl(w - sideWidth * 0.28f, h * 0.13f, utilityRadius),
@@ -7,7 +7,7 @@ class BuildIdentityTest {
@Test
fun debugBuildUsesTheDocumentedIdentity() {
assertEquals("org.neslite.app.debug", BuildConfig.APPLICATION_ID)
assertEquals("0.9.8-debug", BuildConfig.VERSION_NAME)
assertEquals(9008, BuildConfig.VERSION_CODE)
assertEquals("0.9.9-debug", BuildConfig.VERSION_NAME)
assertEquals(9009, BuildConfig.VERSION_CODE)
}
}
@@ -1,10 +1,28 @@
package org.neslite.app
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
import kotlin.math.hypot
class VirtualGamepadLayoutTest {
@Test
fun primaryAndUtilityControlsUseRequestedScaleFactors() {
val width = 2760f
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 geometry = computeVirtualGamepadGeometry(width, height, maxRadius = 126f)
assertEquals(previousPrimaryRadius * 1.50f, geometry.up.radius, 0.01f)
assertEquals(previousPrimaryRadius * 1.50f, geometry.faceA.radius, 0.01f)
assertEquals(previousPrimaryRadius * 0.60f * 1.30f, geometry.select.radius, 0.01f)
assertEquals(previousPrimaryRadius * 0.60f * 1.30f, geometry.start.radius, 0.01f)
assertEquals(previousPrimaryRadius * 0.58f * 1.30f, geometry.pause.radius, 0.01f)
assertEquals(previousPrimaryRadius * 0.58f * 1.30f, geometry.reset.radius, 0.01f)
}
@Test
fun magic8ControlsStayOutsideTheFourByThreeViewport() {
val geometry = computeVirtualGamepadGeometry(width = 2760f, height = 1256f, maxRadius = 126f)
@@ -27,7 +45,15 @@ class VirtualGamepadLayoutTest {
assertTrue(geometry.start.radius < geometry.faceA.radius)
assertTrue(distance(geometry.select, geometry.right) > geometry.select.radius + geometry.right.radius)
assertTrue(distance(geometry.start, geometry.faceA) > geometry.start.radius + geometry.faceA.radius)
assertTrue(distance(geometry.faceY, geometry.faceB) > geometry.faceY.radius + geometry.faceB.radius)
val faceControls = listOf(geometry.faceY, geometry.faceB, geometry.faceA, geometry.faceX)
faceControls.indices.forEach { first ->
(first + 1 until faceControls.size).forEach { second ->
assertTrue(
distance(faceControls[first], faceControls[second]) >
faceControls[first].radius + faceControls[second].radius,
)
}
}
}
@Test