From 3dbde6829d6ec96d39ff23c3553ee13d20ae9b64 Mon Sep 17 00:00:00 2001 From: shen Date: Sat, 12 Sep 2026 23:34:37 +0800 Subject: [PATCH] feat: shift gameplay layout and spread face buttons --- README.md | 2 +- app/build.gradle.kts | 4 +- .../main/java/org/neslite/app/MainActivity.kt | 24 +++++----- .../org/neslite/app/VirtualGamepadLayout.kt | 44 ++++++++++++++----- .../org/neslite/app/VirtualGamepadView.kt | 18 ++++++++ .../java/org/neslite/app/BuildIdentityTest.kt | 4 +- .../neslite/app/VirtualGamepadLayoutTest.kt | 20 +++++++++ docs/architecture.md | 8 ++-- docs/build.md | 4 +- docs/controller-x5lite.md | 2 +- docs/identity.md | 2 +- docs/known-issues.md | 2 +- docs/reports/m8-release-candidate.md | 4 +- docs/usage.md | 3 +- tools/package-rc.ps1 | 4 +- 15 files changed, 106 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index 17fcdfe..4b455fb 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # NESLite NESLite 是一个面向 Android 的轻量 NES/FC 模拟器前端。它使用固定版本的 -FCEUmm libretro 内核。当前仓库已准备 0.9.9 候选基线的冻结样本、输入延迟指标、升级架构、原生对齐审计 +FCEUmm libretro 内核。当前仓库已准备 0.9.10 候选基线的冻结样本、输入延迟指标、升级架构、原生对齐审计 和候选交付脚本;荣耀 Magic8 与 X5 Lite 已由截图确认枚举,但手机未开放 ADB,且发布签名和可观察 玩法的合法 ROM 样本尚未提供,因此 M2~M8 的完整实机验收及 G8 仍待补齐。 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 34453bb..b564af8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -21,8 +21,8 @@ android { applicationId = "org.neslite.app" minSdk = 28 targetSdk = 36 - versionCode = 9009 - versionName = "0.9.9" + versionCode = 9010 + versionName = "0.9.10" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" ndk { diff --git a/app/src/main/java/org/neslite/app/MainActivity.kt b/app/src/main/java/org/neslite/app/MainActivity.kt index b2c7af2..ae9c048 100644 --- a/app/src/main/java/org/neslite/app/MainActivity.kt +++ b/app/src/main/java/org/neslite/app/MainActivity.kt @@ -113,6 +113,7 @@ class MainActivity : ComponentActivity(), InputManager.InputDeviceListener { private lateinit var database: GameDatabase private lateinit var gameList: LinearLayout private lateinit var emulatorSurface: EmulatorSurface + private lateinit var gameViewport: AspectRatioFrameLayout private lateinit var emulatorStatus: TextView private lateinit var audioStatus: TextView private lateinit var pauseMenu: LinearLayout @@ -381,6 +382,7 @@ class MainActivity : ComponentActivity(), InputManager.InputDeviceListener { view.setPadding(0, 0, 0, 0) layoutInsets.gameplay.run { mainScreen.setPadding(left, top, right, bottom) + virtualGamepad.setSafeHorizontalInsets(left, right) } layoutInsets.overlay.run { overlayScreen.setPadding(left, top, right, bottom) @@ -690,7 +692,7 @@ class MainActivity : ComponentActivity(), InputManager.InputDeviceListener { mainScreen = FrameLayout(context).apply { setBackgroundColor(Color.rgb(16, 19, 24)) - val viewport = AspectRatioFrameLayout(context).apply { + gameViewport = AspectRatioFrameLayout(context).apply { setBackgroundColor(Color.BLACK) emulatorSurface = EmulatorSurface(context, ::recordSystemEvent) addView( @@ -720,7 +722,7 @@ class MainActivity : ComponentActivity(), InputManager.InputDeviceListener { ) } addView( - viewport, + gameViewport, FrameLayout.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, @@ -736,6 +738,9 @@ class MainActivity : ComponentActivity(), InputManager.InputDeviceListener { if (activeSessionId == 0L) showEmulatorStatus("请先从游戏列表选择游戏") else sendControlCommand("reset") }, + onHorizontalShiftChanged = { horizontalShift -> + gameViewport.translationX = -horizontalShift + }, ) addView( virtualGamepad, @@ -745,14 +750,6 @@ class MainActivity : ComponentActivity(), InputManager.InputDeviceListener { ), ) } - addView( - virtualControlsOverlay, - FrameLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT, - ), - ) - } addView( mainScreen, @@ -761,6 +758,13 @@ class MainActivity : ComponentActivity(), InputManager.InputDeviceListener { ViewGroup.LayoutParams.MATCH_PARENT, ), ) + addView( + virtualControlsOverlay, + FrameLayout.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, + ), + ) addView( LinearLayout(context).apply { orientation = LinearLayout.HORIZONTAL diff --git a/app/src/main/java/org/neslite/app/VirtualGamepadLayout.kt b/app/src/main/java/org/neslite/app/VirtualGamepadLayout.kt index 5b2b02f..ae81387 100644 --- a/app/src/main/java/org/neslite/app/VirtualGamepadLayout.kt +++ b/app/src/main/java/org/neslite/app/VirtualGamepadLayout.kt @@ -7,6 +7,7 @@ internal data class VirtualControl(val x: Float, val y: Float, val radius: Float internal data class VirtualGamepadGeometry( val gameLeft: Float, val gameRight: Float, + val horizontalShift: Float, val up: VirtualControl, val down: VirtualControl, val left: VirtualControl, @@ -25,37 +26,58 @@ internal fun computeVirtualGamepadGeometry( width: Float, height: Float, maxRadius: Float, + safeLeft: Float = 0f, + safeRight: Float = 0f, ): VirtualGamepadGeometry { val w = width.coerceAtLeast(1f) val h = height.coerceAtLeast(1f) - val gameWidth = min(w, h * 4f / 3f) - val sideWidth = ((w - gameWidth) / 2f).coerceAtLeast(1f) + val leftInset = safeLeft.coerceIn(0f, w) + val rightInset = safeRight.coerceIn(0f, w - leftInset) + 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) 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 unshiftedDpadX = leftInset + sideWidth * 0.50f + val unshiftedDpadLeft = unshiftedDpadX - radius * 2f + val edgeGap = baseRadius * 0.10f + val horizontalShift = min(radius * 2f, (unshiftedDpadLeft - edgeGap).coerceAtLeast(0f)) + val gameLeft = leftInset + sideWidth - horizontalShift + val gameRight = gameLeft + gameWidth + val dpadX = unshiftedDpadX - horizontalShift val dpadY = h * 0.61f val dpadGap = radius - val faceX = w - sideWidth * 0.50f + val expandedRightWidth = (w - rightInset - gameRight).coerceAtLeast(1f) + val faceX = gameRight + expandedRightWidth * 0.50f val faceY = h * 0.54f - val faceGapX = radius * 1.06f + val faceGapX = min(radius * 1.70f, expandedRightWidth * 0.50f - radius) val faceGapY = radius * 1.70f val gameEdgeGap = radius * 0.25f return VirtualGamepadGeometry( - gameLeft = sideWidth, - gameRight = w - sideWidth, + gameLeft = gameLeft, + gameRight = gameRight, + horizontalShift = horizontalShift, up = VirtualControl(dpadX, dpadY - dpadGap, radius), down = VirtualControl(dpadX, dpadY + dpadGap, radius), left = VirtualControl(dpadX - dpadGap, dpadY, radius), right = VirtualControl(dpadX + dpadGap, dpadY, radius), - select = VirtualControl(sideWidth - menuRadius - gameEdgeGap, h * 0.89f, menuRadius), + select = VirtualControl( + leftInset + sideWidth - menuRadius - gameEdgeGap - horizontalShift, + h * 0.89f, + menuRadius, + ), 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), + start = VirtualControl( + leftInset + sideWidth + gameWidth + menuRadius + gameEdgeGap - horizontalShift, + 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), ) } diff --git a/app/src/main/java/org/neslite/app/VirtualGamepadView.kt b/app/src/main/java/org/neslite/app/VirtualGamepadView.kt index 1eedeab..0034ddd 100644 --- a/app/src/main/java/org/neslite/app/VirtualGamepadView.kt +++ b/app/src/main/java/org/neslite/app/VirtualGamepadView.kt @@ -18,6 +18,7 @@ class VirtualGamepadView( context: Context, private val onTransition: (pointerId: Int, action: GameAction, pressed: Boolean) -> Unit, private val onReset: () -> Unit, + private val onHorizontalShiftChanged: (Float) -> Unit = {}, ) : View(context) { private val tracker = VirtualInputTracker() private val resetPointers = mutableSetOf() @@ -40,6 +41,8 @@ class VirtualGamepadView( private val secondaryTextPaint = Paint(textPaint).apply { color = Color.argb(225, 235, 238, 244) } + private var safeLeft = 0f + private var safeRight = 0f init { isFocusable = true @@ -61,6 +64,19 @@ class VirtualGamepadView( drawControl(canvas, geometry.reset, "重置", compact = true, secondary = "长按", isPressed = resetPointers.isNotEmpty()) } + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + onHorizontalShiftChanged(geometry().horizontalShift) + } + + internal fun setSafeHorizontalInsets(left: Int, right: Int) { + if (safeLeft == left.toFloat() && safeRight == right.toFloat()) return + safeLeft = left.toFloat() + safeRight = right.toFloat() + onHorizontalShiftChanged(geometry().horizontalShift) + invalidate() + } + override fun onTouchEvent(event: MotionEvent): Boolean { when (event.actionMasked) { MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> updatePointer(event, event.actionIndex) @@ -220,6 +236,8 @@ class VirtualGamepadView( width = width.toFloat(), height = height.toFloat(), maxRadius = resources.displayMetrics.density * 42f, + safeLeft = safeLeft, + safeRight = safeRight, ) private companion object { diff --git a/app/src/test/java/org/neslite/app/BuildIdentityTest.kt b/app/src/test/java/org/neslite/app/BuildIdentityTest.kt index 689e639..1eadfb4 100644 --- a/app/src/test/java/org/neslite/app/BuildIdentityTest.kt +++ b/app/src/test/java/org/neslite/app/BuildIdentityTest.kt @@ -7,7 +7,7 @@ class BuildIdentityTest { @Test fun debugBuildUsesTheDocumentedIdentity() { assertEquals("org.neslite.app.debug", BuildConfig.APPLICATION_ID) - assertEquals("0.9.9-debug", BuildConfig.VERSION_NAME) - assertEquals(9009, BuildConfig.VERSION_CODE) + assertEquals("0.9.10-debug", BuildConfig.VERSION_NAME) + assertEquals(9010, BuildConfig.VERSION_CODE) } } diff --git a/app/src/test/java/org/neslite/app/VirtualGamepadLayoutTest.kt b/app/src/test/java/org/neslite/app/VirtualGamepadLayoutTest.kt index 09f6171..2e06895 100644 --- a/app/src/test/java/org/neslite/app/VirtualGamepadLayoutTest.kt +++ b/app/src/test/java/org/neslite/app/VirtualGamepadLayoutTest.kt @@ -23,6 +23,26 @@ class VirtualGamepadLayoutTest { assertEquals(previousPrimaryRadius * 0.58f * 1.30f, geometry.reset.radius, 0.01f) } + @Test + fun magic8InsetAllowsAFullButtonDiameterShiftAndExpandsFaceSpacing() { + val width = 2760f + val height = 1256f + val safeLeft = 238f + val geometry = computeVirtualGamepadGeometry( + width = width, + height = height, + maxRadius = 126f, + safeLeft = safeLeft, + ) + val gameWidth = minOf(width - safeLeft, height * 4f / 3f) + val centeredGameLeft = safeLeft + (width - safeLeft - gameWidth) / 2f + + assertEquals(geometry.faceA.radius * 2f, geometry.horizontalShift, 0.01f) + assertEquals(centeredGameLeft - geometry.horizontalShift, geometry.gameLeft, 0.01f) + assertTrue(geometry.left.x - geometry.left.radius > 0f) + assertTrue(geometry.faceB.x - geometry.faceY.x > geometry.faceB.radius * 1.6f) + } + @Test fun magic8ControlsStayOutsideTheFourByThreeViewport() { val geometry = computeVirtualGamepadGeometry(width = 2760f, height = 1256f, maxRadius = 126f) diff --git a/docs/architecture.md b/docs/architecture.md index 697694f..ac5cee6 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -1,4 +1,4 @@ -# NESLite 架构(0.9.9 候选基线) +# NESLite 架构(0.9.10 候选基线) ## 边界与线程 @@ -101,9 +101,11 @@ DataStore 保存,渲染线程只读取整数缩放和过滤快照,音频及 按 pointerId 维护触摸来源并送入与物理手柄相同的 `InputRouter`,因此多来源去重、相反方向和释放规则 一致;取消、滑出、失焦与暂停清空所有虚拟来源。首次使用状态也存于设置 DataStore,不接触用户存档。 -0.9.9 将游戏入口收敛为单一横屏主画面:中央 `AspectRatioFrameLayout` 只按 4:3 测量,左右剩余安全 +0.9.10 将游戏入口收敛为单一横屏主画面:中央 `AspectRatioFrameLayout` 只按 4:3 测量,左右剩余安全 区域绘制虚拟手柄;左上角横排图标入口独立于游戏安全内边距,打开游戏列表、导入和设置的全屏页面。 -方向键与 ABXY 的半径为原布局的 1.5 倍,Select、Start、暂停和重置为原布局的 1.3 倍;X/Y 复用 M4 的 A/B 软件 +方向键与 ABXY 的半径为原布局的 1.5 倍,Select、Start、暂停和重置为原布局的 1.3 倍。Magic8 横屏 +安全区允许时,方向键、Select、4:3 画面、Start、暂停和重置整体左移一个 A 键直径,右侧扩展空间用于 +拉开 ABXY 菱形的横向间距;X/Y 复用 M4 的 A/B 软件 连发动作;重置要求持续按住 650 ms。游戏页沉浸式隐藏系统栏,管理页恢复系统栏;页面打开前先等待 运行会话进入暂停态,页面关闭后不自动恢复,避免文件选择或设置过程中游戏在后台继续。 diff --git a/docs/build.md b/docs/build.md index c36fcf2..53a1d4c 100644 --- a/docs/build.md +++ b/docs/build.md @@ -1,6 +1,6 @@ # NESLite 可复现构建说明 -本说明对应 0.9.9 候选基线。命令使用系统默认 PowerShell 7.6.6(`pwsh`)从仓库根目录执行;不需要手工复制 `.so`、 +本说明对应 0.9.10 候选基线。命令使用系统默认 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.9/`。静态审计逐个检查 APK 内 `.so` 的 ELF LOAD 段和 APK 16 KB 对齐,并拒绝非 +`.build/rc-0.9.10/`。静态审计逐个检查 APK 内 `.so` 的 ELF LOAD 段和 APK 16 KB 对齐,并拒绝非 arm64-v8a 库。 默认 APK 刻意保持未签名;发布私钥和口令不得传入仓库或写入脚本。获得受保护的发布密钥后,在隔离 diff --git a/docs/controller-x5lite.md b/docs/controller-x5lite.md index 8d5de4e..a6270c8 100644 --- a/docs/controller-x5lite.md +++ b/docs/controller-x5lite.md @@ -5,7 +5,7 @@ ABXY、视图/菜单键及左右肩键。随后在荣耀 Magic8 页面取得了 Android 设备身份和静态轴范围; 实际 KeyEvent、动态轴采样、手柄模式及拔出重连仍待诊断 JSON 回填。 -在 0.9.9-debug 中可从“设置 → 手动设置手柄按键、摇杆与功能键”进入编辑页。可选择“开始逐项手动 +在 0.9.10-debug 中可从“设置 → 手动设置手柄按键、摇杆与功能键”进入编辑页。可选择“开始逐项手动 设置全部按键”,按页面顺序操作 X5 Lite;也可点击任一动作单独修改或清除。轴方向捕获后先松回中位, 冲突时确认是否替换,最后点击“保存”。配置按下表设备指纹保存,不依赖临时 deviceId。 diff --git a/docs/identity.md b/docs/identity.md index b68af06..75553c4 100644 --- a/docs/identity.md +++ b/docs/identity.md @@ -6,7 +6,7 @@ | --- | --- | | 显示名称 | `NESLite` | | 正式 application ID/namespace | `org.neslite.app` | -| 当前候选版本 | `0.9.9`,`versionCode = 9009` | +| 当前候选版本 | `0.9.10`,`versionCode = 9010` | | 调试 application ID | `org.neslite.app.debug` | | 发布 ABI | `arm64-v8a` | | min/target SDK | 28/36 | diff --git a/docs/known-issues.md b/docs/known-issues.md index f1f49d5..c7bbe0d 100644 --- a/docs/known-issues.md +++ b/docs/known-issues.md @@ -1,6 +1,6 @@ # 已知问题与候选版限制 -本清单对应 0.9.9 候选源码。优先级含义:阻断表示 G8 不可通过;高表示发布前必须处理;中/低需有 +本清单对应 0.9.10 候选源码。优先级含义:阻断表示 G8 不可通过;高表示发布前必须处理;中/低需有 明确接受或修复结论。 | 编号 | 优先级 | 状态 | 问题与处理条件 | diff --git a/docs/reports/m8-release-candidate.md b/docs/reports/m8-release-candidate.md index 78da488..1ca194e 100644 --- a/docs/reports/m8-release-candidate.md +++ b/docs/reports/m8-release-candidate.md @@ -1,7 +1,7 @@ # M8 0.9.4 发布候选记录 -> 此文件保留 0.9.4 的历史候选证据。0.9.9 改动了主界面、触屏与手柄输入路径和页面/会话交接,不能 -> 直接继承本记录作为最终 G8 结论;完成 Magic8 实机复核后需生成新的 0.9.9 候选记录。 +> 此文件保留 0.9.4 的历史候选证据。0.9.10 改动了主界面、触屏与手柄输入路径和页面/会话交接,不能 +> 直接继承本记录作为最终 G8 结论;完成 Magic8 实机复核后需生成新的 0.9.10 候选记录。 日期:2026-09-12 diff --git a/docs/usage.md b/docs/usage.md index 88071e8..060f7cf 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -1,7 +1,8 @@ # NESLite 日常使用 1. 应用会自动进入沉浸式横屏,中央 4:3 游戏区使用完整屏幕高度,只在左右避开挖孔和返回手势区域。左侧是加大的十字方向键,右侧是 - 加大的 A/B/X/Y;Select/Start 分别位于游戏画面底部两侧。X/Y 分别是 A/B 连发。左上角横排的 + 加大的 A/B/X/Y;Select/Start 分别位于游戏画面底部两侧。布局会利用左侧空余安全区将方向键、 + Select、游戏画面、Start、暂停和重置整体左移,并用扩大的右侧空间拉开 ABXY。X/Y 分别是 A/B 连发。左上角横排的 “列表”“导入”“设置”图标会打开独立页面,并临时恢复系统栏及完整四边安全区。 2. 点左上角“导入”图标,选择你合法持有的 `.nes` 文件。应用按完整 SHA-256 建库;同名不同内容独立, 相同内容不会重复。可按名称/哈希搜索、收藏或从列表隐藏。隐藏不删除 ROM 和存档,重新导入相同 diff --git a/tools/package-rc.ps1 b/tools/package-rc.ps1 index fc81ee1..6bec131 100644 --- a/tools/package-rc.ps1 +++ b/tools/package-rc.ps1 @@ -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.9' -$versionCode = 9009 +$versionName = '0.9.10' +$versionCode = 9010 $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.' }