fix: preserve control size across landscape flips

This commit is contained in:
2026-09-13 21:23:20 +08:00
parent 70847c8b97
commit d60366ab77
17 changed files with 121 additions and 63 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
# NESLite
NESLite 是一个面向 Android 的轻量 NES/FC 模拟器前端。它使用固定版本的
FCEUmm libretro 内核。当前仓库已准备 0.9.12 候选基线的冻结样本、输入延迟指标、升级架构、原生对齐审计
FCEUmm libretro 内核。当前仓库已准备 0.9.13 候选基线的冻结样本、输入延迟指标、升级架构、原生对齐审计
和候选交付脚本;荣耀 Magic8 与 X5 Lite 已由截图确认枚举,但手机未开放 ADB,且发布签名和可观察
玩法的合法 ROM 样本尚未提供,因此 M2~M8 的完整实机验收及 G8 仍待补齐。
+2 -2
View File
@@ -21,8 +21,8 @@ android {
applicationId = "org.neslite.app"
minSdk = 28
targetSdk = 36
versionCode = 9012
versionName = "0.9.12"
versionCode = 9013
versionName = "0.9.13"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
ndk {
@@ -386,13 +386,14 @@ class MainActivity : ComponentActivity(), InputManager.InputDeviceListener {
view.setPadding(0, 0, 0, 0)
layoutInsets.gameplay.run {
mainScreen.setPadding(left, top, right, bottom)
virtualGamepad.setSafeHorizontalInsets(left, right)
virtualGamepad.setSafeHorizontalInsets(left, right, layoutInsets.gameplayRightShift)
}
layoutInsets.overlay.run {
overlayScreen.setPadding(left, top, right, bottom)
}
recordSystemEvent(
"safe_insets_game_${layoutInsets.gameplay.left}_0_${layoutInsets.gameplay.right}_0" +
"_shift_${layoutInsets.gameplayRightShift}" +
"_overlay_${layoutInsets.overlay.left}_${layoutInsets.overlay.top}_" +
"${layoutInsets.overlay.right}_${layoutInsets.overlay.bottom}",
)
@@ -28,6 +28,7 @@ internal fun computeVirtualGamepadGeometry(
maxRadius: Float,
safeLeft: Float = 0f,
safeRight: Float = 0f,
screenShift: Float = 0f,
dpadScale: Float = 1f,
dpadHorizontalOffset: Float = 0f,
dpadVerticalOffset: Float = 0f,
@@ -48,44 +49,49 @@ internal fun computeVirtualGamepadGeometry(
val unshiftedDpadLeft = unshiftedDpadX - dpadRadius * 2f
val edgeGap = baseRadius * 0.05f
val horizontalShift = min(faceRadius * 2f, (unshiftedDpadLeft - edgeGap).coerceAtLeast(0f))
val gameLeft = leftInset + sideWidth - horizontalShift
val gameRight = gameLeft + gameWidth
val baseGameLeft = leftInset + sideWidth - horizontalShift
val baseGameRight = baseGameLeft + gameWidth
val expandedRightWidth = (w - rightInset - baseGameRight).coerceAtLeast(1f)
val faceX = baseGameRight + expandedRightWidth * 0.50f
val faceGapX = min(faceRadius * 1.70f, expandedRightWidth * 0.50f - faceRadius)
val baseResetX = w - rightInset - sideWidth * 0.28f - horizontalShift
val rightmostControl = maxOf(faceX + faceGapX + faceRadius, baseResetX + utilityRadius)
val shift = screenShift.coerceIn(0f, (w - rightmostControl - edgeGap).coerceAtLeast(0f))
val gameLeft = baseGameLeft + shift
val gameRight = baseGameRight + shift
val dpadOuterExtent = dpadRadius * 2f
val dpadX = (unshiftedDpadX - horizontalShift +
val dpadX = (unshiftedDpadX - horizontalShift + shift +
dpadHorizontalOffset.coerceIn(-1f, 1f) * faceRadius)
.coerceIn(dpadOuterExtent, (w - dpadOuterExtent).coerceAtLeast(dpadOuterExtent))
val dpadY = (h * (0.61f + dpadVerticalOffset.coerceIn(-1f, 1f) * 0.12f))
.coerceIn(dpadOuterExtent, (h - dpadOuterExtent).coerceAtLeast(dpadOuterExtent))
val dpadGap = dpadRadius
val expandedRightWidth = (w - rightInset - gameRight).coerceAtLeast(1f)
val faceX = gameRight + expandedRightWidth * 0.50f
val faceY = h * 0.54f
val faceGapX = min(faceRadius * 1.70f, expandedRightWidth * 0.50f - faceRadius)
val faceGapY = faceRadius * 1.70f
val gameEdgeGap = faceRadius * 0.25f
return VirtualGamepadGeometry(
gameLeft = gameLeft,
gameRight = gameRight,
horizontalShift = horizontalShift,
horizontalShift = horizontalShift - shift,
up = VirtualControl(dpadX, dpadY - dpadGap, dpadRadius),
down = VirtualControl(dpadX, dpadY + dpadGap, dpadRadius),
left = VirtualControl(dpadX - dpadGap, dpadY, dpadRadius),
right = VirtualControl(dpadX + dpadGap, dpadY, dpadRadius),
select = VirtualControl(
leftInset + sideWidth - menuRadius - gameEdgeGap - horizontalShift,
leftInset + sideWidth - menuRadius - gameEdgeGap - horizontalShift + shift,
h * 0.89f,
menuRadius,
),
faceY = VirtualControl(faceX, faceY - faceGapY, faceRadius),
faceB = VirtualControl(faceX + faceGapX, faceY, faceRadius),
faceA = VirtualControl(faceX, faceY + faceGapY, faceRadius),
faceX = VirtualControl(faceX - faceGapX, faceY, faceRadius),
faceY = VirtualControl(faceX + shift, faceY - faceGapY, faceRadius),
faceB = VirtualControl(faceX + faceGapX + shift, faceY, faceRadius),
faceA = VirtualControl(faceX + shift, faceY + faceGapY, faceRadius),
faceX = VirtualControl(faceX - faceGapX + shift, faceY, faceRadius),
start = VirtualControl(
leftInset + sideWidth + gameWidth + menuRadius + gameEdgeGap - horizontalShift,
leftInset + sideWidth + gameWidth + menuRadius + gameEdgeGap - horizontalShift + shift,
h * 0.89f,
menuRadius,
),
pause = VirtualControl(w - rightInset - sideWidth * 0.72f - horizontalShift, h * 0.13f, utilityRadius),
reset = VirtualControl(w - rightInset - sideWidth * 0.28f - horizontalShift, h * 0.13f, utilityRadius),
pause = VirtualControl(w - rightInset - sideWidth * 0.72f - horizontalShift + shift, h * 0.13f, utilityRadius),
reset = VirtualControl(baseResetX + shift, h * 0.13f, utilityRadius),
)
}
@@ -46,6 +46,7 @@ class VirtualGamepadView(
}
private var safeLeft = 0f
private var safeRight = 0f
private var screenShift = 0f
private var directionMode = DirectionMode.EIGHT_WAY
private var dpadScale = 1.18f
private var dpadHorizontalOffset = 0f
@@ -76,10 +77,13 @@ class VirtualGamepadView(
onHorizontalShiftChanged(geometry().horizontalShift)
}
internal fun setSafeHorizontalInsets(left: Int, right: Int) {
if (safeLeft == left.toFloat() && safeRight == right.toFloat()) return
internal fun setSafeHorizontalInsets(left: Int, right: Int, rightShift: Int) {
if (safeLeft == left.toFloat() && safeRight == right.toFloat() &&
screenShift == rightShift.toFloat()
) return
safeLeft = left.toFloat()
safeRight = right.toFloat()
screenShift = rightShift.toFloat()
onHorizontalShiftChanged(geometry().horizontalShift)
invalidate()
}
@@ -277,6 +281,7 @@ class VirtualGamepadView(
maxRadius = resources.displayMetrics.density * 42f,
safeLeft = safeLeft,
safeRight = safeRight,
screenShift = screenShift,
dpadScale = dpadScale,
dpadHorizontalOffset = dpadHorizontalOffset,
dpadVerticalOffset = dpadVerticalOffset,
@@ -45,6 +45,7 @@ data class SafeInsets(val left: Int, val top: Int, val right: Int, val bottom: I
data class LayoutSafeInsets(
val gameplay: SafeInsets,
val gameplayRightShift: Int,
val overlay: SafeInsets,
)
@@ -61,16 +62,18 @@ fun resolveLayoutSafeInsets(
systemGestures: SafeInsets,
): LayoutSafeInsets {
val gameplayEdges = mergeSafeInsets(displayCutout, systemGestures)
// A landscape rotation exchanges the physical left and right edges. Keep the
// playable geometry anchored to the same coordinates in either orientation.
val gameplaySide = maxOf(gameplayEdges.left, gameplayEdges.right)
// Only the shared edge reservation should affect control size. When the
// camera is on the left, use its extra reservation to shift gameplay right
// instead of shrinking both side control areas.
val sharedSide = minOf(gameplayEdges.left, gameplayEdges.right)
return LayoutSafeInsets(
gameplay = SafeInsets(
left = gameplaySide,
left = sharedSide,
top = 0,
right = gameplaySide,
right = sharedSide,
bottom = 0,
),
gameplayRightShift = (gameplayEdges.left - sharedSide).coerceAtLeast(0),
// Menus are not touch controls: use the full width while keeping clear
// of visible top and bottom system bars.
overlay = SafeInsets(0, systemBars.top, 0, systemBars.bottom),
@@ -7,7 +7,7 @@ class BuildIdentityTest {
@Test
fun debugBuildUsesTheDocumentedIdentity() {
assertEquals("org.neslite.app.debug", BuildConfig.APPLICATION_ID)
assertEquals("0.9.12-debug", BuildConfig.VERSION_NAME)
assertEquals(9012, BuildConfig.VERSION_CODE)
assertEquals("0.9.13-debug", BuildConfig.VERSION_NAME)
assertEquals(9013, BuildConfig.VERSION_CODE)
}
}
@@ -126,28 +126,66 @@ class VirtualGamepadLayoutTest {
}
@Test
fun flippedLandscapeKeepsTheViewportAndEveryControlAtTheSameCoordinates() {
val first = resolveLayoutSafeInsets(
fun flippedLandscapeKeepsButtonSizesAndMovesGameplayAwayFromLeftCamera() {
val cameraLeft = resolveLayoutSafeInsets(
systemBars = SafeInsets(0, 0, 0, 0),
displayCutout = SafeInsets(238, 0, 0, 0),
systemGestures = SafeInsets(28, 0, 24, 0),
).gameplay
val flipped = resolveLayoutSafeInsets(
displayCutout = SafeInsets(288, 0, 0, 0),
systemGestures = SafeInsets(160, 0, 160, 0),
)
val cameraRight = resolveLayoutSafeInsets(
systemBars = SafeInsets(0, 0, 0, 0),
displayCutout = SafeInsets(0, 0, 238, 0),
systemGestures = SafeInsets(24, 0, 28, 0),
).gameplay
displayCutout = SafeInsets(0, 0, 288, 0),
systemGestures = SafeInsets(160, 0, 160, 0),
)
fun geometry(insets: SafeInsets) = computeVirtualGamepadGeometry(
fun geometry(insets: SafeInsets, shift: Int) = computeVirtualGamepadGeometry(
width = 2760f,
height = 1256f,
maxRadius = 126f,
safeLeft = insets.left.toFloat(),
safeRight = insets.right.toFloat(),
screenShift = shift.toFloat(),
dpadScale = 1.18f,
)
assertEquals(geometry(first), geometry(flipped))
val left = geometry(cameraLeft.gameplay, cameraLeft.gameplayRightShift)
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)
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)
assertEquals(originalRadius * 0.58f * 1.30f, left.pause.radius, 0.01f)
assertEquals(right.up.radius, left.up.radius, 0.01f)
assertEquals(right.faceA.radius, left.faceA.radius, 0.01f)
assertEquals(right.select.radius, left.select.radius, 0.01f)
assertEquals(right.pause.radius, left.pause.radius, 0.01f)
assertEquals(movement, left.gameLeft - right.gameLeft, 0.01f)
val leftControls = listOf(left.up, left.down, left.left, left.right, left.select,
left.faceX, left.faceY, left.faceA, left.faceB, left.start, left.pause, left.reset)
val rightControls = listOf(right.up, right.down, right.left, right.right, right.select,
right.faceX, right.faceY, right.faceA, right.faceB, right.start, right.pause, right.reset)
leftControls.zip(rightControls).forEach { (shifted, original) ->
assertEquals(movement, shifted.x - original.x, 0.01f)
assertEquals(original.radius, shifted.radius, 0.01f)
}
assertTrue(left.faceB.x + left.faceB.radius < 2760f)
}
@Test
fun rightShiftIsCappedBeforeFaceButtonsLeaveTheScreen() {
val geometry = computeVirtualGamepadGeometry(
width = 2760f,
height = 1256f,
maxRadius = 126f,
safeLeft = 160f,
safeRight = 160f,
screenShift = 999f,
dpadScale = 1.18f,
)
assertTrue(geometry.faceB.x + geometry.faceB.radius <= 2760f)
assertTrue(geometry.reset.x + geometry.reset.radius <= 2760f)
}
private fun distance(first: VirtualControl, second: VirtualControl): Float =
@@ -33,32 +33,35 @@ class SystemUiPolicyTest {
}
@Test
fun gameplayIsSymmetricAndMenusUseTheFullWidth() {
fun gameplayUsesSharedSideInsetAndShiftsForLeftCamera() {
val resolved = resolveLayoutSafeInsets(
systemBars = SafeInsets(0, 72, 0, 96),
displayCutout = SafeInsets(54, 28, 12, 0),
systemGestures = SafeInsets(24, 0, 30, 48),
)
assertEquals(SafeInsets(54, 0, 54, 0), resolved.gameplay)
assertEquals(SafeInsets(30, 0, 30, 0), resolved.gameplay)
assertEquals(24, resolved.gameplayRightShift)
assertEquals(SafeInsets(0, 72, 0, 96), resolved.overlay)
}
@Test
fun landscapeFlipKeepsGameplayInsetsAndDropsHiddenBars() {
fun landscapeFlipKeepsControlSpaceButMovesAwayFromLeftCamera() {
val first = resolveLayoutSafeInsets(
systemBars = SafeInsets(0, 0, 0, 0),
displayCutout = SafeInsets(238, 0, 0, 0),
systemGestures = SafeInsets(28, 0, 24, 0),
displayCutout = SafeInsets(288, 0, 0, 0),
systemGestures = SafeInsets(160, 0, 160, 0),
)
val flipped = resolveLayoutSafeInsets(
systemBars = SafeInsets(0, 0, 0, 0),
displayCutout = SafeInsets(0, 0, 238, 0),
systemGestures = SafeInsets(24, 0, 28, 0),
displayCutout = SafeInsets(0, 0, 288, 0),
systemGestures = SafeInsets(160, 0, 160, 0),
)
assertEquals(first.gameplay, flipped.gameplay)
assertEquals(SafeInsets(238, 0, 238, 0), first.gameplay)
assertEquals(SafeInsets(160, 0, 160, 0), first.gameplay)
assertEquals(128, first.gameplayRightShift)
assertEquals(0, flipped.gameplayRightShift)
assertEquals(SafeInsets(0, 0, 0, 0), first.overlay)
}
+7 -6
View File
@@ -1,4 +1,4 @@
# NESLite 架构(0.9.12 候选基线)
# NESLite 架构(0.9.13 候选基线)
## 边界与线程
@@ -101,7 +101,7 @@ DataStore 保存,渲染线程只读取整数缩放和过滤快照,音频及
按 pointerId 维护触摸来源并送入与物理手柄相同的 `InputRouter`,因此多来源去重、相反方向和释放规则
一致;取消、滑出、失焦与暂停清空所有虚拟来源。首次使用状态也存于设置 DataStore,不接触用户存档。
0.9.12 将游戏入口收敛为单一横屏主画面:中央 `AspectRatioFrameLayout` 只按 4:3 测量,左右剩余安全
0.9.13 将游戏入口收敛为单一横屏主画面:中央 `AspectRatioFrameLayout` 只按 4:3 测量,左右剩余安全
区域绘制虚拟手柄;左上角横排图标入口独立于游戏安全内边距,打开游戏列表、导入和设置的全屏页面。
方向键与 ABXY 的半径为原布局的 1.5 倍,Select、Start、暂停和重置为原布局的 1.3 倍。Magic8 横屏
安全区允许时,方向键、Select、4:3 画面、Start、暂停和重置整体左移一个 A 键直径,右侧扩展空间用于
@@ -115,10 +115,11 @@ DataStore 保存,渲染线程只读取整数缩放和过滤快照,音频及
`InputRouter` 中约束物理摇杆。多触点状态以动作集合保存,因此 A 与 B 可以同时按住。方向键大小、
水平与垂直偏移存入 AppSettings DataStore。
横屏翻转时挖孔和返回手势保护值会交换左右两侧。游戏画面与虚拟按键统一采用两侧保护值的最大值,
保证两种横屏方向中的坐标和大小一致;管理页面不使用左右防误触边距,只保留已显示顶部和底部系统栏
所需空间。游戏库按可用横向宽度显示两列或三列完整、可换行的游戏名,长按条目才显示详情、收藏和
移除操作。
横屏翻转时挖孔和返回手势保护值会交换左右两侧。游戏画面与虚拟按键只用两侧共有的保护值计算尺寸;
左侧额外保护值转为游戏画面及按键的整体右移,并在右边缘裁切前限制位移。因此两种横屏方向的按键
保持同样的 1.5/1.3 倍大小,但中央画面位置可以不同。左上角列表、导入、设置入口不参与右移。
管理页面不使用左右防误触边距,只保留已显示顶部和底部系统栏所需空间。游戏库按可用横向宽度显示
两列或三列完整、可换行的游戏名,长按条目才显示详情、收藏和移除操作。
手柄设置支持逐项向导和单项修改/清除。捕获目标动作后,物理 KeyEvent 或超过按下阈值的轴方向成为
该动作的唯一绑定;冲突必须由用户确认替换。轴捕获后必须先回到释放阈值内才进入下一项,防止同一
+2 -2
View File
@@ -1,6 +1,6 @@
# NESLite 可复现构建说明
本说明对应 0.9.12 候选基线。命令使用系统默认 PowerShell 7.6.6(`pwsh`)从仓库根目录执行;不需要手工复制 `.so`、
本说明对应 0.9.13 候选基线。命令使用系统默认 PowerShell 7.6.6(`pwsh`)从仓库根目录执行;不需要手工复制 `.so`、
FCEUmm 或 Oboe 文件。
## 前置条件
@@ -50,7 +50,7 @@ pwsh -NoProfile -ExecutionPolicy Bypass -File .\tools\package-rc.ps1
脚本重跑 Stage 和 release lint,生成 `org.neslite.app` 的未签名 release APK、完整原生符号、应用及
三个固定第三方依赖的源码包、许可证/说明、静态原生审计、候选清单和 SHA-256。输出位于
`.build/rc-0.9.12/`。静态审计逐个检查 APK 内 `.so` 的 ELF LOAD 段和 APK 16 KB 对齐,并拒绝非
`.build/rc-0.9.13/`。静态审计逐个检查 APK 内 `.so` 的 ELF LOAD 段和 APK 16 KB 对齐,并拒绝非
arm64-v8a 库。
默认 APK 刻意保持未签名;发布私钥和口令不得传入仓库或写入脚本。获得受保护的发布密钥后,在隔离
+1 -1
View File
@@ -5,7 +5,7 @@
ABXY、视图/菜单键及左右肩键。随后在荣耀 Magic8 页面取得了 Android 设备身份和静态轴范围;
实际 KeyEvent、动态轴采样、手柄模式及拔出重连仍待诊断 JSON 回填。
在 0.9.12-debug 中可从“设置 → 手动设置手柄按键、摇杆与功能键”进入编辑页。可选择“开始逐项手动
在 0.9.13-debug 中可从“设置 → 手动设置手柄按键、摇杆与功能键”进入编辑页。可选择“开始逐项手动
设置全部按键”,按页面顺序操作 X5 Lite;也可点击任一动作单独修改或清除。轴方向捕获后先松回中位,
冲突时确认是否替换,最后点击“保存”。配置按下表设备指纹保存,不依赖临时 deviceId。
+1 -1
View File
@@ -6,7 +6,7 @@
| --- | --- |
| 显示名称 | `NESLite` |
| 正式 application ID/namespace | `org.neslite.app` |
| 当前候选版本 | `0.9.12`,`versionCode = 9012` |
| 当前候选版本 | `0.9.13`,`versionCode = 9013` |
| 调试 application ID | `org.neslite.app.debug` |
| 发布 ABI | `arm64-v8a` |
| min/target SDK | 28/36 |
+1 -1
View File
@@ -1,6 +1,6 @@
# 已知问题与候选版限制
本清单对应 0.9.12 候选源码。优先级含义:阻断表示 G8 不可通过;高表示发布前必须处理;中/低需有
本清单对应 0.9.13 候选源码。优先级含义:阻断表示 G8 不可通过;高表示发布前必须处理;中/低需有
明确接受或修复结论。
| 编号 | 优先级 | 状态 | 问题与处理条件 |
+2 -2
View File
@@ -1,7 +1,7 @@
# M8 0.9.4 发布候选记录
> 此文件保留 0.9.4 的历史候选证据。0.9.12 改动了主界面、触屏与手柄输入路径和页面/会话交接,不能
> 直接继承本记录作为最终 G8 结论;完成 Magic8 实机复核后需生成新的 0.9.12 候选记录。
> 此文件保留 0.9.4 的历史候选证据。0.9.13 改动了主界面、触屏与手柄输入路径和页面/会话交接,不能
> 直接继承本记录作为最终 G8 结论;完成 Magic8 实机复核后需生成新的 0.9.13 候选记录。
日期:2026-09-12
+2 -1
View File
@@ -1,6 +1,7 @@
# NESLite 日常使用
1. 应用会自动进入沉浸式横屏,中央 4:3 游戏区使用完整屏幕高度,只在左右避开挖孔和返回手势区域。左侧是加大的十字方向键,右侧是
1. 应用会自动进入沉浸式横屏,中央 4:3 游戏区使用完整屏幕高度;当摄像头位于左侧时,游戏区和按键
整体右移以利用右侧空间,翻转后中央游戏区的横向位置可能不同。左侧是加大的十字方向键,右侧是
加大的 A/B/X/Y;Select/Start 分别位于游戏画面底部两侧。布局会利用左侧空余安全区将方向键、
Select、游戏画面、Start、暂停和重置整体左移,并用扩大的右侧空间拉开 ABXY。X/Y 分别是 A/B 连发。左上角横排的
“列表”“导入”“设置”图标会打开独立页面,并临时恢复系统栏;管理页面不再保留左右防误触边距。
+2 -2
View File
@@ -14,8 +14,8 @@ $env:JAVA_HOME = if ($env:JAVA_HOME -and (Test-Path (Join-Path $env:JAVA_HOME 'b
}
$env:ANDROID_HOME = $sdkRoot
$env:ANDROID_SDK_ROOT = $sdkRoot
$versionName = '0.9.12'
$versionCode = 9012
$versionName = '0.9.13'
$versionCode = 9013
$gitStatus = @(& git -C $root status --porcelain)
if ($LASTEXITCODE -ne 0) { throw 'Cannot inspect the Git worktree.' }
if ($gitStatus.Count -ne 0) { throw 'RC packaging requires a clean committed worktree.' }