diff --git a/android/build.sh b/android/build.sh index 7e073ac3..6749378e 100755 --- a/android/build.sh +++ b/android/build.sh @@ -92,7 +92,9 @@ fi APK="$HERE/app/build/outputs/apk/debug/app-debug.apk" ls -l "$APK" -ADB="$ANDROID_HOME/platform-tools/adb"; command -v adb >/dev/null && ADB="$(command -v adb)" +# Prefer the SDK's adb: a different adb version on PATH (e.g. Homebrew's) restarts a running adb +# server it does not match, which drops an install or push in progress. +ADB="$ANDROID_HOME/platform-tools/adb"; [[ -x "$ADB" ]] || ADB="$(command -v adb)" [[ -n "${ADB_SERIAL:-}" ]] && ADB="$ADB -s $ADB_SERIAL" if $ADB get-state >/dev/null 2>&1; then $ADB install -r -d "$APK" diff --git a/docs/PORT-PLAN.md b/docs/PORT-PLAN.md index 10dec7e7..7193e502 100644 --- a/docs/PORT-PLAN.md +++ b/docs/PORT-PLAN.md @@ -1139,6 +1139,7 @@ Not verified: in-game or device visuals (no server in this session). the SDK repository (`LegacyWindController`, `CreateFromSpt` variance, LOD fields). Until that SDK work is pushed, the APK builds from a local mirror with shims: `AVA2_SOURCE_DIR= AVA2_SDK_ROOT= android/build.sh`. + (Obsolete since SDK 62a5f5a, 2026-10-13: plain `AVA2_SDK_ROOT=../sdk` builds.) Verified: debug APK builds; the desktop client reaches the login screen inside `build/android-data/root` (the phone layout) with no missing-effect errors. @@ -1547,3 +1548,23 @@ Outstanding: - A missing or unreadable model should fail that load, not throw out of main. - The `--preview-data` camera starts inside the tree canopy, so the player is hidden. - Thermals over a long session not yet measured. + +### 2026-10-13 Real SpeedTree SDK + +The SDK repository now carries the SpeedTree runtime this checkout calls (SDK 62a5f5a: +"Implement cross-platform SpeedTree runtime and recovery tests" and "Fix terminal foliage +dispatch on frond branches"). The local mirror and SDK shim are no longer needed; desktop +and Android build against the plain SDK checkout. + +Changes: +- `tests/attack_combo_test.cpp` and `tests/ava2_render_3d_test.cpp` call the code under + test inside `assert()`. In RelWithDebInfo (NDEBUG) those calls compiled out and the tests + segfaulted; they had been skipped only because the test rundir was not found. Both now + undefine NDEBUG, like `hardware_scene_test.cpp`. +- `android/build.sh` prefers the SDK's adb over the one on PATH (see the adb note above). + +Verified: +- Desktop ctest 59/59 with `-DAVA2_TEST_RUNDIR=/build/dev/test-rundir`, including + `ava2.speedtree_forest` (without that option the 9 asset tests are skipped). +- Desktop phone layout and the device both render trees with real branches and fronds. +- Device game phase: 60.3 fps, max frame gap 16.6 ms, 0 frames over 25 ms. diff --git a/tests/attack_combo_test.cpp b/tests/attack_combo_test.cpp index 03d419e3..bca6be6a 100644 --- a/tests/attack_combo_test.cpp +++ b/tests/attack_combo_test.cpp @@ -1,5 +1,9 @@ // Attack wiring (mobile step 3b): CRaceMotionData .msa parsing, the PythonPlayerSettingsModule combo // tables, the ActorInstanceBattle combo state machine and __NormalAttackProcess hit detection. +// The checks call the code under test inside assert(); keep them in release builds. +#ifdef NDEBUG +#undef NDEBUG +#endif #include "src/eter_render/ActorInstance.h" #include "src/eter_render/RaceData.h" #include "test_rundir.h" diff --git a/tests/ava2_render_3d_test.cpp b/tests/ava2_render_3d_test.cpp index 2ba3af6f..1bd23a6e 100644 --- a/tests/ava2_render_3d_test.cpp +++ b/tests/ava2_render_3d_test.cpp @@ -1,3 +1,7 @@ +// The checks call the code under test inside assert(); keep them in release builds. +#ifdef NDEBUG +#undef NDEBUG +#endif #include "src/eter_render/Gr2ModelRenderer.h" #include "src/eter_render/TerrainHeightmap.h" #include "src/eter_render/MapObjectManager.h"