Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3aece86d6c | ||
|
|
5d4821195a | ||
|
|
c801c606b5 | ||
|
|
88de3e29c8 | ||
|
|
1785ae99be | ||
|
|
2299395438 | ||
|
|
08d2e4be97 | ||
|
|
95da758408 | ||
|
|
608c372a9e | ||
|
|
fd6def67ec | ||
|
|
78ad6b5397 | ||
|
|
5b5988a22e | ||
|
|
5fe7eef50b | ||
|
|
defd87239e | ||
|
|
48a9042e92 | ||
|
|
bd874fed13 | ||
|
|
00e71f0ec5 | ||
|
|
4e97a01738 | ||
|
|
eee93abc50 | ||
|
|
e8f739e3c0 | ||
|
|
132c972952 | ||
|
|
72b78f7d7e | ||
|
|
b31874271a | ||
|
|
8dfbab5886 | ||
|
|
8a33d1a4be | ||
|
|
46c6d24607 | ||
|
|
5fae6776b0 | ||
|
|
8d3b782ae5 | ||
|
|
f8672ff1b4 | ||
|
|
5841aa803b | ||
|
|
07e3958381 | ||
|
|
2cf1ea8911 | ||
|
|
9fd95c34e9 | ||
|
|
79a5af50fa | ||
|
|
e6f1041a26 | ||
|
|
420a51feed | ||
|
|
3867ecc71a | ||
|
|
16ac8a0979 | ||
|
|
4f63eb0702 | ||
|
|
0022c903fc | ||
|
|
2b0489d440 | ||
|
|
a77f90311d | ||
|
|
d2885ea26a | ||
|
|
0b88e509ae | ||
|
|
fc3824389a | ||
|
|
02aef886fa |
No files matched your search
@@ -19,8 +19,6 @@ CLAUDE.local.md
|
||||
# outputs of `frameport report` / `parity` / ruff
|
||||
REPORT.md
|
||||
.ruff_cache/
|
||||
.eval-home/
|
||||
.eval-results/
|
||||
.claude/worktrees/
|
||||
|
||||
# project page (site/)
|
||||
|
||||
@@ -146,6 +146,23 @@ Read `docs/PLAYBOOK.md` (symptom → fix) before debugging a game, and `docs/FRA
|
||||
`launcher` field, else text swap), list_installed `drive`/`drive_missing` (install_state keeps such games
|
||||
"installed"). PC: `install/drives.py`, library setting `install.drive` (Frame page → Storage), game menu
|
||||
"Move to…" (job kind tool-frame), CLI `frame drives`/`frame move`/`install --dest`. Untested on the device.
|
||||
- **Quest games on this PC via AXRB** (experimental, branch `worktree-pc-android-axrb`, docs/PC_ANDROID.md): the
|
||||
"This PC" target (`PcReviveTarget`) installs APKs through `targets/pc_android.py` + `tools/axrb.py`. AXRB
|
||||
(Android-XR-Bridge/AXRB, Windows: x86_64 Android 16 emulator + libndk_translation + its own OpenXR runtime →
|
||||
`axrb-host-bridge.exe` → SteamVR) is downloaded only on first use (`AXRB-Setup-<v>.exe /S`, SHA256SUMS, per user
|
||||
→ `%LOCALAPPDATA%\Programs\axrb-launcher`), never bundled/modified (host code: AXRB Source-Available License).
|
||||
Its runtime setup lives only in AXRB's Electron JS, so FramePort repeats it (pins read from the installed
|
||||
`app.asar` `core/components.json`, AVD `axrb-managed-api36` port 5584, adb `-P 5038`, receipts `ready.json`/
|
||||
`license-acceptance.json`, so AXRB's own launcher shares it). Spike 2026-10-10 (headless): **unconverted APKs
|
||||
abort** (Meta platform loader) → PC build = OVRPort patches + `Patch.on_pc` APK fixes (`base.pc_selection`,
|
||||
`build(pc=True)`, library `build_pc`, `pc_recipe_fingerprint`); Lucky's Tale ran a full OpenXR session in AXRB's
|
||||
runtime; Pinball FX VR crashed in gfxstream vkAllocateMemory (AXRB's layer). SteamVR can't stand in for a headset
|
||||
(null driver: no D3D11 adapter; vrlink without a Frame: no instance) → frames need the owner. Play = Steam
|
||||
shortcut `powershell.exe -File %LOCALAPPDATA%\FramePort\axrb\fp-axrb-run.ps1 -Package …` → AXRB's
|
||||
`run_windows_game.ps1`; all such shortcuts share Exe, so agent v71 `upsert/remove_shortcut(options_key=
|
||||
"-Package <pkg> ")`. AXRB scripts start through WMI (`axrb.spawn_detached`): QEMU/adb inherit any handle, and
|
||||
even /dev/null through WSL interop kept the call hanging; PowerShell 5.1 `*>>` logs are UTF-16 (`read_log`). Triage
|
||||
`kind: axrb`. Full uninstall in AXRB deletes OBB + saves; a signature change needs one.
|
||||
- **PC VR repacks are pre-patched to run directly** (proven: Rick and Morty, Vader Immortal run when the exe is
|
||||
launched directly; Revive breaks them). So Rift games default to `as_is` = install the copy unchanged and launch
|
||||
the exe directly (`pcvr.xr_timefix` for the Frame OpenXR-1.1→1.0 fix, `pcvr.no_crash_reporter` for Unreal).
|
||||
@@ -223,13 +240,6 @@ Rick and Morty runs on the Frame via its catalog recipe (OpenVR, no Revive),
|
||||
store matches and links then only update `auto_title`; a locked name gets no twin suffix); `sync_title` → Frame
|
||||
agent v77 `rename` (deployment.json title, same shortcut appid: upsert matches by Exe) + art + one Steam restart, PC
|
||||
`PcReviveTarget.rename`; an unreachable Frame → `steam_name_stale` (game page "Update name on Frame", next install).
|
||||
- Newer versions (GitHub #161): game menu "Update with a newer APK…" (`pipeline.replace_apk`, outdated via
|
||||
`build.source_version`) and, for Linux apps / PC VR games, "Update with a newer version…" (`replace_linux_app` /
|
||||
`replace_rift_game` via `add_linux_app(replace=)` / `add_rift_game(replace=)`, CLI `frameport new-version`): the
|
||||
entry keeps package, name, art, tags, switches, user recipe (a confirmed exe if the new folder has it); a new
|
||||
`source_id` goes into the deployment's `recipe` dict at install (no agent change) → `C.source_replaced` = outdated
|
||||
(Frame + `pc_outdated`); such an install re-sends same-size files changed after the last install (mtime/ctime,
|
||||
`installer.changed_since`); the old Rift folder is in `replaced_dirs` (rescans skip it). Untested on the device.
|
||||
- `Recipe.as_is` = install unchanged (pre-patched libraries): `pipeline.prepare_as_is`; auto for APKs that already
|
||||
contain FrameBridge (`frame_patched`). For Rift it changes nothing (the dump is never modified; the Frame copy
|
||||
still gets launch fixes like the crash-reporter rename — `-nocrashreports` alone doesn't stop UE 4.23) — it does
|
||||
@@ -274,15 +284,6 @@ Rick and Morty runs on the Frame via its catalog recipe (OpenVR, no Revive),
|
||||
`working-config.yml` issue → maintainer label `catalog-accepted` (a plain issue needs `working-config` added by
|
||||
hand) → `catalog-from-issue.yml` workflow (`scripts/catalog_from_issue.py` validates) opens a catalog PR. App log:
|
||||
`core/applog.py` (`<data>/logs/app.log`, finished GUI jobs in `<data>/logs/jobs/`).
|
||||
- Announcements (2026-10-15, announcements/README.md; app only, the owner dropped the site pop-up): source of
|
||||
truth `announcements/current.md` on `main` (front matter id/title/date + optional image/image_alt/button+url/
|
||||
expires/active, Markdown body; ships `active: false`). `announcements.py` (no Flet; raw GitHub via
|
||||
`cache.cached_text`, 6 h) + `ui/announcer.py` (pop-up 20 s after start / every 6 h when no dialog is open and not
|
||||
on welcome; `C.dialog` with the portal edge, image downloaded + Pillow-checked into `<data>/announcements/`, shown
|
||||
by asset URL). Shown only if the user was around before `date` (setting `announce.since`, set once at the GUI's
|
||||
first start: 0 when `USED_BEFORE` settings exist, else now), once: any close (X, outside click, Escape, button)
|
||||
stores the id (`announce.dismissed`, last 50). New announcement = new id; same id = typo fix.
|
||||
`FRAMEPORT_NO_ANNOUNCEMENTS`; `ui_smoke.py --announcement` renders it.
|
||||
- Self-update (docs/ARCHITECTURE.md "Self-update", docs/INSTALL.md "Updating"): `_version.py` = the only version
|
||||
(`frameport.__version__`; pyproject reads it via hatch `dynamic`; app log, diagnostics, User-Agent, Settings use
|
||||
it — never `importlib.metadata`, bundles have no dist-info). `updates.py` (no Flet): `check()` = GitHub
|
||||
@@ -475,9 +476,7 @@ Repo is on an NTFS drive (`core.fileMode=false`); line endings are LF (`.gitattr
|
||||
XR_KHR_composition_layer_equirect2/cylinder, XR_FB_composition_layer_image_layout (flip emulated by Vulkan blit).
|
||||
- `xrConvertTimespecTimeToTimeKHR`/`xrConvertTimeToTimespecTimeKHR` return FUNCTION_UNSUPPORTED → adapter emulates
|
||||
(offset = predictedDisplayTime − period − CLOCK_MONOTONIC, sampled in xrWaitFrame).
|
||||
- Guardian STAGE bounds report 1×1 m (scene emulation uses ≥1.5 m). OVRPlugin treats that rect as a configured
|
||||
boundary but can't outline it ("ovrpBoundary_Outer is not supported"): Demeter's guardian check indexed an empty
|
||||
array → with `scene_emul` the app's STAGE `xrGetReferenceSpaceBoundsRect` returns XR_SPACE_BOUNDS_UNAVAILABLE.
|
||||
- Guardian STAGE bounds report 1×1 m (scene emulation uses ≥1.5 m).
|
||||
- GL goes through **Zink** (Mesa GL on Vulkan). Mesa GLSL is strict: `#pragma` before `#extension` fails, implicit
|
||||
int/float conversions fail (enable `GL_EXT_shader_implicit_conversions`), num_views=2 shaders on single-view FBOs
|
||||
give GL_INVALID_OPERATION. Some GLES games hit `zink: DEVICE LOST` (Unity MSAA RTT; Sniper Elite VR even without).
|
||||
@@ -822,24 +821,6 @@ shows what the game draws. Vader: Lucasfilm logo (an OBB mp4: video works), then
|
||||
bar) that never advances; the async loader thread sleeps and OBB reads stop (~168 MB of a 2.7 GB pak).
|
||||
**SteamVR overlay apps (agent v75, 2026-10-10):** host OpenVR overlays (VRApplication_Overlay) are composited over Lepton (Quest) games on the Frame (probe checker seen over 4XVR in the headset view, `native/vroverlay_probe`); Windows ones register through Proton's vrclient too (Temporal Reality's Windows build created its overlays; fpsVR never reaches OpenVR under Proton). Detection `analysis/vroverlay.py` (bundled `.vrmanifest` with `is_dashboard_overlay`, else OpenVR + IVROverlay + self-registration markers, engine Other; Rift fingerprint `RIFT_ANALYSIS`), patch `pcvr.vr_overlay` (param autostart), Linux entry fields `vr_overlay`/`vr_overlay_autostart` (game page switch); agent `register_vr_overlay`/`unregister_vr_overlay`/`launch_vr_overlay` (IVRApplications via ctypes, live; manifest `<anchor>/frameport-overlay.vrmanifest`, the app's own key, binary = launch.sh). **SteamVR on the Frame reads only `binary_path_linux_arm`** (binary_path_linux alone is skipped). Overlay apps: no launch test, no Linux Steam-parent watchdog (`FRAMEPORT_OVERLAY`), not a "running game". A Steam overlay-app shortcut and a game shortcut run together. SteamVR's SetApplicationAutoLaunch didn't persist on the dev Frame (the watch never started by itself) → **agent v76: FramePort's own autostart**: the deployment's `overlay.autostart` is the source of truth; `ensure_host_fixes` (`ensure_overlay_service`) keeps the user service `frameport-vr-overlays.service` (`_vr_overlay_watch`, 5 s polls of the known vrserver's /proc stat) only while an overlay app has autostart on (register/unregister, uninstall, purge and the kill switch `~/.local/share/frameport/vr-overlays.disabled` / `FRAMEPORT_NO_OVERLAY_AUTOSTART` update it); a new vrserver (pid + start time, kept in `~/.cache/frameport-vr-overlays.json` across agent updates) → child `_vr_overlay_round`: wait for IVRApplications, 15 s grace, `launch_vr_overlay` for apps not running (folder process or GetApplicationProcessId); log `~/.local/share/frameport/vr-overlays.log`. Dev Frame: adopted the running vrserver, skipped the already running watch; a start after a real SteamVR start/boot is not yet seen. Details: docs/FRAME_RUNTIME.md "Overlay apps".
|
||||
**Vader's leak solved / AC Nexus flips (2026-10-14):** Vader Immortal leaves GL errors pending on its context; SteamVR's GL interop (`openxr_graphics_gl_openvr.cpp`, `xrclient_<pkg>.txt` in Steam's logs: `SXR_GL_CHECK: error:0x502 ... glGenTextures`) takes the stale error as its own failure once, and from then on `CVRCompositorSharedTextures::BeginCommandBuffer` allocates a command buffer every frame (perf page-fault stacks; ~430 renderD128 mappings + 22 MB/s). Adapter `gl_error_clear` (GLES, catalog on for Vader ep1-3) clears them before xrCreateSwapchain/xrBeginFrame/xrEndFrame: flat memory, no SXR_GL_CHECK (headless). The per-game `xrclient_<pkg>.txt` logs are worth reading for runtime errors. The Frame's runtime caps swapchains per session (XR_ERROR_LIMIT_REACHED from ~15; AC Nexus asks for more): flip emulation now turns quads upright in place (scratch VkImage, once per acquire; transfer usage added to single-layer colour swapchains) instead of a shadow swapchain per quad, which ran into the cap (#138). Headless sessions don't draw AC Nexus's panels (adapter `flip_dump` saves before/after images of flipped quads, for headset runs).
|
||||
**Mixed reality: scanned rooms (agent v92, 2026-10-16, branch mr-scene; docs/mr/):** Quest MR games read the room
|
||||
through Meta's scene APIs; the Frame offers none, and Valve's chaperone is no room (2D outline raised to 2.43 m, often
|
||||
the default 1 m circle -> the Android runtime's STAGE rect falls back to 1x1 m; XRService's plane detection is
|
||||
horizontal-only, its persistent map sparse ORB, its XRIPC single-client; cameras are XRService's alone,
|
||||
IVRTrackedCamera gives no frames). **The passthrough's RoomView 3D depth mesh is readable** (docs/mr/PHASE0.md:
|
||||
IVRBlockQueue_005 `/xrservice/roomview3d/meshData|meshLayout`, metadata through the C++ `IVRPaths_002` on the block
|
||||
handle, `meshIsUpToDate` on the queue handle; 132x128 fan, ~30/s; raw->standing moves during a session -> convert
|
||||
with the final one), so FramePort scans rooms itself: agent `room_capture` (Background/Overlay OpenVR app, prompts =
|
||||
artifacts/roomscan/*.png via IVROverlay_028 slots 1/3/20/22/35/43/44/63, `scripts/mr/render_prompts.py`) -> `.fprs`
|
||||
dump -> `fp_roomscan` (native/roomscan, freestanding, offline) -> `room.txt` + `room-mesh.bin`
|
||||
(docs/mr/ROOM_FORMAT.md; outline = positive shoelace in x-z, wall inward normal (-dz, dx)) in
|
||||
`~/.local/share/frameport/rooms/<universe>/`; launch.sh copies it next to settings.conf (`_room_sync`, games with
|
||||
`scene_emul`); FrameBridge (`scene_room.c/scene_meta.c/scene_anchors.c`) serves N walls, volumes (BOUNDED_3D),
|
||||
planes, GLOBAL_MESH (XR_META_spatial_entity_mesh), XR_META discovery/persistence (newer Meta SDKs and MRUK), anchors
|
||||
saved in `files/framebridge-anchors.txt`; all through xrshim (OVRPort's dispatcher drops unknown META calls).
|
||||
`scene_emul` is now suggested for every USE_SCENE/USE_ANCHOR_API game (migration `scene_emul_all`; NOPE and Pinball
|
||||
FX had none). PC: Frame page "Room" card, `frameport frame room scan|status|from-boundary|import|export|build|show`.
|
||||
Real data (owner's room, 2026-10-16): floor at 0, table surfaces, orthogonal walls found; the ceiling needs "look up".
|
||||
**Unreal's self-restart (agent v90, 2026-10-13):** UE 4.21+ restarts the app once after its first-run shader
|
||||
precompile ("optimizing" screen; `r.ProgramBinaryCache.RestartAndroidAfterPrecompile`): it starts its own LAUNCHER
|
||||
activity and calls System.exit(0); Lepton ends the container with the first process (the restarted one with it).
|
||||
@@ -940,13 +921,6 @@ hide_space_warp / vk_hide_fdm / no Valve layers; FNAF HW (#135) "freeze" = first
|
||||
on Zink (threads busy in zink/disk cache), not a hang; VR4 (#199) reporter's patch.203 OBB truncated. Upload benchmark
|
||||
(`scripts/upload_bench.py`, #242): home Wi-Fi caps every method at ~11 MB/s; paramiko uses ~3x OpenSSH's CPU; Windows
|
||||
OpenSSH refuses FramePort's key file (ACL "bad permissions") until its permissions are tightened.
|
||||
**OpenSSH uploads (2026-10-15, #324/#242):** sftp escapes `* ? [` inside double quotes itself (and undoes it for
|
||||
put's destination), so `native_upload.quote` escapes only `\\`/`"`; Win32 sftp turns every local backslash into `/`
|
||||
(escapes too) → local paths go as `C:/…`. Logins: `Frame.auth` = the attempt that worked (app_key / user_key = a key
|
||||
file from Settings → Installing → SSH keys, library `ssh.extra_keys`, CLI `frame ssh-keys` / agent / password).
|
||||
OpenSSH strict (FramePort + Settings keys, IdentitiesOnly) unless auth was "agent"; a refused strict login retries
|
||||
relaxed (+ private copies of ~/.ssh/id_{rsa,dsa,ecdsa,ed25519}: OpenSSH skips its defaults once any -i is given, + the
|
||||
agent); `-v` key lines go into the error. FramePort doesn't add its key to the Frame for this. Windows-tested.
|
||||
**Meta user id (GitHub #182, 2026-10-11):** OVRPort's platform loader (runtimes 3.4.3-23204ea and -aa54c3f) answers
|
||||
`ovr_GetLoggedInUserID` (and two other callers) without a Meta account with a made-up id from a helper (`stp; mov x29,
|
||||
sp; bl random; …; mov/movk x9 = 0x53444835ec580000 (6e18); add x0, x8, x9; ldp; ret`), kept only in memory → a new id
|
||||
@@ -1098,13 +1072,6 @@ GitHub identity + credentials are maintainer-local (`CLAUDE.local.md`): check `g
|
||||
GitHub write. **The owner approves before posting, labelling or closing anything.** Reply style: "I"/neutral, never
|
||||
we/our/us; never mention agent version numbers or internal tool versions; show the owner every draft in full with a
|
||||
short recap of the thread so far; read **all** comments on a thread first (a later one often has the zip or the answer).
|
||||
- **Every triage also sweeps for unanswered comments**, not just new threads: open AND recently closed issues, PRs
|
||||
(incl. merged/closed ones) and discussions (top-level comments and their replies) whose latest comment isn't the
|
||||
maintainer's, plus earlier user comments a later maintainer reply skipped. Users often ask follow-ups after a fix or
|
||||
after closing (#294: two questions after the reporter closed it; #249: a Q&A discussion with no reply for days;
|
||||
#161/#110: requests posted after the close). Quick check: `gh issue list --state all --search "updated:>=<date>"
|
||||
--json number,comments --jq '.[] | select(.comments[-1].author.login != "spoopyghosty0")'`; discussions via GraphQL
|
||||
(`discussions(orderBy:UPDATED_AT)` with `comments{replies}`).
|
||||
- **Issue templates & labels** (`.github/ISSUE_TEMPLATE/`): `[Game report]` → `game-compatibility` (a game that
|
||||
doesn't work right); `[Working recipe]` (`working-config.yml`) → `working-config` (a headset-verified config to add);
|
||||
`[App]` → `bug` (FramePort itself). Mislabel/relabel to match.
|
||||
@@ -1150,15 +1117,9 @@ MR-only (PASSTHROUGH required + BOUNDARYLESS_APP) → force_passthrough, + USE_S
|
||||
hand tracking required → controller_fix=0; OVRPlugin + ≥20 GiB → disable_space_warp; Unreal ≤4.21 or Unreal Meta XR
|
||||
Audio → nodebug; Oculus-OS class referenced by the Unreal audio build or ≥2 Meta libs → oculusos; legacy-VrApi Unity
|
||||
GLES with MSAA → unity_no_msaa; CryEngine → user.cfg r_variable_rate_shading=0; direct VrApi → bridge (+GL shim for
|
||||
GLAD/GLES); Unreal → alternate no-ForceQuit build. Scoring (docs/HEURISTICS_EVAL.md, 2026-10-15): analyse the dumps
|
||||
once (`scripts/heuristics_snapshot.py <out.json> "<VR CyberDeck Portable>" "<PATCHED>"`, ~30 min, keep out of git),
|
||||
then `scripts/eval_heuristics.py --snapshot <out.json> --split dev|holdout|all [--fit-report]` (catalog-only truth,
|
||||
per-patch precision/recall, a fixed 20% holdout to catch rules fitted to one game). Read the **dated** score: an
|
||||
"extra" on an entry verified before the patch existed is a catalog gap, and adapter/device picks are inherited by
|
||||
catalog recipes anyway. 2026-10-15: strict 5/65 exact, F1 73.8%; dated 39/65, F1 88.6%; remaining misses are
|
||||
one-game runtime fixes. Don't key a rule on one game's code fingerprint (an Unreal splash/depth "detect" matching
|
||||
only Star Wars Tales + FNAF HW was rejected: it would also have bumped ANALYSIS_VERSION for every user). Add a rule →
|
||||
re-run dev + holdout + `pytest -m games`.
|
||||
GLAD/GLES); Unreal → alternate no-ForceQuit build. Score changes with
|
||||
`python scripts/eval_heuristics.py "<dumps>"` (catalog off vs verified recipes; currently 33/34 exact — Phantom's
|
||||
"use the no-ForceQuit build" is only detectable at runtime via triage). Add a rule → re-run the eval + `pytest -m games`.
|
||||
|
||||
## Frame operations
|
||||
- Find/connect: `frameport frame discover` / `frame info` (the remembered Frame is in `<user data>/frames.json`).
|
||||
|
||||
@@ -111,7 +111,8 @@ Out of date? [Report a problem](https://github.com/spoopyghosty0/frameport/issue
|
||||
Most of the work is done by these projects:
|
||||
[OVRPort](https://github.com/Android-XR-Bridge/OVRPort) (Quest → OpenXR, originally
|
||||
[ovrport/app](https://github.com/ovrport/app)) · Valve Lepton, Proton and SteamVR ·
|
||||
[Revive](https://github.com/LibreVR/Revive) · Mesa (Zink) · [Khronos OpenXR SDK](https://github.com/KhronosGroup/OpenXR-SDK)
|
||||
[Revive](https://github.com/LibreVR/Revive) · [AXRB](https://github.com/Android-XR-Bridge/AXRB) (Quest games on a PC,
|
||||
experimental) · Mesa (Zink) · [Khronos OpenXR SDK](https://github.com/KhronosGroup/OpenXR-SDK)
|
||||
· Eclipse Temurin, Android apksigner and NDK · [Flet](https://flet.dev) · OculusDB and Steam store data.
|
||||
What FramePort adds: [Architecture](docs/ARCHITECTURE.md).
|
||||
|
||||
|
||||
@@ -25,6 +25,8 @@ FramePort's own native code (the FrameBridge adapter, GL/Vulkan/OpenXR shims, th
|
||||
| Eclipse Temurin JRE | api.adoptium.net | GPL-2.0 with Classpath Exception |
|
||||
| apksigner (Android build-tools) | dl.google.com Android repository | Apache-2.0 |
|
||||
| Revive (portable copy, only if Revive isn't installed) | github.com/LibreVR/Revive releases | GPL-3.0 |
|
||||
| AXRB / Android XR Bridge (official installer, only when a Quest game is installed on this PC; run unmodified) | github.com/Android-XR-Bridge/AXRB releases | mixed: launcher GPL-3.0-or-later, host/clock code AXRB Source-Available License 1.0, other parts MIT (AXRB's `LICENSE`) |
|
||||
| Android Emulator, platform-tools, build-tools, Android 16 system image (pinned by AXRB) | dl.google.com Android repository | Android SDK License |
|
||||
|
||||
Valve's Lepton, Proton and SteamVR, and Meta's software, are used on your devices as installed by Steam / Meta;
|
||||
FramePort doesn't distribute them.
|
||||
@@ -26,7 +26,6 @@ import base64
|
||||
import glob
|
||||
import hashlib
|
||||
import json
|
||||
import math
|
||||
import os
|
||||
import re
|
||||
import shlex
|
||||
@@ -45,7 +44,7 @@ try:
|
||||
except ImportError: # Windows: pc_revive loads this file for its VDF code only (GitHub #131)
|
||||
fcntl = None
|
||||
|
||||
AGENT_VERSION = 92
|
||||
AGENT_VERSION = 92 # v92: upsert/remove_shortcut options_key (the PC's Quest games share powershell.exe as Exe)
|
||||
HOME = os.path.expanduser("~")
|
||||
STEAM = os.path.join(HOME, ".local/share/Steam")
|
||||
ANCHORS = os.path.join(HOME, "Applications/quest-frame")
|
||||
@@ -983,8 +982,14 @@ def vdf_encode(obj):
|
||||
return bytes(out) + bytes([TYPE_END])
|
||||
|
||||
|
||||
def _shortcut_matches(v, exe, options_key=None):
|
||||
"""A shortcut is the game's when its Exe matches; with options_key (games sharing one Exe, e.g. Quest games on a
|
||||
PC all start powershell.exe) its LaunchOptions must also contain that key."""
|
||||
return isinstance(v, dict) and v.get("Exe") == exe and (not options_key or options_key in v.get("LaunchOptions", ""))
|
||||
|
||||
|
||||
def upsert_shortcut(vdf_path, exe, title, start_dir, icon="", tag="Quest on Frame", launch_options="", tags=None,
|
||||
openvr=True, write=True):
|
||||
openvr=True, write=True, options_key=None):
|
||||
"""Add/update a non-Steam shortcut (matched by Exe, so its appid never changes). `tags` (genres, the user's tags)
|
||||
are merged with tags already on the shortcut, so ones set in Steam are kept. write=False: change nothing, return
|
||||
(appid, whether shortcuts.vdf would change)."""
|
||||
@@ -998,7 +1003,7 @@ def upsert_shortcut(vdf_path, exe, title, start_dir, icon="", tag="Quest on Fram
|
||||
def game_of(options): # the game's program in the injector's arguments (its flags may change)
|
||||
found = re.findall(r'"([^"]+\.exe)"|(\S+\.exe)', options or "", re.IGNORECASE)
|
||||
return (found[-1][0] or found[-1][1]).lower() if found else (options or "")
|
||||
entry = next((v for v in shortcuts.values() if isinstance(v, dict) and v.get("Exe") == exe
|
||||
entry = next((v for v in shortcuts.values() if _shortcut_matches(v, exe, options_key)
|
||||
and (not shared or game_of(v.get("LaunchOptions", "")) == game_of(launch_options))), None)
|
||||
ident = entry["appid"] if entry else shortcut_appid(exe, title)
|
||||
if entry is None:
|
||||
@@ -1093,12 +1098,12 @@ def grid_files(grid, appid):
|
||||
return []
|
||||
|
||||
|
||||
def remove_shortcut(vdf_path, exe):
|
||||
def remove_shortcut(vdf_path, exe, options_key=None):
|
||||
if not os.path.exists(vdf_path):
|
||||
return False
|
||||
root = vdf_decode(open(vdf_path, "rb").read())
|
||||
sc = root.get("shortcuts", {})
|
||||
keep = [v for v in sc.values() if not (isinstance(v, dict) and v.get("Exe") == exe)]
|
||||
keep = [v for v in sc.values() if not _shortcut_matches(v, exe, options_key)]
|
||||
if len(keep) == len(sc):
|
||||
return False
|
||||
root["shortcuts"] = {str(i): v for i, v in enumerate(keep)}
|
||||
@@ -3190,8 +3195,6 @@ def upgrade_launchers():
|
||||
new = set_gamepad_line(new, wants_gamepad(os.path.dirname(path)))
|
||||
new = set_config_sync_line(new, os.path.basename(os.path.dirname(path)),
|
||||
wants_config_sync(os.path.dirname(path)))
|
||||
new = set_room_sync_line(new, os.path.basename(os.path.dirname(path)),
|
||||
wants_scene_room(os.path.dirname(path)))
|
||||
pkg = os.path.basename(os.path.dirname(path))
|
||||
base = launcher_base(new, pkg)
|
||||
if base: # games on a drive whose path has a space reach Lepton through a link (agent v83)
|
||||
@@ -3603,8 +3606,7 @@ def upgrade_linux_launcher(text):
|
||||
return text
|
||||
|
||||
|
||||
def write_launcher(anchor, base, pkg, title, appid, lepton, env, hw_video=False, gamepad=False,
|
||||
config_sync=False, scene_room=False):
|
||||
def write_launcher(anchor, base, pkg, title, appid, lepton, env, hw_video=False, gamepad=False, config_sync=False):
|
||||
extra = "".join(f"export {k}={shlex.quote(str(v))}\n" for k, v in (env or {}).items()
|
||||
if re.fullmatch(r"[A-Z_][A-Z0-9_]*", k))
|
||||
text = LAUNCH_SH.format(title=title.replace("\n", " "), pkg=pkg, app_dir=app_dir_lines(base, pkg), appid=appid,
|
||||
@@ -3615,7 +3617,6 @@ def write_launcher(anchor, base, pkg, title, appid, lepton, env, hw_video=False,
|
||||
plays_start=plays_lines(anchor)[0],
|
||||
plays_end=plays_lines(anchor)[1], restart=restart_block(pkg, lepton))
|
||||
text = set_config_sync_line(text, pkg, config_sync)
|
||||
text = set_room_sync_line(text, pkg, scene_room)
|
||||
path = os.path.join(anchor, "launch.sh")
|
||||
with open(path + ".tmp", "w") as f:
|
||||
f.write(text)
|
||||
@@ -3926,869 +3927,6 @@ def set_flatscreen(app_dir, on):
|
||||
os.remove(marker)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------- mixed-reality room storage (format v1)
|
||||
# Standalone stdlib code: the PC validates the complete geometry; the agent also checks records and mesh sizes
|
||||
# before making an uploaded room current. Never import the desktop package on the Frame.
|
||||
ROOMS_DIR = os.path.join(HOME, ".local/share/frameport/rooms")
|
||||
ROOM_SCANNER = os.path.join(HOME, ".local/share/frameport/bin/fp_roomscan")
|
||||
ROOM_SYNC_LINE = ('python3 {agent_q} _room_sync {pkg_q} >"$app_dir/room-sync.log" 2>&1 9>&- || true '
|
||||
'# frameport-room-sync')
|
||||
|
||||
|
||||
def room_universe(value):
|
||||
text = str(value)
|
||||
if not re.fullmatch(r"[0-9]{1,20}", text) or int(text) >= 2**64:
|
||||
raise AgentError("invalid chaperone universe")
|
||||
return str(int(text))
|
||||
|
||||
|
||||
def room_universe_from_log(text):
|
||||
"""Last universe switch in vrserver.txt; 424242 is Valve's dummy universe (not a room)."""
|
||||
found = None
|
||||
for line in text.splitlines():
|
||||
match = re.search(r"chaperone universe\s+(\d+)|Switch to\s+(?:.*?\s+)?universe\s*[:=]?\s*(\d+)", line, re.I)
|
||||
if match:
|
||||
found = int(match.group(1) or match.group(2))
|
||||
return None if found is None else (0 if found == 424242 else int(room_universe(found)))
|
||||
|
||||
|
||||
def room_chaperone():
|
||||
try:
|
||||
with open(os.path.join(HOME, ".config/openvr/config/chaperone_info.vrchap")) as f:
|
||||
return json.load(f).get("universes") or []
|
||||
except (OSError, ValueError, AttributeError):
|
||||
return []
|
||||
|
||||
|
||||
def room_current_universe():
|
||||
try:
|
||||
with open(os.path.join(STEAM, "logs/vrserver.txt"), "rb") as f:
|
||||
f.seek(0, 2)
|
||||
f.seek(max(0, f.tell() - 2 * 1024 * 1024))
|
||||
found = room_universe_from_log(f.read().decode("utf-8", "replace"))
|
||||
if found is not None:
|
||||
return found
|
||||
except (OSError, ValueError, AgentError):
|
||||
pass
|
||||
universes = [u for u in room_chaperone() if str(u.get("universeID", "0")) not in ("0", "424242")]
|
||||
if not universes:
|
||||
return 0
|
||||
newest = max(enumerate(universes), key=lambda item: (str(item[1].get("time", "")), item[0]))[1]
|
||||
try:
|
||||
return int(room_universe(newest["universeID"]))
|
||||
except (KeyError, AgentError):
|
||||
return 0
|
||||
|
||||
|
||||
def room_boundary(universes, current):
|
||||
"""Chaperone collision quads' bottom edges, in standing/STAGE space, chained into an outline."""
|
||||
import math
|
||||
candidates = [u for u in universes if str(u.get("universeID", "0")) not in ("0", "424242")]
|
||||
if not candidates:
|
||||
raise AgentError("No play area found. Set up a play area in SteamVR first.")
|
||||
u = next((u for u in candidates if str(u.get("universeID")) == str(current)), None)
|
||||
if u is None:
|
||||
u = max(enumerate(candidates), key=lambda item: (str(item[1].get("time", "")), item[0]))[1]
|
||||
edges = []
|
||||
for quad in u.get("collision_bounds") or []:
|
||||
if len(quad) != 4 or any(len(p) != 3 for p in quad):
|
||||
raise AgentError("Invalid chaperone wall")
|
||||
quad = [[float(v) for v in p] for p in quad]
|
||||
if not all(math.isfinite(v) for p in quad for v in p):
|
||||
raise AgentError("Invalid chaperone coordinate")
|
||||
bottom = min(p[1] for p in quad)
|
||||
pts = list(dict.fromkeys((p[0], p[2]) for p in quad if abs(p[1] - bottom) < .001))
|
||||
if len(pts) != 2:
|
||||
raise AgentError("Invalid chaperone wall edge")
|
||||
edges.append(tuple(pts))
|
||||
if len(edges) < 3:
|
||||
raise AgentError("No play area outline found")
|
||||
outline = list(edges.pop(0))
|
||||
while edges:
|
||||
for i, (a, b) in enumerate(edges):
|
||||
if a == outline[-1] or b == outline[-1]:
|
||||
outline.append(b if a == outline[-1] else a)
|
||||
edges.pop(i)
|
||||
break
|
||||
else:
|
||||
raise AgentError("Play area outline is not closed")
|
||||
if outline[-1] != outline[0]:
|
||||
raise AgentError("Play area outline is not closed")
|
||||
return int(room_universe(u["universeID"])), outline[:-1]
|
||||
|
||||
|
||||
def room_default_circle(points):
|
||||
import math
|
||||
if len(points) != 20:
|
||||
return False
|
||||
cx = sum(p[0] for p in points) / 20
|
||||
cz = sum(p[1] for p in points) / 20
|
||||
radii = [math.hypot(x-cx, z-cz) for x, z in points]
|
||||
return all(.85 <= r <= 1.15 for r in radii) and max(radii) - min(radii) < .05
|
||||
|
||||
|
||||
def room_records(text):
|
||||
"""Validate the wire format without desktop dependencies; return its status counts and mesh metadata."""
|
||||
import math
|
||||
lines = [line.split("#", 1)[0].split() for line in text.splitlines()]
|
||||
lines = [line for line in lines if line]
|
||||
if not lines or lines[0] != ["frameport-room", "1"]:
|
||||
raise AgentError("expected frameport-room 1")
|
||||
result = {"universe": 0, "source": "manual", "time": 0,
|
||||
"summary": {"walls": 0, "volumes": {}, "planes": 0}}
|
||||
outline, walls, floor, ceiling = [], [], 0, None
|
||||
ids = set()
|
||||
for row in lines[1:]:
|
||||
k, v = row[0], row[1:]
|
||||
try:
|
||||
if k in ("room", "floor", "ceiling", "wall", "volume", "plane", "mesh"):
|
||||
if not v or not re.fullmatch(r"[a-f0-9]{32}", v[0]) or v[0] in ids:
|
||||
raise ValueError("invalid or duplicate entity UUID")
|
||||
ids.add(v[0])
|
||||
if k == "universe":
|
||||
if len(v) != 1:
|
||||
raise ValueError("expected universe")
|
||||
result[k] = int(room_universe(v[0]))
|
||||
elif k == "time":
|
||||
if len(v) != 1 or not v[0].isdigit():
|
||||
raise ValueError("invalid time")
|
||||
result[k] = int(v[0])
|
||||
elif k == "source":
|
||||
if len(v) != 1 or v[0] not in ("scan", "boundary", "box", "manual"):
|
||||
raise ValueError("invalid source")
|
||||
result[k] = v[0]
|
||||
elif k == "room":
|
||||
if len(v) != 1:
|
||||
raise ValueError("invalid room")
|
||||
elif k in ("floor", "ceiling", "wall", "volume", "plane", "outline"):
|
||||
expected = {"floor": 2, "ceiling": 2, "wall": 7, "volume": 9, "plane": 11}
|
||||
if k == "wall" and len(v) == 8: # optional label: an edge the scanner closed itself
|
||||
if v[7] not in ("WALL_FACE", "INVISIBLE_WALL_FACE"):
|
||||
raise ValueError("invalid wall label")
|
||||
v = v[:7]
|
||||
if k != "outline" and len(v) != expected[k]:
|
||||
raise ValueError("invalid field count")
|
||||
nums = [float(x) for x in v[2 if k in ("volume", "plane") else 1:]]
|
||||
if not all(math.isfinite(x) for x in nums):
|
||||
raise ValueError("nonfinite coordinate")
|
||||
if k == "floor":
|
||||
floor = nums[0]
|
||||
elif k == "ceiling":
|
||||
ceiling = nums[0]
|
||||
elif k == "outline":
|
||||
if int(v[0]) < 3 or len(nums) != int(v[0]) * 2:
|
||||
raise ValueError("invalid outline")
|
||||
outline = list(zip(nums[::2], nums[1::2], strict=True))
|
||||
elif k == "wall":
|
||||
if nums[5] <= nums[4] or nums[:2] == nums[2:4]:
|
||||
raise ValueError("invalid wall dimensions")
|
||||
walls.append(nums)
|
||||
elif k in ("volume", "plane"):
|
||||
if not re.fullmatch(r"[A-Z][A-Z0-9_]*", v[1]) or min(nums[-3 if k == "volume" else -2:]) <= 0:
|
||||
raise ValueError("invalid label or dimensions")
|
||||
if k == "plane":
|
||||
if sum(x*x for x in nums[3:7]) < 1e-12:
|
||||
raise ValueError("zero quaternion")
|
||||
result["summary"]["planes"] += 1
|
||||
else:
|
||||
counts = result["summary"]["volumes"]
|
||||
counts[v[1]] = counts.get(v[1], 0) + 1
|
||||
elif k == "mesh":
|
||||
ident, name, nv, ni = v
|
||||
nv, ni = int(nv), int(ni)
|
||||
if (not re.fullmatch(r"[A-Za-z0-9_-][A-Za-z0-9_.-]*", name) or name in ("room.txt", "scan.log")
|
||||
or nv < 0 or ni < 0 or ni % 3 or ni > 600000):
|
||||
raise ValueError("invalid mesh record")
|
||||
result["mesh"] = {"filename": name, "vertices": nv, "indices": ni}
|
||||
except (ValueError, IndexError) as exc:
|
||||
raise AgentError(f"Invalid room {k}: {exc}") from exc
|
||||
if not outline and walls:
|
||||
xs = [x for w in walls for x in (w[0], w[2])]
|
||||
zs = [z for w in walls for z in (w[1], w[3])]
|
||||
outline = [(min(xs), min(zs)), (max(xs), min(zs)), (max(xs), max(zs)), (min(xs), max(zs))]
|
||||
area = abs(sum(x*b-a*z for (x, z), (a, b) in zip(outline, outline[1:]+outline[:1], strict=True))) / 2
|
||||
height = (ceiling if ceiling is not None else floor + 2.5) - floor
|
||||
if len(outline) < 3 or area < 1e-8 or height <= 0:
|
||||
raise AgentError("Invalid room outline or ceiling")
|
||||
result["summary"].update(walls=len(walls) or len(outline), floor_area=area, ceiling_height=height)
|
||||
return result
|
||||
|
||||
|
||||
def room_validate_mesh(data, record):
|
||||
import math
|
||||
if len(data) < 16:
|
||||
raise AgentError("truncated room mesh")
|
||||
magic, version, nv, ni = struct.unpack_from("<4sIII", data)
|
||||
if (magic != b"FPRM" or version != 1 or nv != record["vertices"] or ni != record["indices"]
|
||||
or len(data) != 16 + 12*nv + 4*ni):
|
||||
raise AgentError("invalid room mesh header or counts")
|
||||
if any(not math.isfinite(v) for (v,) in struct.iter_unpack("<f", data[16:16+12*nv])):
|
||||
raise AgentError("invalid room mesh coordinate")
|
||||
if any(i >= nv for (i,) in struct.iter_unpack("<I", data[16+12*nv:])):
|
||||
raise AgentError("invalid room mesh index")
|
||||
|
||||
|
||||
def room_selected(universe=None):
|
||||
"""The matching universe, otherwise current; never follow a link outside the room store."""
|
||||
for name in (room_universe(room_current_universe() if universe is None else universe), "current"):
|
||||
path = os.path.realpath(os.path.join(ROOMS_DIR, name))
|
||||
if (os.path.dirname(path) == os.path.realpath(ROOMS_DIR) and os.path.basename(path).isdigit()
|
||||
and os.path.isfile(os.path.join(path, "room.txt"))):
|
||||
return path
|
||||
return None
|
||||
|
||||
|
||||
def cmd_room_status(args):
|
||||
current = room_current_universe()
|
||||
selected = room_selected(current)
|
||||
rooms = []
|
||||
for path in glob.glob(os.path.join(ROOMS_DIR, "*")):
|
||||
if not os.path.basename(path).isdigit() or os.path.islink(path):
|
||||
continue
|
||||
try:
|
||||
with open(os.path.join(path, "room.txt")) as f:
|
||||
record = room_records(f.read())
|
||||
rooms.append(record)
|
||||
except (OSError, AgentError):
|
||||
continue
|
||||
active = None
|
||||
text = None
|
||||
if selected:
|
||||
with open(os.path.join(selected, "room.txt")) as f:
|
||||
text = f.read()
|
||||
active = room_records(text)
|
||||
try:
|
||||
_, points = room_boundary(room_chaperone(), current)
|
||||
circle = room_default_circle(points)
|
||||
except (AgentError, ValueError, TypeError):
|
||||
circle = None
|
||||
return {"rooms": sorted(rooms, key=lambda r: r["time"], reverse=True), "universe": current,
|
||||
"room": active, "room_text": text,
|
||||
"aligned": bool(active and current and active["universe"] == current),
|
||||
"default_circle": circle, "scanner_installed": os.access(ROOM_SCANNER, os.X_OK)}
|
||||
|
||||
|
||||
def room_store(text, mesh=None, scan_log=None):
|
||||
record = room_records(text)
|
||||
if record.get("mesh"):
|
||||
if mesh is None:
|
||||
raise AgentError("room mesh sidecar is missing")
|
||||
room_validate_mesh(mesh, record["mesh"])
|
||||
elif mesh is not None:
|
||||
raise AgentError("room has no mesh record")
|
||||
universe = room_universe(record["universe"])
|
||||
os.makedirs(ROOMS_DIR, exist_ok=True)
|
||||
with open(os.path.join(ROOMS_DIR, ".lock"), "a") as lock:
|
||||
if fcntl:
|
||||
fcntl.flock(lock, fcntl.LOCK_EX)
|
||||
dest = os.path.join(ROOMS_DIR, universe)
|
||||
if os.path.islink(dest):
|
||||
raise AgentError("refusing a linked room folder")
|
||||
stage = tempfile.mkdtemp(prefix=".room-", dir=ROOMS_DIR)
|
||||
previous = dest + ".previous"
|
||||
try:
|
||||
with open(os.path.join(stage, "room.txt"), "w") as f:
|
||||
f.write(text)
|
||||
if record.get("mesh"):
|
||||
with open(os.path.join(stage, record["mesh"]["filename"]), "wb") as f:
|
||||
f.write(mesh)
|
||||
if scan_log:
|
||||
with open(os.path.join(stage, "scan.log"), "w") as f:
|
||||
f.write(scan_log)
|
||||
shutil.rmtree(previous, ignore_errors=True)
|
||||
if os.path.isdir(dest):
|
||||
os.rename(dest, previous)
|
||||
try:
|
||||
os.rename(stage, dest)
|
||||
except OSError:
|
||||
if os.path.isdir(previous):
|
||||
os.rename(previous, dest)
|
||||
raise
|
||||
link = os.path.join(ROOMS_DIR, ".current-new")
|
||||
if os.path.lexists(link):
|
||||
os.unlink(link)
|
||||
os.symlink(universe, link)
|
||||
os.replace(link, os.path.join(ROOMS_DIR, "current"))
|
||||
shutil.rmtree(previous, ignore_errors=True)
|
||||
finally:
|
||||
shutil.rmtree(stage, ignore_errors=True)
|
||||
return record
|
||||
|
||||
|
||||
def cmd_room_put(args):
|
||||
# PC uploads to a unique directory below the room store, not to a game's files or an arbitrary host path.
|
||||
path = os.path.realpath(args["path"])
|
||||
if not _inside(path, os.path.realpath(ROOMS_DIR)) or os.path.basename(path) != "room.txt":
|
||||
raise AgentError("upload room.txt below the room store")
|
||||
with open(path) as f:
|
||||
text = f.read(8*1024*1024)
|
||||
record = room_records(text)
|
||||
mesh = None
|
||||
if record.get("mesh"):
|
||||
mesh_path = os.path.realpath(os.path.join(os.path.dirname(path), record["mesh"]["filename"]))
|
||||
if os.path.dirname(mesh_path) != os.path.dirname(path):
|
||||
raise AgentError("linked mesh outside upload folder")
|
||||
with open(mesh_path, "rb") as f:
|
||||
mesh = f.read(64*1024*1024)
|
||||
return {"room": room_store(text, mesh)}
|
||||
|
||||
|
||||
def cmd_room_delete(args):
|
||||
selected = room_selected()
|
||||
name = room_universe(args["universe"]) if "universe" in args else (os.path.basename(selected) if selected else None)
|
||||
if name:
|
||||
path = os.path.join(ROOMS_DIR, name)
|
||||
if os.path.islink(path):
|
||||
raise AgentError("refusing a linked room folder")
|
||||
shutil.rmtree(path, ignore_errors=True)
|
||||
current = os.path.join(ROOMS_DIR, "current")
|
||||
if os.path.islink(current) and not os.path.exists(current):
|
||||
os.unlink(current)
|
||||
remaining = cmd_room_status({})["rooms"]
|
||||
if remaining:
|
||||
os.symlink(room_universe(remaining[0]["universe"]), current)
|
||||
return cmd_room_status({})
|
||||
|
||||
|
||||
def cmd_room_from_boundary(args):
|
||||
import math
|
||||
import uuid
|
||||
universe, outline = room_boundary(room_chaperone(), room_current_universe())
|
||||
if room_default_circle(outline):
|
||||
raise AgentError("Valve's default circle is not a room. Set up your play area in SteamVR first.")
|
||||
height = float(args.get("height", 2.5))
|
||||
if not math.isfinite(height) or height <= 0:
|
||||
raise AgentError("room height must be positive")
|
||||
area = sum(x*b-a*z for (x, z), (a, b) in zip(outline, outline[1:]+outline[:1], strict=True))
|
||||
if area < 0:
|
||||
outline.reverse()
|
||||
rows = ["frameport-room 1", f"universe {universe}", "source boundary", f"time {int(time.time())}",
|
||||
f"room {uuid.uuid4().hex}", f"floor {uuid.uuid4().hex} 0", f"ceiling {uuid.uuid4().hex} {height}",
|
||||
"outline " + str(len(outline)) + " " + " ".join(str(v) for p in outline for v in p)]
|
||||
rows += [f"wall {uuid.uuid4().hex} {x} {z} {a} {b} 0 {height}"
|
||||
for (x, z), (a, b) in zip(outline, outline[1:]+outline[:1], strict=True)]
|
||||
room_store("\n".join(rows) + "\n")
|
||||
return cmd_room_status({})
|
||||
|
||||
|
||||
def cmd_room_build(args):
|
||||
dump = os.path.realpath(args["dump"])
|
||||
if not _inside(dump, os.path.realpath(ROOMS_DIR)):
|
||||
raise AgentError("upload scan dump below the room store")
|
||||
if not os.access(ROOM_SCANNER, os.X_OK):
|
||||
raise AgentError("Room scanner is not installed")
|
||||
universe = room_universe(args.get("universe", room_current_universe()))
|
||||
with tempfile.TemporaryDirectory(prefix=".build-", dir=ROOMS_DIR) as out:
|
||||
result = subprocess.run([ROOM_SCANNER, "--offline", dump, "--out", out, "--universe", universe, "--json"],
|
||||
capture_output=True, text=True, timeout=300)
|
||||
if result.returncode:
|
||||
raise AgentError("Room scan failed: " + result.stderr[-4000:])
|
||||
try:
|
||||
report = json.loads(result.stdout)
|
||||
except ValueError as exc:
|
||||
raise AgentError("Room scanner returned invalid JSON") from exc
|
||||
with open(os.path.join(out, "room.txt")) as f:
|
||||
text = f.read()
|
||||
record = room_records(text)
|
||||
if str(record["universe"]) != universe:
|
||||
raise AgentError("Room scanner returned the wrong universe")
|
||||
mesh = None
|
||||
if record.get("mesh"):
|
||||
with open(os.path.join(out, record["mesh"]["filename"]), "rb") as f:
|
||||
mesh = f.read()
|
||||
room_store(text, mesh, result.stderr)
|
||||
return {"report": report, **cmd_room_status({})}
|
||||
|
||||
|
||||
# --- RoomView 3D capture (docs/mr/PHASE0.md) -------------------------------------------------------------------
|
||||
# Valve's passthrough computes a head-centred depth mesh (~30/s) and publishes it in two OpenVR block queues;
|
||||
# FramePort records it into a .fprs scan dump (docs/mr/ROOM_FORMAT.md) for fp_roomscan. Background app only: reading
|
||||
# never starts SteamVR or changes it. Poses are kept in SteamVR's raw space while recording and converted to STAGE
|
||||
# with the raw->standing transform at the END: Valve's floor estimate moves that transform during a session.
|
||||
ROOMVIEW_DATA = b"/xrservice/roomview3d/meshData"
|
||||
ROOMVIEW_LAYOUT = b"/xrservice/roomview3d/meshLayout"
|
||||
FPRS_FRAME = "<d7fII" # time, pose (px py pz qx qy qz qw), vertex count, index count
|
||||
FPRS_POSE_OFFSET = 8 # the pose's byte offset inside a frame header (rewritten at the end)
|
||||
ROOMVIEW_MAX_DEPTH = 4.0 # metres; beyond this Valve's depth is inpainted (only reported here)
|
||||
VR_APP_OVERLAY = 2 # EVRApplicationType VRApplication_Overlay
|
||||
|
||||
|
||||
def _m34_mul(a, b):
|
||||
"""Row-major 3x4 affine a * b."""
|
||||
out = []
|
||||
for r in range(3):
|
||||
for c in range(4):
|
||||
v = sum(a[r * 4 + k] * b[k * 4 + c] for k in range(3))
|
||||
out.append(v + (a[r * 4 + 3] if c == 3 else 0.0))
|
||||
return out
|
||||
|
||||
|
||||
def _m34_quat(m):
|
||||
"""Rotation of a row-major 3x4 as (x, y, z, w)."""
|
||||
r00, r01, r02, r10, r11, r12, r20, r21, r22 = m[0], m[1], m[2], m[4], m[5], m[6], m[8], m[9], m[10]
|
||||
tr = r00 + r11 + r22
|
||||
if tr > 0:
|
||||
s = math.sqrt(tr + 1.0) * 2
|
||||
return ((r21 - r12) / s, (r02 - r20) / s, (r10 - r01) / s, 0.25 * s)
|
||||
if r00 > r11 and r00 > r22:
|
||||
s = math.sqrt(1.0 + r00 - r11 - r22) * 2
|
||||
return (0.25 * s, (r01 + r10) / s, (r02 + r20) / s, (r21 - r12) / s)
|
||||
if r11 > r22:
|
||||
s = math.sqrt(1.0 + r11 - r00 - r22) * 2
|
||||
return ((r01 + r10) / s, 0.25 * s, (r12 + r21) / s, (r02 - r20) / s)
|
||||
s = math.sqrt(1.0 + r22 - r00 - r11) * 2
|
||||
return ((r02 + r20) / s, (r12 + r21) / s, 0.25 * s, (r10 - r01) / s)
|
||||
|
||||
|
||||
def _view_coverage(m, yaw_bins, pitch):
|
||||
"""Note where the camera looked (+Z of the mesh = forward): yaw in 30 deg bins, how many frames looked up."""
|
||||
fx, fy, fz = m[2], m[6], m[10]
|
||||
yaw_bins.add(int((math.degrees(math.atan2(fx, fz)) % 360) // 30))
|
||||
if fy > 0.6:
|
||||
pitch["up"] += 1
|
||||
elif fy < -0.6:
|
||||
pitch["down"] += 1
|
||||
|
||||
|
||||
class _RoomViewReader:
|
||||
"""The two RoomView queues + their path properties through libopenvr_api.so (ctypes)."""
|
||||
|
||||
def __init__(self, app_type=None):
|
||||
import ctypes
|
||||
|
||||
self.ct = ctypes
|
||||
lib = next((p for p in OPENVR_LIBS if os.path.isfile(p)), None)
|
||||
if lib is None:
|
||||
raise RuntimeError("SteamVR isn't installed")
|
||||
vr = self.vr = ctypes.CDLL(lib)
|
||||
vr.VR_InitInternal2.restype = ctypes.c_uint32
|
||||
vr.VR_InitInternal2.argtypes = [ctypes.POINTER(ctypes.c_int), ctypes.c_int, ctypes.c_char_p]
|
||||
vr.VR_GetGenericInterface.restype = ctypes.c_void_p
|
||||
vr.VR_GetGenericInterface.argtypes = [ctypes.c_char_p, ctypes.POINTER(ctypes.c_int)]
|
||||
vr.VR_ShutdownInternal.restype = None
|
||||
err = ctypes.c_int(0)
|
||||
# an Overlay app may create the prompt overlay; Background (no prompts) can't start SteamVR by accident
|
||||
vr.VR_InitInternal2(ctypes.byref(err), VR_APP_BACKGROUND if app_type is None else app_type, None)
|
||||
if err.value:
|
||||
raise RuntimeError("SteamVR isn't running")
|
||||
H, E, VP = ctypes.c_uint64, ctypes.c_int, ctypes.c_void_p
|
||||
self.H, self.VP = H, VP
|
||||
|
||||
class BQ(ctypes.Structure): # openvr_capi.h VR_IVRBlockQueue_FnTable (IVRBlockQueue_005)
|
||||
_fields_ = [("Create", VP), ("Connect", ctypes.CFUNCTYPE(E, ctypes.POINTER(H), ctypes.c_char_p)),
|
||||
("Destroy", VP), ("AcquireWriteOnlyBlock", VP), ("ReleaseWriteOnlyBlock", VP),
|
||||
("WaitAndAcquireReadOnlyBlock", ctypes.CFUNCTYPE(E, H, ctypes.POINTER(H), ctypes.POINTER(VP),
|
||||
ctypes.c_int, ctypes.c_uint32)),
|
||||
("AcquireReadOnlyBlock", VP), ("ReleaseReadOnlyBlock", ctypes.CFUNCTYPE(E, H, H)),
|
||||
("QueueHasReader", VP)]
|
||||
|
||||
class PathRead(ctypes.Structure): # openvr_driver.h PathRead_t
|
||||
_fields_ = [("ulPath", ctypes.c_uint64), ("pvBuffer", VP), ("unBufferSize", ctypes.c_uint32),
|
||||
("unTag", ctypes.c_uint32), ("unRequiredBufferSize", ctypes.c_uint32), ("eError", ctypes.c_int),
|
||||
("pszPath", ctypes.c_char_p)]
|
||||
|
||||
class M34(ctypes.Structure):
|
||||
_fields_ = [("m", ctypes.c_float * 12)]
|
||||
|
||||
self.PathRead, self.M34 = PathRead, M34
|
||||
e = ctypes.c_int(0)
|
||||
ptr = vr.VR_GetGenericInterface(b"FnTable:IVRBlockQueue_005", ctypes.byref(e))
|
||||
paths = vr.VR_GetGenericInterface(b"IVRPaths_002", ctypes.byref(e))
|
||||
system = next((s for s in (vr.VR_GetGenericInterface(n, ctypes.byref(e))
|
||||
for n in (b"IVRSystem_023", b"IVRSystem_022")) if s), None)
|
||||
if not ptr or not paths or not system:
|
||||
self.close()
|
||||
raise RuntimeError("this SteamVR has no RoomView mesh interfaces")
|
||||
self.bq = ctypes.cast(ptr, ctypes.POINTER(BQ)).contents
|
||||
self.paths = paths
|
||||
pvt = ctypes.cast(ctypes.cast(paths, ctypes.POINTER(VP))[0], ctypes.POINTER(VP))
|
||||
self._read = ctypes.CFUNCTYPE(E, VP, ctypes.c_uint64, ctypes.POINTER(PathRead), ctypes.c_uint32)(pvt[0])
|
||||
self._handle = ctypes.CFUNCTYPE(E, VP, ctypes.POINTER(ctypes.c_uint64), ctypes.c_char_p)(pvt[2])
|
||||
self.system = system
|
||||
svt = ctypes.cast(ctypes.cast(system, ctypes.POINTER(VP))[0], ctypes.POINTER(VP))
|
||||
self._raw_to_standing = ctypes.CFUNCTYPE(M34, VP)(svt[13]) # GetRawZeroPoseToStandingAbsoluteTrackingPose
|
||||
self.handles = {}
|
||||
self.data, self.layout = self._connect(ROOMVIEW_DATA), self._connect(ROOMVIEW_LAYOUT)
|
||||
if self.data is None or self.layout is None:
|
||||
self.close()
|
||||
raise RuntimeError("SteamVR has no RoomView mesh (passthrough never started since SteamVR started?)")
|
||||
|
||||
def _connect(self, path):
|
||||
h = self.H(0)
|
||||
return h if self.bq.Connect(self.ct.byref(h), path) == 0 else None
|
||||
|
||||
def prop(self, root, path, fmt):
|
||||
ct = self.ct
|
||||
if path not in self.handles:
|
||||
h = ct.c_uint64(0)
|
||||
self._handle(self.paths, ct.byref(h), path.encode())
|
||||
self.handles[path] = h.value
|
||||
buf = (ct.c_ubyte * 64)()
|
||||
pr = self.PathRead(self.handles[path], ct.cast(buf, self.VP), 64, 0, 0, 0, None)
|
||||
self._read(self.paths, root, ct.byref(pr), 1)
|
||||
if pr.eError or pr.unRequiredBufferSize < struct.calcsize(fmt):
|
||||
return None
|
||||
vals = struct.unpack_from(fmt, bytes(buf))
|
||||
return vals if len(vals) > 1 else vals[0]
|
||||
|
||||
def up_to_date(self):
|
||||
return bool(self.prop(self.data.value, "/meshData/meshIsUpToDate", "<?"))
|
||||
|
||||
def acquire(self, queue, read_type, timeout_ms):
|
||||
blk, buf = self.H(0), self.VP(0)
|
||||
if self.bq.WaitAndAcquireReadOnlyBlock(queue, self.ct.byref(blk), self.ct.byref(buf), read_type, timeout_ms):
|
||||
return None, None
|
||||
return blk, buf.value
|
||||
|
||||
def release(self, queue, blk):
|
||||
self.bq.ReleaseReadOnlyBlock(queue, blk)
|
||||
|
||||
def raw_to_standing(self):
|
||||
return list(self._raw_to_standing(self.system).m)
|
||||
|
||||
def close(self):
|
||||
try:
|
||||
self.vr.VR_ShutdownInternal()
|
||||
except Exception: # noqa: BLE001 - shutting down a half-initialised client
|
||||
pass
|
||||
|
||||
|
||||
class _ScanPrompt:
|
||||
"""A head-locked SteamVR overlay showing FramePort's pre-rendered scan prompts (artifacts/roomscan/*.png,
|
||||
uploaded next to fp_roomscan): IVROverlay_028 through its C function table. Failing to show it never stops a
|
||||
scan (the PC app shows the same state)."""
|
||||
SLOTS = {"Create": 1, "Destroy": 3, "SortOrder": 20, "Width": 22, "DeviceRelative": 35, "Show": 43, "Hide": 44,
|
||||
"FromFile": 63}
|
||||
|
||||
def __init__(self, rv, image_dir):
|
||||
ct = self.ct = rv.ct
|
||||
self.dir, self.shown, self.handle = image_dir, None, None
|
||||
e = ct.c_int(0)
|
||||
table = rv.vr.VR_GetGenericInterface(b"FnTable:IVROverlay_028", ct.byref(e))
|
||||
if not table or not os.path.isdir(image_dir):
|
||||
return
|
||||
fn = ct.cast(table, ct.POINTER(ct.c_void_p))
|
||||
U64, E = ct.c_uint64, ct.c_int
|
||||
self.create = ct.CFUNCTYPE(E, ct.c_char_p, ct.c_char_p, ct.POINTER(U64))(fn[self.SLOTS["Create"]])
|
||||
self.destroy = ct.CFUNCTYPE(E, U64)(fn[self.SLOTS["Destroy"]])
|
||||
self.sort = ct.CFUNCTYPE(E, U64, ct.c_uint32)(fn[self.SLOTS["SortOrder"]])
|
||||
self.width = ct.CFUNCTYPE(E, U64, ct.c_float)(fn[self.SLOTS["Width"]])
|
||||
self.relative = ct.CFUNCTYPE(E, U64, ct.c_uint32, ct.POINTER(rv.M34))(fn[self.SLOTS["DeviceRelative"]])
|
||||
self.show_fn = ct.CFUNCTYPE(E, U64)(fn[self.SLOTS["Show"]])
|
||||
self.from_file = ct.CFUNCTYPE(E, U64, ct.c_char_p)(fn[self.SLOTS["FromFile"]])
|
||||
h = U64(0)
|
||||
if self.create(b"frameport.roomscan", b"FramePort room scan", ct.byref(h)):
|
||||
return
|
||||
self.handle = h
|
||||
m = rv.M34()
|
||||
for i, v in enumerate((1, 0, 0, 0, 0, 1, 0, -0.25, 0, 0, 1, -1.2)): # 1.2 m ahead, a bit below eye level
|
||||
m.m[i] = v
|
||||
self.width(h, 0.8)
|
||||
self.sort(h, 10)
|
||||
self.relative(h, 0, ct.byref(m)) # k_unTrackedDeviceIndex_Hmd
|
||||
|
||||
def show(self, name):
|
||||
if self.handle is None or name == self.shown:
|
||||
return
|
||||
path = os.path.join(self.dir, name + ".png")
|
||||
if os.path.isfile(path) and self.from_file(self.handle, path.encode()) == 0:
|
||||
self.show_fn(self.handle)
|
||||
self.shown = name
|
||||
|
||||
def close(self, final=None, linger=4.0):
|
||||
if self.handle is None:
|
||||
return
|
||||
if final:
|
||||
self.show(final)
|
||||
time.sleep(linger)
|
||||
self.destroy(self.handle)
|
||||
self.handle = None
|
||||
|
||||
|
||||
ROOM_SCAN_LOOK_FRAMES = 5 # recorded frames looking up / down (~1.7 s at 3/s) that count as "ceiling/floor seen"
|
||||
ROOM_SCAN_MIN_SECONDS = 60 # a complete scan still records this long: a 32 s one found 2 of 7 furniture boxes
|
||||
|
||||
|
||||
ROOMVIEW_STREAM_MESHES = 3 # new meshes within ROOMVIEW_STREAM_WINDOW s = passthrough is on (Valve: ~30/s)
|
||||
ROOMVIEW_STREAM_WINDOW = 2.0
|
||||
ROOM_SCAN_MIN_FRAMES = 30 # fewer recorded frames is no room: refused instead of replacing the saved one
|
||||
|
||||
|
||||
def _prompt_for(started, yaw_bins, pitch, streaming=True):
|
||||
"""Which prompt image the headset shows: "start" (turn on passthrough) whenever no meshes stream, also mid-scan."""
|
||||
if started is None or not streaming:
|
||||
return "start"
|
||||
if len(yaw_bins) >= 10 and pitch["up"] < ROOM_SCAN_LOOK_FRAMES:
|
||||
return "ceiling"
|
||||
if len(yaw_bins) >= 10 and pitch["down"] < ROOM_SCAN_LOOK_FRAMES:
|
||||
return "floor"
|
||||
return f"look_{min(12, len(yaw_bins)):02d}"
|
||||
|
||||
|
||||
def _scan_complete(started, now, yaw_bins, pitch):
|
||||
return (started is not None and now - started >= ROOM_SCAN_MIN_SECONDS and len(yaw_bins) >= 12
|
||||
and pitch["up"] >= ROOM_SCAN_LOOK_FRAMES and pitch["down"] >= ROOM_SCAN_LOOK_FRAMES)
|
||||
|
||||
|
||||
def capture_roomview(seconds, out_path, wait=0.0, max_hz=3.0, progress=None, prompts=None):
|
||||
"""Record RoomView 3D meshes into a .fprs dump: `seconds` of fresh meshes (after waiting up to `wait` s for the
|
||||
first one), at most `max_hz` frames per second. progress(dict) is called about once a second. Returns a summary:
|
||||
frames, duration, yaw coverage (30 deg bins seen), frames looking up/down, warnings."""
|
||||
rv = _RoomViewReader(VR_APP_OVERLAY if prompts else None)
|
||||
ct = rv.ct
|
||||
prompt = _ScanPrompt(rv, prompts) if prompts else None
|
||||
tmp = out_path + ".part"
|
||||
offsets, raw_poses = [], []
|
||||
yaw_bins, pitch = set(), {"up": 0, "down": 0}
|
||||
indices, layout_id, last_mesh, last_write = None, None, None, 0.0
|
||||
# Valve only computes new meshes while passthrough is shown; a queue's last block (and meshIsUpToDate) stays
|
||||
# after it stops. So "streaming" = ROOMVIEW_STREAM_MESHES new mesh ids within ROOMVIEW_STREAM_WINDOW seconds, and
|
||||
# frames are recorded only then (2026-10-16: a scan started on one leftover block and recorded nothing else).
|
||||
arrivals = []
|
||||
seen_mesh = None
|
||||
started, paused_since, paused_total = None, None, 0.0
|
||||
t_end = time.time() + (wait or seconds)
|
||||
next_progress = time.time()
|
||||
try:
|
||||
with open(tmp, "wb") as f:
|
||||
f.write(b"FPRS" + struct.pack("<I", 1))
|
||||
while time.time() < t_end:
|
||||
now = time.time()
|
||||
arrivals = [t for t in arrivals if now - t < ROOMVIEW_STREAM_WINDOW]
|
||||
streaming = len(arrivals) >= ROOMVIEW_STREAM_MESHES
|
||||
if started is not None: # passthrough off mid-scan: the countdown waits (at most `wait` in all)
|
||||
if not streaming and paused_since is None:
|
||||
paused_since = now
|
||||
elif streaming and paused_since is not None:
|
||||
pause = min(now - paused_since, max(0.0, (wait or seconds) - paused_total))
|
||||
t_end += pause
|
||||
paused_total += pause
|
||||
paused_since = None
|
||||
if _scan_complete(started, now, yaw_bins, pitch):
|
||||
break # every direction, the ceiling and the floor seen: "Room scanned" at once
|
||||
if now >= next_progress:
|
||||
if prompt:
|
||||
prompt.show(_prompt_for(started, yaw_bins, pitch, streaming))
|
||||
if progress:
|
||||
progress({"recording": started is not None, "frames": len(offsets),
|
||||
"seconds": round(now - started - paused_total, 1) if started else 0,
|
||||
"directions": len(yaw_bins), "looked_up": pitch["up"],
|
||||
"looked_down": pitch["down"], "live": streaming})
|
||||
next_progress = now + 1
|
||||
blk, buf = rv.acquire(rv.data, 1, 200) # EBlockQueueReadType_New
|
||||
if blk is None:
|
||||
continue
|
||||
try:
|
||||
mesh_id = rv.prop(blk.value, "/meshData/meshId", "<Q")
|
||||
if mesh_id != seen_mesh:
|
||||
seen_mesh = mesh_id
|
||||
arrivals.append(now)
|
||||
if not streaming or not rv.up_to_date() or now - last_write < 1.0 / max_hz:
|
||||
continue
|
||||
lid = rv.prop(blk.value, "/meshData/layoutId", "<Q")
|
||||
count = rv.prop(blk.value, "/meshData/elementCount", "<i") or 0
|
||||
pose = rv.prop(blk.value, "/meshData/rawFromMeshPose", "<12f")
|
||||
if mesh_id == last_mesh or pose is None or count < 9 or not all(map(math.isfinite, pose)):
|
||||
continue
|
||||
if lid != layout_id: # the index layout only changes with the mesh resolution
|
||||
lb, lbuf = rv.acquire(rv.layout, 0, 500)
|
||||
if lb is not None:
|
||||
n = rv.prop(lb.value, "/meshLayout/indexCount", "<i") or 0
|
||||
indices = ct.string_at(lbuf, n * 4)
|
||||
layout_id = rv.prop(lb.value, "/meshLayout/layoutId", "<Q")
|
||||
rv.release(rv.layout, lb)
|
||||
if indices is None or layout_id != lid:
|
||||
continue
|
||||
verts = ct.string_at(buf, count * 4)
|
||||
finally:
|
||||
rv.release(rv.data, blk)
|
||||
if started is None:
|
||||
started = now
|
||||
t_end = now + seconds
|
||||
offsets.append(f.tell())
|
||||
raw_poses.append(list(pose))
|
||||
_view_coverage(pose, yaw_bins, pitch)
|
||||
f.write(struct.pack(FPRS_FRAME, now, 0, 0, 0, 0, 0, 0, 1, count // 3, len(indices) // 4))
|
||||
f.write(verts)
|
||||
f.write(indices)
|
||||
last_mesh, last_write = mesh_id, now
|
||||
r2s = rv.raw_to_standing()
|
||||
finally:
|
||||
if prompt:
|
||||
prompt.close("done" if offsets else "failed")
|
||||
rv.close()
|
||||
with open(tmp, "r+b") as f: # raw -> STAGE with the final floor/universe transform
|
||||
for off, raw in zip(offsets, raw_poses, strict=True):
|
||||
m = _m34_mul(r2s, raw)
|
||||
f.seek(off + FPRS_POSE_OFFSET)
|
||||
f.write(struct.pack("<7f", m[3], m[7], m[11], *_m34_quat(m)))
|
||||
warnings = []
|
||||
if not offsets:
|
||||
warnings.append("no passthrough mesh: turn on passthrough in the headset")
|
||||
if len(yaw_bins) < 9:
|
||||
warnings.append("not all directions seen: look around the whole room")
|
||||
if pitch["up"] < 5:
|
||||
warnings.append("ceiling not seen: look up")
|
||||
os.replace(tmp, out_path)
|
||||
return {"frames": len(offsets), "seconds": round(last_write - started, 1) if started else 0,
|
||||
"directions": len(yaw_bins), "looked_up": pitch["up"], "looked_down": pitch["down"],
|
||||
"bytes": os.path.getsize(out_path), "warnings": warnings}
|
||||
|
||||
|
||||
ROOM_SCAN_STATUS = os.path.join(ROOMS_DIR, "scan-status.json")
|
||||
ROOM_SCAN_DUMPS = os.path.join(ROOMS_DIR, "scans")
|
||||
ROOM_SCAN_PROMPTS = os.path.join(HOME, ".local/share/frameport/bin/roomscan-prompts")
|
||||
ROOM_SCAN_UNIT = "frameport-room-scan"
|
||||
ROOM_SCAN_KEEP = 2 # newest dumps kept for diagnostics (each ~100-600 MB)
|
||||
|
||||
|
||||
def cmd_room_capture(args):
|
||||
"""Start a room scan in the headset: a detached job records the passthrough mesh (with prompts in the headset),
|
||||
then builds and stores the room. Progress: room_capture_status."""
|
||||
seconds = float(args.get("seconds", 90))
|
||||
wait = float(args.get("wait", 180))
|
||||
if not (10 <= seconds <= 900 and 0 <= wait <= 1800):
|
||||
raise AgentError("scan length out of range")
|
||||
if not os.access(ROOM_SCANNER, os.X_OK):
|
||||
raise AgentError("Room scanner is not installed")
|
||||
state = cmd_room_capture_status({})
|
||||
if state.get("state") in ("waiting", "recording", "building") and _unit_active(ROOM_SCAN_UNIT):
|
||||
raise AgentError("A room scan is already running")
|
||||
os.makedirs(ROOMS_DIR, exist_ok=True)
|
||||
_write_json(ROOM_SCAN_STATUS, {"state": "waiting", "started": time.time(), "seconds": seconds})
|
||||
p = run(["systemd-run", "--user", "--collect", "--quiet", f"--unit={ROOM_SCAN_UNIT}-{int(time.time())}",
|
||||
"--setenv=HOME=" + HOME, sys.executable, os.path.abspath(__file__), "_room_capture",
|
||||
json.dumps({"seconds": seconds, "wait": wait})])
|
||||
if p.returncode != 0:
|
||||
_write_json(ROOM_SCAN_STATUS, {"state": "failed", "error": p.stderr.strip()[-300:]})
|
||||
raise AgentError(f"couldn't start the room scan: {p.stderr.strip()[-300:]}")
|
||||
return {"started": True, "status": ROOM_SCAN_STATUS}
|
||||
|
||||
|
||||
def _unit_active(prefix):
|
||||
p = run(["systemctl", "--user", "list-units", "--no-legend", "--plain", f"{prefix}-*"])
|
||||
return any(line.split()[2:3] == ["active"] for line in (p.stdout or "").splitlines() if line.strip())
|
||||
|
||||
|
||||
def cmd_room_capture_status(args):
|
||||
try:
|
||||
with open(ROOM_SCAN_STATUS) as f:
|
||||
return json.load(f)
|
||||
except (OSError, ValueError):
|
||||
return {"state": "none"}
|
||||
|
||||
|
||||
def room_capture_worker(payload):
|
||||
job = json.loads(payload)
|
||||
status = {"state": "waiting", "started": time.time(), "seconds": job["seconds"]}
|
||||
os.makedirs(ROOM_SCAN_DUMPS, exist_ok=True)
|
||||
dump = os.path.join(ROOM_SCAN_DUMPS, time.strftime("scan-%Y%m%d-%H%M%S.fprs"))
|
||||
|
||||
def progress(p):
|
||||
status.update(p, state="recording" if p.get("recording") else "waiting")
|
||||
_write_json(ROOM_SCAN_STATUS, status)
|
||||
|
||||
try:
|
||||
summary = capture_roomview(job["seconds"], dump, wait=job["wait"], progress=progress,
|
||||
prompts=ROOM_SCAN_PROMPTS if os.path.isdir(ROOM_SCAN_PROMPTS) else None)
|
||||
status.update(capture=summary, state="building")
|
||||
_write_json(ROOM_SCAN_STATUS, status)
|
||||
if summary["frames"] < ROOM_SCAN_MIN_FRAMES: # never replace a saved room with a scrap of one
|
||||
raise AgentError("The scan saw too little of the room: keep passthrough on, look around until the "
|
||||
"headset says \"Room scanned\", and scan again")
|
||||
built = cmd_room_build({"dump": dump})
|
||||
status.update(state="done", report=built.get("report"), room=built.get("room"), finished=time.time())
|
||||
except Exception as exc: # noqa: BLE001 - every failure ends in the status file the PC polls
|
||||
status.update(state="failed", error=str(exc)[-500:], finished=time.time())
|
||||
finally:
|
||||
_write_json(ROOM_SCAN_STATUS, status)
|
||||
for old in sorted(glob.glob(os.path.join(ROOM_SCAN_DUMPS, "scan-*.fprs")))[:-ROOM_SCAN_KEEP]:
|
||||
try:
|
||||
os.remove(old)
|
||||
except OSError:
|
||||
pass
|
||||
|
||||
|
||||
def wants_scene_room(anchor):
|
||||
try:
|
||||
with open(os.path.join(anchor, "deployment.json")) as f:
|
||||
dep = json.load(f)
|
||||
# Live Game settings changes are in settings.conf; older recipes list patch ids only.
|
||||
conf = os.path.join(dep.get("base", anchor), "settings.conf")
|
||||
if os.path.isfile(conf):
|
||||
for line in open(conf):
|
||||
key, _, value = line.strip().partition("=")
|
||||
if key == "scene_emul":
|
||||
return float(value) != 0
|
||||
recipe = dep.get("recipe") or {}
|
||||
return dep.get("scene_room", "adapter.scene_emul" in (recipe.get("patches") or []))
|
||||
except (OSError, ValueError, AttributeError):
|
||||
return False
|
||||
|
||||
|
||||
def set_room_sync_line(text, pkg, want):
|
||||
text = "".join(line for line in text.splitlines(True) if "# frameport-room-sync" not in line)
|
||||
if not want or "\nsetsid " not in text:
|
||||
return text
|
||||
line = ROOM_SYNC_LINE.format(agent_q=shlex.quote(os.path.abspath(__file__)), pkg_q=shlex.quote(pkg))
|
||||
return text.replace("\nsetsid ", "\n" + line + "\nsetsid ", 1)
|
||||
|
||||
|
||||
def room_sync_worker(pkg):
|
||||
dep = deployment(check_pkg(pkg))
|
||||
if not dep or dep.get("kind", "quest") != "quest":
|
||||
return
|
||||
base = dep["base"]
|
||||
# Explicit scene_room follows the recipe at finalize; older deployments derive it on launcher upgrade.
|
||||
selected = room_selected() if wants_scene_room(os.path.join(ANCHORS, pkg)) else None
|
||||
record = None
|
||||
if selected:
|
||||
with open(os.path.join(selected, "room.txt")) as f:
|
||||
text = f.read()
|
||||
record = room_records(text)
|
||||
if record.get("mesh"):
|
||||
with open(os.path.join(selected, record["mesh"]["filename"]), "rb") as f:
|
||||
mesh = f.read()
|
||||
room_validate_mesh(mesh, record["mesh"])
|
||||
# The public format allows any sidecar basename; per-game copies use the contract's fixed name.
|
||||
text = re.sub(r"(?m)^(mesh\s+[a-f0-9]{32}\s+)\S+", r"\g<1>room-mesh.bin", text)
|
||||
with open(os.path.join(base, "room-mesh.bin.tmp"), "wb") as f:
|
||||
f.write(mesh)
|
||||
os.replace(os.path.join(base, "room-mesh.bin.tmp"), os.path.join(base, "room-mesh.bin"))
|
||||
with open(os.path.join(base, "room.txt.tmp"), "w") as f:
|
||||
f.write(text)
|
||||
os.replace(os.path.join(base, "room.txt.tmp"), os.path.join(base, "room.txt"))
|
||||
for name in ("room.txt", "room-mesh.bin"):
|
||||
if not selected or (name == "room-mesh.bin" and not record.get("mesh")):
|
||||
try:
|
||||
os.unlink(os.path.join(base, name))
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
return {"room": record, "aligned": bool(record and record["universe"] == room_current_universe())}
|
||||
|
||||
|
||||
def room_setting_changed(pkg, dep, settings):
|
||||
"""Live settings must update the launcher too, including switching emulation on after install."""
|
||||
if "scene_emul" not in settings:
|
||||
return
|
||||
dep["scene_room"] = float(settings["scene_emul"]) != 0
|
||||
write_deployment(pkg, dep)
|
||||
path = os.path.join(ANCHORS, pkg, "launch.sh")
|
||||
if os.path.isfile(path):
|
||||
with open(path) as f:
|
||||
old = f.read()
|
||||
text = set_room_sync_line(old, pkg, dep["scene_room"])
|
||||
if text != old:
|
||||
with open(path + ".tmp", "w") as f:
|
||||
f.write(text)
|
||||
os.chmod(path + ".tmp", 0o755)
|
||||
os.replace(path + ".tmp", path)
|
||||
if not dep["scene_room"]:
|
||||
room_sync_worker(pkg)
|
||||
|
||||
|
||||
# ---------------------------------------------------------- end mixed-reality room storage
|
||||
|
||||
def cmd_finalize(args):
|
||||
"""Move uploaded files into place, write launcher/settings/config files/deployment.json. Keeps saves."""
|
||||
pkg = check_pkg(args["package"])
|
||||
@@ -4944,11 +4082,7 @@ def configure_install(args, prep, moved):
|
||||
if gamepad:
|
||||
ensure_podman_wrapper()
|
||||
config_sync = args.get("config_sync") if isinstance(args.get("config_sync"), dict) else {}
|
||||
scene_value = settings.get("scene_emul", (recipe.get("adapter") or {}).get(
|
||||
"scene_emul", int("adapter.scene_emul" in (recipe.get("patches") or []))))
|
||||
scene_room = float(scene_value) != 0
|
||||
write_launcher(anchor, base, pkg, title, appid, lepton, args.get("env"), hw_video, gamepad,
|
||||
bool(config_sync), scene_room)
|
||||
write_launcher(anchor, base, pkg, title, appid, lepton, args.get("env"), hw_video, gamepad, bool(config_sync))
|
||||
art_in = os.path.join(base, "incoming-artwork")
|
||||
art_moved = False
|
||||
if args.get("consume_artwork") and os.path.isdir(art_in):
|
||||
@@ -4961,7 +4095,6 @@ def configure_install(args, prep, moved):
|
||||
"sha256": args.get("apk_sha256") or previous.get("sha256"),
|
||||
"recipe": args.get("recipe"), "installed_by": "frameport",
|
||||
"hw_video_decode": hw_video, "steam_gamepad": gamepad, "config_sync": config_sync,
|
||||
"scene_room": scene_room,
|
||||
"agent_version": AGENT_VERSION, "time": time.time()}
|
||||
if previous.get("eye_base"): # the runtime's eye size learned from an earlier start (device.config_sync)
|
||||
dep["eye_base"] = previous["eye_base"]
|
||||
@@ -4983,8 +4116,6 @@ def configure_install(args, prep, moved):
|
||||
dep["apk_stat"] = {"size": st.st_size, "mtime_ns": st.st_mtime_ns}
|
||||
synced = sync_game_config(pkg, dep)
|
||||
write_deployment(pkg, dep)
|
||||
if not scene_room:
|
||||
room_sync_worker(pkg)
|
||||
return {"ok": True, "base": base, "appid": appid, "moved_data_files": moved, "controller_models": models,
|
||||
"config_sync": synced, "deployment": deployment_summary(dep)}
|
||||
|
||||
@@ -6255,7 +5386,6 @@ def cmd_set_settings(args):
|
||||
os.makedirs(files_dir, exist_ok=True)
|
||||
with open(os.path.join(files_dir, "framebridge.conf"), "w") as f:
|
||||
f.write(text)
|
||||
room_setting_changed(pkg, dep, args.get("settings") or {})
|
||||
models = install_controller_models(files_dir, current.get("controller_models", "0") not in ("0", "0.0"))
|
||||
synced = sync_game_config(pkg, dep)
|
||||
if isinstance(dep.get("configuration"), dict):
|
||||
@@ -8802,9 +7932,6 @@ def main():
|
||||
if len(sys.argv) >= 3 and sys.argv[1] == "_purge_worker":
|
||||
purge_worker(sys.argv[2])
|
||||
return 0
|
||||
if len(sys.argv) >= 3 and sys.argv[1] == "_room_capture":
|
||||
room_capture_worker(sys.argv[2])
|
||||
return 0
|
||||
if len(sys.argv) >= 3 and sys.argv[1] == "_move_worker":
|
||||
move_worker(sys.argv[2])
|
||||
return 0
|
||||
@@ -8822,9 +7949,6 @@ def main():
|
||||
if len(sys.argv) >= 4 and sys.argv[1] == "_dashboard_worker":
|
||||
dashboard_worker(sys.argv[2], sys.argv[3])
|
||||
return 0
|
||||
if len(sys.argv) >= 3 and sys.argv[1] == "_room_sync":
|
||||
print(json.dumps(room_sync_worker(sys.argv[2])))
|
||||
return 0
|
||||
if len(sys.argv) >= 3 and sys.argv[1] == "_config_sync":
|
||||
config_sync_worker(sys.argv[2])
|
||||
return 0
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
# Announcements
|
||||
|
||||
`current.md` is the one announcement FramePort shows as a pop-up in the app. Edit it on `main`: the app reads it
|
||||
from GitHub `main` (raw.githubusercontent.com) at most every 6 hours, so a push reaches everyone without a release.
|
||||
|
||||
## Who sees it
|
||||
|
||||
- **Only people who already used FramePort before the announcement's `date`.** A new install never shows one, and
|
||||
nor does an announcement published before FramePort was installed.
|
||||
- **Once.** Closing it in any way (the X, a click outside it, Escape, or its button) dismisses it for good. The app
|
||||
remembers dismissals in its settings (`announce.dismissed`).
|
||||
- **A new announcement = a new `id`.** Fixing a typo with the same `id` doesn't show it again to anyone who closed it.
|
||||
A new `id` shows to everyone who used FramePort before its `date`, whether they closed the earlier one or not.
|
||||
|
||||
## The file
|
||||
|
||||
```markdown
|
||||
---
|
||||
active: true # false = nothing is shown (the fields are still checked)
|
||||
id: meetup-2026-11 # letters, digits, . _ - — change it for every new announcement
|
||||
title: Steam Frame meetup on Discord # required
|
||||
date: 2026-11-02T18:00:00Z # required: when it was published (UTC; a bare date = midnight UTC)
|
||||
image: announcements/meetup.png # optional: a file in this folder, or an https URL (PNG, JPEG, WebP, GIF; ≤ 5 MiB)
|
||||
image_alt: The meetup poster # optional: what the picture shows (screen readers)
|
||||
button: Join the meetup # optional: an action button, with url
|
||||
url: https://example.com/meetup
|
||||
expires: 2026-11-30 # optional: not shown after this day (UTC, inclusive)
|
||||
---
|
||||
The body, in Markdown: **bold**, *italic*, `code`, [links](https://frameport.app/), lists, headings.
|
||||
```
|
||||
|
||||
The body is Markdown (no HTML). A `date` in the future works as a schedule: nobody sees it before then.
|
||||
|
||||
Images look best at about 2:1 (e.g. 1200×600). The pop-up is 600 px wide and shows between 140 and 320 px of the
|
||||
picture's height.
|
||||
|
||||
`pytest tests/test_announcements.py` checks this file, so a broken announcement fails CI instead of silently showing
|
||||
nothing.
|
||||
|
||||
To turn announcements off for testing: `FRAMEPORT_NO_ANNOUNCEMENTS=1`.
|
||||
@@ -1,16 +0,0 @@
|
||||
---
|
||||
# The announcement FramePort shows once (announcements/README.md). Switched off: set active: true.
|
||||
active: false
|
||||
id: example-2026-10
|
||||
title: Example announcement
|
||||
date: 2026-10-15T12:00:00Z
|
||||
# image: announcements/example.png
|
||||
# image_alt: What the picture shows
|
||||
# button: Read more
|
||||
# url: https://frameport.app/changelog/
|
||||
# expires: 2026-11-30
|
||||
---
|
||||
This is where the text goes, in **Markdown**: *emphasis*, `code`, [links](https://frameport.app/) and lists.
|
||||
|
||||
- Keep it short: one or two paragraphs.
|
||||
- Change `id` for every new announcement.
|
||||
@@ -5,19 +5,20 @@ c9c3da5cac224c38e2210b781bd12b7f97e02bd6b0ebb0ef85543e4ea4b76671 ./arm64-v8a/li
|
||||
18d8d917e83a6d87008f41908eb478dff635e798844e125abd1e8a5cf31805e2 ./arm64-v8a/liba32stub.so
|
||||
d6337034fb0bdcca7ef9b7063d85b7586b8508b63b435959e8fffaba0691091c ./arm64-v8a/libfp_langpack.so
|
||||
69102b128e00fa1809489a7308e09c1505f563bf7091bbdd3fe5a58e4cc96c2c ./arm64-v8a/libfp_luajit.so
|
||||
321da502e0f8f46f0880aad39fe6b84bdef88f925164568814cf704a1b31a577 ./arm64-v8a/libfp_ovrp.so
|
||||
e2465e8960b4dd591d303e30c9d80b8a7c7c7eeff53736419c7105a697725732 ./arm64-v8a/libfp_ovrp.so
|
||||
40defdaddcda53bd2649eb48076fae1622bfc2bfc88e9e03c94fc8b45af2a4f2 ./arm64-v8a/libfp_ovrtrace.so
|
||||
0167c2fde5dfde62897f9d85afc4fc8e97784e988b5b8df6cea8c407240b3424 ./arm64-v8a/libfp_tkeys.so
|
||||
e8c0965c188665a4e565e4a3af983ef1866d1cf9225665cc90d8df286bc96ef3 ./arm64-v8a/libfp_vk.so
|
||||
7fa29014eed2881ee0d7ac486434de9c5fe46710e640b15f697030ad052acfc4 ./arm64-v8a/libfp_vkext.so
|
||||
383054f8b3b41dde76d062c71856cd3163655e50009c08454bc1793f393ead65 ./arm64-v8a/libfpg.so
|
||||
5432674a59d02f411cd853a5dc57e3fa547d1ac518f25bf433fc54c43677177a ./arm64-v8a/libfpglmv.so
|
||||
8a8f6b1da8952cb3933a5b53558424a5fc56043b2527a16bb6dd62a00d2de01a ./arm64-v8a/libframe_xrshim.so
|
||||
19ba5ed3c4b780f5ae46251f6958f552acfc5f13c8bb39f995579593fa8990c6 ./arm64-v8a/libglshim.so
|
||||
4d64e5ede5f832a8850d7892e3c96ee9cebd2dc1df6deda8da176e054636999f ./arm64-v8a/libopenxr_loader_generic.so
|
||||
227626fcd96ea31a5c4fbd006e971b40f9b5a1e10d1bb30456f0a2792fa2c9e2 ./arm64-v8a/libglshim.so
|
||||
34ae4e6757adf83942d179a098ae91b4da187fead17e02a3a65dd6507daf2073 ./arm64-v8a/libopenxr_loader_generic.so
|
||||
1feaeafad467c4cafdf2b018a4d84b0bee200c3f711697b4ce97e66a3ba256ca ./arm64-v8a/libovrplatformcompat.so
|
||||
a4ed80ae45ca90758239f152ea5a2e8c127d491e1e697ea5680db6fd7f72db07 ./arm64-v8a/libvrapi.so
|
||||
a4ed80ae45ca90758239f152ea5a2e8c127d491e1e697ea5680db6fd7f72db07 ./arm64-v8a/libvrapi_foveation.so
|
||||
4f2dc5859c58f008b01e9b54964199834e33b4446016389bca72df202acffdbb ./armeabi-v7a/libopenxr_loader_generic.so
|
||||
f7f8349b0d3e9a29305b4d2aa1eb3ec6b394feff4d3e2ea07b8a65f6df1d15f9 ./arm64-v8a/libvrapi.so
|
||||
71b3df219f331bcb42a483550e35371475b1aa886762ddcf5d0d739d74c51ead ./arm64-v8a/libvrapi_foveation.so
|
||||
c7dea9e3435f36e281341121a9e43102f008cc08bba08191c21bac14912e6b87 ./armeabi-v7a/libopenxr_loader_generic.so
|
||||
1871eae093432d277da4bc751bf5f3269dfcf11f9168260b0c3caadb0dedb19d ./dex/oculusos-stubs.dex
|
||||
b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe ./hevc/COPYING.FFmpeg
|
||||
141de01f0d40b97d4f9a720db5ab8ea442f6aa35db5272048899292884994a1c ./hevc/libstagefrighthw.so
|
||||
@@ -27,25 +28,6 @@ b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe ./hevc/COPYING
|
||||
6cda3076a8c09b31bb1f90da614ea89e7ee194589626eeac613e522849604e47 ./licenses/LuaJIT.txt
|
||||
1aa733117cf57ccff7cf23f0425dbfd73b0332a3ef1c905ceeca0ccd0449c4e0 ./linux-arm64/XR_APILAYER_FRAMEPORT_timefix.json
|
||||
28c2430a02bbd8902c5bfb9562c6fd0e318654f9e05c095bfeb94b0450ab1b07 ./linux-arm64/libxr_frameport_timefix.so
|
||||
63af0050054ad3705b17a0b00ce0c076ba1af0b73abd673ba6c588f64b4591cd ./linux-arm64-bin/fp_roomscan
|
||||
b10b3a5c10c3339fc63fd9f6cb4d01ea29be11a863d0ebad1389ea69fd471940 ./linux-arm64-bin/fp_venc
|
||||
00c2dead0fd7497929833467f0e55699d57d26be1b85dce35402993852f7b111 ./roomscan/ceiling.png
|
||||
c1962de31ed2810d31c760cf9ee63316ac2b8c9528ccbcd9299ebf5ba39b2995 ./roomscan/done.png
|
||||
0dfaea4c68979b0a45a9fef06fdf1a92468ffc8f46f80a3a014fce1d805972d5 ./roomscan/failed.png
|
||||
1147391822be3f1aa5351374b8fd9ec85f8b5ce40e3cb9f3146d778e6fbc652a ./roomscan/floor.png
|
||||
eb3c8b55a9dbafa030797ca9f06a22c3ee3bbef96cb7adea26d433ebad43d43f ./roomscan/look_00.png
|
||||
6ba965ff6d22a469c558f2a68229bd2ff48fc28badb95889ca245310d1dd3e96 ./roomscan/look_01.png
|
||||
0a11cec25ebc76fe11d505d1f2ec162c9b4a6754393065800e73b1f81e2d94c8 ./roomscan/look_02.png
|
||||
fa5a4c94d20af56797b9fcc111148767847a6633ade9217cab373de232efad90 ./roomscan/look_03.png
|
||||
e80fa493e380fba39084be2ee62859adcff4e39aa66566abee10a4d6339c52e9 ./roomscan/look_04.png
|
||||
133617f0d8d1e69c37408aac80033f71856b592b62e3b780cc12b446bd974680 ./roomscan/look_05.png
|
||||
d5dd296ff23641c6973c57ac139147e99c7b783316ab60537adb2155dd196880 ./roomscan/look_06.png
|
||||
c08570aa78f966ae937b2e21d0bad887c5352fbca56aa579a2a7ef8541fb96ad ./roomscan/look_07.png
|
||||
3767e7db5fb6babc872fa62c42604f749c65936717d332101745b201cd450cd5 ./roomscan/look_08.png
|
||||
2924dc65e5c497545340209edc16060e12e1834d11af6871d1c1baa50b7b2562 ./roomscan/look_09.png
|
||||
cd0150dfc10b2aea39403c74eff72fd05fb0111178ef39b4c98657a6d16d105e ./roomscan/look_10.png
|
||||
011355e412f73ade3896e9037490e607c4365d0cf8ceb807d236bf68b414d3ed ./roomscan/look_11.png
|
||||
1b8b47ffb47568d540921f065b5958eeb44a6489498d58e0f33f5d1f535154e2 ./roomscan/look_12.png
|
||||
926c7bc6a103adee5b9bf938f5d4e39095ab77fd6270b5301be3b0428edd9ae6 ./roomscan/start.png
|
||||
c2c70f4af1a5c3e6089dff1130161dd417f8044f99ec639eeecf1083930aab16 ./win-x64/fp_oculushmd.exe
|
||||
60ebc5fea05b8945082e2ca8b9f2eb74616012a26eb50133af273dff0fcddc42 ./win-x64/fp_vrsettings.exe
|
||||
|
Before Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 26 KiB |
@@ -34,11 +34,7 @@ say "Letting FramePort log in"
|
||||
key=$(curl -fsS "$PC_URL/key?code=$PAIR_CODE")
|
||||
[[ "$key" == ssh-ed25519\ * ]] || { echo "Couldn't reach FramePort at $PC_URL. Is it still open?"; exit 1; }
|
||||
mkdir -p ~/.ssh && chmod 700 ~/.ssh && touch ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys
|
||||
# a file without a final newline would glue our key onto its last line, where sshd never matches it (GitHub #242)
|
||||
grep -qxF "$key" ~/.ssh/authorized_keys || {
|
||||
[ -n "$(tail -c1 ~/.ssh/authorized_keys)" ] && echo >> ~/.ssh/authorized_keys
|
||||
echo "$key" >> ~/.ssh/authorized_keys
|
||||
}
|
||||
grep -qxF "$key" ~/.ssh/authorized_keys || echo "$key" >> ~/.ssh/authorized_keys
|
||||
|
||||
say "Setting up Lepton's containers"
|
||||
# rootless podman leaks one kernel keyring per container start; ~200 game launches would exhaust the quota
|
||||
|
||||
@@ -7,14 +7,8 @@ xr: OpenXR
|
||||
status: works
|
||||
notes: Uses Meta XR Audio via FMOD (not covered by patch_meta_xr_audio); if audio is missing, that is the likely
|
||||
cause.
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: 63fff470777f2753d55ad50f8355573ced8fa48bcaee0f5e6a0c10369f951a38
|
||||
updated: '2026-10-15'
|
||||
@@ -6,15 +6,9 @@ engine: Unity
|
||||
xr: VrApi
|
||||
status: issues
|
||||
notes: Right eye distorts during movement (unresolved; swap, tracking, Valve layers, depth and pacing ruled out).
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
details: Legacy VrApi via OVRPlugin; overport swaps in an OpenXR OVRPlugin. Do not remove VrApi.
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: 192ff250f5fbec38b9c4e898f0b8408edc25901f46bb4b227f7ca60bbd9f0bba
|
||||
updated: '2026-10-15'
|
||||
@@ -6,15 +6,9 @@ engine: Unity
|
||||
xr: OpenXR
|
||||
status: works
|
||||
notes: Needed the GLES/sRGB swapchain fallback.
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
details: Also available as a native PC SteamVR title.
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: 158f7c4f5e8558029dc8cc5e8dcb4e67e846b261bf34e3e448fee7f657c74597
|
||||
updated: '2026-10-15'
|
||||
@@ -1,20 +0,0 @@
|
||||
package: com.CreaTeam.Sclerosis
|
||||
title: Sclerosis
|
||||
status: works
|
||||
notes: Copy the "Amnesia The Dark Descent" folder from a Windows/Proton install to "FramePort/com.CreaTeam.Sclerosis/lepton-data/external".
|
||||
Default hand positions are rather askew and should be amended via VR Controller Mappings in Steam itself. FOV
|
||||
warping effects are EXTREMELY disorienting in VR, beware. Otherwise seems to work without issue.
|
||||
tested_version: 1.10.7
|
||||
engine: Unity
|
||||
xr: OpenXR
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-10-16'
|
||||
known_good_sha256: e17421ad9894f5e57fb9b1b8110544715166756ef924b5a86831f6f20e70a6d5
|
||||
app: 1.2.0
|
||||
overport_cli: 1.2.5
|
||||
issue: 339
|
||||
source_hint: Sclerosis_v1.10.7
|
||||
@@ -1,24 +0,0 @@
|
||||
package: com.Curve.LawnMowingSimulatorVR
|
||||
title: Lawn Mowing Simulator VR
|
||||
status: issues
|
||||
notes: Left eye textures flicker only when mowing in specific areas.
|
||||
tested_version: 1.0.50
|
||||
engine: Unity
|
||||
xr: OpenXR
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
adapter:
|
||||
haptic_fix: 1
|
||||
pose_consistency: 1
|
||||
hide_space_warp: 1
|
||||
verified:
|
||||
date: '2026-10-16'
|
||||
known_good_sha256: 2653e9b1dfbd11d607b5dd17b9c07ab19d9e98e1004ef9b14cb52867b5f959dc
|
||||
app: 1.2.0
|
||||
overport_cli: 1.2.5
|
||||
frame_build: '20261015.6141207'
|
||||
agent: 91
|
||||
issue: 344
|
||||
source_hint: com.Curve.LawnMowingSimulatorVR
|
||||
@@ -1,10 +0,0 @@
|
||||
package: com.FlatHeadStudio.DeadlyDelivery
|
||||
title: Deadly Delivery
|
||||
status: unsupported
|
||||
notes: "Quits after Meta's entitlement check fails: it needs Meta's online services."
|
||||
tested_version: 1.0.30
|
||||
engine: Unity
|
||||
xr: OpenXR
|
||||
verified:
|
||||
date: '2026-10-15'
|
||||
issue: 322
|
||||
@@ -6,14 +6,8 @@ engine: Unity
|
||||
xr: OpenXR
|
||||
status: works
|
||||
notes: Recommended pilot title.
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: 2300f628ce04c1da60b52fed18335d6a31b88cc88313fd6d2c0e1a8e7785126f
|
||||
updated: '2026-10-15'
|
||||
@@ -1,22 +0,0 @@
|
||||
package: com.HypetrainDigitalLtd.Breathedge
|
||||
title: Breathedge VR
|
||||
status: works
|
||||
notes: Loading fade is broken and only shows a small square but the game works!
|
||||
tested_version: 1.0.7
|
||||
engine: Unreal
|
||||
xr: VrApi
|
||||
alt_overport:
|
||||
- patch_remove_unreal_force_quit
|
||||
frame:
|
||||
- frame.hw_video_decode
|
||||
adapter:
|
||||
haptic_fix: 1
|
||||
verified:
|
||||
date: '2026-10-16'
|
||||
known_good_sha256: 4975a32fbf36b4d417142a944bf7d771c18a184dc0320b5937ac2c67bd013575
|
||||
app: 1.2.0
|
||||
overport_cli: 1.2.5
|
||||
frame_build: '20261015.6141207'
|
||||
agent: 91
|
||||
issue: 347
|
||||
source_hint: Breathadge
|
||||
@@ -5,14 +5,9 @@ source_hint: 'Sniper Elite VR- Winter Warrior'
|
||||
engine: Unity
|
||||
xr: OpenXR
|
||||
status: works
|
||||
notes: frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
notes: ''
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: 6b8170da5826b9a35326a20967a0e5a242d46fb569a0a3c669e1cbd368102dd3
|
||||
updated: '2026-10-15'
|
||||
@@ -1,28 +0,0 @@
|
||||
package: com.Miragesoft.RealVrFishingQ
|
||||
title: Real VR Fishing
|
||||
status: issues
|
||||
notes: Seems to be almost 100% functional with meta permissions enabled. In the new Mixed Reality mode, the room
|
||||
scan doesn't seem to do anything and I can't seem to manually place anything either.
|
||||
tested_version: '3.06096'
|
||||
engine: Unity
|
||||
xr: OpenXR
|
||||
frame:
|
||||
- frame.vivox_audio_route
|
||||
- frame.unity_text_input
|
||||
- frame.oculusos
|
||||
- frame.meta_permissions
|
||||
device:
|
||||
- device.text_input_window
|
||||
adapter:
|
||||
haptic_fix: 1
|
||||
scene_emul: 1
|
||||
controller_models: 1
|
||||
verified:
|
||||
date: '2026-10-16'
|
||||
known_good_sha256: 8b17dd26ef0486618ec006f9d948a60dabea4d7763bbe6061db07ee8aad27c76
|
||||
app: 1.2.0
|
||||
overport_cli: 1.2.5
|
||||
frame_build: '20261007.6125817'
|
||||
agent: 91
|
||||
issue: 333
|
||||
source_hint: Real VR Fishing
|
||||
@@ -6,15 +6,11 @@ engine: Unity
|
||||
xr: OpenXR
|
||||
status: works
|
||||
notes: Passthrough + Meta scene/room emulated from the Steam guardian (scene_emul=1).
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
details: Mixed-reality-only; builds its level from the room model, which the adapter emulates from the Steam guardian.
|
||||
overport_extra:
|
||||
- patch_force_passthrough
|
||||
adapter:
|
||||
scene_emul: 1
|
||||
scene_hide_bounds: 1
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
@@ -22,5 +18,3 @@ verified:
|
||||
known_good_sha256: 9f900fc86fbb2663abe83c82ab79cc72bbf1f93fea54f7583fd274dd07e3d09c
|
||||
frame:
|
||||
- frame.meta_permissions
|
||||
- frame.unity_text_input
|
||||
updated: '2026-10-17'
|
||||
@@ -1,22 +0,0 @@
|
||||
package: com.SchellGames.LostRecipes
|
||||
title: Lost Recipes
|
||||
status: works
|
||||
tested_version: 1.0.1+273175
|
||||
engine: Unreal
|
||||
xr: VrApi
|
||||
alt_overport:
|
||||
- patch_remove_unreal_force_quit
|
||||
frame:
|
||||
- frame.unreal_skip_obb_check
|
||||
- frame.hw_video_decode
|
||||
adapter:
|
||||
haptic_fix: 1
|
||||
verified:
|
||||
date: '2026-10-16'
|
||||
known_good_sha256: f071a1deea3e3b6dce0c3a923127f540a48b88532106536c1838f496e9d3e6c9
|
||||
app: 1.2.0
|
||||
overport_cli: 1.2.5
|
||||
frame_build: '20261015.6141207'
|
||||
agent: 91
|
||||
issue: 340
|
||||
source_hint: Lost Recipes
|
||||
@@ -6,18 +6,12 @@ engine: Unity
|
||||
xr: OpenXR
|
||||
status: issues
|
||||
notes: Hand-tracking game; the Frame synthesizes hands from controllers, so it is janky.
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
details: Hand-tracking-only game; Steam Frame has no optical hand tracking. Built with controller_fix=0 so hand
|
||||
data passes through if the runtime ever provides it.
|
||||
adapter:
|
||||
controller_fix: 0
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: a19b80db0c300d422cbba35a4924ab59211b39bcb6485e200d310e3e1372ddb7
|
||||
updated: '2026-10-15'
|
||||
@@ -1,24 +1,22 @@
|
||||
package: com.UNIVRS.Freedom
|
||||
title: 'Attack on Titan VR: Unbreakable'
|
||||
status: works
|
||||
notes: Keep the extra files that come with the APK and OBB next to the OBB (they hold the audio). Cutscenes are
|
||||
detached from the head but still viewable.
|
||||
title: Freedom
|
||||
status: issues
|
||||
notes: Volume can't be changed in the game.
|
||||
tested_version: 1.0.2950
|
||||
engine: Unity
|
||||
xr: OpenXR
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
- frame.asset_files
|
||||
device:
|
||||
- device.text_input_window
|
||||
adapter:
|
||||
haptic_fix: 1
|
||||
verified:
|
||||
date: '2026-10-16'
|
||||
known_good_sha256: 1b3ced1a24b3b708f66aba6aa879863b667c0e502ef153d8a8cfa03e529d21fd
|
||||
app: 1.2.0
|
||||
date: '2026-10-10'
|
||||
known_good_sha256: 24662272c4cbe5dc7c4f3c803bdb9dead9661ac3d59bf80cca2e260256acc4bc
|
||||
app: 0.12.0
|
||||
overport_cli: 1.2.5
|
||||
frame_build: '20261015.6141207'
|
||||
agent: 91
|
||||
issue: 337
|
||||
source_hint: Aot
|
||||
frame_build: '20261007.6125817'
|
||||
agent: 59
|
||||
issue: 132
|
||||
source_hint: AOT VR
|
||||
@@ -7,15 +7,10 @@ xr: OpenXR
|
||||
status: works
|
||||
notes: FrameBridge turns its upside-down UI panels upright (flip emulation, in place since FramePort 1.2.0). Ubisoft
|
||||
login may not work.
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
details: Ubisoft online login may not work. Data folder holds raw assets (start0..2, .climb, bundles), not .obb
|
||||
files; install to obb as-is.
|
||||
overport_extra:
|
||||
- patch_ac_nexus_no_appsw_90
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
@@ -23,5 +18,5 @@ verified:
|
||||
known_good_sha256: 89644a12bf8df956fa3d3a9a40540ba9e1fb62f63494714a05c9f05984383ac8
|
||||
no_appsw_90: '2026-10-02, OVRPort 1.2.5 (owner: 90 Hz felt better than 72 Hz; same known issues)'
|
||||
flip_in_place: '2026-10-14, owner in the headset: launch warnings and tutorial pop-ups upright (GitHub #138)'
|
||||
updated: '2026-10-15'
|
||||
updated: '2026-10-14'
|
||||
min_app: 1.2.0
|
||||
@@ -1,5 +1,5 @@
|
||||
package: com.asg.clockworkdev
|
||||
title: The Last Clockwinder
|
||||
title: Clockwork
|
||||
status: works
|
||||
tested_version: '1.29'
|
||||
engine: Unity
|
||||
|
||||
@@ -2,7 +2,6 @@ package: com.camouflaj.manta
|
||||
title: 'Batman: Arkham Shadow'
|
||||
status: works
|
||||
notes: Large data set (~27 GiB) incl. all language packs.
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
details: 'Uses Meta XR Audio (Wwise), handled by patch_meta_xr_audio. Cutscenes are 8K HEVC panoramas: frame.hw_video_decode
|
||||
decodes them on the Frame''s hardware, adapter.surface_native shows them in stereo (PRs #96, #128). Includes all
|
||||
language packs (~28 GB). sync_guard (to test, GitHub #102) - a reporter''s game quit to Steam''s waiting screen
|
||||
@@ -14,18 +13,15 @@ overport_extra:
|
||||
- patch_disable_space_warp
|
||||
frame:
|
||||
- frame.hw_video_decode
|
||||
- frame.unity_text_input
|
||||
adapter:
|
||||
sync_guard: 1
|
||||
surface_native: 1
|
||||
fade_quad: 1
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: 796d1cab08f614d72c50d9702974c719c0908f5de91183cfe02d1fd5eb09551a
|
||||
updated: '2026-10-15'
|
||||
updated: '2026-10-13'
|
||||
min_app: 1.1.0
|
||||
source_hint: Batman- Arkham Shadow
|
||||
@@ -6,15 +6,9 @@ engine: Unity
|
||||
xr: OpenXR
|
||||
status: works
|
||||
notes: Co-op unavailable.
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
details: 'Release notes: for DLC use an older version. Co-op likely unavailable.'
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: 06428a6328a49b3ca769e070dd0d2bb55c2122c8fba5d07a69b1b206a532c212
|
||||
updated: '2026-10-15'
|
||||
@@ -1,21 +0,0 @@
|
||||
package: com.crytek.climb
|
||||
title: The Climb
|
||||
status: works
|
||||
tested_version: '666.0'
|
||||
engine: CryEngine
|
||||
xr: VrApi
|
||||
frame:
|
||||
- frame.vrapi_bridge
|
||||
device_files:
|
||||
user.cfg: 'r_vr_foveated = 0
|
||||
|
||||
'
|
||||
verified:
|
||||
date: '2026-10-16'
|
||||
known_good_sha256: 3899967dd6d3ee0ce3409e94d543405c779e9c282ead29536abe93b3531ca285
|
||||
app: 1.2.0
|
||||
overport_cli: 1.2.5
|
||||
frame_build: '20261015.6141207'
|
||||
agent: 91
|
||||
issue: 341
|
||||
source_hint: TheClimb
|
||||
@@ -1,22 +0,0 @@
|
||||
package: com.fasttravelgames.mascot
|
||||
title: 'Cities: VR'
|
||||
status: works
|
||||
notes: Loading screen Cities VR Logo doesn't load right.
|
||||
tested_version: 1.00.502
|
||||
engine: Unity
|
||||
xr: OpenXR
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
adapter:
|
||||
haptic_fix: 1
|
||||
verified:
|
||||
date: '2026-10-16'
|
||||
known_good_sha256: 5537e4e9333a04eda8c1b2f96cdc9572c1bbed52a9d3af42269ba442ce9ba801
|
||||
app: 1.2.0
|
||||
overport_cli: 1.2.5
|
||||
frame_build: '20261015.6141207'
|
||||
agent: 91
|
||||
issue: 345
|
||||
source_hint: CitiesSkylines
|
||||
@@ -5,10 +5,8 @@ source_hint: NOPE CHALLENGE
|
||||
engine: Unreal
|
||||
xr: OpenXR
|
||||
status: works
|
||||
notes: "Meta XR Audio telemetry patch + nodebug. MR mode: needs a scanned room."
|
||||
details: The MR 'Reality Breach' mode needs passthrough and a room; standard VR mode was verified.
|
||||
adapter:
|
||||
scene_emul: 1
|
||||
notes: Meta XR Audio telemetry patch + nodebug. MR "Reality Breach" mode unavailable.
|
||||
details: The MR 'Reality Breach' mode needs passthrough; standard VR mode used.
|
||||
alt_overport:
|
||||
- patch_remove_unreal_force_quit
|
||||
frame:
|
||||
|
||||
@@ -6,17 +6,11 @@ engine: Unity
|
||||
xr: OpenXR
|
||||
status: works
|
||||
notes: Passthrough emulated with the Frame cameras (greyscale).
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
details: Mixed-reality-only title; relies on passthrough (emulated).
|
||||
overport_extra:
|
||||
- patch_force_passthrough
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: 65ca3a8f46cc9acfd268949418f9adeecb0cf9f59d11591ba95fe2ba9ea966d8
|
||||
updated: '2026-10-15'
|
||||
@@ -2,17 +2,10 @@ package: com.nexxr.nexplayer
|
||||
title: NEX Player
|
||||
status: works
|
||||
notes: 'Confirmed in the headset by the owner (2026-10-01): 72 fps, local 2D/360/3D videos play (it browses /sdcard/Movies
|
||||
itself). USB-drive browsing can''t work in Lepton. Typing (frame.unity_text_input + device.text_input_window,
|
||||
owner in the headset 2026-10-15): SteamVR''s keyboard button works and typed text reaches the fields; the keyboard
|
||||
doesn''t open by itself when a field is selected.'
|
||||
itself). USB-drive browsing can''t work in Lepton.'
|
||||
tested_version: 1.3.1.0
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
engine: Unity
|
||||
xr: OpenXR
|
||||
verified:
|
||||
date: '2026-10-01'
|
||||
source_hint: NEX - NEXt-Gen Video Player
|
||||
updated: '2026-10-15'
|
||||
@@ -1,22 +0,0 @@
|
||||
package: com.s3d.ExplodingKittensVR.TestRelease
|
||||
title: Exploding Kittens VR
|
||||
status: issues
|
||||
notes: Requires online for most modes. Practice lobby does work though.
|
||||
tested_version: 1.4.25779
|
||||
engine: Unreal
|
||||
xr: OpenXR
|
||||
alt_overport:
|
||||
- patch_remove_unreal_force_quit
|
||||
frame:
|
||||
- frame.hw_video_decode
|
||||
adapter:
|
||||
haptic_fix: 1
|
||||
verified:
|
||||
date: '2026-10-16'
|
||||
known_good_sha256: 4b0a2348a5553851dcec820835e02c93a1a64927a30533d554943a9b81b3baa0
|
||||
app: 1.2.0
|
||||
overport_cli: 1.2.5
|
||||
frame_build: '20261015.6141207'
|
||||
agent: 91
|
||||
issue: 343
|
||||
source_hint: com.s3d.ExplodingKittensVR.TestRelease
|
||||
@@ -6,14 +6,8 @@ engine: Unity
|
||||
xr: OpenXR
|
||||
status: works
|
||||
notes: Layers with failed swapchains are dropped by the adapter.
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: c3f8cba1c22762231b6a6fbd881668db859d83224884ebeae0c1a3ba716f298c
|
||||
updated: '2026-10-15'
|
||||
@@ -6,15 +6,9 @@ engine: Unity
|
||||
xr: OpenXR
|
||||
status: works
|
||||
notes: Use VR mode.
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
details: Has VR and MR modes; use VR mode (passthrough not forced).
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: 5ba09a2bc0046c8cb587272ab81e8d32739334fef523b10ab26531a733d54f12
|
||||
updated: '2026-10-15'
|
||||
@@ -1,14 +1,13 @@
|
||||
package: com.zenstudios.PFXVRQuest
|
||||
title: Pinball FX VR
|
||||
status: issues
|
||||
notes: "Plays; space warp off (fewer stutters). MR mode: needs a scanned room."
|
||||
notes: Plays; mixed reality mode not working yet. Space warp off (fewer stutters).
|
||||
tested_version: '1.9'
|
||||
engine: Unreal
|
||||
xr: OpenXR
|
||||
alt_overport:
|
||||
- patch_remove_unreal_force_quit
|
||||
adapter:
|
||||
scene_emul: 1
|
||||
equirect_emul: 1
|
||||
hide_space_warp: 1
|
||||
verified:
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
package: jp.co.hit_point.vneko
|
||||
title: Neko Atsume Purrfect
|
||||
status: works
|
||||
tested_version: 2.3.0
|
||||
engine: Unity
|
||||
xr: OpenXR
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
- frame.oculusos
|
||||
device:
|
||||
- device.text_input_window
|
||||
adapter:
|
||||
controller_models: 1
|
||||
haptic_fix: 1
|
||||
scene_emul: 1
|
||||
verified:
|
||||
date: '2026-10-16'
|
||||
known_good_sha256: da0196efa495d6ea7b34be2cea5b279acf23489134bb1dd1acef7cf54aa57da6
|
||||
app: 1.2.0
|
||||
overport_cli: 1.2.5
|
||||
frame_build: '20261015.6141207'
|
||||
agent: 91
|
||||
issue: 338
|
||||
source_hint: jp.co.hit_point.vneko
|
||||
@@ -1,18 +0,0 @@
|
||||
package: org.crisiszone.vr
|
||||
title: Crisis Zone VR
|
||||
status: works
|
||||
notes: Played the beginning of the first mission without issues.
|
||||
tested_version: 0.1.4
|
||||
engine: Other
|
||||
xr: OpenXR
|
||||
frame:
|
||||
- frame.sdl_clipboard
|
||||
verified:
|
||||
date: '2026-10-15'
|
||||
known_good_sha256: 747d1e6613ae443ef03e509b509e4ec89039eec1aecf3689643db4057e53266a
|
||||
app: 1.2.1.dev433
|
||||
overport_cli: 1.2.5
|
||||
frame_build: '20261007.6125817'
|
||||
agent: 91
|
||||
issue: 331
|
||||
source_hint: CrisisZoneVR-v0.1.4-quest3
|
||||
@@ -1,18 +0,0 @@
|
||||
package: org.smarttube.stable
|
||||
title: SmartTube
|
||||
status: issues
|
||||
notes: Android's home screen shows for a few seconds while the app starts (normal for flat Android apps; longest on the
|
||||
first start after an install). Froze once in the reporter's session.
|
||||
tested_version: '32.56'
|
||||
engine: Other
|
||||
xr: '?'
|
||||
as_is: true
|
||||
frame:
|
||||
- frame.hw_video_decode
|
||||
verified:
|
||||
date: '2026-10-16'
|
||||
known_good_sha256: cc53f1aedac52ea0d4e77803acd580e32e7e5179adc96b55db7267b63a16c864
|
||||
app: 1.2.0
|
||||
overport_cli: 1.2.5
|
||||
issue: 350
|
||||
source_hint: SmartTube_stable_arm64-v8a
|
||||
@@ -5,14 +5,9 @@ source_hint: Toy Master
|
||||
engine: Unity
|
||||
xr: OpenXR
|
||||
status: works
|
||||
notes: frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
notes: ''
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: e951595c67b6e448f3fb4afd07e6b83e98e589094bb3b73374cfb28aa01e96ee
|
||||
updated: '2026-10-15'
|
||||
@@ -7,9 +7,6 @@ xr: OpenXR
|
||||
status: works
|
||||
notes: Needs Oculus OS telemetry class stubs and the no-ForceQuit build (the normal build quits right after
|
||||
starting).
|
||||
frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
device:
|
||||
- device.text_input_window
|
||||
verified:
|
||||
date: '2026-10-02' # owner-confirmed with the no-ForceQuit build
|
||||
overport_cli: 1.2.3
|
||||
@@ -17,8 +14,6 @@ verified:
|
||||
known_good_sha256: 31469d50b8ee292597291db7cc3bc3eca8e851f533cd92bba0d64214893580cc
|
||||
frame:
|
||||
- frame.oculusos
|
||||
- frame.unity_text_input
|
||||
alt_overport:
|
||||
- patch_remove_unreal_force_quit
|
||||
use_alt: true
|
||||
updated: '2026-10-15'
|
||||
@@ -1,9 +1,9 @@
|
||||
package: xyz.TheAviary.Vermillion
|
||||
title: Vermillion
|
||||
status: works
|
||||
notes: "The canvas used to hide the hand and brush while painting (the Frame draws the game's canvas layer in front
|
||||
of everything); the recipe makes the game draw canvases in the scene instead (fix found by Klownicle, GitHub #200).
|
||||
Confirmed in the headset by Klownicle."
|
||||
status: issues
|
||||
notes: Runs. The canvas used to hide the hand and brush while painting (the Frame draws the game's canvas layer in
|
||||
front of everything); the recipe makes the game draw canvases in the scene instead (fix found by Klownicle, GitHub
|
||||
#200). Not yet confirmed in the headset with this patch.
|
||||
tested_version: 1.7.2
|
||||
engine: Unity
|
||||
xr: OpenXR
|
||||
@@ -16,10 +16,10 @@ adapter:
|
||||
haptic_fix: 1
|
||||
scene_emul: 1
|
||||
verified:
|
||||
date: '2026-10-15'
|
||||
date: '2026-10-11'
|
||||
app: 1.0.1
|
||||
frame_build: '20261007.6125817'
|
||||
agent: 79
|
||||
issue: 200
|
||||
updated: '2026-10-15'
|
||||
updated: '2026-10-12'
|
||||
source_hint: Vermillion - VR Painting
|
||||
@@ -5,14 +5,9 @@ source_hint: H.U.N.T
|
||||
engine: Unity
|
||||
xr: OpenXR
|
||||
status: works
|
||||
notes: frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
|
||||
frame:
|
||||
- frame.unity_text_input
|
||||
device:
|
||||
- device.text_input_window
|
||||
notes: ''
|
||||
verified:
|
||||
date: '2026-09-28'
|
||||
overport_cli: 1.2.3
|
||||
overport_runtime: 3.4.3-23204ea
|
||||
known_good_sha256: c35373d0f7c870ade148e3259abcc74098b6bc89fe2c2f3a2e55168df642e391
|
||||
updated: '2026-10-15'
|
||||
@@ -6,31 +6,11 @@
|
||||
# with diagnostics. Launch tests and real play sessions (agent session_log, `frameport session`) are both matched.
|
||||
# Sources: every failure we hit porting 34 games to the Steam Frame (see docs/PLAYBOOK.md).
|
||||
signatures:
|
||||
- id: mr-no-room
|
||||
pattern: 'FrameBridge[^\r\n]*scene: (?:capture requested -> (?:guardian box|using guardian room)|room from guardian|room [^\r\n]*(?:from guardian|configured/default size|box))'
|
||||
severity: info
|
||||
diagnosis: 'The game is using a simple fallback room. Scan your room for mixed reality, or use Frame > Room > Use my play area for walls without furniture. A recorded scan can be imported until headset capture is available.'
|
||||
suggest: []
|
||||
- id: mr-discovery-unsupported
|
||||
pattern: '(?:Unknown proc addr:\s*xrDiscoverSpacesMETA|(?:MRUK[^\r\n]*)?NoRoomsFound)'
|
||||
severity: warning
|
||||
diagnosis: 'The game cannot discover a Meta room. Enable room layout (adapter.scene_emul), rebuild and reinstall for the updated extension shim, then save a room under Frame > Room.'
|
||||
suggest: [adapter.scene_emul]
|
||||
- id: meta-asset-status-error
|
||||
pattern: 'Asset status error\s+\(code 100\)'
|
||||
severity: error
|
||||
diagnosis: A DLC manager reports a Meta asset-file status error after VR starts (e.g. PixelRipped 1995). The asset-file check failed; the log does not identify the native call or asset ID. Try the experimental asset-file bypass (empty list, installed status with no file path); this does not supply DLC and has not been verified in the game.
|
||||
suggest: [frame.asset_files_stub]
|
||||
- id: meta-entitlement
|
||||
# Quest games (the pcvr oculus-entitlement signature covers Rift games). Only explicit failure results: a bare
|
||||
# ovr_PlatformInitialize error isn't matched. `error`, not fatal: offline games may log it and play on; an online
|
||||
# game that then quits (e.g. Deadly Delivery, GitHub #322) fails the test through its exit.
|
||||
pattern: '(?i)entitlement check failed|\bnot entitled to (use|play)|ovrPlatformInitialize_(NotEntitled|UnableToVerify|FileInvalid|SignatureInvalid)'
|
||||
severity: error
|
||||
diagnosis: The game's Meta licence check (entitlement) failed. It needs Meta's online login and licence check,
|
||||
which the Frame doesn't have; games that depend on it (often online games) quit or stay offline. FramePort
|
||||
doesn't get around such checks.
|
||||
suggest: []
|
||||
- id: lua-lightuserdata-pointer
|
||||
pattern: 'bad light userdata pointer'
|
||||
severity: fatal
|
||||
@@ -590,6 +570,132 @@ signatures:
|
||||
the video was decoded in software instead, which is slow for 4K/8K. Turn off hardware video decoding in Steam's
|
||||
settings, restart Steam, then start the game again.
|
||||
suggest: []
|
||||
# ---- Quest games on this PC (AXRB, docs/PC_ANDROID.md): AXRB's host.err/session.json + guest log
|
||||
- id: axrb-no-headset
|
||||
kind: axrb
|
||||
pattern: 'failed to find D3D11 adapter requested by OpenXR runtime|xrCreateInstance failed: XR_ERROR_RUNTIME_FAILURE'
|
||||
severity: fatal
|
||||
diagnosis: The PC's OpenXR runtime (SteamVR) has no headset to show the game on, so AXRB's bridge couldn't open its VR session. Connect the headset (Steam Link / cable) and let SteamVR show it before starting the game.
|
||||
suggest: []
|
||||
- id: axrb-host-not-ready
|
||||
kind: axrb
|
||||
pattern: 'Host pose server did not become ready|Host failed to start'
|
||||
severity: fatal
|
||||
diagnosis: AXRB's Windows bridge (axrb-host-bridge.exe) didn't start, so the game was never launched. Its reason is in host.err (diagnostics); a missing headset is the usual one.
|
||||
suggest: []
|
||||
report: true
|
||||
- id: axrb-gfxstream-crash
|
||||
kind: axrb
|
||||
pattern: 'vulkan\.ranchu\.so \(gfxstream::vk::'
|
||||
severity: fatal
|
||||
diagnosis: The game crashed inside the Android emulator's Vulkan driver (gfxstream), reached through AXRB's runtime layer (e.g. Pinball FX VR at its first Vulkan allocations). That's AXRB's GPU path, not FramePort's build - report it to AXRB with the diagnostics.
|
||||
suggest: []
|
||||
report: true
|
||||
- id: axrb-translation-crash
|
||||
kind: axrb
|
||||
pattern: 'libndk_translation\.so \(berberis::|DEBUG\s*:.*#00 pc \S+\s+/system/lib64/libndk_translation\.so'
|
||||
severity: fatal
|
||||
diagnosis: The game crashed in Android's ARM translation (libndk_translation), which runs Quest games' arm64 code on the PC's x86 CPU (known for some Unity games, AXRB issue #9). Nothing to patch in the game; AXRB plans another translator.
|
||||
suggest: []
|
||||
# AXRB's direct mode (axrb-direct.exe, no emulator): direct.log lines are "<s> <tid> E/<tag>: ..." from the runner
|
||||
# and "E/<tag>(<tid>): ..." from the game's Android log; direct.out has AppProcess's AXRB_AOSP_* lines
|
||||
- id: axrb-direct-incomplete
|
||||
kind: axrb
|
||||
pattern: 'Direct mode installation is incomplete|Direct mode is missing |AXRB Direct is incomplete|Preparing the AOSP application failed'
|
||||
severity: fatal
|
||||
diagnosis: AXRB's direct mode is missing part of itself or of its Android system root, so the game was never started. Reinstall AXRB-Emulatorless (or rebuild the local build FRAMEPORT_AXRB_DIRECT_DIR points at), then `frameport pc install-axrb --backend direct` sets the system root up again.
|
||||
suggest: []
|
||||
- id: axrb-direct-no-vulkan
|
||||
kind: axrb
|
||||
pattern: 'vulkan-1\.dll is not installed|E/vulkan: \S+ is not available on the host'
|
||||
severity: fatal
|
||||
diagnosis: AXRB's direct mode found no usable Vulkan driver on this PC (or the driver lacks a function the game calls). Install the graphics card's current driver.
|
||||
suggest: []
|
||||
- id: axrb-direct-no-gles
|
||||
kind: axrb
|
||||
pattern: 'eglInitialize\b.*(?:fail|0x3008)|Failed to initiali[sz]e EGL|Unable to initiali[sz]e (?:EGL|the OpenGL)|EGL_BAD_DISPLAY|Unable to retrieve the default EGL display'
|
||||
# Unreal Vulkan builds probe EGL at start too (eglInitialize -> EGL_BAD_DISPLAY in direct mode), then create
|
||||
# their Vulkan device: only a session without one is a GLES game (Deadpool VR, 2026-10-15)
|
||||
# ... and one that died first on something AXRB's direct mode lacks (a dialog window, a framework call) never
|
||||
# got that far: that is the blocker, not EGL (Of Lies and Rain, NOPE CHALLENGE, 2026-10-16)
|
||||
unless: '(?m)I/vulkan: vkCreateDevice\(.*\) = 0$|UnsupportedOperationException: addToDisplayAsUser|^AXRB_SERVICE_UNIMPLEMENTED '
|
||||
severity: fatal
|
||||
diagnosis: The game draws with OpenGL ES, and AXRB's direct mode only has a Vulkan renderer. Install it for AXRB's emulator instead (the "AXRB mode on this PC" option, pc.axrb_backend backend=emulator, or `frameport install <game> --to pc --axrb-backend emulator`).
|
||||
suggest: []
|
||||
- id: axrb-direct-no-native-window
|
||||
kind: axrb
|
||||
pattern: '(?m)^AXRB_AOSP_HOST_SURFACES 0'
|
||||
unless: 'APP_CMD_INIT_WINDOW|AXRB_AOSP_TAKEN_SURFACE|AXRB\.Space|session state='
|
||||
severity: warning
|
||||
diagnosis: The game's activity got no window in AXRB's direct mode. NativeActivity games (CryEngine, other own engines) take their surface with Window.takeSurface, which AXRB's direct mode doesn't serve yet (it only hands SurfaceViews one), so they wait for APP_CMD_INIT_WINDOW forever and never start VR (The Climb 2 stopped after "Loading plug-in CryHTTP"). That's AXRB's side; AXRB's emulator may run the game.
|
||||
suggest: []
|
||||
report: true
|
||||
- id: axrb-direct-vulkan-extensions
|
||||
kind: axrb
|
||||
pattern: 'Renderer initialization[\s\S]{0,600}?CrySystem initialization failed'
|
||||
unless: 'fp_vkext: listing'
|
||||
severity: fatal
|
||||
diagnosis: CryEngine found its Vulkan device without extensions every Quest has (VK_EXT_fragment_density_map, Android's external memory) and gave up before creating it; the PC's graphics driver doesn't have them. "Vulkan - list Android's external-memory extensions (this PC)" lists them for the game in builds for this PC, and AXRB leaves them out again when the device is created.
|
||||
suggest: [frame.vk_android_extensions]
|
||||
- id: axrb-direct-unhandled-instruction
|
||||
kind: axrb
|
||||
pattern: 'fatal signal 4 \(SIGILL\)|unhandled synchronous signal 4 '
|
||||
severity: fatal
|
||||
diagnosis: AXRB's direct mode met an arm64 instruction its translator can't run (Dynarmic, or Digitalis when chosen) and the game stopped. That's AXRB's side - report it to AXRB with the diagnostics (direct.log has the instruction's address); the other translator (pc.axrb_backend translator=digitalis / dynarmic) or AXRB's emulator may get further.
|
||||
suggest: []
|
||||
report: true
|
||||
- id: axrb-direct-guest-crash
|
||||
kind: axrb
|
||||
pattern: 'E/cpu: thread \d+ \(.*\): fatal signal (?:5|6|7|11) '
|
||||
severity: fatal
|
||||
diagnosis: The game's own arm64 code crashed in AXRB's direct mode (a SIGSEGV/SIGBUS/SIGABRT, or the SIGTRAP Unity raises on a fatal error; direct.log has the backtrace by library). Often a missing Android service or a translation bug rather than the game; try the other translator (pc.axrb_backend translator=digitalis) or AXRB's emulator, and report it to AXRB with the diagnostics.
|
||||
suggest: []
|
||||
report: true
|
||||
- id: axrb-direct-host-fault
|
||||
kind: axrb
|
||||
pattern: 'E/host-fault: |E/fatal: '
|
||||
severity: fatal
|
||||
diagnosis: axrb-direct.exe itself crashed (its translator or Linux/Binder layer, not the game). That's AXRB's side - report it to AXRB with the diagnostics.
|
||||
suggest: []
|
||||
report: true
|
||||
- id: axrb-direct-dialog-window
|
||||
kind: axrb
|
||||
pattern: 'UnsupportedOperationException: addToDisplayAsUser'
|
||||
severity: fatal
|
||||
diagnosis: The game opened a second Android window (a Dialog, for example Unreal's message box or a Unity plugin's dialog) and AXRB's direct mode can only show the game's own activity, so the game stopped ("Adding window failed"). Seen with Medieval Dynasty, Under Cover and Of Lies and Rain. That's AXRB's side; AXRB's emulator shows dialogs, so `--axrb-backend emulator` may get further (Vulkan games there go through gfxstream).
|
||||
suggest: []
|
||||
report: true
|
||||
- id: axrb-direct-unimplemented-service
|
||||
kind: axrb
|
||||
pattern: '(?m)^AXRB_SERVICE_UNIMPLEMENTED \S+'
|
||||
severity: error
|
||||
diagnosis: The game (or a library in it, often Google Play services) called an Android framework service function AXRB's direct mode doesn't implement yet (the line names it, e.g. IActivityManager.getMyMemoryState for NOPE CHALLENGE); the call throws, and an uncaught one ends the game. That's AXRB's side - report it to AXRB with the diagnostics; AXRB's emulator has the full framework.
|
||||
suggest: []
|
||||
report: true
|
||||
- id: axrb-direct-java-crash
|
||||
kind: axrb
|
||||
pattern: 'E/app: the application crashed|FATAL EXCEPTION: |Runtime aborting|JNI DETECTED ERROR IN APPLICATION'
|
||||
severity: fatal
|
||||
diagnosis: The game's Java side (or Android's ART runtime under it) ended with an uncaught exception or an abort in AXRB's direct mode. direct.log / direct.err have the stack; a framework service AXRB's direct mode doesn't provide yet (Meta/Play services, account, DRM) is the usual cause.
|
||||
suggest: []
|
||||
- id: axrb-direct-missing-function
|
||||
kind: axrb
|
||||
pattern: 'guest called unknown host function|unimplemented JNI function|call to unregistered host function'
|
||||
severity: error
|
||||
diagnosis: The game called an Android/JNI function AXRB's direct mode doesn't implement yet; it may fail right after. Report it to AXRB with the diagnostics.
|
||||
suggest: []
|
||||
- id: axrb-direct-unsupported-syscall
|
||||
kind: axrb
|
||||
pattern: 'W/syscall: unimplemented syscall|W/binder: unsupported (?:command|ioctl|object type)|execve\(.*\) refused: one process image only'
|
||||
severity: warning
|
||||
diagnosis: The game asked for a Linux system call or Binder feature (or a second process) AXRB's direct mode doesn't provide. Often harmless; when the game then fails, it's the first thing to report to AXRB.
|
||||
suggest: []
|
||||
- id: axrb-direct-slow-stop
|
||||
kind: axrb
|
||||
pattern: 'the game did not close within 25 seconds'
|
||||
severity: info
|
||||
diagnosis: The game didn't finish its activity shutdown when the session ended, so AXRB stopped it; anything it hadn't saved yet may be lost.
|
||||
suggest: []
|
||||
# Launch tests run without a worn headset. Some parts give up on tracking after a while and end the VR session; what
|
||||
# the game does after that (often a crash in the GPU driver while its renderer tears down) never happens in the
|
||||
# headset. In a launch test that already had paced frames before such a line, a later exit or crash still passes,
|
||||
@@ -598,6 +704,13 @@ headless_end:
|
||||
- label: the VrApi bridge's 30 s tracking deadline
|
||||
pattern: 'EnterVrMode: no tracked head pose before deadline'
|
||||
milestones: # progress markers, in order; the furthest one reached is reported
|
||||
- {id: axrb-host, kind: axrb, pattern: 'AXRB TCP: listening', label: AXRB bridge started}
|
||||
- {id: axrb-direct-art, kind: axrb, pattern: '(?m)^AXRB_AOSP_BOOTSTRAP', label: Android runtime (ART) started (direct mode)}
|
||||
- {id: axrb-direct-activity, kind: axrb, pattern: '(?m)^AXRB_AOSP_ACTIVITY_CREATED ', label: Game activity created (direct mode)}
|
||||
- {id: axrb-runtime, kind: axrb, pattern: 'AXRB\.PoseClient|Got runtime: package: com\.axrb\.openxrruntime', label: AXRB's OpenXR runtime loaded}
|
||||
- {id: axrb-instance, kind: axrb, pattern: 'xrCreateInstance\(\) succeeded|LoaderInstance::CreateInstance succeeded', label: OpenXR instance created}
|
||||
- {id: axrb-direct-vulkan, kind: axrb, pattern: '(?m)I/vulkan: vkCreateDevice\(.*\) = 0$', label: Vulkan device created on the PC's GPU (direct mode)}
|
||||
- {id: axrb-frames, kind: axrb, pattern: 'AXRB\.Perf end-frame', label: Submitting frames}
|
||||
- {id: pcvr-launch, kind: pcvr, pattern: 'FramePort: launching|Launched injector with', label: Launcher started}
|
||||
- {id: pcvr-oculus-hmd, kind: pcvr, pattern: 'FramePort oculushmd: OculusHMDConnected event ready', label: Oculus headset event provided}
|
||||
- {id: pcvr-inject, kind: pcvr, pattern: 'Succesfully injected|Successfully injected', label: Revive injected into the game}
|
||||
|
||||
@@ -60,30 +60,6 @@
|
||||
`launch.sh` at the new folder and only then deletes the old copy; on the same filesystem it renames instead.
|
||||
Moving a game whose Lepton data holds absolute paths, or a PC VR prefix, is not yet verified on the device.
|
||||
|
||||
## Room data
|
||||
|
||||
- SteamVR on the Frame has no Meta scene/anchor extensions. Its chaperone supplies only a 2D outline raised to
|
||||
2.43 m, without furniture, ceiling or a room mesh. Valve's default boundary is a 20-point circle of roughly 1 m
|
||||
radius; FramePort refuses to treat it as a room.
|
||||
- FrameBridge's `scene_emul=1` serves saved room data, with a guardian box when no room is available. OVRPort's
|
||||
loader only dispatches functions in its own table: newer Meta entry points go through FramePort's extension shim.
|
||||
MRUK uses discovery (`xrDiscoverSpacesMETA`, older versions `xrQuerySpacesFB`) and requests Space Setup when
|
||||
discovery returns no rooms. Volumes hang below their top-face anchor in Meta's coordinate convention.
|
||||
- Room files use STAGE coordinates (metres, +Y up, floor y=0, -Z forward). The format contract is
|
||||
[mr/ROOM_FORMAT.md](mr/ROOM_FORMAT.md). On the Frame: `~/.local/share/frameport/rooms/<universe>/room.txt`,
|
||||
optional `room-mesh.bin` and `scan.log`; `rooms/current` points to the most recently saved room.
|
||||
- A room belongs to its chaperone universe. The agent reads the last universe switch from `vrserver.txt`, falling
|
||||
back to the newest universe in `~/.config/openvr/config/chaperone_info.vrchap`; dummy 424242 means none.
|
||||
A matching room is selected first, else `current`; the app reports `aligned: false` after a universe change.
|
||||
- Quest launchers copy that room beside `settings.conf` before Lepton starts; FrameBridge reads
|
||||
`dirname($FRAMEBRIDGE_CONFIG)/room.txt`. Stale copies are removed if no room exists or emulation is disabled.
|
||||
Each game's persistent anchors stay in `/sdcard/Android/data/<pkg>/files/framebridge-anchors.txt`.
|
||||
- Frame → Room and `frameport frame room` manage rooms. `from-boundary` creates walls without furniture;
|
||||
`import` / `export` transfer room files; `show` writes an SVG preview; `build <dump.fprs>` syncs the bundled
|
||||
`fp_roomscan` by SHA-256 and runs it on the Frame with `--offline`. Headset capture (`room_capture`) deliberately
|
||||
returns "not implemented yet" pending the RoomView device spike. The scanner consumes recorded RoomView meshes
|
||||
from `/xrservice/roomview3d/meshData` + `/meshLayout` (`IVRBlockQueue_005`); it does not capture them itself.
|
||||
|
||||
## OpenXR runtime (as seen by games through overport's loader)
|
||||
- Instance extensions present include KHR_android_create_instance (must be enabled; the adapter adds it),
|
||||
KHR_vulkan_enable(2), KHR_opengl_es_enable, KHR_composition_layer_depth, FB_display_refresh_rate, EXT_hand_tracking
|
||||
|
||||
@@ -13,14 +13,11 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
|
||||
| Arkio | Quest | ✅ Works | |
|
||||
| Asgard's Wrath 2 | Quest | ✅ Works | |
|
||||
| Assassin's Creed Nexus | Quest | ✅ Works | |
|
||||
| Attack on Titan VR: Unbreakable | Quest | ✅ Works | |
|
||||
| Audica | Quest | ✅ Works | |
|
||||
| AugmentedEmpire | Quest | ✅ Works | |
|
||||
| BAM | Quest | ✅ Works | |
|
||||
| BARTENDER VR SIMULATOR | Quest | ✅ Works | |
|
||||
| Batman: Arkham Shadow | Quest | ✅ Works | |
|
||||
| BattleGlide | Quest | ✅ Works | |
|
||||
| Battlemarked | Quest | ✅ Works | |
|
||||
| BattleSisters | Quest | ✅ Works | |
|
||||
| Beat Saber | Quest | ✅ Works | |
|
||||
| Beat Saber | Quest | ✅ Works | |
|
||||
@@ -30,19 +27,16 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
|
||||
| BlazeRush | Quest | ✅ Works | |
|
||||
| BodyCombat | Quest | ✅ Works | |
|
||||
| BONELAB | Quest | ✅ Works | |
|
||||
| Breathedge VR | Quest | ✅ Works | |
|
||||
| Carve Snowboarding | Quest | ✅ Works | |
|
||||
| Caves | Quest | ✅ Works | |
|
||||
| Cities: VR | Quest | ✅ Works | |
|
||||
| Clockwork | Quest | ✅ Works | |
|
||||
| COMPOUND | Quest | ✅ Works | |
|
||||
| Cook-Out | Quest | ✅ Works | |
|
||||
| Cosmodread | Quest | ✅ Works | |
|
||||
| Creed | Quest | ✅ Works | |
|
||||
| Crisis Zone VR | Quest | ✅ Works | |
|
||||
| cubism | Quest | ✅ Works | |
|
||||
| Dance Central | Quest | ✅ Works | |
|
||||
| Deep Cuts | Quest | ✅ Works | |
|
||||
| Demeo | Quest | ✅ Works | |
|
||||
| Demeter | Quest | ✅ Works | |
|
||||
| Dinosaur Island | Quest | ✅ Works | |
|
||||
| Doom3Quest | Quest | ✅ Works | |
|
||||
@@ -52,12 +46,10 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
|
||||
| Eleven Table Tennis | Quest | ✅ Works | |
|
||||
| Eleven: Table Tennis VR | PC VR | ✅ Works | |
|
||||
| Espire 2 | Quest | ✅ Works | |
|
||||
| Eye of the Temple | Quest | ✅ Works | |
|
||||
| FrenzyVR | Quest | ✅ Works | |
|
||||
| Fruit Ninja | Quest | ✅ Works | |
|
||||
| Fruit Salon | Quest | ✅ Works | |
|
||||
| Genotype | Quest | ✅ Works | |
|
||||
| Ghost Town | Quest | ✅ Works | |
|
||||
| Ghostbusters: Rise of the Ghost Lord | Quest | ✅ Works | |
|
||||
| GORN2 | Quest | ✅ Works | |
|
||||
| Gravity Lab | Quest | ✅ Works | |
|
||||
@@ -69,33 +61,25 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
|
||||
| In Death: Unchained | Quest | ✅ Works | |
|
||||
| Into The Radius 2 | Quest | ✅ Works | |
|
||||
| Job Simulator | Quest | ✅ Works | |
|
||||
| Journey of the Gods | Quest | ✅ Works | |
|
||||
| Jurassic World Aftermath Collection | Quest | ✅ Works | |
|
||||
| Keep Talking and Nobody Explodes | Quest | ✅ Works | |
|
||||
| Kill It With Fire VR | Quest | ✅ Works | |
|
||||
| Ladder | Quest | ✅ Works | |
|
||||
| Lambda1VR | Quest | ✅ Works | |
|
||||
| LEGO® Bricktales | Quest | ✅ Works | |
|
||||
| Lost Recipes | Quest | ✅ Works | |
|
||||
| Lucky's Tale | Quest | ✅ Works | |
|
||||
| Maestro | Quest | ✅ Works | |
|
||||
| Marvel's Deadpool VR | Quest | ✅ Works | |
|
||||
| Marvel's Iron Man VR | Quest | ✅ Works | |
|
||||
| Max Mustard | Quest | ✅ Works | |
|
||||
| Medieval Dynasty New Settlement | Quest | ✅ Works | |
|
||||
| Metro Awakening | Quest | ✅ Works | |
|
||||
| Mini Motor Racing X | Quest | ✅ Works | |
|
||||
| Mobile Suit Gundam: Silver Phantom | Quest | ✅ Works | |
|
||||
| Moss | Quest | ✅ Works | |
|
||||
| Moss: Book II | Quest | ✅ Works | |
|
||||
| Munkr Funkr (The Legacy Days) | Quest | ✅ Works | |
|
||||
| Nano | Quest | ✅ Works | |
|
||||
| Neko Atsume Purrfect | Quest | ✅ Works | |
|
||||
| NEX Player | Quest | ✅ Works | |
|
||||
| NFL PRO ERA II | Quest | ✅ Works | |
|
||||
| NOPE CHALLENGE | Quest | ✅ Works | |
|
||||
| Ocean Rift | Quest | ✅ Works | |
|
||||
| Operation Wolf Returns: First Mission VR | Quest | ✅ Works | |
|
||||
| palazzo_santacruz | Quest | ✅ Works | |
|
||||
| Path of the Warrior | Quest | ✅ Works | |
|
||||
| Pistol Whip | Quest | ✅ Works | |
|
||||
@@ -113,12 +97,9 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
|
||||
| Riven | Quest | ✅ Works | |
|
||||
| Robo Recall | Quest | ✅ Works | |
|
||||
| RUINSMAGUS | Quest | ✅ Works | |
|
||||
| Sclerosis | Quest | ✅ Works | |
|
||||
| Shadow Point | Quest | ✅ Works | |
|
||||
| Shoot The Zombirds VR | Quest | ✅ Works | |
|
||||
| Shores of Loci | Quest | ✅ Works | |
|
||||
| SilentSlayer | Quest | ✅ Works | |
|
||||
| Smash Drums | Quest | ✅ Works | |
|
||||
| Sniper Elite VR | Quest | ✅ Works | |
|
||||
| Sniper Elite VR: Winter Warrior | Quest | ✅ Works | |
|
||||
| Space Pirate Trainer Quest | Quest | ✅ Works | |
|
||||
@@ -131,12 +112,9 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
|
||||
| SUPERHOT VR | Quest | ✅ Works | |
|
||||
| SynthRiders | Quest | ✅ Works | |
|
||||
| Taskmaster | Quest | ✅ Works | |
|
||||
| Tea For God | Quest | ✅ Works | |
|
||||
| TetrisEffect | Quest | ✅ Works | |
|
||||
| The Boys VR | Quest | ✅ Works | |
|
||||
| The Climb | Quest | ✅ Works | |
|
||||
| The Climb 2 | Quest | ✅ Works | |
|
||||
| The Last Clockwinder | Quest | ✅ Works | |
|
||||
| The Room VR | Quest | ✅ Works | |
|
||||
| The Tale of Onogoro | Quest | ✅ Works | |
|
||||
| Time Crisis II VR (Test) | Quest | ✅ Works | |
|
||||
@@ -150,8 +128,6 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
|
||||
| Vader Immortal: Episode II | Quest | ✅ Works | |
|
||||
| Vader Immortal: Episode III | Quest | ✅ Works | |
|
||||
| Vampire Survivors | Quest | ✅ Works | |
|
||||
| Vendetta Forever | Quest | ✅ Works | |
|
||||
| Vermillion | Quest | ✅ Works | |
|
||||
| VR HOT Quest | Quest | ✅ Works | |
|
||||
| VR4 | Quest | ✅ Works | |
|
||||
| Walkabout Mini Golf | Quest | ✅ Works | |
|
||||
@@ -165,30 +141,26 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
|
||||
| Does it Stack? | Quest | ⚠️ Works with issues | Mixed reality mode does not work (works on Demeo), everything else seems to be OK |
|
||||
| Dungeons of Eternity | Quest | ⚠️ Works with issues | It can not connect to servers |
|
||||
| End Space | Quest | ⚠️ Works with issues | Controls stop responding after the first mission loads. |
|
||||
| Exploding Kittens VR | Quest | ⚠️ Works with issues | Requires online for most modes. |
|
||||
| ExploreVR | Quest | ⚠️ Works with issues | The 3D world warps and shifts with head movement (wrong perspective). |
|
||||
| Fisherman | Quest | ⚠️ Works with issues | Loading screens have corruption, but everything works otherwise. |
|
||||
| Homeworld: Vast Reaches | Quest | ⚠️ Works with issues | The game starts but after selecting to start a new game it seems to crash. |
|
||||
| Lawn Mowing Simulator VR | Quest | ⚠️ Works with issues | Left eye textures flicker only when mowing in specific areas. |
|
||||
| Freedom | Quest | ⚠️ Works with issues | Volume can't be changed in the game. |
|
||||
| MacacoVR | Quest | ⚠️ Works with issues | 2d loading screens are glitchy, otherwise main gameplay is fine |
|
||||
| Majora's Mask VR | Quest | ⚠️ Works with issues | Audio on the file select screen sounds crunchy. |
|
||||
| Myst | Quest | ⚠️ Works with issues | Minor graphical glitches on some objects. |
|
||||
| Phantom: Covert Ops | Quest | ⚠️ Works with issues | DLC/store button crashes (no Meta store). |
|
||||
| Pinball FX VR | Quest | ⚠️ Works with issues | Plays; mixed reality mode not working yet. |
|
||||
| Plezy | Quest | ⚠️ Works with issues | Some videos play with strong artifacts and wrong colours; the cause is unknown, possibly hardware video decoding. |
|
||||
| Quantum Void | Quest | ⚠️ Works with issues | no hands |
|
||||
| Ragnarock | Quest | ⚠️ Works with issues | |
|
||||
| Real VR Fishing | Quest | ⚠️ Works with issues | Seems to be almost 100% functional with meta permissions enabled. |
|
||||
| Silhouette | Quest | ⚠️ Works with issues | Hand-tracking game; the Frame synthesizes hands from controllers, so it is janky. |
|
||||
| SmartTube | Quest | ⚠️ Works with issues | Android's home screen shows for a few seconds while the app starts (normal for flat Android apps; longest on the first start after an install). |
|
||||
| Spunky Dungeon | Quest | ⚠️ Works with issues | Gear VR / Oculus Go game (32-bit only), runs through FramePort's 32-bit bridge (experimental). |
|
||||
| Swarm 2 | Quest | ⚠️ Works with issues | MSAA creates visible seams around edge geometry and also the skybox edge |
|
||||
| The Light Brigade | Quest | ⚠️ Works with issues | Judder in weapons |
|
||||
| The Thrill Of The Fight | Quest | ⚠️ Works with issues | Right eye doesn't draw the opponent or the referee. |
|
||||
| Time Stall | Quest | ⚠️ Works with issues | Both eyes distort during movement (unresolved). |
|
||||
| Vermillion | Quest | ⚠️ Works with issues | Runs. |
|
||||
| WiiCompiled VR | Quest | ⚠️ Works with issues | To add a game: in FramePort's Files tab, upload your .wcgame file to this game's storage, folder Android/data/org.wiicompiled.quest/files/WiiCompiledOpenXRVR… |
|
||||
| Deadly Delivery | Quest | ❌ Doesn't run | Quits after Meta's entitlement check fails: it needs Meta's online services. |
|
||||
| Espire 1: VR Operative (Quest Edition) | Quest | ❌ Doesn't run | Mesa GL driver crash during texture upload. |
|
||||
| GOLF+ | Quest | ❌ Doesn't run | Black screen. |
|
||||
| HITMAN 3 VR: Reloaded | Quest | ❌ Doesn't run | Vulkan driver crash (freedreno), even without Valve layers. |
|
||||
| Journey of the Gods | Quest | ❌ Doesn't run | 32-bit only; the Frame has no AArch32. |
|
||||
| Roblox | Quest | ❌ Doesn't run | Crashes on its first VR frame on the Frame. |
|
||||
| Shadow Point | Quest | ❌ Doesn't run | 32-bit only; the Frame has no AArch32. |
|
||||
@@ -1,83 +0,0 @@
|
||||
# Evaluating patch heuristics
|
||||
|
||||
`scripts/eval_heuristics.py` compares `engine.suggest(analysis, use_catalog=False)` with the bundled
|
||||
`catalog/games/*.yaml` entries. It does not merge personal or remote catalog recipes into the benchmark.
|
||||
It supports the original dumps command, or a precomputed `scripts/heuristics_snapshot.py` snapshot:
|
||||
|
||||
```sh
|
||||
.venv/bin/python scripts/eval_heuristics.py '<dumps folder>' --verbose
|
||||
.venv/bin/python scripts/eval_heuristics.py --snapshot analyses.json --split all --json baseline.json
|
||||
.venv/bin/python scripts/eval_heuristics.py --snapshot analyses.json --fit-report --out fit-report.md
|
||||
```
|
||||
|
||||
Use a scratch `FRAMEPORT_HOME`, `FRAMEPORT_NO_CATALOG_UPDATE=1`, and an empty `FRAMEPORT_WINDOWS_DATA` for offline
|
||||
measurement. Snapshot mode reads no APKs or game data. Each snapshot read copies the source to a temporary file,
|
||||
then parses the copy, retrying incomplete JSON. To compare multiple splits against an actively growing snapshot,
|
||||
freeze one valid copy first and use that file for every run.
|
||||
|
||||
The default split is `dev`. `split_packages({package: analysis_engine})` sorts packages by SHA-256 within Unity,
|
||||
Unreal, and Other strata, then holds out the nearest 20% (half rounded up). Pass only packages with both an analysis
|
||||
and a catalog entry. The same input set always yields the same split regardless of iteration order; adding packages
|
||||
can move the cutoff. Very small strata can have no holdout. Unsupported entries participate in splitting.
|
||||
|
||||
## What is scored
|
||||
|
||||
Ground truth contains catalog choices and patch registry defaults, with no inherited heuristic adapter settings.
|
||||
Default expectations are determined per analysis, using each default patch's own detection in the same way as the
|
||||
engine's initial heuristic pass. Thus a conditional default that is not detected (e.g. LTW on a game without LTW)
|
||||
is not expected. Explicit catalog `overport_remove` and `frame_remove` entries remove expected defaults. An absent
|
||||
expected default is represented as `remove:<patch id>`; enabled defaults do not inflate patch scores.
|
||||
|
||||
Opt-in overport/frame/device/PC VR IDs, default removals, adapter values, device-file names, foveation parameters,
|
||||
and alternate-build patch IDs are compared. Alternate-build identities use `alt:<patch id>` so choosing one in a
|
||||
fallback is distinct from choosing it in the primary build. Device-file content is not compared. Adapter values
|
||||
must match: a wrong value contributes both an FP and an FN for `adapter.<key>`. Patch precision, recall and F1 are
|
||||
micro-averaged across games; an empty denominator is reported as zero. Exact-game accuracy also compares the
|
||||
unsupported status flag. Fields report matching games, including empty-field matches.
|
||||
|
||||
`RUNTIME_ONLY` lists choices excluded from the headline: `use_alt`, selected runtime adapter settings, Lepton
|
||||
environment variables, and config-sync settings. They have their own exact, field and patch metrics. Catalog
|
||||
entries with status `unsupported` are excluded from both headline and runtime supported-game metrics, and have
|
||||
separate metrics and per-game diffs. Converted analyses are included and marked. JSON contains all metrics per
|
||||
engine, all game signatures, split assignments, and missing/extra decisions.
|
||||
|
||||
## Dated score: catalog gaps vs. detection errors
|
||||
|
||||
The strict score treats the catalog as complete, but older entries were verified before many patches existed, and
|
||||
a catalog recipe inherits every heuristic adapter setting and device patch (except `device.text_input_window`)
|
||||
without listing them (`engine.suggest`), so the verified build had those. The dated score (`headline_dated`, printed
|
||||
under "Dated") sets aside, on both sides:
|
||||
|
||||
- patches first committed after the entry's `verified.date` (the verifier couldn't have chosen them), and
|
||||
- inherited adapter/device picks (`inherited_decisions`).
|
||||
|
||||
What remains are real disagreements: an extra on an entry verified after the patch existed, or a catalog choice
|
||||
the heuristics don't make. Gaps are counted per patch ("Catalog gaps by patch"). The dated score needs the intro
|
||||
date cache that `--fit-report` writes; without it only inherited picks are set aside.
|
||||
|
||||
Before tuning a rule to remove an "extra", check which kind it is: a gap on an old entry is a candidate for the
|
||||
catalog (fit report), not a detection error. Before adding a patch to a working entry, weigh its benefit (does it
|
||||
fix something the game hits?) against a rebuild prompt for everyone who installed it; adapter settings never need
|
||||
adding (inherited). Results 2026-10-15: strict 5/65 exact, F1 73.8%; dated 39/65, F1 88.6% (dev 90.5%, holdout
|
||||
79.5%). Remaining misses are one-game fixes found at runtime (e.g. Vader's gl_error_clear, BlazeRush's GL settings).
|
||||
|
||||
An evaluation writes JSON even when its headline has differences, then exits 1 for compatibility with the original
|
||||
script. It exits 0 when exact, or after producing a fit report.
|
||||
|
||||
## New patch fit
|
||||
|
||||
The fit report covers all catalog entries, independently of `--split`. Candidates come from the final heuristic
|
||||
recipe, preserving platform, flat-app, dependency, and 32-bit normalization rules. A candidate must also be opt-in,
|
||||
applicable and recommended by its own `detect()`. Entries already listing or explicitly removing the patch are
|
||||
excluded; a listed adapter key is excluded regardless of its value. This report proposes additions, not value edits.
|
||||
|
||||
Each candidate includes its reason, experimental/strict flags, first local git introduction date, catalog entry
|
||||
date (`verified.date`; `updated` only without one, since it also moves for unrelated edits), and whether the
|
||||
patch is newer. Unknown dates are marked unknown. Warnings
|
||||
come from the full catalog recipe plus that one candidate; they may include pre-existing conflicts. Missing-analysis
|
||||
entries appear as metadata-only rows. Intro dates, including unknown results, are cached in
|
||||
`patch-intro-dates.json` beside the snapshot (or dumps folder); subsequent runs only query uncached patch IDs.
|
||||
|
||||
`tests/test_eval_heuristics.py` uses synthetic data. The opt-in real-dump test in `tests/test_games.py` ratchets the
|
||||
supported all-split exact ratio and patch F1 against measured, rounded-down baseline constants. Machine-local
|
||||
`.eval-home/` and `.eval-results/` scratch outputs are ignored by git.
|
||||
@@ -167,10 +167,6 @@ FramePort downloads it, checks it, restarts and keeps your games and settings. *
|
||||
- Settings → **Updates** turns the check off or turns on **Install updates automatically**.
|
||||
- **Recipes** (the tested patches and settings for each game) update by themselves. A game whose recipe changed shows
|
||||
**Update on Frame**.
|
||||
- **A newer version of a game:** right-click it (or use **…** on its page) → **Update with a newer APK…** (Quest and
|
||||
Android games) or **Update with a newer version…** (Linux apps: the new AppImage, archive or folder; PC VR games:
|
||||
the new game folder). Its name, artwork, tags and your settings stay. Then click **Update on Frame** (or **on this
|
||||
PC**).
|
||||
- **Dev builds:** if you're asked to test a change before its release, use Settings → Updates → **Install the latest
|
||||
dev build…**. The next release then arrives as a normal update.
|
||||
|
||||
@@ -259,7 +255,6 @@ option. The main ones:
|
||||
|---|---|
|
||||
| `scan <folder>` / `list` / `show <game>` | add games, list the library, show a game's patches |
|
||||
| `add-linux <path> [--exe <program>]` | add a Linux app (AppImage, folder or archive) |
|
||||
| `new-version <game> <path>` | point a game at its newer version (APK, Linux app file/folder, PC VR game folder) |
|
||||
| `recipe <game> --enable/--disable <patch>` | change a game's patches (`patches` lists them all) |
|
||||
| `build <game>` / `install <game>` / `test <game>` | build, install on the Frame (`--to pc` for this PC), launch test |
|
||||
| `frame discover` / `frame connect` / `frame info` | find, connect to and describe the Frame |
|
||||
|
||||
@@ -0,0 +1,470 @@
|
||||
# Quest games on this PC (AXRB)
|
||||
|
||||
FramePort's PC target ("This PC") already runs Oculus Rift games through Revive. For Quest/Android games it uses
|
||||
**AXRB** (Android XR Bridge, github.com/Android-XR-Bridge/AXRB): an Android 16 emulator (x86_64 Google APIs image,
|
||||
WHPX) that runs arm64 games through Android's ARM translation (`libndk_translation`), with AXRB's own OpenXR runtime
|
||||
inside Android and a Windows host process (`axrb-host-bridge.exe`) that opens a real OpenXR session on the PC's
|
||||
runtime (SteamVR, Virtual Desktop, ...). FramePort only drives it: it downloads AXRB's official release when a user
|
||||
first installs a Quest game on the PC, never bundles or modifies it (AXRB's host/clock code is under the AXRB
|
||||
Source-Available License 1.0, which allows running it and interoperating through its public interfaces).
|
||||
|
||||
Status: **experimental**. AXRB is young (v1.0.4, 2026-10-06) and many games still fail in it; Steam Frame
|
||||
controllers don't work in AXRB yet (AXRB issue #20).
|
||||
|
||||
## Two backends: the emulator (1.0.4) and direct mode (2.x, "AXRB-Emulatorless")
|
||||
|
||||
AXRB's main branch (2026-10-15, launcher 2.0.0) became **AXRB-Emulatorless**: a separate program (own installer,
|
||||
app id `org.axrb.emulatorless`, `%LOCALAPPDATA%\Programs\axrb-emulatorless-launcher`, runtime
|
||||
`%LOCALAPPDATA%\AXRB-Emulatorless Runtime`, profile `%APPDATA%\AXRB-Emulatorless`) whose **direct mode** runs the
|
||||
game without an emulator: `axrb-direct.exe` translates the game's arm64 code (Dynarmic JIT; Digitalis optional) and
|
||||
runs the real AOSP ART + framework from Google's Android 16 arm64 system image, with its own Linux syscall/Binder
|
||||
layer; Vulkan goes to the Windows driver, frames and tracking through the same `axrb-host-bridge.exe`. **Vulkan only:**
|
||||
its EGL is a stub, there is no GLES renderer. Both programs can be installed side by side; FramePort keeps one
|
||||
`axrb.Install` record per backend (`backend`, `version`, app folder, AXRB's root = `resources\runtime`, runtime
|
||||
folder) and picks per game:
|
||||
|
||||
- **Choice** (`targets/pc_android.choose_backend`): `--axrb-backend direct|emulator` on `frameport install --to pc`,
|
||||
else the recipe's `pc.axrb_backend` (device category, `on_pc`: part of the PC build's selection, no-op on the
|
||||
Frame), else **direct for `graphics` Vulkan, emulator for GLES / unknown**. Unreal games never declare
|
||||
`android.hardware.vulkan`; since analysis version 20 their manifest meta-data
|
||||
`com.epicgames.{ue4,unreal}.GameActivity.bSupportsVulkan` = true makes them "Vulkan (Unreal bSupportsVulkan)"
|
||||
(UE 4.25+ Quest builds, e.g. Deadpool VR, Pinball FX VR, Myst; false or missing = GLES: Espire 1, Vader Immortal). `deployment.json` records `backend`
|
||||
and the launcher `flags`; installs from before have none (= emulator). Switching leaves the other backend's copy
|
||||
and saves alone.
|
||||
- **Per-game options** (`pc.axrb_backend` params → `run_direct_game.ps1` switches): `translator` (`dynarmic` =
|
||||
AXRB's default, `digitalis`), `precompose` (`-PrecomposeProjectionLayers`, also for the emulator's
|
||||
`run_windows_game.ps1`; also taken from AXRB's own `core/game-compatibility.json` profile for the game, e.g. The
|
||||
Climb 2), `legacy_oculus_driver` / `quest_identity` / `controllers_only` (for unconverted store APKs with older
|
||||
Oculus loaders; off by default and never taken from AXRB's profiles: FramePort always hands AXRB an OVRPort build;
|
||||
`controllers_only` only works with the legacy driver, as `prepare_art_session.py` requires).
|
||||
- **Install/upgrade** (`tools/axrb.install`): `releases/latest` when it has the backend's installer
|
||||
(`AXRB-Setup-*.exe` / `AXRB-Emulatorless-Setup-*.exe`, SHA256SUMS checked, `/S`), else the known-good release
|
||||
(`KNOWN_GOOD = {"emulator": "1.0.4"}`, `releases/tags/v1.0.4`). An install older than the known-good one is
|
||||
upgraded on use; `frameport pc install-axrb --backend … --update` upgrades to the release on offer. No 2.x release
|
||||
is published yet: **`FRAMEPORT_AXRB_DIRECT_DIR`** names a local build (AXRB's source tree after
|
||||
`scripts\build\build_direct.ps1` + the host build, its `out\direct`, or a folder laid out like the installed
|
||||
`resources\runtime`): it needs the files of AXRB's `core/direct-runtime-files.cjs` (`out\direct\axrb-direct.exe`,
|
||||
`art\axrb-bootstrap.dex`, `art\lib64\*`, `guest\lib64\*`, `guest\axrb-systemdriver.apk`) plus
|
||||
`scripts\run\run_direct_game.ps1`, `scripts\run\stop_game.ps1`, `scripts\paths.ps1`,
|
||||
`direct\tools\make_sysroot.py`, `direct\tools\prepare_art_session.py`, `out\host\bin\Release\axrb-host-bridge.exe`
|
||||
(+ `openxr_loader.dll`, `out\gpu\Release` for the GPU-share layer) and ideally `tools\python` (else Python from
|
||||
PATH). A local build is set up but never replaced. `FRAMEPORT_AXRB_DIRECT_RUNTIME` overrides the runtime folder
|
||||
(default: the launcher's `library.json` `settings.managedDirectory`, else `%LOCALAPPDATA%\AXRB-Emulatorless Runtime`).
|
||||
- **Direct setup** (`axrb.setup_direct`, what `core/direct.mjs ensureDirectSystem` does): the pinned image
|
||||
(`arm64-v8a-36_r02.zip`, 810,736,863 bytes, SHA-1 `62ad6714…`; values read from the installed `core/direct.mjs`,
|
||||
only `dl.google.com`) into its own empty folder, AXRB's `make_sysroot.py <zip> <runtime>\direct\sysroot.new --art`
|
||||
with AXRB's embedded Python, receipt `.axrb-sysroot.json` `{"digest","format"}`, rename to `sysroot`, archive
|
||||
deleted; `license-acceptance.json` like AXRB's DirectSetup. Ready = receipt matches + the key files exist and
|
||||
aren't empty + AXRB's direct files complete. Requirements: ≥ 6 GB RAM, `vulkan-1.dll` (no hypervisor, no GPU
|
||||
vendor gate).
|
||||
- **Direct install** (no adb): the PC build is copied to `%LOCALAPPDATA%\FramePort\axrb\games\<pkg>\<pkg>.apk`
|
||||
(FramePort removes its converted copies after an install; `FRAMEPORT_AXRB_LAUNCHER_DIR` moves FramePort's `axrb`
|
||||
folder, for isolated `FRAMEPORT_HOME` runs), the launch activity comes from the APK's manifest
|
||||
(`axml.launcher_activity`, `pkg/fully.qualified.Class`), the data files become AXRB's content list `assets.txt`
|
||||
(`Android/obb/<pkg>/<file>\t<Windows path>`, read-only mounts of the files where they are; WSL-only folders, which
|
||||
Windows reads only through `\\wsl$`, are copied next to the APK). AXRB's `prepare_art_session.py` turns every
|
||||
content file into one `--mount-ro` argument of `axrb-direct.exe` (with the path resolved: junctions and 8.3 names
|
||||
don't shorten it), and Batman's 90 files from a long dump folder made a 32,876-character command line (Windows'
|
||||
limit is 32,767: "The filename or extension is too long"). A list over 25,000 characters therefore goes through
|
||||
hard links in `games\<pkg>\content` (no extra space; only on the drive FramePort's folder is on), else the install
|
||||
stops with a clear message. App data and saves: `<runtime>\direct\data\data\<pkg>` and
|
||||
`direct\sdcard\Android\data\<pkg>`.
|
||||
- **Play**: Steam shortcut → `%LOCALAPPDATA%\FramePort\axrb\fp-axrb-direct.ps1 -Package … -Activity … [flags]` →
|
||||
sets `AXRB_DATA_HOME=<runtime>\output` (as AXRB's launcher does) → AXRB's `run_direct_game.ps1 -Apk -Package
|
||||
-Activity -GameName -Executable <root>\out\direct\axrb-direct.exe -DataDirectory <runtime>\direct -Sysroot
|
||||
<runtime>\direct\sysroot [-AssetList] -Translator …`. Exit 4 = host lost.
|
||||
- **Launch test**: watches `direct.out` for `AXRB_AOSP_ACTIVITY_CREATED` / `AXRB_AOSP_LIFECYCLE` (5 min for ART's
|
||||
interpreted first start), runs, then stops through AXRB's `stop_game.ps1 -ParentPid` (closes the bridge window;
|
||||
the run script lets the game pause/stop/save). Logs `<runtime>\output\logs\game\{direct.out, direct.err,
|
||||
direct.log, host.err, host.log, session.json}` (diagnostics: `axrb/direct/*`); triage signatures
|
||||
`axrb-direct-*` and milestones ART started → activity created → OpenXR → Vulkan device (`catalog/triage.yaml`).
|
||||
|
||||
**Tested end to end with a local build** (2026-10-15, AXRB `windows-android16` @ 59626ac built on the dev PC,
|
||||
`FRAMEPORT_AXRB_DIRECT_DIR` = its staged `runtime\`, the staged sysroot reached through a junction
|
||||
`<FRAMEPORT_AXRB_DIRECT_RUNTIME>\direct\sysroot`; Monado's simulated HMD, see below): scan → PC build → direct
|
||||
install → `frameport test --to pc --sim --axrb-backend direct` → launcher → AXRB's run script → bridge + runner →
|
||||
milestones → AXRB's Stop. Still untested: the 2.x NSIS installer (no release yet), `setup_direct`'s download +
|
||||
`make_sysroot.py` path, the upgrade of an installed 1.0.x, AXRB's launcher seeing FramePort-set-up runtimes.
|
||||
|
||||
### Direct-mode results (2026-10-15, Monado simulated HMD at 72 Hz, Dynarmic, no headset)
|
||||
|
||||
PC build = the catalog recipe's PC selection (OVRPort's patches + `on_pc` fixes + FrameBridge with `focus_hold=0`),
|
||||
no `pc.axrb_backend` options. "fps" = AXRB.Perf `end-frame` (game) / `host-fresh-submit` (bridge → Monado), the
|
||||
median of the last summaries. What is drawn was judged from Monado's window and AXRB's layer captures.
|
||||
|
||||
| Game (engine, graphics) | Reached | fps | Picture | Blocker / notes |
|
||||
|---|---|---|---|---|
|
||||
| Batman: Arkham Shadow 1.4.1-350961 (Unity, Vulkan; 90 content files, 27 GB) | menu (SELECT REGION) in ~25 s | 63.7 / 62.9 | stereo menu over the Batcave scene, both eyes correct | none; needed the content-list fix (command line overflow) and hard links; stop clean (activities stopped) |
|
||||
| PowerWash Simulator VR 2.5.0 (Unity 2020.3, Vulkan) | in game: the garage hub (~3-4 min; at 90 s still its loading logo) | 70.5 / 69.8 | garage in both eyes, both hands drawn at the simulated controllers | none; Meta multiplayer callbacks throw NullReferenceExceptions (no Meta services, harmless so far) |
|
||||
| LEGO Bricktales 2.1 (Unity, Vulkan, URP) | scene `Diorama_Hub_Startup` loaded (~3 min) | 72 / 72 | intro text panel ("You want to free the simulation? Follow the white rabbit.") on black, both eyes | stop slow: the game didn't finish its activity shutdown in 25 s (`axrb-direct-slow-stop`); Meta achievements fail (no Meta services, harmless) |
|
||||
| Toy Master 1.1.2 (Unity 2022.3, **GLES**) | activity created, then crash in 18 s | - | - | not a Vulkan game: "Vulkan (Unity boot.config)" came from the Oculus plugin's `xr-vulkan-*` keys; Unity: "Unable to retrieve the default EGL display!" + SIGTRAP. Automatic choice now sends such games to the emulator |
|
||||
| Marvel's Deadpool VR 1.0.40 (UE 4.27, Vulkan; `frame.vk_sanitize` in the build) | first-run LANGUAGE menu (~3 min; at 90 s still loading at 1-2 fps) | 64 (FrameBridge pacing) | game-drawn stereo menu, both eyes | none; AXRB transcodes ASTC to BC on the GPU; stop slow (`axrb-direct-slow-stop`) |
|
||||
| Pinball FX VR 1.9 (UE 5.3, Vulkan, 7 GB OBB) | 3D lobby with the Terms & Conditions panel (~4 min) | ~60 (FrameBridge pacing) | arcade hall + panel in both eyes | none of the emulator's blockers (gfxstream `vkAllocateMemory` SIGSEGV, and Refract's FRSQRTE SIGILL / ASTC layout probe / promoted extension names) showed up in direct mode (no SIGILL under Dynarmic, no ASTC or device-loss failure; AXRB stores ASTC as BC); OVRPlugin's xrPerfSettingsSetPerformanceLevelEXT unsupported (harmless) |
|
||||
| Myst 3.3.0 (UE 5.3, Vulkan) | loading screen (book), then its starfield intro | 72 | stereo, both eyes | a white splash quad at first (texture not shown yet), then normal |
|
||||
| Metro Awakening 1.0-916944 (UE 5.2, Vulkan) | splash art, then the USER DATA COLLECTION consent screen with the laser pointer | 72 | stereo, both eyes | stop slow (`axrb-direct-slow-stop`) |
|
||||
|
||||
Unreal Vulkan games: before analysis version 20 every Unreal game was "GLES or unknown" (Unreal never declares
|
||||
`android.hardware.vulkan`), so the automatic choice sent them to the emulator; now `GameActivity.bSupportsVulkan`
|
||||
picks direct mode (Myst and Metro above were installed without `--axrb-backend`). Unreal probes EGL before it
|
||||
creates its Vulkan device, which tripped `axrb-direct-no-gles`; the signature now needs no Vulkan device. None of
|
||||
the four needed a recipe change for the PC.
|
||||
|
||||
Integration bugs found and fixed on the way: AXRB's trap message never reached FramePort's log; the content list
|
||||
overflowed the command line (Batman); Unity's EGL failure and SIGTRAP weren't triaged; long sessions lost their
|
||||
start-up milestones; the boot.config Vulkan label picked direct mode for GLES games. Open, AXRB's side: the content
|
||||
list should reach `axrb-direct.exe` as a file (FramePort's hard links only work when the data is on the drive of
|
||||
FramePort's folder; drafted as an upstream issue). Needs a headset: picture and latency through SteamVR, sound,
|
||||
controllers (the simulated ones hold still), Batman beyond its region menu.
|
||||
|
||||
### VrApi-direct games (2026-10-16, direct mode, Monado simulated HMD, Dynarmic, no headset)
|
||||
|
||||
Games whose engine calls VrApi itself (no OVRPlugin), so OVRPort can't translate them: they need a `libvrapi.so`
|
||||
that translates VrApi to OpenXR. Two candidates: FramePort's `frame.vrapi_bridge` (OVRPort's translator + FramePort's
|
||||
changes) and OVRPort's own `patch_vrapi_openxr` (the unpatched translator; only in experimental CLI builds made with
|
||||
`-PwithVrApi=true`, e.g. the `OVRPort-CLI-1.2.5-experimental-5e7df52.jar` AXRB's v1.0.0/1.0.1 releases attached;
|
||||
AXRB's own profile for The Climb 2 uses it with `-PrecomposeProjectionLayers`). Only converted copies of both games
|
||||
were at hand, so the comparison swapped the one file (OVRPort's = the v1.2.5 build from the 2026-10-02 Frame tests).
|
||||
|
||||
| Game (engine, graphics) | VrApi route | Reached | fps | Picture | Blocker / notes |
|
||||
|---|---|---|---|---|---|
|
||||
| The Climb 2 2.2 (CryEngine, Vulkan VrApi) | FramePort's bridge | first-start menu (gender/skin selection) in ~60 s | 69.8 / 69.8 | menu, both hands and controllers, both eyes (AXRB layer captures + Monado's window) | needs AXRB's HostWindow fix (below, AXRB's side) + `frame.vk_android_extensions`; crash only during AXRB's stop (forgiven by triage); no `-PrecomposeProjectionLayers` needed |
|
||||
| The Climb 2 2.2 | OVRPort's translator | the same menu | 70.2 / 70.2 | identical | same blockers; passes AXRB's AHB device-extension request through unchanged (worked only because `libfp_vkext.so` lists AHB) |
|
||||
| Path of the Warrior (own engine, **GLES** VrApi) | - | not run | - | - | GLES: direct mode can't run it; the emulator (1.0.4) had a copy signed with another key installed by another test, so it wasn't replaced. OVRPort's translator can't run it anywhere (no GLES path: `cannot locate symbol "vrapi_GetTextureSwapChainHandle"`, Frame test 2026-10-02); FramePort's bridge has one |
|
||||
|
||||
**Default for PC builds: FramePort's bridge** (`frame.vrapi_bridge`, now `on_pc = True`; recipes keep it as they
|
||||
are, nothing to switch). Both translators give the same picture and frame rate in direct mode, but OVRPort's needs
|
||||
an unpublished experimental CLI (stable jars list `patch_vrapi_openxr` but fail), has no GLES path (POTW, every GLES
|
||||
VrApi game on the emulator) and lacks the device-extension filter; FramePort's is the same code the Frame builds
|
||||
use, so one recipe serves both.
|
||||
|
||||
Blockers found on the way (in order):
|
||||
1. **No window for NativeActivity** (AXRB's side, drafted upstream): CryEngine's `EngineActivity` takes its surface
|
||||
with `Window.takeSurface`; direct mode's `HostWindow.attach` only bridges SurfaceViews (`AXRB_AOSP_HOST_SURFACES
|
||||
0`), so `APP_CMD_INIT_WINDOW` never comes and the game waits after `Loading plug-in CryHTTP` (triage
|
||||
`axrb-direct-no-native-window`). A ~40-line HostWindow patch (`mTakeSurfaceCallback` → `registerSurface` +
|
||||
`surfaceCreated/Changed`, bootstrap dex rebuilt with AXRB's `build_art_bootstrap.py` into a test copy of the
|
||||
local build) fixed it. Likely the same for every NativeActivity engine.
|
||||
2. **Quest Vulkan device extensions**: CryEngine checks its list before vkCreateDevice and gave up
|
||||
(`CrySystem initialization failed!`): AXRB's runtime asks for `VK_ANDROID_external_memory_android_hardware_buffer`
|
||||
also in direct mode, and the game requires `VK_EXT_fragment_density_map` (NVIDIA's Windows driver has neither).
|
||||
The bridge now leaves runtime extensions no device offers out; `frame.vk_android_extensions` lists the missing
|
||||
Quest ones to the renderer (AXRB drops them at vkCreateDevice). Triage `axrb-direct-vulkan-extensions`.
|
||||
3. **Simulator only**: Monado's head lacks POSITION_TRACKED, so AXRB's host never made its LOCAL origin and the
|
||||
bridge never got a tracked head (empty frames, `initial recenter: head flags=0x0`) → `--sim` sets AXRB's
|
||||
`AXRB_TEST_SYNTHETIC_HMD=2`.
|
||||
4. The analysis called The Climb 2 "GLES or unknown" (no manifest declaration) → analysis 20: engines importing
|
||||
`vrapi_CreateSystemVulkan` are "Vulkan (VrApi Vulkan system)", so it goes to direct mode automatically.
|
||||
|
||||
Debugging aid: `FRAMEPORT_AXRB_TEST_ENV="AXRB_DIRECT_TRACE=syscall,vulkan;AXRB_CAPTURE_FIRST_SEQUENCE=4500"` passes
|
||||
variables to a launch test's AXRB processes (`AXRB_DIRECT_DUMP` only works in AXRB's own VM mode, not with ART).
|
||||
Needs a headset: the picture through SteamVR, controllers past the first menu (the simulated ones hold still),
|
||||
climbing, sound; and a released AXRB-Emulatorless with the window fix.
|
||||
|
||||
### Library sweep 2026-10-16
|
||||
|
||||
Every other Quest game of the owner's library that `pipeline.pc_installable` accepts and whose APK still exists,
|
||||
installed with `frameport install <pkg> --to pc --no-library` (automatic backend, isolated `FRAMEPORT_HOME`, catalog
|
||||
recipe or heuristics, no per-game changes) and tested with `frameport test <pkg> --to pc --sim --seconds 150` (240 for
|
||||
Unreal) under Monado's simulated HMD at 72 Hz. Direct mode = the local AXRB build of 59626ac **with the HostWindow
|
||||
patch** (above; upstream had no newer commit or 2.x release on 2026-10-16); emulator = AXRB 1.0.4 with this branch's
|
||||
`adb install -g`, `projection_only=2` and qwerty-head fixes. "fps" = game submits / bridge to Monado (AXRB.Perf
|
||||
medians); "Picture" = Monado's window (both eyes) at the end of the run, plus AXRB's layer captures. Not run: the
|
||||
three 32-bit-only games (Sports Scramble, Shadow Point, Journey of the Gods: AXRB has no AArch32, and the PC build
|
||||
drops the 32-bit bridge), and the emulator games after NEX Player (disk, see the end).
|
||||
|
||||
| Game (engine) | Backend | Reached | fps | Picture | Blocker / notes |
|
||||
|---|---|---|---|---|---|
|
||||
| Arcsmith 1.128 (Unity) | direct | frames | 59 / 51.7 | in game: the workshop, both hands with tools, both eyes | none |
|
||||
| QuestCraft 6.0.0-RC4 (Unity) | direct | frames | 65.1 / 63.6 | launcher room, QuestCraft EULA panel, laser pointers | none (Minecraft itself is behind its Continue button) |
|
||||
| BattleGlide 0.4.1 (UE) | direct | frames | 62.2 / 54.8 | title screen (START), both hands | none |
|
||||
| In Death: Unchained 1.8.0 (UE) | direct | frames | 64.1 / 56.9 | sky + PRIVACY UPDATE panel | none |
|
||||
| The Boys VR 1.1.0 (Unity) | direct | frames | 62.4 / 59.9 | ANALYTICS DISCLAIMER panel over a lit floor, laser | slow stop |
|
||||
| Creed: Rise to Glory CE (UE) | direct | frames | 60.6 / 55.5 | IMPORTANT SAFETY INFORMATION panel, both hands, laser | none |
|
||||
| Wallace & Gromit: The Grand Getaway 1.0.34 (UE) | direct | frames | 61.5 / 53.5 | space scene (nebula, planets), both gloved hands | none |
|
||||
| VR4 2.3 (UE) | direct | frames | 71.9 / 72 | title scene: church interior, "resident evil 4" logo, both hands | none (slow stop) |
|
||||
| Demeter 1.1.0 (Unity, MR) | direct | frames, FrameBridge scene emulation active | 62.3 / 57.3 | "PERMISSION REQUIRED ... access to your spatial data" panel, controllers | AXRB's direct mode grants only 8 allow-listed permissions (`HostPackageManager.permission`): `com.oculus.permission.USE_SCENE` stays denied although the build declares it (`frame.meta_permissions`). AXRB's side |
|
||||
| Green Hell VR 2.5.2 (Unity) | direct | frames | 11.8 / 11.7 | loading screen at "50%" after 180 s | slow load |
|
||||
| TRIANGLE STRATEGY 1.0 (UE) | direct | frames | 44.6 / 40.2 | both controllers with a "Control Guide" label, rest black at 280 s | still loading? |
|
||||
| Riven 1.9.0 (UE) | direct | frames | 29.8 / 25.2 | white splash quad (AXRB captures), black window at 274 s | still loading (as Myst's white splash) |
|
||||
| Espire 2 1.7.13 (UE) | direct | frames | 72 / 71.8 | white splash quad low in both eyes at 289 s | splash texture never shown |
|
||||
| Carve Snowboarding 1.09 (UE) | direct | frames | 64.5 / 59.3 | both hands, rest black at 270 s | scene never appears; not diagnosed |
|
||||
| Asgard's Wrath 2 12.1 (UE, 33 GB) | direct | frames | 30.6 / 21.9 | black at 287 s | still loading |
|
||||
| Assassin's Creed Nexus 207706 (Unity) | direct | frames | 42.6 / 42.6 | black at 180 s (captures too) | loading or no visible layer yet |
|
||||
| BARTENDER VR SIMULATOR 1.9.2.7 (UE) | direct | frames (in a second process) | 62.7 / 53.6 | black for 260 s (window + captures all 0) | not diagnosed (no Unreal log lines in direct.log) |
|
||||
| Vermillion 1.7.2 (Unity) | direct | frames, OVRManager focused | 63.8 / 60.3 | black with its brush loading icon | stays there (Vuplex 3D WebView starts, then nothing) |
|
||||
| H.U.N.T 0.1.2 (Unity OpenXR) | direct | session created, no frame in 200 s | - | bridge splash | never submits a frame; not diagnosed |
|
||||
| WiiCompiled VR 0.4.0 | direct | 2D launcher activity, no OpenXR | - | bridge splash | its launcher imports games through a document picker; the VR part is a second activity |
|
||||
| Medieval Dynasty New Settlement 2.4 (Unity) | direct | OpenXR FOCUSED, exit(1) at 30 s | - | - | **opens an Android Dialog** (right after "initOculus Java!"); direct mode can't add a second window (`UnsupportedOperationException: addToDisplayAsUser`, "Adding window failed"). Triage `axrb-direct-dialog-window` |
|
||||
| Under Cover 1.1.3r2 (Unity) | direct | Vulkan device, exit(1) at 33 s | - | - | the same Dialog |
|
||||
| Of Lies and Rain 1.1.0 (UE) | direct | vkCreateInstance, exit(1) at 32 s | - | - | Unreal's `MessageBox01` (an error box before its Vulkan device; its text is lost with the window) |
|
||||
| NOPE CHALLENGE 1.0.964 (UE) | direct | ART, crash at 15 s | - | - | Google Play services call `IActivityManager.getMyMemoryState`: `AXRB_SERVICE_UNIMPLEMENTED` -> uncaught exception. Triage `axrb-direct-unimplemented-service` |
|
||||
| BAM 1.2 (Unity) | direct (manifest declares Vulkan) | activity, crash at 33 s | - | - | runs GLES: "Unable to retrieve the default EGL display!"; the manifest's Vulkan feature doesn't say which API Unity picks first. Emulator run not reached |
|
||||
| Mobile Suit Gundam: Silver Phantom 1.1.58 (Unity) | direct | install refused | - | - | 257 content files with ~80-character names don't fit axrb-direct.exe's command line even through hard links (the guest paths alone are too long); needs AXRB to read the list from a file or mount the folder. Emulator run not reached |
|
||||
| Silhouette 1.3.0 (Unity) | emulator | frames | 30.2 / 30.1 | title menu (Play / Options / Quit), both eyes | none headless |
|
||||
| Yupitergrad 2.6.1 (Unity) | emulator | frames | 13.8 / 14 | splash ("Loading...") in both eyes | still loading at 174 s |
|
||||
| 4XVR Video Player 2.0.22 | emulator | frames | 34.9 / 32.2 | black | gfxstream rejects its GL every frame: `glEnable(GL_FRAMEBUFFER_SRGB_EXT)`, a `glTexParameteri` value, vertex attribute index >= `CODEC_MAX_VERTEX_ATTRIBUTES` |
|
||||
| NEX Player 1.3.1 (Unity) | emulator | frames | 9.3 / 9.3 | black | not diagnosed |
|
||||
| Lambda1VR 1.7.3 (Team Beef) | emulator | Java crash at start | - | - | `libopenxr_loader_google.so not found`: TBXR ports load `openxr_loader_<Build.MANUFACTURER>`; `frame.tbxr_vendor` handles "valve" and isn't in PC builds; AXRB's Android says "google" (a PC variant: add that library and match "google" in the maker checks) |
|
||||
|
||||
Summary (31 games run): **8 reach a menu or the game in both eyes** in direct mode (Arcsmith in game; QuestCraft,
|
||||
BattleGlide, In Death, The Boys, Creed, Wallace & Gromit, VR4 at their first menu/panel) and 1 in the emulator
|
||||
(Silhouette); Demeter shows its own "permission required" panel; 12 submit frames but were still loading or black at
|
||||
the end of the run (big Unreal games at 30-45 fps while loading under Dynarmic); 9 never submit a frame. The most
|
||||
common blockers, all on AXRB's side:
|
||||
1. **No second window in direct mode** (3 games: Medieval Dynasty, Under Cover, Of Lies and Rain): any Android
|
||||
Dialog ends the game. Upstream candidate together with the permission allow-list (Demeter's `USE_SCENE`) and the
|
||||
unimplemented framework calls (Play services' `getMyMemoryState`, NOPE).
|
||||
2. **Long or loading-heavy starts**: under Dynarmic the large Unreal games need more than 4-5 minutes to their first
|
||||
picture (Riven, Asgard's Wrath 2, TRIANGLE STRATEGY, Espire 2's white splash); a longer `--seconds` would show more.
|
||||
3. **The content list on the command line** (Gundam): a list file or folder mounts in `axrb-direct.exe` would fix it
|
||||
for good (drafted upstream).
|
||||
4. GLES-in-direct-mode mislabels: a Unity manifest that declares Vulkan can still run GLES (BAM).
|
||||
|
||||
FramePort changes from the sweep: triage `axrb-direct-dialog-window` and `axrb-direct-unimplemented-service`
|
||||
(`axrb-direct-no-gles` no longer blames Unreal's EGL probe when one of those ended the game first); the
|
||||
command-line message suggests the emulator; and **direct-mode uninstalls and reinstalls remove the libraries AXRB's
|
||||
`prepare_art_session.py` extracts per APK** into `<runtime>\direct\installed\<identity>`, which AXRB never deletes
|
||||
(5 GB after 25 games; `pc_android.staged_libraries` computes AXRB's identity: the APK's Windows path + every
|
||||
`lib/arm64-v8a` entry's name, CRC and size; unit-tested, not yet seen on a real uninstall).
|
||||
|
||||
The emulator half stopped after NEX Player: the WSL disk and C: filled up (other jobs; C: 14 GB free, below the 60
|
||||
GB the sweep keeps), so the remaining emulator games were not run: The Room VR, Pixel Ripped 1995, Time Stall, Five
|
||||
Nights at Freddy's: HW, Star Wars Pinball VR, I Am Cat, Vader Immortal 1-3, Genotype, Phantom: Covert Ops, Sniper Elite
|
||||
VR (+ Winter Warrior), Robo Recall, Budget Cuts Ultimate, Espire 1, BodyCombat, Star Wars: Tales from the Galaxy's
|
||||
Edge, HITMAN 3, Jurassic World Aftermath, Nano, Wander, Stremio, Eleven Table Tennis, BlazeRush, plus BAM and Gundam
|
||||
in the emulator.
|
||||
|
||||
## Spike results (2026-10-10, Windows 11 26200, i7-14700K, RTX 4080 SUPER, 64 GB; headless)
|
||||
|
||||
| Step | Result |
|
||||
|---|---|
|
||||
| AXRB install | `AXRB-Setup-<v>.exe /S` (electron-builder one-click NSIS, per user, no UAC) → `%LOCALAPPDATA%\Programs\axrb-launcher`, 462 MB. Release assets: Setup exe + `SHA256SUMS-<v>-setup.txt` + source zip (no portable zip since 1.0.4). |
|
||||
| Runtime setup | Not scriptable through AXRB (it lives in the Electron launcher's JS), so FramePort reproduces it: 4 pinned `dl.google.com` zips from AXRB's `core/components.json` (emulator 36.5.11, platform-tools r37.0.1, build-tools 36.1, `sys-img/google_apis/x86_64-36_r07`), hash-checked, into `%LOCALAPPDATA%\AXRB Runtime\sdk`, AVD `axrb-managed-api36` written as AXRB writes it, `ready.json` / `license-acceptance.json` receipts so AXRB's own launcher sees the same runtime as set up. 2.4 GB download, ~3 min on a fast line; 26 GB on disk after one 7 GB game. |
|
||||
| Emulator boot | AXRB's `scripts\emulator\windows_android_emulator.ps1 -Action Start` (headless QEMU, AXRB clock adapter + GPU layer). First cold boot ~6 min (TSC-corrected clock cold-boots every time). ABIs `x86_64,arm64-v8a`. QEMU (`Start-Process`) and the adb server inherit the caller's handles: a pipe, a file through WSL interop, even `/dev/null` through interop (its relay stays open) all left the FramePort call hanging after the script had ended → FramePort starts AXRB scripts through WMI (`Win32_Process.Create`, hidden, nothing inherited), polls the PID and reads an `FP_EXIT <code>` line from the log. Windows PowerShell 5.1's `*>>` writes UTF-16. |
|
||||
| AXRB runtime | `adb install --no-incremental --force-queryable -r axrb-openxr-runtime-debug.apk` (0.3 s); found by the OpenXR loader through the system runtime broker. |
|
||||
| Data | `adb push` of OBB/pak files: 25-35 MB/s (7.2 GB Pinball FX VR in 5.5 min). A full uninstall (or a signature change: `INSTALL_FAILED_UPDATE_INCOMPATIBLE`) deletes the OBB folder and the saves → FramePort's stable per-game keys matter here too. |
|
||||
| **Original APK** (Pinball FX VR) | No launcher activity (Meta's VR category only), started explicitly: **SIGABRT 0.3 s after loading Meta's `libovrplatformloader.so`**. Unconverted Quest APKs don't run. |
|
||||
| **OVRPort-only build** (Lucky's Tale, Unity 2019 GLES) | OVRPort's loader → AXRB runtime → instance + session, frames submitted (2 s each without a host: the image send times out), no crash in 40 s. |
|
||||
| **OVRPort-only build** (Pinball FX VR, UE5 Vulkan) | OVRPlugin pre-init OK (AXRB reports "Oculus 67.522.0"), then exits (ForceQuit) / with the no-ForceQuit build SIGSEGV in `gfxstream vkAllocateMemory` called from AXRB's runtime Vulkan layer. Not decided headless (no host attached, see below). |
|
||||
| Host bridge | Needs an OpenXR runtime with a D3D11 adapter. Headless options all failed: SteamVR's null driver (`failed to find D3D11 adapter requested by OpenXR runtime`), `vrlink` without a headset (`xrCreateInstance` -2), Meta XR Simulator (binary download needs a Meta developer login). → frames-to-SteamVR need a real headset. |
|
||||
|
||||
**Build decision: FramePort hands AXRB an OVRPort-only build** (the recipe's OVRPort patches, no Steam Frame fixes,
|
||||
signed with the game's FramePort key). The original APK crashes; FramePort's Frame fixes (FrameBridge adapter, Lepton
|
||||
and Frame-runtime workarounds) target the Frame. The recipe's alternate (no-ForceQuit) build is used when the recipe
|
||||
says so. (Since 2026-10-15 the PC build also carries the runtime-independent APK fixes and FrameBridge, see below.)
|
||||
|
||||
## Which patches reach the build for this PC
|
||||
|
||||
One recipe serves both builds; `patches/base.pc_selection(patches, analysis)` picks the PC part (used by
|
||||
`build.build(pc=True)`, `pipeline.pc_recipe_fingerprint`, the PC deployment record and `ui/components.pc_outdated`).
|
||||
`docs/PATCHES.md` marks each kept patch "also in builds for this PC (AXRB)".
|
||||
|
||||
- **All of OVRPort's patches** (category `overport`).
|
||||
- **APK fixes that don't depend on Lepton or the Frame's runtime** (`Patch.on_pc = True`): they fix the game's own
|
||||
code or its Meta libraries, which misbehave the same way in AXRB's Android (no Meta services, not a Quest device
|
||||
model, no Horizon app): `frame.ovrplatformcompat`, `frame.ovrstubs`, `frame.swapchain_limit` (OVRPort's
|
||||
dispatcher), `frame.ovr_stable_user`, `frame.unreal_ovrp_entrypoints`, `frame.avatar_stub`, `frame.vrapi_stub`,
|
||||
`frame.metaxr_telemetry`, `frame.oculusos`, `frame.ovr_microphone`, `frame.langpacks`, `frame.asset_files`,
|
||||
`frame.asset_files_stub`, `frame.ovr_trace`, `frame.blazerush`, `frame.unity_oculus_check` (with its ovrpshim),
|
||||
`frame.unity_text_input`, `frame.unreal_quest_precompile`, `frame.unreal_quest_keymap`,
|
||||
`frame.unreal_thumb_touch`, `frame.unreal_skip_obb_check`, `frame.unreal_skip_obb_delivery`, `frame.nodebug`,
|
||||
`frame.meta_permissions`, `frame.launcher`, and `frame.vrapi_bridge` (VrApi → OpenXR through OVRPort's loader,
|
||||
so AXRB's runtime; seen working in direct mode with The Climb 2, see "VrApi-direct games" below; the bridge
|
||||
doesn't need the GL shim, but GLES games keep `frame.gl_shim` for gfxstream, see "GLES games in the emulator").
|
||||
- **Experimental on the PC, for GLES games in the emulator**: `frame.gl_shim` (only with a GLES analysis,
|
||||
`Patch.pc_keeps`; Vulkan VrApi games never get it), `frame.unity_multipass` (also added by `pc_detect`), and the
|
||||
GLES FrameBridge defaults `scale` ≤ 0.5, `scale_max=1`, `projection_only=1`.
|
||||
- **Experimental on the PC** (`on_pc = "experimental"`, kept but not yet seen working in AXRB): `frame.vk_sanitize`
|
||||
(the Vulkan shim; gfxstream / the host driver instead of Lepton's Fossilize), `frame.unity_tls_key_pool`,
|
||||
`frame.eos_keychain_loop`.
|
||||
- **PC-only APK fix** `frame.vk_android_extensions` (`pc_detect`: direct-VrApi games whose engine creates VrApi's
|
||||
Vulkan system, analysis `graphics` "Vulkan (VrApi Vulkan system)"): the renderer's
|
||||
`vkEnumerateDeviceExtensionProperties` import goes to `libfp_vkext.so`, which also lists the Quest device
|
||||
extensions the PC's driver lacks (VK_EXT_fragment_density_map, Android external memory); AXRB's vkCreateDevice
|
||||
leaves them out again.
|
||||
- **FrameBridge** (`frame.adapter`) with its settings in `lib/<abi>/libframe_settings.so`: it wraps OVRPort's loader
|
||||
the same way in AXRB (scale, haptic_fix, pose_time_fix, rect_clamp, profile_remap, ...). Left out
|
||||
(`settings.PC_DENY`): `sync_guard` (a race in the Frame's vrclient.so), `focus_hold` / `focus_hold_ms` (the
|
||||
Frame's flickering wear sensor; FrameBridge's built-in default is on, so the PC build writes `focus_hold=0`,
|
||||
`settings.PC_VALUES`), `controller_models` (models the agent converts from the Frame's SteamVR at install) and the
|
||||
settings only the GL shim / Zink shader layer read (`gl_*`, `zink_*`). `controller_fix` stays: it is the game's
|
||||
choice (0 = hand tracking) and its Touch mapping of `/valve/` and generic profiles is runtime-independent.
|
||||
FrameBridge finds `libframe_settings.so` next to its own path (dladdr); on the Frame the agent also passes the
|
||||
settings as files, in AXRB the library is the only source, so the PC build turns `extractNativeLibs` on
|
||||
(`build.extract_native_libs`; apps with `extractNativeLibs="false"` would map their libraries from base.apk).
|
||||
Without OVRPort (a 32-bit recipe) the PC build drops FrameBridge: there is no loader to wrap.
|
||||
- **PC-only:** OVRPort's `patch_disable_meta_xr_audio_telemetry` (for x86_64 ARM translation, which AXRB is) is
|
||||
never in a Steam Frame recipe (`applies()` is False); `pc_selection` adds it, given the analysis, to games with
|
||||
Meta XR Audio (`Patch.pc_detect`; AXRB's own profile turns it on for North Star).
|
||||
- **Off on the PC:** Lepton/Android 11 workarounds (clipboard, Vivox audio route, start activity, ...), the Zink/Mesa
|
||||
GL shims and shader layer, pac_hints/luajit, hardware video decoding, every `device.*` option, the 32-bit bridge.
|
||||
- TODO: `device.files` (files written into the game's storage at install) could be reproduced with `adb push` in
|
||||
`targets/pc_android.py`.
|
||||
|
||||
### FramePort end to end (same day, headless, this branch)
|
||||
|
||||
`frameport install com.playful.LuckysTale --to pc --no-library` (isolated `FRAMEPORT_HOME`): PC build (19 patches:
|
||||
OVRPort's + `frame.ovrplatformcompat`/`frame.ovrstubs`/`frame.swapchain_limit`; static checks pass without the
|
||||
FrameBridge check) → AXRB found, requirements met → emulator → AXRB runtime → `adb install` → 3.7 GB OBB in ~95 s
|
||||
(39 MB/s) → `deployment.json` + launcher script. `frameport test com.playful.LuckysTale --to pc`: launcher → AXRB run
|
||||
script → host bridge → triage `axrb-no-headset` (expected without a headset). The Steam shortcut write (needs a Steam
|
||||
restart) is unit-tested only.
|
||||
|
||||
## How FramePort drives AXRB
|
||||
|
||||
- `tools/axrb.py`: find (env `FRAMEPORT_AXRB_DIR` > installed AXRB) / install (Setup exe, SHA256SUMS checked, `/S`) /
|
||||
runtime setup (above) / requirements (WHPX via AXRB's `check_windows.ps1`, ≥ 12 GB RAM, x64).
|
||||
- Environment for every AXRB script (the installed build sets none of it itself): `AXRB_DATA_HOME=<Runtime>\output`,
|
||||
`ANDROID_AVD_HOME=<Runtime>\avd`, `ANDROID_USER_HOME=<Runtime>\android`, `ANDROID_HOME`/`ANDROID_SDK_ROOT=<Runtime>\sdk`,
|
||||
`ANDROID_ADB_SERVER_PORT=5038`, `ADB_USB_LEGACY=1`, `ADB_LOCAL_TRANSPORT_MAX_PORT=5683`, AXRB's embedded Python
|
||||
(`resources\runtime\tools\python`) first on PATH; arguments `-Sdk <Runtime>\sdk -Avd axrb-managed-api36 -Port 5584`.
|
||||
- Install: start the emulator if needed (and stop it again if FramePort started it), install the AXRB runtime APK,
|
||||
`adb install -r` the build, push OBB/data to `/sdcard/Android/obb|data/<pkg>/`, record `<data>/pc/<pkg>/deployment.json`
|
||||
(`kind: "android"`).
|
||||
- Play: a Steam shortcut runs FramePort's small launcher script (`%LOCALAPPDATA%\FramePort\axrb\fp-axrb-run.ps1`),
|
||||
which sets the environment above and calls AXRB's `scripts\run\run_windows_game.ps1` (boots the emulator when
|
||||
needed and then owns it, registers a SteamVR app identity, starts the host bridge, `am start`, waits; exit codes
|
||||
0 ok, 1 error, 3 game lost, 4 host lost; `logs\game\session.json`, `host.err`).
|
||||
- Logs for diagnostics: `<Runtime>\output\logs\game\{host.log,host.err,session.json,guest.log}`,
|
||||
`logs\emulator\emulator.std{out,err}.log`.
|
||||
|
||||
## Headset results (2026-10-10, Steam Frame streaming to the PC through Steam Link / vrlink, 96 Hz)
|
||||
|
||||
AXRB's bridge opened a SteamVR session on the Frame each time (session state up to FOCUSED, both hands active), started
|
||||
through FramePort's launcher with the emulator booted by AXRB's run script (~1 min), and shut down cleanly.
|
||||
|
||||
- **Lucky's Tale (Unity, GLES): black.** GLES games go through AXRB's raw image path (eye readback → TCP), sized
|
||||
by SteamVR's recommended resolution: 3412×3412 per eye at the owner's 250 % supersampling = 93 MB per frame,
|
||||
~10 s per frame; at a lowered resolution 2644×2644 = 56 MB, 6.6 s per frame (~8.5 MB/s). AXRB's zero-copy GPU
|
||||
path covers Vulkan games only. The ~8.5 MB/s was the transport, not the readback: see "GLES games in the
|
||||
emulator" below (adb reverse: ~100 MB/s, half-size eyes, multipass: Lucky's Tale draws at 30 fps).
|
||||
- **Pinball FX VR (UE5, Vulkan): crash 4 s after start**, the same gfxstream `vkAllocateMemory` SIGSEGV from AXRB's
|
||||
runtime layer as headless (so not a headless artefact). AXRB's side.
|
||||
|
||||
Not reached: sound, controllers. Next candidates: a Vulkan game AXRB reports playable (Deadpool VR, Batman: Arkham
|
||||
Shadow); an AXRB issue for the Pinball crash.
|
||||
|
||||
## GLES games in the emulator (2026-10-16, headless under Monado's simulated HMD)
|
||||
|
||||
AXRB 1.0.4's emulator is the only backend with GLES (direct mode's EGL is a stub). A GLES frame is read back with
|
||||
`glReadPixels` on the game's thread inside `xrEndFrame` (`runtime/src/frame_transport.cpp`), sent as raw RGBA to the
|
||||
host (two eyes per frame) and uploaded there; `xrEndFrame` returns only after the send. Measured with
|
||||
`AXRB.Perf eye-readback` / `image-send` (guest log) and `host-image-arrival` (host.err):
|
||||
|
||||
| Eye size (per eye) | Bytes/frame | Route | Send | Frame rate |
|
||||
|---|---|---|---|---|
|
||||
| 896×1007 (Monado's recommendation) | 7.2 MB | default: TCP to 10.0.2.2 (QEMU user-mode network) | 850-950 ms | 1.1 fps |
|
||||
| 448×504 (`scale=0.5`) | 1.8 MB | default | 200-230 ms | 4.4 fps |
|
||||
| 896×1008 | 7.2 MB | **adb reverse** (`debug.axrb.image_transport=adb`) | 87 ms (~83 MB/s) | 9.4 fps |
|
||||
| 640×720 (`scale=0.7`) | 3.7 MB | adb reverse | 38 ms (~96 MB/s) | 17.6 fps |
|
||||
| 448×512 (`scale=0.5`) | 1.8 MB | adb reverse | 14.5 ms (~125 MB/s) | 30.5-30.8 fps |
|
||||
|
||||
The readback itself is 1-3 ms. The default route caps at ~8 MB/s (the same rate as in the headset run above); AXRB's
|
||||
adb reverse route (AXRB sets up `adb reverse tcp:38491` anyway) is 10-15x faster. For SteamVR's resolutions the math
|
||||
stays hard: 2016² per eye = 32.5 MB/frame (~3 fps), at half size 8.1 MB (~10 fps); the owner's 2644² at half size
|
||||
14 MB (~6 fps). Lowering SteamVR's resolution for the game is what helps further (AXRB has a minimum-extent setting,
|
||||
`AXRB_MIN_EYE_EXTENT`, but no maximum).
|
||||
|
||||
What FramePort does for GLES games on this PC (all in the PC build / launcher, nothing on the Frame changes):
|
||||
- FramePort's launcher (`fp-axrb-run.ps1`) starts Android itself when it isn't running (AXRB's Start action, as the run
|
||||
script would; the run script then gets `-OwnsEmulator` and shuts it down), sets `debug.axrb.image_transport=adb`
|
||||
(`FRAMEPORT_AXRB_IMAGE_TRANSPORT=default` leaves AXRB's choice) and `debug.wm.disable_deprecated_target_sdk_dialog=1`.
|
||||
- `pc_selection` with a GLES analysis: FrameBridge `scale` at most 0.5 (FrameBridge's minimum), `scale_max=1` (the
|
||||
maximum eye size reported is the scaled one too), `projection_only=2`: AXRB's emulator refuses every GLES frame with
|
||||
more than one layer (`xrEndFrame` -2), so FrameBridge submits the projection layer alone after drawing the quad
|
||||
layers that follow it into its eye images (`native/adapter/quad_compose_gl.c`, on the game's GL context, per eye at
|
||||
the eye's view and FOV, blending by the quad's flags); `projection_only=1` only drops them.
|
||||
- Game installs use `adb install -g` (runtime permissions granted, as Lepton does on the Frame): Android's permission
|
||||
dialog over the game's activity pauses Unity for good (BattleSisters asks for the microphone in its menu).
|
||||
- The VrApi bridge copies the game's eye textures into the OpenXR images with `glBlitFramebuffer` when the context
|
||||
has no `glCopyImageSubData` (the emulator's GLES translator is "OpenGL ES 3.1" without `GL_EXT_copy_image`; its stub
|
||||
only logs `libEGL: called unimplemented OpenGL ES API`, so every eye reached the runtime black).
|
||||
- `frame.unity_multipass` (experimental on the PC, `pc_detect` for Unity GLES + Oculus XR Plugin): gfxstream lists
|
||||
`GL_OVR_multiview2` but its encoder finds a multiview framebuffer incomplete and drops every draw
|
||||
(`GL2Encoder.cpp:s_glDrawElements … GL error 0x506 checkFramebufferCompleteness`): both eyes black.
|
||||
- `frame.gl_shim` (experimental on the PC, GLES only, `Patch.pc_keeps`): gfxstream has no
|
||||
`GL_EXT_disjoint_timer_query`; the shim lists it and hands out stand-ins ("available, 0 ns") so GLAD engines that
|
||||
call the timer queries unconditionally don't jump to NULL. Its multiview hiding also suits gfxstream.
|
||||
- FrameBridge settings without a rebuild: `frameport settings <pkg> --to pc key=value` writes
|
||||
`/sdcard/Android/data/<pkg>/files/framebridge.conf` (emulator: adb push, Android started for it if needed; direct
|
||||
mode: the file in AXRB's runtime folder); an empty value removes a key.
|
||||
|
||||
Per game (AXRB 1.0.4 emulator, Monado simulated HMD at 72 Hz, FramePort's PC build; Windows 11, RTX 4080 SUPER):
|
||||
|
||||
| Game | Build / settings | Furthest | Frame rate / time | Blocker |
|
||||
|---|---|---|---|---|
|
||||
| Lucky's Tale 1.0.55 (Unity 2019.4 + Oculus XR Plugin, GLES) | PC build + `frame.unity_multipass`, `scale=0.5`, adb route | **title scene drawn in both eyes** (Monado window captured) | 30.5-30.8 fps, image-send 14.5 ms | none headless; needs the headset (picture through SteamVR at its resolution, controllers) |
|
||||
| Accounting+ 1.24.35 (Unity 2017.4 built-in Oculus, GLES) | PC build (`frame.unity_oculus_check`), `projection_only`, old-SDK dialog off | **stance selection screen drawn in both eyes** | 10 fps, image-send 82 ms: its OVRPlugin makes 896×1024 eye buffers whatever FrameBridge's scale/max say | its quads (OVROverlay) were dropped by `projection_only=1` (AXRB rejects every multi-layer GLES frame with -2); rebuilt with `projection_only=2` (2026-10-16, qwerty head): same screen at 9.9 fps, no regression (its controller pointers are missing there because qwerty's controllers are inactive); eye size only shrinks with the PC runtime's resolution |
|
||||
| Path of the Warrior 21.11.10 (VrApi-direct GLES, own engine; from the `PATCHED/` copy) | VrApi bridge (blit copies) + GL shim (timer-query stand-ins), `scale=0.5`, `projection_only=2`, `--sim` with Monado's qwerty head | **its first screen drawn in both eyes**: the "Please ensure that your Oculus Touch Controllers are properly connected" panel (a VrApi cylinder → quad, drawn into the projection) | 38 fps, image-send ~15 ms | the simulator's controllers: Monado's qwerty builder (needed for a tracked head here, see `--sim` notes) has WMR controllers, which AXRB's bindings don't cover. Found on the way: (1) the simulated head: no tracked pose, `EnterVrMode` gave up after 30 s; (2) every frame -2 (projection + the cylinder quad); (3) black eyes: no `glCopyImageSubData` in the emulator's GLES. Before the stand-ins: SIGSEGV at pc 0 in `EgHalGrTimestampQueryGL` (NULL `glad_glGenQueriesEXT`). Needs a headset: controllers past this screen, gameplay |
|
||||
| BattleSisters 1.2.4 (Unity 2019.4 built-in VR, GLES) | PC build (ovrpshim frame loop), `scale=0.5`, installed with `-g`, `--sim` with Monado's qwerty head | **main menu drawn in both eyes** (Continue / New game / Level select hub / Last Bastion / Settings) | 31 fps for 90 s, no stall | none headless. The "hang after 3 frames" was Android's permission dialog: a few seconds into its menu the game asks for a runtime permission (microphone), `GrantPermissionsActivity` became the resumed activity over the game, Unity paused (AAudio pause, no Update2/WaitToBeginFrame/BeginFrame/EndFrame in progress per `ovrp_trace`) and nobody can answer it; not the ovrpshim frame wait and not AXRB's pacing. Fixed by installing with `adb install -g` (as Lepton does). Needs a headset: controllers, gameplay |
|
||||
|
||||
`--sim` notes: AXRB 1.0.4's emulator host only reads `AXRB_TEST_SYNTHETIC_HMD=1` (direct mode's `=2` is newer) and
|
||||
applies it only to a head *without* valid flags; Monado's simulated head is valid but not tracked, so the host never
|
||||
sets its LOCAL origin and VrApi games never get a tracked head. For games on the emulator backend `frameport test
|
||||
--sim` therefore runs Monado's **qwerty** builder (`SIMULATED_ENABLE=0`, `QWERTY_ENABLE=1`: its head reports
|
||||
POSITION_TRACKED; host.err `AXRB OpenXR: LOCAL origin in tracking world=(0.000 1.600 0.000)`). Its controllers are
|
||||
WMR ones, which AXRB's suggested bindings (Touch/Index/Vive) don't cover: no hands. `FRAMEPORT_PC_XR_SIM_HEAD=simulated`
|
||||
keeps the simulated head (and its ml2 controllers), `=tracked` forces qwerty. Monado's `remote` builder (tracked head +
|
||||
Index controllers) would cover both but listens on 0.0.0.0:4242 (a firewall prompt), so it isn't used. FrameBridge's
|
||||
`ovrp_trace=1` (ovrpshim, Unity 2017-2019 legacy frame loop) logs every 5 s how many Update2/WaitToBeginFrame/
|
||||
BeginFrame/EndFrame calls went through and which one is in progress (thread, frame, how long): where a stalled game
|
||||
waits. AXRB's opt-in host capture (`AXRB_CAPTURE_PREFIX`) only starts at sequence 2000 in 1.0.4 (hard-coded;
|
||||
`AXRB_CAPTURE_FIRST_SEQUENCE` isn't read), which GLES games at 10-30 fps don't reach in a test: use the Monado
|
||||
window captures and FrameBridge `snapshot=N`. AXRB's guest log only keeps warnings plus AXRB's own tags: read
|
||||
`adb logcat -d` for FrameBridge/OVRPlugin lines. `debuggerd -b <pid>` works from `adb shell` (stacks).
|
||||
|
||||
## Open (needs the owner + a headset)
|
||||
|
||||
- A game in the headset through SteamVR (picture, audio, controllers; Steam Frame controllers: AXRB #20).
|
||||
- Pinball FX VR's Vulkan crash with the host attached happens in the emulator only; in direct mode it reaches its lobby
|
||||
headless. Needs the headset: picture/latency through SteamVR, controllers, a table played.
|
||||
- Play from the PC's Steam library (shortcut → launcher script → AXRB).
|
||||
|
||||
## Testing without a headset (Monado's simulated HMD, 2026-10-15)
|
||||
|
||||
AXRB's host bridge needs an OpenXR session with a D3D11 binding, which SteamVR doesn't give without a headset. For
|
||||
unattended tests FramePort can run the bridge against **Monado for Windows** with Monado's simulated HMD instead,
|
||||
without changing the system's OpenXR runtime or touching SteamVR:
|
||||
|
||||
- **Monado build:** an official CI artifact of `monado/monado` (gitlab.freedesktop.org, project 2685), job `windows`
|
||||
of a `main` pipeline (there is no Windows release asset; the job's `install/` folder is the portable runtime:
|
||||
`bin\monado-service.exe`, `bin\openxr_monado.dll`, `openxr_monado.json`, SDL2/Vulkan loader DLLs). Tested build:
|
||||
pipeline 1766968, job 112793105, commit 8b259763f (`v25.1.0-917-g8b259763f`). Unpacked by hand into
|
||||
`%LOCALAPPDATA%\FramePort-dev\monado\install` (or `FRAMEPORT_MONADO_DIR`): no installer, no UAC, no registry. Its
|
||||
`share\steamvr-monado` (a SteamVR driver) is never registered.
|
||||
- **Selection per process only:** the OpenXR loader's `XR_RUNTIME_JSON=<monado>\openxr_monado.json`. HKLM's
|
||||
`ActiveRuntime` stays SteamVR. AXRB's run script registers an app identity with SteamVR whenever HKLM names SteamVR
|
||||
(an OpenVR utility client, which starts SteamVR), so under the simulator FramePort's launcher call answers that one
|
||||
`python steamvr_app_identity.py` call "failed" (the script only warns).
|
||||
- **Service settings** (`tools/xr_sim.SERVICE_ENV`): `SIMULATED_ENABLE=1` (the simulated builder; the Windows build
|
||||
only has the qwerty/remote/simulated builders, so no real device is probed), `SIMULATED_LEFT/RIGHT=ml2` (the only
|
||||
simulated controllers whose bindings cover the Vive wand profile: AXRB suggests Touch/Index/Vive, so with `simple`
|
||||
or `wmr` its hands stay inactive), `XRT_COMPOSITOR_DEFAULT_FRAMERATE=72`. Headless variant: `XRT_COMPOSITOR_NULL=1`
|
||||
+ `XRT_COMPOSITOR_NULL_FPS=72` (no window, nothing to capture).
|
||||
- **D3D11 + adapter:** Monado's D3D11 client compositor works (timeline semaphores); it renders on the discrete GPU
|
||||
(Vulkan device 0, RTX 4080 SUPER here; `XRT_COMPOSITOR_FORCE_GPU_INDEX` would change it) and asks D3D11 clients for
|
||||
that adapter's LUID, which DXGI finds.
|
||||
- **Results:** a minimal D3D11 client (`native/xrsimprobe/xr_sim_probe.cpp`, built with VS Build Tools against the
|
||||
Khronos `openxr_loader_windows` 1.1.63 release) went IDLE → READY → SYNCHRONIZED → VISIBLE → FOCUSED in 0.01 s
|
||||
and submitted 72 frames/s until it asked to exit. AXRB's host bridge (`--serve-openxr 38490 0 <title>`, no
|
||||
emulator) reached `D3D11 graphics binding ready`, session state 5 (FOCUSED), `AXRB TCP: listening on
|
||||
0.0.0.0:38490`, both controllers active with valid poses, `host-end-frame: rate=72.0/s`, its splash in both eyes.
|
||||
No game was run yet.
|
||||
- **Seeing what is drawn:** the windowed compositor ("Monado (Windowed)", 1264×681, both eyes side by side without
|
||||
distortion) can be saved with `native/xrsimprobe/xr_sim_capture.cpp` (`PrintWindow`, works behind other windows;
|
||||
`xr_sim.capture(path)`), and `--sim` also sets AXRB's own opt-in `AXRB_CAPTURE_PREFIX` (4 PPM readbacks of the
|
||||
submitted layers, 5 s apart, from frame 300) into `<data>/logs/xr-sim/`. A launch test that reached RUNNING saves
|
||||
Monado's window there too, just before it stops the game (`<time>-<pkg>-headset.bmp`, `pc_android.sim_capture`),
|
||||
and every AXRB launch test reports the frame rate from AXRB's `AXRB.Perf` summaries (game submits / bridge). Monado itself has no screenshot function;
|
||||
`XRT_WINDOW_PEEK` and `XRT_DEBUG_GUI` exist but only show windows.
|
||||
- **Use:** `frameport test <pkg> --to pc --sim` (or `FRAMEPORT_PC_XR_SIM=1`): starts `monado-service.exe` hidden
|
||||
(WMI, like AXRB's scripts; ready when its pipe `\\.\pipe\<%TEMP%>\monado_comp_ipc` exists), passes the environment to
|
||||
the AXRB launch (`pc_android.launch_test(extra_env=…)`, default `xr_sim.active_env()`), stops the service afterwards
|
||||
(an already running Monado is used and left running). Service log: `<data>/logs/xr-sim-service.log`.
|
||||
- **Head per backend:** when every game tested is on AXRB's emulator backend, the service runs Monado's qwerty builder
|
||||
instead of the simulated one (a tracked head; AXRB 1.0.4's emulator host has no synthetic head for Monado's
|
||||
untracked one, see the GLES section's `--sim` notes); its controllers stay inactive in AXRB.
|
||||
`FRAMEPORT_PC_XR_SIM_HEAD=tracked|simulated` overrides the choice. An already running Monado is used as it is.
|
||||
- **Limits:** the simulated head wobbles slowly and the controllers hold still with no buttons pressed, so it proves
|
||||
startup, frame submission and what is drawn, not gameplay; the windowed compositor opens a visible window on the
|
||||
desktop; frame pacing is Monado's, not a headset's.
|
||||
@@ -24,7 +24,6 @@ version is `catalog/triage.yaml` (used by `frameport test` / the Job screen); ke
|
||||
| A Unity OpenXR game closes right after the OpenXR instance is created: `F VrApiLoader: vrapi_SetPropertyInt was called before vrapi_Initialize()!`, SIGABRT on UnityMain (GitHub #62, Jurassic World Aftermath) | the APK still ships Meta's VrApi loader; OVRPlugin (1.89, on OpenXR) calls it without starting VrApi and Meta's loader aborts. The VrApi bridge can't replace it (39 of the loader's 114 functions: OVRPlugin wouldn't link) | `frame.vrapi_stub` (same exports, each returns 0); triage `vrapi-before-init` |
|
||||
| A VrApi game exits at once: `UnsatisfiedLinkError … dlopen failed: cannot locate symbol "vrapi_PollEvent"` (GitHub #57, BlazeRush) | the engine imports a VrApi function the VrApi bridge didn't implement | the bridge has `vrapi_PollEvent`, `RecenterPose`, `SetDisplayRefreshRate`, `GetSystemPropertyFloatArray` (rebuild the game); the static check "VrApi functions resolvable" names any other missing one; triage `vrapi-symbol-missing` |
|
||||
| A Team Beef port (Lambda1VR, RTCWQuest, …) exits at once: `UnsatisfiedLinkError: dlopen failed: library "libopenxr_loader_valve.so" not found` (GitHub #59) | TBXR loads `openxr_loader_<Build.MANUFACTURER>` (Lepton: valve) and takes the Meta path only when `strstr(OPENXR_HMD, "meta")` matches, else Pico's | `frame.tbxr_vendor` (empty `libopenxr_loader_valve.so` + the "meta" literal → "alve"). Game data (`xash/`, …) goes to /sdcard: upload it with the Files tab to the game's storage. Black eyes with `TBXR: Incomplete frame buffer object: GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE`: TBXR always uses multisampled render-to-texture (even `--msaa 1`); `frame.tbxr_vendor` links the GL shim, which hands it single-sampled versions (log `GL shim: multisampled render-to-texture … drawn single-sampled`) |
|
||||
| A Quest game renders, then logs `Entitlement check failed` / `ovrPlatformInitialize_NotEntitled` (often with retries) and quits, e.g. `SIG: 9` after `[Photon] Disconnected` (GitHub #322, Deadly Delivery) | The game's Meta licence check (entitlement) needs Meta's online login, which the Frame doesn't have; online-only games quit (triage `meta-entitlement`) | None: FramePort doesn't get around entitlement checks. Offline games that log it and play on are fine |
|
||||
| Black screen after VR starts; `Asset status error (code 100)` in `DLC_Manager:AssetStatusCallback` (GitHub #203, e.g. PixelRipped 1995) | Meta asset-file status fails after entitlement succeeds; the log does not identify the native call or asset ID | Try `frame.asset_files_stub` (opt-in, triage-only): native/langpack answers GetList with an empty successful list and StatusById with installed status, an empty path and the requested ID. No DLC files are supplied; download requests retain their existing behavior. Disable with `FRAMEPORT_ASSET_FILES_STUB=0`. Host-tested only; whether this fixes startup needs a game/device test |
|
||||
| Missing sound or extra content in a game whose OBB folder has separate `*.pak` files (GitHub #61, Star Wars: Tales from the Galaxy's Edge: seasons + Wwise banks) | the game asks Meta's platform for these asset files (`ovr_AssetFile_GetList` / `DownloadById`); OVRPort's loader doesn't list them | copy every content/sound-bank PAK and use `frame.asset_files` (native/langpack lists the data's `*.pak` as installed `default` assets, IAP `free`, and answers DownloadById at once with the path; off: env FRAMEPORT_ASSET_FILES=0). Tales also needs the splash and depth-size fixes below |
|
||||
| A SideQuest backup has `apk/` and a sibling `obb/` with content/sound-bank PAKs, but the Frame only has the main OBB (GitHub #61, Tales from the Galaxy's Edge) | older scans treated that layout as loose expansion files and selected only the named OBBs; the asset-file patch then found no PAKs | the scanner chooses the OBB folder by version first, then keeps the whole sibling data folder when all its expansion files are selected for this APK; app updates repair affected library entries and refresh asset/language-pack detection. Reinstall to copy the missing files, or scan the backup again first. Folders with other packages or unselected OBB versions still send only the selected OBBs |
|
||||
@@ -63,8 +62,6 @@ version is `catalog/triage.yaml` (used by `frameport test` / the Job screen); ke
|
||||
| Un-cracked Oculus PC VR game: "Initializing OVR session" then exits / signature check on the runtime | Revive's hooks don't install on Proton-arm64; the Oculus shim rejects the unsigned Revive runtime | Not runnable on the Frame without the repack's crack extracted (not done by FramePort); use the PC version |
|
||||
| PC VR game: `Failed to initialize Oculus API (-3001)` / `Unable to load LibOVRRT DLL` | Revive's LoadLibrary hook doesn't work under Proton arm64 (ARM64EC kernelbase); the game's LibOVR shim finds no runtime DLL | Symlink `LibOVRRT64_1.dll` → Revive's DLL in the prefix's system32 (manual so far) → then -3021 (runtime signature check; open) |
|
||||
| Uploads to the Frame are slow | The link, storage or transfer backend can limit throughput | Check the job's "Transfer link"; try the Frame's hotspot or USB cable. Large install files prefer system OpenSSH SFTP, retaining paired-host checks and `.part` resume; unavailable or failed native uploads fall back to Paramiko. The log names the backend. Settings → Installing → Parallel uploads accepts 1–8 (default 3; saved preferences are preserved). More is not always faster. Measure the production path with `scripts/upload_bench.py --methods app-files-3 --check-resume` (three repetitions, checksum verification) |
|
||||
| Log: `OpenSSH SFTP failed (255): … Permission denied (publickey,password)`, then Paramiko | OpenSSH offered keys the Frame doesn't authorize (GitHub #242) | The log lists the keys OpenSSH offered (`Offering public key`) and its warnings. A connection that logged in with the PC's own keys/agent makes OpenSSH use them too (copies of `~/.ssh/id_*` + the agent); a refused FramePort key is retried that way once. A Frame that accepts only another key file: Settings → Installing → SSH keys (CLI `frameport frame ssh-keys --add <file>`); passphrase keys go through the SSH agent |
|
||||
| Log: `OpenSSH SFTP failed (1): stat C://…/[…: No such file or directory` | sftp got glob escapes inside its quotes (GitHub #324, fixed): `[` in a local folder name | Update FramePort; the native_upload `quote()` passes only `\\` and `\"` escapes, Windows paths with `/` |
|
||||
| PC VR game exits right away: `Unhandled Exception: 0xc06d007e` (after `FOnlineSubsystemOculus::InitWithWindowsPlatform`) | Delay-loaded `LibOVRPlatform64_1.dll` (Oculus Platform SDK, installed with the Oculus app) is missing | None on the Frame (entitlement check; FramePort doesn't replace it). PC mode with the Oculus app |
|
||||
| Unity PC VR game (Oculus + SteamVR build: `OVRPlugin.dll` and `openvr_api.dll` in `<Name>_Data/Plugins`) opens a window and quits after ~20 s; no VR Vulkan instance after the game's DXVK device in launch.log; Unity log (`unity log … Player.log`, agent v67): `OpenVR failed initialization` / `Initialization of device … failed` | Unity's built-in VR tries its SDKs in list order (Oculus first) unless `-vrmode` picks one; a catalog recipe verified with another build of the game (for example SUPERHOT VR's OpenXR build, GitHub #105) used to drop the build's own arguments | `pcvr.launch_args` = `-vrmode OpenVR` (detected for such builds; kept when the catalog's `xr` differs from the build's). A game's Electron launcher next to it (SHVR.exe) is ranked below the game |
|
||||
| Unreal PC VR game opens the crash reporter instead of closing | UE starts CrashReportClient.exe on a crash | `pcvr.no_crash_reporter` (default for Unreal Rift games): `-nocrashreports` + CrashReportClient.exe renamed `.disabled` in the Frame copy |
|
||||
@@ -176,12 +173,7 @@ version is `catalog/triage.yaml` (used by `frameport test` / the Job screen); ke
|
||||
| Passthrough black (BAM) | XR_FB_passthrough missing | adapter `passthrough_emul=1` (default) + `patch_force_passthrough` for MR-only games |
|
||||
| Quest Touch controllers (or none) shown in a game that uses Meta's runtime controller models | XR_FB_render_model missing on the Frame | adapter `controller_models=1`: the agent converts the Frame's SteamVR controller models to glb at install, the adapter serves them. Games with their own controller meshes aren't affected (none of the 34 catalog games use runtime models) |
|
||||
| `overportOXR: Unknown proc addr: xr…` for a function the adapter emulates | overport's dispatcher only forwards functions in its own table | route the plugin's lookups through `native/xrshim` (done for XR_FB_render_model when `controller_models=1`) |
|
||||
| MR game stuck waiting for room data (e.g. Demeter) | No Meta scene API | `adapter.scene_emul=1` (+ `frame.meta_permissions`); Frame → Room → Use my play area, or import a scanned room |
|
||||
| Unity MR game rejects every room / its "use guardian" fallback does nothing; `ovrpBoundary_Outer is not supported`, `IndexOutOfRangeException` in a guardian check (e.g. Demeter's `RemoveObjectNotInGuardian`) | OVRPlugin calls the Frame's 1x1 m STAGE rect a configured boundary but can't give its outline | `adapter.scene_hide_bounds=1` (with `scene_emul`): FrameBridge then answers the app's STAGE `xrGetReferenceSpaceBoundsRect` with `XR_SPACE_BOUNDS_UNAVAILABLE` (log `scene: STAGE bounds hidden`). Per game only: NOPE stalled without a play area. Demeter also needs a floor of at least 2.5 x 2.5 m, as on a Quest |
|
||||
| MR game with `scene_emul` never asks for the room (no `scene: query`/`discovery` lines), black screen or MR mode with no room (e.g. NOPE, Pinball FX); `m_XR_META_boundary_visibility extension is not supported` every frame | Meta's scene/anchor permissions undeclared (Lepton can't grant them); boundary suppression unsupported | `frame.meta_permissions` (now with every `scene_emul` recipe of a USE_SCENE/USE_ANCHOR_API game, migration `scene_permissions`); FrameBridge emulates `XR_META_boundary_visibility` (log `scene: boundary suppressed`). `passthrough:` lines show the app's passthrough calls |
|
||||
| Build says `Unity text fields: not fixed: Cpp2IL couldn't start on this PC` (older versions: `Cpp2IL couldn't read this game's code: at Cpp2IL.Program.Main`) | .NET aborts without libicu (fresh WSL/Linux) | FramePort runs Cpp2IL with `DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1`; such failures aren't cached, so the next build retries |
|
||||
| MR uses an empty/simple room; FrameBridge `scene: capture requested -> guardian box` / `using guardian room`, `room from guardian`, or fallback box dimensions (`mr-no-room`) | No saved room, so FrameBridge uses its guardian box | Save a room in Frame → Room. A real SteamVR boundary supplies walls; Valve's default circle is refused. Import a scanner-built room for furniture/mesh; headset capture is not implemented yet |
|
||||
| `Unknown proc addr: xrDiscoverSpacesMETA` or MRUK `NoRoomsFound` (`mr-discovery-unsupported`) | Scene discovery is unavailable or no room was discovered | Enable `adapter.scene_emul`, rebuild/reinstall to get the updated extension shim, then save a room. All games declaring USE_SCENE or USE_ANCHOR_API now get this suggestion |
|
||||
| MR game stuck waiting for room data (Demeter) | no Meta scene API | adapter `scene_emul=1` (+ `frame.meta_permissions`) |
|
||||
| Hand-tracking game janky (Silhouette) | Frame synthesizes hands from controllers | `controller_fix=0` passes hands through; not really fixable |
|
||||
| Eye distortion while moving (Arcsmith, Time Stall) | unknown (not eye swap, tracking, Valve layers, depth or pacing) | unresolved |
|
||||
| The Climb 666.0: hand outlines ripple in both eyes while menus and gameplay work (GitHub #238) | Unknown. Sessions paced around 72 fps, controller tracking reported valid, and SteamVR motion smoothing was already off; these checks do not establish the cause | Unresolved after wearer comparisons on 2026-10-12: disabling Valve's Vulkan layers, setting `r_AntialiasingMode = 1`, and setting `r_AntialiasingMode = 0` with `r_MotionBlur = 0` each gave the same or worse result. These were config comparisons; runtime cvar values were not verified. Restored the playable configuration (`r_vr_foveated = 0` with the default Vulkan layers), retaining the startup/rendering crash fixes above. Do not keep the unsuccessful experimental settings as a fix |
|
||||
@@ -275,3 +267,28 @@ Scan a folder with Rift game dumps (Windows game folders) like Quest dumps; they
|
||||
| Proton game hangs at start in a headless/SSH launch; log `no driver could be loaded` / `explorer process failed to start` | no display session (DISPLAY/GAMESCOPE_WAYLAND_DISPLAY) | the Proton launch.sh takes them from the running Steam (built in) |
|
||||
| Unreal game starts (window created) then `CrashReportClient` runs | the game crashed under Proton; often no VR runtime reached it (Revive off) | keep `pcvr.revive` on (repacks' bundled LibRevive64.dll isn't loaded by itself); read the game log + crash summary in the launch log |
|
||||
| `VK_ERROR_DEVICE_LOST` under DXVK | freedreno GPU hang | `pcvr.proton_log` to capture; PC mode |
|
||||
|
||||
## Quest games on this PC (AXRB, `docs/PC_ANDROID.md`)
|
||||
|
||||
| Symptom | Cause | Fix |
|
||||
|---|---|---|
|
||||
| Unconverted Quest APK in AXRB: no launcher activity, SIGABRT ~0.3 s after `libovrplatformloader.so` loads | Meta's platform loader aborts outside a Quest | FramePort always gives AXRB its OVRPort build (the PC build: OVRPort + `on_pc` APK fixes, no Steam Frame fixes) |
|
||||
| `axrb-no-headset`: host.err `failed to find D3D11 adapter requested by OpenXR runtime` / `xrCreateInstance failed: XR_ERROR_RUNTIME_FAILURE` | SteamVR has no headset (null driver: no D3D11 adapter; vrlink with no Frame connected: no instance) | connect the headset and let SteamVR show it first; for unattended tests use Monado's simulated headset: `frameport test <pkg> --to pc --sim` (docs/PC_ANDROID.md "Testing without a headset") |
|
||||
| Testing a PC (AXRB) game without a headset: need a D3D11 OpenXR session, but SteamVR must stay untouched | SteamVR without a headset gives no D3D11 adapter / no instance | `--sim` (or `FRAMEPORT_PC_XR_SIM=1`): portable Monado for Windows, simulated HMD + `ml2` controllers, selected per process with `XR_RUNTIME_JSON` (the system runtime stays SteamVR); AXRB's SteamVR app registration is skipped; frames in `<data>/logs/xr-sim/` (AXRB_CAPTURE_PREFIX), Monado's window via `xr_sim.capture()`. Service log `<data>/logs/xr-sim-service.log` |
|
||||
| `axrb-gfxstream-crash`: SIGSEGV in `vulkan.ranchu.so (gfxstream::vk::ResourceTracker::on_vkAllocateMemory)` from `libVkLayer_AXRB_runtime.so` (Pinball FX VR, UE5 Vulkan, headless) | the emulator's Vulkan path through AXRB's runtime layer | report to AXRB with diagnostics (`axrb/*` logs); recheck with the host attached |
|
||||
| `axrb-translation-crash`: crash in `libndk_translation.so (berberis::…)` | Android's ARM translation (AXRB issue #9, some Unity games) | nothing to patch; wait for AXRB's other translator |
|
||||
| Reinstall fails `INSTALL_FAILED_UPDATE_INCOMPATIBLE`, or the game data must be copied again | a copy signed with another key was installed in AXRB (e.g. by AXRB's own launcher); a full uninstall deletes the OBB folder and saves | uninstall it in AXRB first; FramePort keeps one key per game, so its own updates keep data |
|
||||
| A FramePort call that runs an AXRB script never returns although the script ended (emulator already up) | QEMU (`Start-Process`) and the adb server inherit the caller's handles; through WSL interop even a file or /dev/null keeps the relay open | `axrb.spawn_detached` starts the script through WMI (`Win32_Process.Create`, nothing inherited) and polls its PID; exit code from the log's `FP_EXIT` line |
|
||||
| Which AXRB runs a game? (`deployment.json` `backend`) | AXRB 2.x (AXRB-Emulatorless) has a direct mode (`axrb-direct.exe`, no emulator) that only renders Vulkan; 1.0.4 is the emulator | automatic: direct for `graphics` Vulkan, emulator for GLES/unknown; `pc.axrb_backend` (backend / translator / precompose / legacy-driver options) or `frameport install <pkg> --to pc --axrb-backend direct\|emulator`; a switch leaves the other backend's copy and saves where they are |
|
||||
| `axrb-direct-no-gles`: direct.log `eglInitialize … EGL_BAD_DISPLAY` / `Unable to initialize EGL` / Unity's `Unable to retrieve the default EGL display!` | the game draws with OpenGL ES; direct mode's EGL is a stub (no GLES renderer). Not reported once a Vulkan device exists (Unreal Vulkan builds probe EGL first) | install it for the emulator (`pc.axrb_backend` backend=emulator); automatic choice already does this when the analysis says GLES |
|
||||
| `axrb-direct-incomplete`: `Direct mode installation is incomplete` / `Direct mode is missing …` / `Preparing the AOSP application failed` | a direct-mode file of AXRB is missing, or the sysroot (`<runtime>\direct\sysroot`, receipt `.axrb-sysroot.json` digest + format) isn't complete | reinstall AXRB-Emulatorless or rebuild the local build (`FRAMEPORT_AXRB_DIRECT_DIR`), then `frameport pc install-axrb --backend direct` (re-runs AXRB's `make_sysroot.py --art`) |
|
||||
| `axrb-direct-no-vulkan`: `vulkan-1.dll is not installed: the guest has no GPU` | no Windows Vulkan loader/driver | install the GPU's current driver |
|
||||
| `axrb-direct-unhandled-instruction`: `fatal signal 4 (SIGILL)` in direct.log | Dynarmic (or Digitalis) can't execute an arm64 instruction | report to AXRB with diagnostics (`axrb/direct/*`); try `pc.axrb_backend` translator=digitalis (or dynarmic) or the emulator |
|
||||
| `axrb-direct-guest-crash` (`E/cpu: thread … fatal signal 11/7/6/5`), `axrb-direct-host-fault` (`E/host-fault:` / `E/fatal:` = axrb-direct.exe itself), `axrb-direct-java-crash` (`FATAL EXCEPTION`, `Runtime aborting`) | a crash under direct mode's translator/ART; usually a missing Android service (Meta/Play/account/DRM), a translation bug or an unsupported syscall/Binder call (`axrb-direct-unsupported-syscall`, warning) | the other translator or the emulator; report to AXRB with the backtrace in direct.log |
|
||||
| `axrb-direct-no-native-window`: `AXRB_AOSP_HOST_SURFACES 0`, then nothing (The Climb 2: last line `Loading plug-in CryHTTP`, the main thread busy-polls its looper) | NativeActivity games take their surface with `Window.takeSurface`; AXRB's direct mode (`HostWindow.attach`) only bridges SurfaceViews, so `APP_CMD_INIT_WINDOW` never comes | AXRB's side (drafted upstream issue + a ~40-line HostWindow patch, tested); FramePort can't fix it in the APK. With the patched bootstrap the game gets its window (`AXRB_AOSP_TAKEN_SURFACE`) |
|
||||
| `axrb-direct-vulkan-extensions`: CryEngine `Renderer initialization` → `CrySystem initialization failed!` with no vkCreateDevice (The Climb 2, direct mode) | the PC's driver lacks Quest-only device extensions (VK_EXT_fragment_density_map is the one Climb 2 requires; Android external memory too); AXRB's runtime also asks for AHB in direct mode | `frame.vk_android_extensions` (PC builds only, added automatically for direct-VrApi Vulkan games): the renderer's `vkEnumerateDeviceExtensionProperties` import → `libfp_vkext.so`, which lists them; AXRB drops them again at vkCreateDevice. The VrApi bridge leaves runtime extensions no device has out of `vrapi_GetDeviceExtensionsVulkan` |
|
||||
| AXRB under Monado's simulator: VrApi games only submit empty frames; bridge `initial recenter: head flags=0x0`, `EnterVrMode: no tracked head pose before deadline` | Monado's simulated head lacks POSITION_TRACKED, so AXRB's host never sets up its LOCAL origin (`local_origin_flags` 0) and every pose in LOCAL has flags 0 | `--sim` sets AXRB's test-only `AXRB_TEST_SYNTHETIC_HMD=2` (fixed standing head + valid LOCAL; direct mode's host only: AXRB 1.0.4's emulator host only knows `=1`, which it ignores for a valid head) and, for games on the emulator backend, runs Monado's qwerty head instead (POSITION_TRACKED, the host sets LOCAL: `AXRB OpenXR: LOCAL origin in tracking world=(0.000 1.600 0.000)`; its WMR controllers stay inactive in AXRB, `FRAMEPORT_PC_XR_SIM_HEAD=simulated` keeps the simulated head); real headsets need neither |
|
||||
| AXRB emulator, GLES VrApi game (Path of the Warrior): frames submitted but both eyes pure black (FrameBridge `snapshot` of the eye images: all 0), guest log `libEGL: called unimplemented OpenGL ES API` about once a second | the emulator's GLES translator ("OpenGL ES 3.1") has no `glCopyImageSubData`: the VrApi bridge's copy of the game's eye texture into the OpenXR image did nothing | the bridge copies with `glBlitFramebuffer` when the context lacks ES 3.2 / `GL_EXT_copy_image` (log `GLES eye copies: glBlitFramebuffer, no glCopyImageSubData (OpenGL ES 3.1 …)`) |
|
||||
| AXRB emulator, GLES game with menus/messages as quad layers (VrApi cylinders, OVROverlay): `xrEndFrame failed: -2` on every frame, or with `projection_only=1` the menus missing | AXRB 1.0.4's emulator refuses GLES frames with more than one layer | FrameBridge `projection_only=2` (the PC default for GLES): the quads after the projection layer are drawn into its eye images on the game's GL context, then the projection layer goes alone (log `projection_only=2: 1 quad layer(s) drawn into the main picture`) |
|
||||
| A direct-mode launch test ran its full time but ends in `axrb-direct-guest-crash` | the game crashed during AXRB's own stop (after `AXRB_AOSP_ACTIVITIES_STOPPED`; The Climb 2 after `ovr_Shutdown finished`) | triage turns it into the info finding `axrb-direct-crash-at-stop`; the verdict passes |
|
||||
| Direct-mode launch test: "NEVER_STARTED" although AXRB's bridge ran | direct.out never printed `AXRB_AOSP_ACTIVITY_CREATED`/`AXRB_AOSP_LIFECYCLE` (ART's first start is interpreted, `-Xint`: slow); the run script stops when the bridge loses its headset | check host.err (`axrb-no-headset`), direct.out/err; the test waits 5 min for the activity and stops through AXRB's `stop_game.ps1` (closes the bridge window, the game pauses and saves) |
|
||||
|
Before Width: | Height: | Size: 421 KiB After Width: | Height: | Size: 415 KiB |
|
Before Width: | Height: | Size: 663 KiB After Width: | Height: | Size: 668 KiB |
|
Before Width: | Height: | Size: 99 KiB After Width: | Height: | Size: 103 KiB |
@@ -1,49 +0,0 @@
|
||||
# Phase 0: reading Valve's RoomView 3D mesh (dev Frame, SteamOS 0.4.5 build 20261007, 2026-10-16)
|
||||
|
||||
Result: **a third-party OpenVR client can read the passthrough depth mesh, and it carries enough of the room for
|
||||
a scan** (floor, table-height surfaces, orthogonal walls; the ceiling only weakly).
|
||||
|
||||
## Access
|
||||
- Background OpenVR app (`VR_InitInternal2(..., VRApplication_Background)`, never starts SteamVR) through
|
||||
`/opt/steamvr/bin/linuxarm64/libopenvr_api.so`.
|
||||
- `FnTable:IVRBlockQueue_005`: `Connect("/xrservice/roomview3d/meshData")` and `.../meshLayout` work (created by
|
||||
Valve's cv driver; no exclusivity seen next to the compositor's own reader). Read with
|
||||
`WaitAndAcquireReadOnlyBlock(queue, &block, &buffer, EBlockQueueReadType_New, timeout_ms)` + `ReleaseReadOnlyBlock`.
|
||||
- Metadata through the C++ interface `IVRPaths_002` (vtable slot 0 `ReadPathBatch(root, PathRead_t*, n)`, slot 2
|
||||
`StringToHandle(&handle, path)`; `FnTable:IVRPaths_001` doesn't exist), root = the **block** handle, except
|
||||
`/meshData/meshIsUpToDate` which is a property of the **queue** handle:
|
||||
|
||||
| path | tag | meaning |
|
||||
|---|---|---|
|
||||
| `/meshLayout/layoutId` | 3 (u64) | id of the index layout (static while the mesh resolution stays) |
|
||||
| `/meshLayout/vertexCount` | 2 (i32) | 16896 = 132 x 128 |
|
||||
| `/meshLayout/indexCount` | 2 | 99822 (u32 triangle indices into the grid, row width 132) |
|
||||
| `/meshData/meshId` | 3 | frame counter (~30 per second while passthrough runs) |
|
||||
| `/meshData/layoutId` | 3 | matches the layout block |
|
||||
| `/meshData/elementCount` | 2 | floats in the data block (vertexCount x 3) |
|
||||
| `/meshData/rawFromMeshPose` | 20 (HmdMatrix34) | mesh -> SteamVR raw tracking space |
|
||||
| `/meshData/posePredictionBaseTime` | 7 (f64) | seconds (system uptime clock) |
|
||||
| `/meshData/meshIsUpToDate` (queue) | 4 (bool) | false in standby / headset off |
|
||||
|
||||
- STAGE (= standing universe) = `IVRSystem_023` vtable slot 13 `GetRawZeroPoseToStandingAbsoluteTrackingPose()` x
|
||||
rawFromMeshPose. Check: the mesh origin is 6.7 cm from `GetDeviceToAbsoluteTrackingPose(Standing)`'s head
|
||||
position in every frame (camera vs head centre). **The raw->standing transform changes during a session** (its
|
||||
height went 1.60 -> 1.07 m while recording: Valve's floor estimate) -> capture raw poses and convert all frames
|
||||
with the transform at the end of the capture.
|
||||
|
||||
## The mesh
|
||||
- A fixed fan of view directions, +Z forward, rows top->bottom (row 0 = up in the image, -Y), ~126 deg across the
|
||||
corners (corner directions ~(+-0.67, +-0.66, 0.34)); one depth per grid point. Not head-locked in world terms:
|
||||
its pose is the passthrough camera pose at capture.
|
||||
- Range: reliable ~0.3-4 m; far values are inpainted (up to ~10 m) -> drop > 4 m. Strongly smoothed (soft edges,
|
||||
small objects lost); locally planar: plane-fit residual of 12x12 patches median 5-17 mm.
|
||||
- First frames after tracking starts can have NaN poses -> skip non-finite frames.
|
||||
- Fused normals (60 s of looking around, ~3 frames/s used): floor clearly at y ~= 0, a table-height surface at
|
||||
0.7 m, a lower one at 0.5 m; vertical surfaces in two orientation clusters ~85 deg apart (orthogonal walls), wall
|
||||
offsets readable; ceiling: few down-facing points (people rarely look straight up; prompt for it).
|
||||
- Data rate: 16896 x 12 B vertices + 99822 x 4 B indices per frame (the dump repeats the indices per frame).
|
||||
|
||||
## Consequences for the design
|
||||
- Capture = stdlib Python on the Frame (ctypes), as above; the C scanner works offline on the dump.
|
||||
- Scanner input quality: smooth, noisy at depth discontinuities; walls/floor via normals + RANSAC are robust;
|
||||
furniture only as coarse boxes; ceiling needs a guided "look up" step, else the default height.
|
||||
@@ -1,82 +0,0 @@
|
||||
# FramePort room files (mixed reality)
|
||||
|
||||
Quest MR games read a room model (floor, ceiling, walls, furniture, a global mesh) through Meta's scene APIs. The
|
||||
Steam Frame has no such data for apps (see docs/FRAME_RUNTIME.md "Room data"), so FramePort scans the room itself
|
||||
(`fp_roomscan`) and FrameBridge (`native/adapter/scene_emu.c`) serves it to games. This file is the contract between
|
||||
the scanner, the Frame agent, the PC app and FrameBridge.
|
||||
|
||||
## Coordinates
|
||||
- Everything is in **STAGE space** = SteamVR's standing universe = OpenXR `XR_REFERENCE_SPACE_TYPE_STAGE`:
|
||||
metres, right-handed, +Y up, floor at y = 0, -Z = the universe's forward.
|
||||
- A room belongs to one chaperone universe (`universe` line). The Frame sometimes starts a new universe without
|
||||
relocalizing; then the stored room may be misaligned (the agent reports `aligned: false`, nothing breaks).
|
||||
|
||||
## room.txt (UTF-8 text, one record per line, `#` starts a comment, fields separated by spaces)
|
||||
```
|
||||
frameport-room 1 # magic + format version (required, first line)
|
||||
universe <decimal u64> # chaperone universe id the room was scanned in (0 = unknown)
|
||||
source scan|boundary|box|manual # how it was made
|
||||
time <unix seconds>
|
||||
room <uuid> # the room anchor
|
||||
floor <uuid> <y> # floor height (normally 0)
|
||||
ceiling <uuid> <y> # ceiling height
|
||||
outline <n> x0 z0 x1 z1 ... x(n-1) z(n-1)
|
||||
# floor polygon, n >= 3, not closed, POSITIVE signed area:
|
||||
# sum(x[i]*z[i+1] - x[i+1]*z[i]) > 0 (turning from +X towards +Z; seen from
|
||||
# above with -Z forward that is clockwise). Readers reverse a negative outline.
|
||||
wall <uuid> x0 z0 x1 z1 <y0> <y1> [LABEL]
|
||||
# one wall face from (x0,z0) to (x1,z1), bottom y0, top y1.
|
||||
# Its normal points INTO the room: walls follow the outline's order, and the
|
||||
# inward normal is (-dz, dx)/|d| for d = (x1-x0, z1-z0).
|
||||
# LABEL (optional, default WALL_FACE): INVISIBLE_WALL_FACE for an edge the
|
||||
# scanner closed without seeing a wall (open side of a room, doorway gap).
|
||||
volume <uuid> <LABEL> cx cz top_y yaw_deg w d h
|
||||
# furniture box: top-face centre (cx, top_y, cz), yaw about +Y in degrees
|
||||
# (0 = local X along world X), width w along local X, depth d along the
|
||||
# horizontal local axis perpendicular to it, height h downwards from the top
|
||||
plane <uuid> <LABEL> px py pz qx qy qz qw w h
|
||||
# extra 2D plane (DOOR_FRAME, WINDOW_FRAME, WALL_ART, ...): pose of its centre,
|
||||
# Meta convention (bounds in local XY, local +Z = the plane's normal)
|
||||
mesh <uuid> <file name> <vertex count> <index count>
|
||||
# global mesh sidecar in the same folder (GLOBAL_MESH entity)
|
||||
```
|
||||
- `<uuid>` = 32 lowercase hex digits (no dashes). New ones per scan; FrameBridge uses them as the XrUuidEXT bytes.
|
||||
- Labels are Meta's semantic label strings: FLOOR, CEILING, WALL_FACE, INVISIBLE_WALL_FACE, TABLE, COUCH, BED,
|
||||
STORAGE, SCREEN, LAMP, PLANT, DOOR_FRAME, WINDOW_FRAME, WALL_ART, OTHER, GLOBAL_MESH.
|
||||
- Readers ignore unknown record types (forward compatibility) and reject a file whose first line isn't
|
||||
`frameport-room <version>` with a version they know. Missing ceiling -> 2.5 m above the floor. Missing walls ->
|
||||
walls from the outline edges. Missing outline -> the bounding rectangle of the walls.
|
||||
|
||||
### How FrameBridge maps records to Meta entities (scene_emu.c)
|
||||
- ROOM: ROOM_LAYOUT (floor, ceiling, walls in file order) + SPACE_CONTAINER (every other entity) + LOCATABLE/STORABLE.
|
||||
- floor/ceiling: pose at the outline centroid at height y; local +Z = +Y (floor) / -Y (ceiling);
|
||||
BOUNDED_2D = the outline's bounding rect in local XY; BOUNDARY_2D = the outline polygon in local XY.
|
||||
- wall: pose at the segment midpoint, height (y0+y1)/2; local +X along the wall (x0,z0)->(x1,z1), local +Y up,
|
||||
local +Z = inward normal; BOUNDED_2D = length x (y1-y0) centred.
|
||||
- volume: pose at the top-face centre, rotation = yaw about +Y then local +Z pointing up (+Y); BOUNDED_3D offset
|
||||
(-w/2, -d/2, -h), extent (w, d, h) (Meta: volumes hang below their anchor); BOUNDED_2D = the top face (w x d).
|
||||
- plane: pose as given; BOUNDED_2D = w x h centred.
|
||||
- mesh: entity at the identity pose labelled GLOBAL_MESH with TRIANGLE_MESH (XR_META_spatial_entity_mesh).
|
||||
|
||||
## room-mesh.bin (little-endian)
|
||||
```
|
||||
char[4] "FPRM", u32 version = 1, u32 vertex_count, u32 index_count,
|
||||
float32 xyz[vertex_count], u32 indices[index_count] (triangles; counter-clockwise seen from the room's inside)
|
||||
```
|
||||
Coordinates in STAGE space. Kept below 200k triangles (decimated).
|
||||
|
||||
## Where the files live
|
||||
- Frame: `~/.local/share/frameport/rooms/<universe>/room.txt` + `room-mesh.bin` (+ `scan.log`).
|
||||
`~/.local/share/frameport/rooms/current` = symlink to the newest room's folder.
|
||||
- Per game: launch.sh copies the current universe's room (else `current`) to `<app_dir>/room.txt` (+ mesh) before
|
||||
Lepton starts, next to `settings.conf`; FrameBridge reads `dirname($FRAMEBRIDGE_CONFIG)/room.txt`. No room ->
|
||||
the old guardian box.
|
||||
- A game's own saved anchors: `/sdcard/Android/data/<pkg>/files/framebridge-anchors.txt`
|
||||
(`anchor <uuid> px py pz qx qy qz qw` per line, STAGE space), written by FrameBridge on save/erase.
|
||||
|
||||
## Scan dumps (*.fprs) — recorded RoomView 3D meshes, input of `fp_roomscan --offline`
|
||||
```
|
||||
char[4] "FPRS", u32 version = 1, then frames until EOF:
|
||||
f64 time_s, float32 pose[7] (px py pz qx qy qz qw: mesh -> STAGE), u32 vertex_count, u32 index_count,
|
||||
float32 xyz[vertex_count] (mesh space), u32 indices[index_count]
|
||||
```
|
||||
@@ -1,216 +0,0 @@
|
||||
# Scene emulation stream
|
||||
|
||||
Implemented against `ROOM_FORMAT.md` without changing the contract, patch revisions, agent version or analysis version.
|
||||
No Frame access or external downloads were used. Headset behavior still needs maintainer verification.
|
||||
|
||||
## Implementation
|
||||
|
||||
- `scene_emu.c` owns entities, component APIs, pose transforms, bounded query snapshots and the event queue.
|
||||
`scene_room.c` parses room files and meshes; `scene_meta.c` implements META discovery and batch persistence;
|
||||
`scene_anchors.c` implements per-game saved anchors. All are included by the adapter, with no new dependencies.
|
||||
- At session creation, read `dirname(FRAMEBRIDGE_CONFIG)/room.txt`. Invalid magic/version, unusable geometry or
|
||||
absent files retain the original guardian box, settings and seven deterministic UUIDs. Unknown records are
|
||||
ignored; malformed records are logged and skipped. Missing ceiling, outline and walls follow the contract.
|
||||
- Floor/ceiling use the polygon area centroid and real local-XY polygons. Walls retain file order, with local +X
|
||||
along their segment, +Y up and +Z inward. Furniture poses use yaw then +Z up; volume bounds extend downwards.
|
||||
The room container includes every other room-file entity, excluding independently created application anchors.
|
||||
- Geometry exposes BOUNDED_2D, BOUNDED_3D, semantic labels and TRIANGLE_MESH as appropriate. OpenXR has no separate
|
||||
`BOUNDARY_2D` component enum: `xrGetSpaceBoundary2DFB` belongs to BOUNDED_2D. Labels preserve comma-separated strings.
|
||||
All variable-sized outputs support count-only and insufficient-capacity calls, including independent mesh arrays.
|
||||
- Limits: 2,048 entities including application anchors, 1,024 outline points, 255 label bytes, 64 KiB record lines,
|
||||
one global mesh, 600,000 vertices/indices (200,000 triangles) and 16 MiB mesh payload. Sidecar filenames cannot
|
||||
escape the config directory. Magic, version, counts, exact byte size, finite coordinates and indices are checked.
|
||||
- FB queries and META discovery snapshot results under the mutation lock, before queuing available/complete events.
|
||||
META component/UUID filters intersect; unrecognized filters impose no restriction. FB max-result limits are honored.
|
||||
There are 64 retained query snapshots and 63 queued events; calls that cannot fit their events return
|
||||
`XR_ERROR_LIMIT_REACHED`. Geometry readers share the mutation lock with persistence.
|
||||
- Application anchors use kernel randomness (`getrandom`, then `/dev/urandom`), never index-derived UUIDs.
|
||||
Saved poses are in STAGE space. FB/META saves write a private temporary file, flush/fsync, then rename to
|
||||
`/sdcard/Android/data/<package>/files/framebridge-anchors.txt`. A process suffix such as `:game` is stripped.
|
||||
Erase removes application anchors from disk and the discoverable in-memory set. Failed writes report failure
|
||||
through completion events and restore memory. Room-file entities remain owned by the scan: save/erase are no-ops
|
||||
for those entities. Storage is local; there is no cloud synchronization.
|
||||
- A new session reloads the room and saved anchors. Fake handles fit both adapter ABIs and include a session
|
||||
generation; erased/stale fake spaces are never passed to SteamVR. Session generations wrap after 256 sessions.
|
||||
- Capture completes immediately and logs exactly `scene: capture requested -> scanned room` for a usable room file,
|
||||
or `scene: capture requested -> guardian box` for the fallback. The former covers all file sources, including manual
|
||||
and boundary files. The load summary preserves the actual `source` and `universe`.
|
||||
|
||||
The cached `openxr-f2448a8797` headers already contain discovery, persistence and mesh declarations and enum values.
|
||||
No local structure/enum substitutes were necessary. Both META extensions are added to the existing conditional
|
||||
extension advertisement/instance filtering. Their system capability structures report support when emulation is active.
|
||||
Passthrough and unrelated adapter settings are unchanged.
|
||||
|
||||
## Routing and integration
|
||||
|
||||
All of the following use `scene_emulation` through **both** the adapter's normal `xrGetInstanceProcAddr` and
|
||||
`framebridge_extension_proc`, reached through xrshim's existing name-agnostic lookup:
|
||||
|
||||
```
|
||||
xrQuerySpacesFB xrRetrieveSpaceQueryResultsFB
|
||||
xrGetSpaceUuidFB xrEnumerateSpaceSupportedComponentsFB
|
||||
xrSetSpaceComponentStatusFB xrGetSpaceComponentStatusFB
|
||||
xrGetSpaceContainerFB xrGetSpaceRoomLayoutFB
|
||||
xrGetSpaceBoundingBox2DFB xrGetSpaceBoundingBox3DFB
|
||||
xrGetSpaceBoundary2DFB xrGetSpaceSemanticLabelsFB
|
||||
xrRequestSceneCaptureFB xrCreateSpatialAnchorFB
|
||||
xrSaveSpaceFB xrEraseSpaceFB
|
||||
xrGetSpaceTriangleMeshMETA xrDiscoverSpacesMETA
|
||||
xrRetrieveSpaceDiscoveryResultsMETA xrSaveSpacesMETA
|
||||
xrEraseSpacesMETA
|
||||
```
|
||||
|
||||
The shim additionally routes `xrPollEvent`, `xrGetSystemProperties`, `xrLocateSpace`, `xrLocateSpaces`,
|
||||
`xrLocateSpacesKHR` and `xrDestroySpace` to the adapter while scene emulation is active. Other shim names continue to
|
||||
OVRPort, preserving existing haptics/render-model handling. The real shim is host-tested against a dispatcher that
|
||||
refuses every scene function; every emulated scene lookup succeeds and an actual discovery/retrieve round trip runs.
|
||||
|
||||
**Plumb-stream requirement:** ensure `scene_emul=1` also installs xrshim and rewrites OVRPlugin's loader string to it.
|
||||
The pre-existing adapter patch only did this for other shim settings. These files are outside this stream's ownership.
|
||||
Delivery of room files before Lepton starts and detection of universe misalignment also belong to plumb. FrameBridge
|
||||
serves the supplied coordinates; it does not silently transform a room belonging to another universe.
|
||||
|
||||
No contract changes are needed. Whether each MRUK version accepts a room without further permissions, how it chooses
|
||||
volume versus mesh geometry, and whether its visible placement matches the scan need headset tests. The existing
|
||||
single-active-session architecture is retained; simultaneous independent sessions are not implemented.
|
||||
|
||||
## Offline verification
|
||||
|
||||
- 25 host tests passed, compiling the actual emulation and shim. Coverage includes malformed records, unknown
|
||||
records, mesh corruption/path/cap checks, derived geometry, 300 walls, poses/normals, all buffer sizing idioms,
|
||||
discovery event order/filters/backpressure, UUID query/discovery of saved anchors, new sessions/processes,
|
||||
FB/META save/erase and atomic-write failure rollback.
|
||||
- ASan/UBSan: scanned room, generated walls and box cases passed. LeakSanitizer was disabled because this sandbox
|
||||
prohibits ptrace; its default exit failed with that environmental limitation.
|
||||
- `python native/build.py --only adapter,xrshim` succeeded from cached tools. Two final builds were byte-identical,
|
||||
including `SHA256SUMS`. The shim was rebuilt and is byte-identical to its previous artifact (the routing lives in
|
||||
the adapter). Artifact content changes are the two adapter binaries and two checksum lines.
|
||||
- Full pytest was attempted: **1,771 passed, 40 skipped, 11 failed, 16 errors**. All 27 failing/erroring tests create
|
||||
local HTTP sockets, which the sandbox prohibits (`PermissionError: [Errno 1] Operation not permitted`). They are
|
||||
in `test_deeplink`, `test_devkit`, `test_install_links_extra`, `test_livestream`, `test_setup_url` and `test_ui_state`.
|
||||
With exactly those 27 tests deselected, and the additional real-shim test included: **1,772 passed, 40 skipped,
|
||||
27 deselected**. An unrestricted maintainer run of the whole suite is still required.
|
||||
- The worktree had no usable venv. Verification reused the existing local dependencies through an ignored venv
|
||||
`.pth`, with `PYTHONPATH="$PWD/src"`, `UV_CACHE_DIR=/tmp/frameport-uv-cache`, `UV_OFFLINE=true` and
|
||||
`uv run --no-sync pytest`. No dependencies were downloaded. The build cache was made a local directory with
|
||||
symlinks to cached tools/headers so generated shader files stayed inside this writable worktree.
|
||||
|
||||
Adapter SHA-256:
|
||||
|
||||
```
|
||||
arm64-v8a: a90c8d58904857bc198a48fd7a411b7807f68f14fa58fd268c57e2c2ca87e389
|
||||
armeabi-v7a: 92daecaf5b86e1857ee8a61b76598e5645f8b427e5f373067c1f87bf8ff99d07
|
||||
```
|
||||
|
||||
## Maintainer device tests
|
||||
|
||||
These commands are a handoff, not commands run by this agent. Use an isolated populated `FRAMEPORT_HOME`, cached
|
||||
build tools, a paired Frame and legally obtained game sources. Stop games before changing their files. Back up the
|
||||
existing recipe, APK, room files and saved anchors first. Integrate plumb before testing normal room delivery.
|
||||
|
||||
On the PC, from the integrated checkout (replace `frame.local` if necessary):
|
||||
|
||||
```sh
|
||||
export FRAMEPORT_HOME="$PWD/.home"
|
||||
export FRAMEPORT_NO_UPDATE_CHECK=1 FRAMEPORT_NO_CATALOG_UPDATE=1
|
||||
FRAME=steamos@frame.local
|
||||
PKG=com.Novelab.Demeter
|
||||
uv run frameport recipe "$PKG" --set scene_emul=1
|
||||
uv run frameport install "$PKG" --frame "$FRAME" --force
|
||||
uv run frameport test "$PKG" --frame "$FRAME" --seconds 45
|
||||
ssh "$FRAME"
|
||||
```
|
||||
|
||||
In that Frame shell, find the deployment's actual base (also supports a game moved to another drive):
|
||||
|
||||
```sh
|
||||
PKG=com.Novelab.Demeter
|
||||
BASE=$(python3 -c 'import json,os,sys; p=os.path.expanduser("~/Applications/quest-frame/"+sys.argv[1]+"/deployment.json"); print(json.load(open(p)).get("base",os.path.dirname(p)))' "$PKG")
|
||||
grep -E 'scene:|extension shim:.*(Spaces|TriangleMesh|BoundingBox3D|PollEvent)' "$BASE/launch.log"
|
||||
```
|
||||
|
||||
With a current scan delivered beside `settings.conf`, expect:
|
||||
|
||||
```
|
||||
scene: room from scan file (N walls, M volumes, P planes, K mesh triangles, universe U)
|
||||
scene: capture requested -> scanned room
|
||||
```
|
||||
|
||||
The capture line appears only if the game requests capture. A source made from a boundary/manual file names that
|
||||
source in the summary. The shim logs each requested function, for example
|
||||
`extension shim: xrDiscoverSpacesMETA -> FrameBridge`. There must be no `Unknown proc addr` for a scene function
|
||||
that the game obtains through the shim. Repeat the rebuild/install/headset check for `com.gritGames.Nope` and
|
||||
`com.zenstudios.PFXVRQuest` with `scene_emul=1`; these exercise newer MRUK discovery/persistence paths.
|
||||
|
||||
Wear the headset and launch from Steam. Enter each game's MR mode and request room setup if offered. Verify the
|
||||
floor polygon, every wall, ceiling and furniture match the scan; tables sit below their top-face anchors; doors and
|
||||
windows have the correct orientation. Headless startup alone cannot prove tracking or visual placement.
|
||||
|
||||
Fallback/undo test, while stopped: preserve `$BASE/room.txt` and `$BASE/room-mesh.bin` under a separate backup
|
||||
folder, then disable plumb's room delivery for this run or move the source room out of `rooms/current` as well.
|
||||
Without that precaution launch.sh will restore the file. Launch again; expect the original box summary and
|
||||
`scene: capture requested -> guardian box`. Test `scene_width=3 scene_depth=4 scene_height=2.7` with the existing
|
||||
`frameport settings` command and expect `scene: room 3.00 x 4.00 x 2.70 m`. Restore the saved files, recipe/settings
|
||||
and normal room delivery afterward. Do not delete a real game's saved anchors to test the fallback.
|
||||
|
||||
### Android persistence probe (independent of a game's UI)
|
||||
|
||||
This probe uses the **real scene code with the fake runtime from the host harness**. It checks Android storage,
|
||||
process-name handling and both persistence APIs; the headset tests above check the real SteamVR integration.
|
||||
The following cross-compilation command was verified offline:
|
||||
|
||||
```sh
|
||||
native/.cache/ndk-27.2.12479018/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android29-clang \
|
||||
-std=gnu11 -O2 -Wall -Wextra -Werror -Wno-unused-function \
|
||||
-I native/.cache/openxr-f2448a8797 -I native/adapter tests/native/scene_emu_test.c \
|
||||
-lm -o /tmp/frameport-scene-test-android
|
||||
scp /tmp/frameport-scene-test-android "$FRAME":/tmp/
|
||||
```
|
||||
|
||||
Keep a freshly installed game running so its Lepton container exists, then run in the Frame shell:
|
||||
|
||||
```sh
|
||||
APPID=$(python3 -c 'import json,os,sys; print(json.load(open(os.path.expanduser("~/Applications/quest-frame/"+sys.argv[1]+"/deployment.json")))["appid"])' "$PKG")
|
||||
CONTAINER=lepton-steamlaunch-$APPID
|
||||
podman cp /tmp/frameport-scene-test-android "$CONTAINER":/data/local/tmp/frameport-scene-test
|
||||
podman exec "$CONTAINER" test ! -e /sdcard/Android/data/org.frameport.scenetest
|
||||
# Continue only if that test succeeds: use a fresh test-only package directory.
|
||||
podman exec "$CONTAINER" mkdir -p /sdcard/Android/data/org.frameport.scenetest/files /data/local/tmp/frameport-scene-probe
|
||||
for mode in save reload erase-failure reload erase empty; do
|
||||
podman exec "$CONTAINER" sh -c "FRAMEBRIDGE_CONFIG=/data/local/tmp/frameport-scene-probe/settings.conf exec -a org.frameport.scenetest /data/local/tmp/frameport-scene-test $mode" || break
|
||||
done
|
||||
podman exec "$CONTAINER" wc -l /sdcard/Android/data/org.frameport.scenetest/files/framebridge-anchors.txt
|
||||
```
|
||||
|
||||
Every invocation must exit 0 without `FAIL`; logs show `anchors saved`, `loaded 2 saved anchors`, a deliberate
|
||||
`anchor write failed` during `erase-failure` (then the following reload still finds two), and `anchors erased`.
|
||||
The final file has zero lines. `save` also recreates a session internally, while separate invocations validate
|
||||
new-process reload. Undo, before stopping this container:
|
||||
|
||||
```sh
|
||||
podman exec "$CONTAINER" rm -rf /sdcard/Android/data/org.frameport.scenetest /data/local/tmp/frameport-scene-probe
|
||||
podman exec "$CONTAINER" rm -f /data/local/tmp/frameport-scene-test
|
||||
rm -f /tmp/frameport-scene-test-android
|
||||
```
|
||||
|
||||
Remove the PC's temporary probe binary too. Restore backed-up game files/settings and install the previous APK if
|
||||
rolling the feature back. No probe command changes real application anchors.
|
||||
|
||||
## Commit handoff under the sandbox
|
||||
|
||||
This worktree's real Git metadata is on a read-only mount. Commits therefore live on `mr/emul` in
|
||||
`/tmp/frameport-mr-emul.git`, with a portable bundle at `/tmp/frameport-mr-emul.bundle`. The actual worktree contains
|
||||
all final source/artifact edits but its original branch metadata cannot be advanced here. No local instruction,
|
||||
app-data or credential files were staged. The base is `4bf48d3`.
|
||||
|
||||
After reviewing the worktree and verifying it contains exactly these changes, the maintainer can import the commits
|
||||
and align the existing worktree index without discarding its files:
|
||||
|
||||
```sh
|
||||
git bundle verify /tmp/frameport-mr-emul.bundle
|
||||
git fetch /tmp/frameport-mr-emul.bundle mr/emul
|
||||
git log --oneline 4bf48d3..FETCH_HEAD
|
||||
git reset --mixed FETCH_HEAD
|
||||
```
|
||||
|
||||
Run the unrestricted whole suite before merging. The bundle preserves the ordered implementation/test/build commits.
|
||||
@@ -1,171 +0,0 @@
|
||||
# Room plumbing stream
|
||||
|
||||
Implemented on `mr/plumb`; no Frame access or device verification. The shared `ROOM_FORMAT.md`, agent version,
|
||||
analysis version and patch revisions were left unchanged. No native binaries belong to this stream.
|
||||
|
||||
## What changed
|
||||
|
||||
- `frameport.mr.room`: room/entity dataclasses, v1 text and binary-mesh validation, canonical serialization,
|
||||
missing ceiling/wall/outline defaults, clockwise outline/wall repair, summaries and top-down SVG previews.
|
||||
Mesh counts, indices, finite coordinates, UUIDs and sidecar basenames are checked before import.
|
||||
- Standalone stdlib agent room commands live in one marked block. Rooms are staged under
|
||||
`~/.local/share/frameport/rooms/<universe>/`; a `current` symlink selects the latest saved room. Uploads validate
|
||||
before replacing a room. Deleting the current room selects the newest remaining room.
|
||||
- `room_status` returns `rooms`, current `universe`, selected `room`, `room_text`, `aligned`, `default_circle`
|
||||
(null when no usable boundary exists) and `scanner_installed`. Summaries include wall/plane counts, furniture
|
||||
counts by label, floor area and ceiling height. Status text lets the UI preview a room without another transfer.
|
||||
- Universe detection takes the last matching vrserver log line, then the newest chaperone record if no log match
|
||||
exists. Dummy universe 424242 means unknown. Boundary conversion chains collision quads' bottom edges and refuses
|
||||
the default 20-point, roughly 1 m circle. Boundary ceilings default to 2.5 m; SteamVR's 2.43 m wall extrusion
|
||||
does not measure the real ceiling.
|
||||
- Finalize records `scene_room` from adapter settings. A marked `_room_sync` launcher line follows the existing
|
||||
config-sync pattern, before Lepton starts. Launcher upgrades also handle old recipes listing
|
||||
`adapter.scene_emul`. Matching universe wins over `current`; absent rooms remove stale sidecars. Live setting
|
||||
changes update the launcher and clear copies when disabled. Non-scene launchers keep their existing layout.
|
||||
- PC room helpers implement status/import/export/delete/boundary/build/show/capture. Scanner upload reuses the
|
||||
SHA-256 helper extracted from live view; `fp_venc` retains its soft-failure behavior. Import uploads canonical
|
||||
text. Export checks mesh counts; build uploads FPRS dumps, runs the scanner and cleans its staging directory.
|
||||
- CLI: `frameport frame room status|from-boundary|import|export|delete|build|show`, with `--frame` on each command.
|
||||
`show --output <path.svg>` writes a preview (default below `FRAMEPORT_HOME/rooms`). Build accepts `--universe`.
|
||||
- Frame page Room card: checklist, asset-URL preview, boundary/delete/capture actions, refresh and recoverable errors.
|
||||
SSH and preview writes run in a background worker; state is cached per connection. Scene-game pages link to Room
|
||||
setup when the connected Frame has no room. `ui_smoke.py --fake-frame` supplies local room-command answers.
|
||||
- Every USE_SCENE/USE_ANCHOR_API game gets the scene-emulation suggestion. Migration `scene_emul_all` enables it once
|
||||
in automatic recipes, preserving user recipes. NOPE and Pinball FX keep their other recipe fields and now request
|
||||
scene emulation. Triage explains guardian fallback and missing discovery; patch docs and translation template
|
||||
were regenerated.
|
||||
|
||||
## Integration questions and limits
|
||||
|
||||
1. Headset capture is intentionally unfinished: `room_capture` returns `{"error":"not implemented yet"}`. The
|
||||
`capture_roomview(seconds, out_path)` hook documents the pending RoomView queue work. The GUI explains this and
|
||||
offers the boundary path. Do not present the capture button as a completed scan workflow yet.
|
||||
2. This branch has no `fp_roomscan` artifact; merge the scan stream before using `frame room build`. The exact scanner
|
||||
invocation is `fp_roomscan --offline <dump> --out <temporary directory> --universe U --json`. Stdout must contain
|
||||
one JSON value, stderr is saved as `scan.log`, and output must include a valid `room.txt` with the requested U.
|
||||
3. Merge the emulation/shim stream before expecting games to use saved rooms, meshes or new Meta entry points.
|
||||
Runtime log spelling is owned there; triage accepts both existing `using guardian room`/dimension logs and the
|
||||
brief's `guardian box`/`room from guardian` messages. Reconcile new success logs at integration.
|
||||
4. Confirm the chaperone JSON path, exact universe-switch logs and whether collision quads are already in STAGE on
|
||||
the device. This implementation follows the brief's path and coordinate contract; it does not apply a second
|
||||
standing-origin transform. A universe match alone cannot detect Valve changing an origin without changing its ID.
|
||||
5. Agent and desktop perform independent validation because the deployed agent cannot import the desktop package.
|
||||
The desktop canonicalizes outlines and fills defaults; the agent preserves scanner output and validates it.
|
||||
The format contract needed no changes.
|
||||
6. Rooms are shared across games; per-game saved anchors are not deleted or rewritten by these commands. Replacing
|
||||
a room creates new entity UUIDs, so a game may need its own room-setup reset. No automatic game reset was added.
|
||||
|
||||
## Offline validation
|
||||
|
||||
All commands used `FRAMEPORT_HOME` in this worktree (tests use temporary isolated homes), an existing dependency
|
||||
venv and offline/no-sync uv settings. No dependencies or native toolchains were downloaded.
|
||||
|
||||
- Room, PC/CLI, UI, heuristics, migration, MR triage and translation checks passed: 63 tests. The related
|
||||
agent/launcher/screenshots/codec/gamepad regression group passed 170 tests. The final deployment/configuration
|
||||
regression check passed 48 tests, including all four recipe/settings precedence cases.
|
||||
- Ruff over changed Python files and `scripts/patch_docs.py --check` passed. The UI detector reported no findings.
|
||||
`scripts/i18n_extract.py` regenerated `src/frameport/locales/template.json`.
|
||||
- `pytest -m games`: 3 skipped (no game dumps). Dev/holdout evaluation used only the checked-in demo analysis
|
||||
snapshot, 21 catalog matches: dev dated 9/17 exact, F1 81.1%; holdout dated 1/4 exact, F1 73.3%. These are limited
|
||||
fixture results, not a new score for the owner's complete collection; the evaluator exits 1 for recipe differences.
|
||||
- Final full suite: **1790 passed, 40 skipped, 11 failed, 16 errors** in 87.35 s. All 27 failures/errors are
|
||||
`PermissionError: [Errno 1] Operation not permitted` when existing tests create sockets. The whole-suite green
|
||||
requirement cannot be met in this sandbox; rerun `uv run pytest -q` on a host permitting loopback sockets.
|
||||
Browser UI smoke also requires a loopback server, so it
|
||||
was not run. New UI tests construct the real Flet controls and exercise deferred preview/error/cache states.
|
||||
|
||||
## Exact device checks (maintainer only)
|
||||
|
||||
Run these after integrating emul + scan. Substitute the paired Frame address below; keep the current worktree's
|
||||
`FRAMEPORT_HOME=.home` and use explicit `--frame` so the test does not open another app data directory. The source
|
||||
connection syncs the agent by digest even without a version bump, unless the Frame has a newer agent version.
|
||||
The maintainer must perform integration version bumps before testing against a newer installed agent.
|
||||
|
||||
```sh
|
||||
export FRAME='steamos@<frame>'
|
||||
export PKG='com.gritGames.Nope' # repeat with com.zenstudios.PFXVRQuest and a known scene game
|
||||
uv run frameport frame info --frame "$FRAME"
|
||||
uv run frameport frame room status --frame "$FRAME" > .home/mr-status.json
|
||||
# Back up ALL rooms on the Frame before destructive checks; use an unused backup name.
|
||||
ssh "$FRAME" 'test ! -e ~/.local/share/frameport/rooms.before-mr-test && { test ! -d ~/.local/share/frameport/rooms || cp -a ~/.local/share/frameport/rooms ~/.local/share/frameport/rooms.before-mr-test; }'
|
||||
```
|
||||
|
||||
1. Inspect status: no room gives `room: null`, `aligned: false`. With Valve's default circle, `default_circle: true`;
|
||||
`uv run frameport frame room from-boundary --frame "$FRAME"` must fail with the default-circle explanation.
|
||||
Set a real play area in SteamVR, repeat `from-boundary`: expect source `boundary`, one wall per boundary edge,
|
||||
correct floor area and `aligned: true`. Open Frame → Room: visible preview, warning for the unscanned room,
|
||||
aligned row ready; the capture button should show the friendly unavailable message without crashing.
|
||||
2. Exercise import/export and preview with a manual fixture in the current universe:
|
||||
|
||||
```sh
|
||||
uv run frameport frame room status --frame "$FRAME" > .home/mr-status.json
|
||||
uv run python - <<'PY'
|
||||
import json
|
||||
from pathlib import Path
|
||||
from frameport.mr.room import Mesh, Volume, box_room, dumps, write_mesh
|
||||
p = Path('.home/mr-check'); p.mkdir(parents=True, exist_ok=True)
|
||||
r = box_room(4, 3, 2.5)
|
||||
r.source = 'manual'
|
||||
r.universe = json.loads(Path('.home/mr-status.json').read_text())['universe']
|
||||
r.volumes.append(Volume('a'*32, 'TABLE', .5, 0, .8, 20, 1.2, .7, .8))
|
||||
r.mesh = Mesh(vertices=[(-2, 0, -1.5), (2, 0, -1.5), (2, 0, 1.5)], indices=[0, 1, 2])
|
||||
(p/'room.txt').write_text(dumps(r))
|
||||
(p/'room-mesh.bin').write_bytes(write_mesh(r.mesh))
|
||||
PY
|
||||
uv run frameport frame room import .home/mr-check/room.txt --frame "$FRAME"
|
||||
uv run frameport frame room export .home/mr-export --frame "$FRAME"
|
||||
uv run frameport frame room show --output .home/mr-check/preview.svg --frame "$FRAME"
|
||||
cmp .home/mr-check/room-mesh.bin .home/mr-export/room-mesh.bin
|
||||
```
|
||||
|
||||
Expect four walls, one TABLE, area 12 m² and height 2.5 m. The preview must label TABLE and the game must show it
|
||||
hanging below its top-face anchor. Check the corresponding universe folder and `rooms/current` on the Frame.
|
||||
3. Use a recorded dump from the same standing universe (do not invent one). Copy it to `.home/mr-check/scan.fprs`,
|
||||
then run the command below. Expect the scanner JSON under `report`, source `scan`, aligned room data, `scan.log`
|
||||
on the Frame and an installed executable. Run twice: an unchanged scanner must not upload again.
|
||||
|
||||
```sh
|
||||
uv run frameport frame room build .home/mr-check/scan.fprs --frame "$FRAME"
|
||||
uv run frameport frame room status --frame "$FRAME"
|
||||
```
|
||||
|
||||
If the recording is from another universe, pass its original `--universe <id>`; do not relabel its coordinates.
|
||||
4. Prepare the game's source and its existing backed-up signing key in the isolated test library, then force a
|
||||
rebuild/reinstall after integration: `uv run frameport install "$PKG" --frame "$FRAME" --force --apk-only`.
|
||||
Repeat for both catalog games. In each deployment, expect `scene_room: true`. Run `frame info` twice to upgrade
|
||||
old launchers and check one marker only:
|
||||
|
||||
```sh
|
||||
uv run frameport frame info --frame "$FRAME"
|
||||
uv run frameport frame info --frame "$FRAME"
|
||||
ssh "$FRAME" "grep -c '# frameport-room-sync' ~/Applications/quest-frame/$PKG/launch.sh"
|
||||
uv run frameport settings "$PKG" scene_emul=1 --frame "$FRAME"
|
||||
```
|
||||
|
||||
Expected marker count: 1. Start the game with Steam's Play button in the headset, enter its MR mode, then inspect
|
||||
`<deployment.base>/room-sync.log`: JSON has the selected universe and alignment. The two room files must be
|
||||
beside `<deployment.base>/settings.conf`. FrameBridge must load that room; `xrDiscoverSpacesMETA` must resolve
|
||||
through the extension shim, with no `Unknown proc addr`/MRUK `NoRoomsFound`. Exact new native success log strings
|
||||
should be taken from the emul stream. Verify walls/table placement physically; never infer alignment from FPS.
|
||||
5. Exit the game. Switch `scene_emul=0` using Game settings (or the settings command above with 0): marker and game
|
||||
sidecars disappear. Switch it back to 1: one marker returns. Delete the room and launch again: stale copies are
|
||||
removed and existing FrameBridge guardian fallback logs trigger informational `mr-no-room` triage.
|
||||
6. To check a universe mismatch, back up/export the room, change its `universe` record to another valid ID and import
|
||||
it, then delete the original universe's room with `frame room delete --universe <original-id>`. Status must select
|
||||
`current` but report `aligned: false`; the Room card warns. Restore the original file before playing physically.
|
||||
The dummy universe 424242 should report current universe 0 rather than claim alignment.
|
||||
|
||||
## Undo device checks
|
||||
|
||||
Close all games. Restore the backed-up store (or remove only the fixture universes if there was no previous store):
|
||||
|
||||
```sh
|
||||
ssh "$FRAME" 'if test -d ~/.local/share/frameport/rooms.before-mr-test; then rm -rf ~/.local/share/frameport/rooms; mv ~/.local/share/frameport/rooms.before-mr-test ~/.local/share/frameport/rooms; fi'
|
||||
```
|
||||
|
||||
Set each tested game's `scene_emul` back to its recorded original value. To remove a test room without a backup:
|
||||
`uv run frameport frame room delete --universe <fixture-universe> --frame "$FRAME"`. Start a scene game once to
|
||||
refresh/remove its copies. The scanner can be removed with
|
||||
`ssh "$FRAME" 'rm -f ~/.local/share/frameport/bin/fp_roomscan'`; the next build reinstalls it. Game saves and
|
||||
`framebridge-anchors.txt` are untouched. Restore the previous app/agent/native artifacts through the maintainer's
|
||||
normal integration rollback if testing the combined native implementation fails.
|
||||
@@ -1,338 +0,0 @@
|
||||
# Offline room scanner (scan stream)
|
||||
|
||||
`fp_roomscan` converts recorded FPRS v1 meshes to the [room contract](ROOM_FORMAT.md), including the optional
|
||||
wall label adopted from upstream commit `8cb2783`:
|
||||
`room.txt` and `room-mesh.bin`. It does not capture RoomView queues, contact a headset, install rooms, or modify
|
||||
the current-room symlink. Scanner work changes `native/roomscan/`, its build target and artifact/checksum,
|
||||
`scripts/mr/synth_scan.py`, `tests/test_roomscan.py`, and this note. The upstream contract commit also brings its
|
||||
existing prompt assets and renderer unchanged. No runtime, agent, patch, or analysis versions were bumped.
|
||||
|
||||
## Build and run
|
||||
|
||||
Use the cached NDK; no downloads are needed for this target:
|
||||
|
||||
```sh
|
||||
python native/build.py --only roomscan
|
||||
```
|
||||
|
||||
The result is `artifacts/linux-arm64-bin/fp_roomscan`, a static aarch64 Linux ELF with its own `_start`, raw Linux
|
||||
syscalls, and no interpreter, dynamic section, libc, libm, UAPI headers, generated tables, or new dependencies.
|
||||
`platform.h` is the reconstruction code's entire I/O/allocation boundary. The same five C sources compile on the
|
||||
host:
|
||||
|
||||
```sh
|
||||
cc -std=c11 -O2 -Wall -Wextra -Werror -ffp-contract=off -fno-math-errno -DFP_HOSTED native/roomscan/*.c -o /tmp/fp_roomscan
|
||||
python scripts/mr/synth_scan.py /tmp/room.fprs
|
||||
/tmp/fp_roomscan --offline /tmp/room.fprs --out /tmp/scanned-room --universe 0 --json
|
||||
```
|
||||
|
||||
The output directory's parent must exist; the scanner creates the final directory if needed. It always prints
|
||||
exactly one JSON summary, whether `--json` is supplied or omitted. Success exits 0, errors exit 2 with
|
||||
`{"ok":false,"error":"..."}`. `--help` prints usage and exits 0. Successful summaries contain:
|
||||
|
||||
```json
|
||||
{"ok":true,"frames":30,"skipped_frames":0,"far_vertices":0,"discontinuity_triangles":0,
|
||||
"walls":4,"detected_walls":4,"volumes":2,"floor_y":-0.0023,
|
||||
"ceiling_y":2.5992,"coverage_percent":100.0,"hint_used":false,"triangles":70997,
|
||||
"accepted_triangles":118804,"rejected_triangles":704,"warnings":[],
|
||||
"timings_ms":{"read":0,"fusion":0,"model":0,"mesh":0,"total":0}}
|
||||
```
|
||||
|
||||
The example above illustrates the schema; actual counts and timings depend on the input. Heights are absolute
|
||||
STAGE coordinates. `frames` includes skipped frames; `skipped_frames`, `far_vertices`, and
|
||||
`discontinuity_triangles` count input exclusions once, not once per pass. `walls` counts output polygon
|
||||
edges including synthesized edges; `detected_walls` counts fitted physical planes. Coverage means the percentage
|
||||
of the output perimeter supported by observed wall planes, **not camera coverage of all room surfaces**. Timings
|
||||
include parsing, fusion, structural/furniture modelling, mesh generation, and total time including output.
|
||||
|
||||
All frame headers, timestamps/vertices/poses, approximately unit quaternions, counts, indices and EOF boundaries
|
||||
are checked before publication. A non-finite timestamp/pose/vertex or invalid tracking quaternion skips the entire
|
||||
frame after consuming and structurally validating its record, with a count and warning. A bad frame never erases
|
||||
usable frames elsewhere in the dump. Vertices outside the camera-relative range (default 4 m) and every triangle
|
||||
touching them are discarded. Triangles with a camera-depth jump over `--depth-jump + --depth-ratio * nearest_depth`
|
||||
are rejected before fusion; this complements long-edge and grazing rejection. Frame counts are capped at
|
||||
1 million vertices / 3 million indices;
|
||||
oversized records fail rather than allocating from untrusted counts. A header-only dump or one without usable
|
||||
triangles fails. Empty frames may accompany useful frames. Structural corruption (truncation, unsupported header,
|
||||
bad counts or indices) remains fatal, preserves any existing output byte for byte and creates no output directory.
|
||||
UUIDs come from `getrandom`, fresh per scan; mesh geometry is repeatable.
|
||||
|
||||
Both complete files are written to exclusive, randomly named temporary files, then individually renamed, with
|
||||
the mesh first and `room.txt` last. A write failure removes the temporary files. These are atomic **file**
|
||||
replacements, not a two-file filesystem transaction: the installer should scan into a fresh staging directory
|
||||
and publish that directory/symlink after success. Do not run concurrent writers into the same output directory.
|
||||
There is no fsync-based power-loss durability promise. Neither scan nor build writes application data outside
|
||||
the worktree's `FRAMEPORT_HOME`; fixtures and test output use temporary directories.
|
||||
|
||||
## Reconstruction
|
||||
|
||||
1. The first streaming pass validates every frame, rotates its mesh by the supplied quaternion, and translates
|
||||
it into STAGE. It rejects degenerate triangles, excessively long edges, out-of-range points, and grazing
|
||||
surfaces. Winding is corrected toward the observing camera. A deterministic bounded reservoir of 32,768
|
||||
accepted triangle centroids determines median position and padded bounds. No frames are retained across reads.
|
||||
2. The second pass rasterizes accepted triangles at 0.75 voxel spacing. Per-cell surfels average positions and
|
||||
inward normals, weighted by area and squared incidence. A capped accumulated weight lets later views correct
|
||||
earlier ones. The grid is sized from the sample bounds and capped at 8 x 8 x 4 metres about the data median.
|
||||
Unobserved cells have zero weight. This implementation uses a bounded dense backing array for the sparse
|
||||
observations, rather than a hash table; the 4.2-million-cell hard cap bounds all later work. Complete regular
|
||||
fans are recognized from their index topology, without hardcoding a camera resolution. Their normals come from
|
||||
12 x 12 neighbourhood covariance plane fits, rejecting patches above `--patch-residual` RMS; irregular meshes
|
||||
retain triangle normals. Each cell counts contributing frames once and needs `--min-views` evidence, capped at
|
||||
ten percent of usable frames (rounded down, at least one) for brief captures. This suppresses transient stereo
|
||||
geometry without requiring a short scan to see each surface five times.
|
||||
3. Horizontal normal/height histograms select the dominant floor within the STAGE floor band and a ceiling above
|
||||
the minimum ceiling height. Missing floor uses STAGE y=0 with a warning; missing ceiling uses floor plus
|
||||
`--ceiling-default`, warning exactly `ceiling not seen`. A ceiling must also have at least 15% as many supported
|
||||
cells as all upward-facing horizontal surfaces, so a few isolated down-facing patches do not invent a ceiling.
|
||||
4. RANSAC fits near-vertical planes using distance and normal agreement, then refines them by position covariance.
|
||||
Minimum height, span, and area reject furniture faces. Wall directions within the snap tolerance of the
|
||||
dominant wall's orthogonal directions are snapped, with offsets refitted. Directed wall segments are connected
|
||||
by nearest endpoints and adjacent line intersections. This preserves the L-shaped fixture's re-entrant corner.
|
||||
Parallel same-facing planes within 25 cm / approximately 14° merge, suppressing duplicate softened faces.
|
||||
Planes below 20% of the strongest original plane's area are discarded. When at least 65% of candidate wall area
|
||||
supports an orthogonal family, directions outside 12° of that family are discarded (`--snap-degrees 0` disables
|
||||
this orthogonal consensus filter). Large gaps close along observed endpoints. Ambiguous endpoints with three
|
||||
or four planes can use inward half-plane intersections; concave rooms retain segment ordering. Otherwise a
|
||||
warned observed-bounds rectangle is used. Polygon checks reject crossing edges. The output follows the contract's positive
|
||||
shoelace ordering in (x,z), with left-facing inward normals.
|
||||
5. Furniture tops are clustered separately from vertical faces, within supported horizontal height bands. A
|
||||
softened edge connecting a tabletop to a wall can no longer absorb the whole room into one box. Top boxes use
|
||||
a minimum-area horizontal orientation search and the median surface height; vertical screen candidates use
|
||||
face-direction harmonics / PCA. Bounds trim the outer 2% to suppress stereo halos. Top boxes extend down to the
|
||||
floor (the footprint and lower extent remain geometric estimates). Weak/sparse top patches are discarded.
|
||||
Labels follow height, area, long-side (with two voxels of measurement tolerance),
|
||||
thinness and near-wall rules, in order BED, COUCH, TABLE, SCREEN, STORAGE, OTHER. Only volumes are emitted;
|
||||
optional table plane records are not required. Floor/ceiling/wall surfaces are excluded before clustering.
|
||||
6. Surfel splats form an incidence/area-weighted signed distance field within three voxels of each surface. The
|
||||
sign is positive in observed free room space. Marching cubes traces zero crossings on cube faces, resolving
|
||||
ambiguous faces from their centre sign. It fans closed contours and orients triangles toward the positive
|
||||
gradient. Unknown corners suppress extraction rather than bridging unobserved space. If necessary, extraction
|
||||
is repeated on a coarser lattice (strides 2–4) until at most 200,000 triangles remain, with a decimation warning;
|
||||
excess beyond that fails. Vertices are unshared triangle vertices, so at most 600,000 vertices. Structural
|
||||
planes are semantic anchors, not substituted for the observed global mesh.
|
||||
|
||||
Peak allocation stays below 260 MiB, including maximum frame buffers, the grid, model worklists and mesh buffers
|
||||
(the latter phases do not retain frame buffers). Default synthetic scenes use a much smaller grid. Thresholds
|
||||
are CLI options below or named constants next to their algorithms. No room-specific coordinates or dimensions are
|
||||
used; on-device quality and speed still need validation.
|
||||
|
||||
## Tuning
|
||||
|
||||
Distances are metres, areas m², volumes m³. `--universe` accepts the full unsigned 64-bit range; 0 means unknown.
|
||||
|
||||
| Option | Default | Accepted range / meaning |
|
||||
| --- | ---: | --- |
|
||||
| `--voxel` | 0.05 | 0.04–0.20, spatial resolution; lower values cost more memory/work |
|
||||
| `--ceiling-default` | 2.5 | 1.8–3.8, height above floor when ceiling is unseen |
|
||||
| `--truncation` | 3 | 1–5, TSDF band in voxel units |
|
||||
| `--max-edge` | 0.6 | 0.05–1.5, reject longer triangle edges |
|
||||
| `--grazing` | 0.12 | 0.01–0.9, minimum absolute camera/normal cosine |
|
||||
| `--range` | 4 | 1–10, maximum camera-relative vertex distance; >4 m opts back into inpainted depth |
|
||||
| `--depth-jump` | 0.25 | 0.02–1, absolute part of a triangle's maximum depth discontinuity |
|
||||
| `--depth-ratio` | 0.12 | 0–0.5, additional fraction of nearest vertex depth |
|
||||
| `--min-views` | 5 | 1–16, temporal support target; brief scans cap it as described above |
|
||||
| `--patch-residual` | 0.03 | 0.005–0.1, maximum RMS residual of a regular-fan normal patch |
|
||||
| `--plane-distance` | 0.045 | 0.01–0.15, point-to-plane inlier tolerance |
|
||||
| `--min-plane-area` | 0.45 | 0.1–4, minimum occupied plane area estimate |
|
||||
| `--wall-height` | 1.5 | 0.5–3, minimum observed vertical wall span |
|
||||
| `--snap-degrees` | 5 | 0–15, orthogonal snap tolerance |
|
||||
| `--floor-band` | 0.35 | 0.05–1, floor search distance from STAGE y=0 |
|
||||
| `--ceiling-min` | 1.8 | 1.5–3, minimum absolute ceiling y |
|
||||
| `--min-volume` | 0.05 | 0.005–1, reject smaller furniture boxes |
|
||||
| `--cluster-gap` | 0.10 | 0.04–0.20, voxel neighbourhood gap (rounded up to cells) |
|
||||
| `--gap` | 0.65 | 0.1–1.5, maximum adjacent-wall endpoint extrapolation |
|
||||
| `--horizontal` | 0.85 | 0.6–0.99, minimum floor/ceiling/top normal cosine |
|
||||
|
||||
Additional constants in `model.c` include RANSAC trials, normal agreement, wall span, furniture margins,
|
||||
label height/area thresholds, box trimming and circle recognition. Fusion sampling/weight limits are in
|
||||
`fusion.c`; mesh splat radii/decimation limits in `mesh.c`; hard resource limits in `scan.h`.
|
||||
|
||||
`--hint outline.txt` accepts one `x z` point per line, decimal/scientific notation, optional `#` comments, either
|
||||
winding, at most 96 points / 8 KiB. At least eight points with radial coefficient of variation below 5% count as
|
||||
the default circle and are ignored. A non-circular hint is used only when walls are incomplete **and every
|
||||
observed wall has a compatible hint edge** within `--gap`. Complete scans are never constrained to chaperone.
|
||||
Incompatible inset play boundaries are ignored with a warning. Hint-completed edges retain synthesized status.
|
||||
|
||||
## Limits for integration
|
||||
|
||||
- Synthesized wall records now append `INVISIBLE_WALL_FACE` as their optional eighth field. Observed walls omit
|
||||
the label and default to `WALL_FACE`; comments are no longer used to carry semantics. This matches upstream's
|
||||
authorized contract change exactly; adapters need that same contract revision.
|
||||
- A private RoomView recording was used for offline robustness work. It, its derived geometry, and its results
|
||||
stay outside committed files. Synthetic fixtures independently exercise the input characteristics. They are
|
||||
regressions, not proof
|
||||
of headset accuracy. Furniture labels are geometric heuristics; adjacent/touching objects can merge, occluded
|
||||
objects may split, top-only clusters have inferred depth, and thin fragments can be screen candidates. Nearby
|
||||
parallel walls and small wall jogs can merge under coarse depth uncertainty. Large disconnected coplanar wall segments are
|
||||
currently fitted together; complicated rooms can fall back to a warned rectangle.
|
||||
- Cropped or sparse captures can produce an incomplete mesh and synthesized outline. Surfaces are not filled
|
||||
through unseen regions. Furniture is not an accessibility/safety boundary. Rooms beyond the grid cap are
|
||||
cropped with a warning. Default-circle recognition may also ignore an intentionally circular boundary.
|
||||
- Output paths are fixed by the contract. The plumbing stream should stage a new directory and switch `current`
|
||||
after scanner success, preserving the previous room for rollback. Assign the recording's actual universe id;
|
||||
this standalone scanner cannot query SteamVR or validate universe alignment.
|
||||
|
||||
## Offline validation
|
||||
|
||||
`tests/test_roomscan.py` builds with the host compiler (skips only if none exists). Its 41 tests cover the noisy
|
||||
4 x 3 x 2.6 m room with table/couch, six-wall L, moving and rotated/translated mesh poses, ceiling fallback, a single
|
||||
frame, missing walls, circular/matching hints, correct UUIDs/wire layout, interior mesh winding, triangle budget,
|
||||
repeatable mesh bytes with fresh UUIDs, truncated/corrupt dumps, invalid counts/indices/poses and invalid CLI values.
|
||||
The test module takes about fourteen seconds including synthetic rendering and compilation (under the 60 s budget).
|
||||
New cases cover non-finite frames before/after usable frames, per-vertex far rejection, depth jumps below the edge
|
||||
limit, weak ceiling evidence, wall labels and a complete camera-fan scan. The deterministic stdlib renderer now
|
||||
defaults to a 132 x 128 full index fan (99,822 indices), +Z forward / -Y image up, with poses mapping to STAGE.
|
||||
It adds separable depth smoothing, spatially correlated noise, far inpainting, two initial NaN poses, 3 Hz timestamps
|
||||
and head-height drift from 0.9 to 1.7 m. `--profile legacy` retains the smaller 110° x 76° test cone. New CLI controls
|
||||
are `--profile`, `--invalid-start`, `--smoothing` and optional resolution overrides. Use `--invalid-start 0` for a
|
||||
usable one-frame fixture; default RoomView warm-up frames otherwise have no valid tracking.
|
||||
|
||||
```sh
|
||||
UV_OFFLINE=1 UV_CACHE_DIR=/tmp/frameport-uv-cache uv run pytest -q tests/test_roomscan.py
|
||||
UV_OFFLINE=1 UV_CACHE_DIR=/tmp/frameport-uv-cache uv run ruff check scripts/mr/synth_scan.py tests/test_roomscan.py
|
||||
```
|
||||
|
||||
The synthetic camera fan passes AddressSanitizer + UndefinedBehaviorSanitizer. Two consecutive final native builds
|
||||
produce identical SHA-256 `0d88e5adfa1a21da7e0cfec2698a835d7767961e15c0b41c84235fa24ae1e751` (54,248 bytes),
|
||||
matching `artifacts/SHA256SUMS`. ELF inspection confirms aarch64, little-endian, no PT_INTERP / PT_DYNAMIC, and no
|
||||
embedded local build paths.
|
||||
|
||||
The required full `uv run pytest -q` run completed with **1,788 passed, 40 skipped, 11 failed, 16 errors** in 79 s.
|
||||
All 27 failures/errors are the sandbox's `PermissionError: [Errno 1] Operation not permitted` on socket creation
|
||||
in existing HTTP/pairing/live-stream tests (`test_deeplink`, `test_devkit`, `test_install_links_extra`,
|
||||
`test_livestream`, `test_setup_url`, `test_ui_state`). This environment forbids sockets, including loopback.
|
||||
The unchanged baseline had the identical 27 failures/errors before the scanner tests were added (1,747 passed).
|
||||
Consequently the whole-suite-pass requirement cannot be satisfied here; rerun it outside that restriction at
|
||||
integration. No tests were changed/skipped to hide the restriction and no network/device access was attempted.
|
||||
No patch/settings/catalog/triage files were touched, so the conditional patch documentation regeneration is
|
||||
unnecessary.
|
||||
|
||||
## Ten-minute capture budget (synthetic benchmark)
|
||||
|
||||
The scanner is streaming and single-threaded. On an Intel Core i7-14700K host, a **synthetic-only** 1,800-frame
|
||||
132 x 128 dump (1,083,751,208 bytes, equivalent to ten minutes at 3 Hz) took **7.41 s elapsed / 7.08 s CPU**, with
|
||||
**27,208 KiB maximum RSS** at the default voxel size. The file repeats a 30-view synthetic sweep, including its
|
||||
warm-up frames; it tests parsing/fusion throughput rather than 1,800 independent viewpoints. Geometry-dependent
|
||||
model/mesh work and storage caches affect timing. No private recording or derived room data is in that benchmark.
|
||||
|
||||
Reproduce with bounded copies rather than loading a gigabyte into Python:
|
||||
|
||||
```sh
|
||||
python scripts/mr/synth_scan.py /tmp/roomview.fprs
|
||||
python - <<'PY'
|
||||
import shutil
|
||||
with open('/tmp/roomview.fprs', 'rb') as source, open('/tmp/roomscan-1800.fprs', 'wb') as out:
|
||||
out.write(source.read(8))
|
||||
for repeat in range(60):
|
||||
source.seek(8)
|
||||
shutil.copyfileobj(source, out, 1024 * 1024)
|
||||
PY
|
||||
/usr/bin/time -v /tmp/fp_roomscan --offline /tmp/roomscan-1800.fprs --out /tmp/roomscan-benchmark --json
|
||||
```
|
||||
|
||||
For the Frame's Cortex-A720/X4-class cores, budgeting **3–5 times the host CPU time plus storage** gives roughly
|
||||
**23–38 s** for this workload, leaving headroom under the requested ~60 s. This is an estimate, not an ARM
|
||||
measurement or an 8-core speedup claim. Worst-case allocations are bounded below 260 MiB independently of frame
|
||||
count (48-byte cells, 4.2-million-cell cap, bounded frame buffers/worklists), below both the original 300 MB and
|
||||
follow-up 600 MB limits. A maximum-sized complex room can add model/mesh work beyond this small synthetic sweep.
|
||||
The maintainer must time a ten-minute real capture on the Frame and check CPU time, wall time and RSS before
|
||||
claiming the target is achieved on-device. Hardware square root instructions replace iterative division; neither
|
||||
build links libm. The build and host command both require `-fno-math-errno` for that intrinsic.
|
||||
|
||||
## Exact device checks (maintainer only; none executed by this stream)
|
||||
|
||||
1. On the development PC, build, then render the canonical fixtures:
|
||||
|
||||
```sh
|
||||
python native/build.py --only roomscan
|
||||
python scripts/mr/synth_scan.py /tmp/box.fprs
|
||||
python scripts/mr/synth_scan.py /tmp/l.fprs --shape l
|
||||
python scripts/mr/synth_scan.py /tmp/down.fprs --no-ceiling
|
||||
python scripts/mr/synth_scan.py /tmp/one.fprs --frames 1 --invalid-start 0
|
||||
scp artifacts/linux-arm64-bin/fp_roomscan /tmp/box.fprs /tmp/l.fprs /tmp/down.fprs /tmp/one.fprs steamos@<FRAME>:~/Downloads/
|
||||
```
|
||||
|
||||
2. In a terminal **on the Frame**, use an isolated directory; no game or current room is changed:
|
||||
|
||||
```sh
|
||||
mkdir -p "$HOME/.local/share/frameport/roomscan-test"
|
||||
cd "$HOME/.local/share/frameport/roomscan-test"
|
||||
cp "$HOME/Downloads/fp_roomscan" ./fp_roomscan
|
||||
chmod 700 ./fp_roomscan
|
||||
./fp_roomscan --help
|
||||
./fp_roomscan --offline "$HOME/Downloads/box.fprs" --out box --universe 0 --json > box.json
|
||||
cat box.json
|
||||
./fp_roomscan --offline "$HOME/Downloads/l.fprs" --out l --json > l.json
|
||||
./fp_roomscan --offline "$HOME/Downloads/down.fprs" --out down --ceiling-default 2.7 --json > down.json
|
||||
./fp_roomscan --offline "$HOME/Downloads/one.fprs" --out one --json > one.json
|
||||
```
|
||||
|
||||
Expected JSON: box has `ok:true`, `walls:4`, `detected_walls:4`, `volumes:2`, floor within 5 cm of 0,
|
||||
ceiling within 5 cm of 2.6, coverage 100; the only expected box warnings concern skipped warm-up frames and
|
||||
out-of-range vertices. `box/room.txt` includes TABLE and COUCH volume records.
|
||||
L has six walls and the concave corner near (0,0), rather than a rectangle. Down includes exactly the warning
|
||||
string `ceiling not seen` (other warnings are expected), with ceiling minus floor 2.7. One includes
|
||||
`few frames; scan more viewpoints`. Every mesh should have at most 200,000 triangles. JSON is the scanner log;
|
||||
there are no expected stderr status lines.
|
||||
|
||||
3. Verify sidecars, wall labels and the corrupt-input exit status on the Frame:
|
||||
|
||||
```sh
|
||||
python3 - <<'PY'
|
||||
import json, pathlib, struct
|
||||
for name in ('box', 'l', 'down', 'one'):
|
||||
report = json.loads(pathlib.Path(name + '.json').read_text())
|
||||
data = pathlib.Path(name, 'room-mesh.bin').read_bytes()
|
||||
magic, version, nv, ni = struct.unpack_from('<4sIII', data)
|
||||
assert report['ok'] and magic == b'FPRM' and version == 1
|
||||
assert ni % 3 == 0 and 0 < ni // 3 <= 200000
|
||||
assert len(data) == 16 + nv * 12 + ni * 4
|
||||
for line in pathlib.Path(name, 'room.txt').read_text().splitlines():
|
||||
if line.startswith('wall '):
|
||||
fields = line.split()
|
||||
assert len(fields) in (8, 9)
|
||||
if len(fields) == 9:
|
||||
assert fields[-1] == 'INVISIBLE_WALL_FACE'
|
||||
print(name, nv, ni // 3, report['warnings'])
|
||||
pathlib.Path('broken.fprs').write_bytes(b'FPRS\x01\0\0\0\0')
|
||||
PY
|
||||
./fp_roomscan --offline broken.fprs --out broken --json
|
||||
echo "$?"
|
||||
test ! -e broken/room.txt
|
||||
test ! -e broken/room-mesh.bin
|
||||
```
|
||||
|
||||
Expected: `{"ok":false,"error":"truncated frame header"}`, exit status 2, no `broken` outputs.
|
||||
|
||||
4. Record actual RoomView dumps with the maintainer's recorder (FPRS v1, mesh-to-STAGE poses, stable universe).
|
||||
Copy the recording to `~/Downloads/capture.fprs`. Look around slowly for about a minute, including floor,
|
||||
ceiling, every wall, and furniture from several directions. With the **recorded universe id** assigned below:
|
||||
|
||||
```sh
|
||||
scan_universe=0 # replace 0 with the recorder's actual decimal universe id
|
||||
/usr/bin/time -v ./fp_roomscan --offline "$HOME/Downloads/capture.fprs" --out real --universe "$scan_universe" --json > real.json 2> real-timing.log
|
||||
cat real.json real-timing.log
|
||||
cat real/room.txt
|
||||
```
|
||||
|
||||
Measure wall offsets/yaws, ceiling and table top physically and compare to the records (target 5 cm / 2°).
|
||||
Check resident memory below 300 MB, sensible coverage/warnings, tabletop labels and no false wall/furniture
|
||||
blobs from smeared edges. Repeat with `--max-edge 0.35 --grazing 0.2` into `real-stricter` if edges smear;
|
||||
try `--voxel 0.08 --plane-distance 0.07` into `real-coarser` if depth is noisy. Keep both JSON logs and raw
|
||||
dumps **outside git** for threshold calibration. These are proposed tuning probes, not established device fixes.
|
||||
|
||||
5. Repeat the synthetic 1,800-frame benchmark from the preceding section on the Frame, using the same command
|
||||
and `/usr/bin/time -v`. Then test a ten-minute independent real capture. Target: about 60 s elapsed or less,
|
||||
less than 600 MB RSS, successful JSON and bounded mesh size. Record CPU time as well as wall time so storage
|
||||
overhead is visible. With difficult stereo edges compare `--min-views 8 --patch-residual 0.02` in a fresh output
|
||||
directory; short captures cap view support automatically. Include the JSON's exclusion counters in triage;
|
||||
skipped frames may occur anywhere in the capture. Keep all personal results outside git.
|
||||
|
||||
6. After merging plumbing/emulation, publish this staged room through that stream's room-install path and try
|
||||
Demeter, then an MRUK discovery/mesh game. Check room loading, furniture alignment, and warning/fallback
|
||||
behaviour in-headset; the scanner alone cannot verify the Meta API path. Do not replace `rooms/current` by hand
|
||||
during these standalone checks.
|
||||
|
||||
Undo standalone checks: remove only the isolated `~/.local/share/frameport/roomscan-test` directory and the five
|
||||
test files copied to `~/Downloads` (plus `capture.fprs` if no longer needed). No Steam settings, games, agent,
|
||||
room universe folder, or current-room symlink were changed by these steps.
|
||||
@@ -13,12 +13,13 @@ embeds debug paths (`-g`) and the dex depends on the d8 version, so those differ
|
||||
|---|---|---|
|
||||
| `luajit/` | `arm64-v8a/libfp_luajit.so` | Pinned upstream LuaJIT with full-width lightuserdata (`frame.luajit_pointers`). Only the verified old Lua engine's shared public functions become imports; the original xLua API 105 bindings, LuaSocket helpers and `luaopen_perflib` remain in the game. No game library is bundled. Build: `python native/build.py --only luajit`; source revision + archive SHA-256 in `luajit/build.py`, MIT notices in `luajit/COPYRIGHT` and `artifacts/licenses/LuaJIT.txt`. `runtime.c` checks GC64 and the retained `xlua_gl` global-reference offset. `smoke.c` compares a real low-address allocation with the original library's own native static pointer; the unmodified library fails only the high-address case, the patched one round-trips both exactly. Startup verified on Frame; gameplay unverified. |
|
||||
| `adapter/` | `{arm64-v8a,armeabi-v7a}/libopenxr_loader_generic.so` | **FrameBridge**: replaces overport's generic loader (which is renamed `libopenxr_loader_original.so`) and fixes Steam Frame runtime gaps. Hooks xrCreateInstance, swapchains, xrEndFrame, spaces, xrPollEvent, … everything else is forwarded by `gen_forwarders.py`-generated tail calls. `scene_emu.c` = Meta scene/spatial-entity emulation; `flip_vk.c` = Vulkan blit for VERTICAL_FLIP quads. `session_fixes.c` = per-game session fixes, all off by default and hooked only when on (`layer_debug` diagnostics, `stable_local`, `focus_hold`, aim correction `aim_pitch/aim_yaw/aim_forward`, `refresh_rate`, `proximity_emul` = finger proximity (XR_FB_touch_controller_proximity, which the Frame lacks) from the capacitive touch inputs: OVRPlugin's `hand_thumb_proximity`/`hand_trigger_proximity` actions get extra Touch bindings); `input_diag.c` = controller-input diagnostics (setting `input_diag`, off by default and hooked only when on; logs suggested interaction profiles and the runtime's answers, each hand's current profile, functions the runtime lacks and failing input/haptics/perf calls, each line once; tested on the host by `tests/test_input_diag.py`); `layer_emul_gl.c` = `equirect_emul` (GLES sessions only): 360° equirect/equirect2 layers become one adapter projection layer, drawn by a worker thread with its own EGL context shared with the app's: each 360° image is converted to a cube map only when it changes, and the view is redrawn only after a 4° head turn (GL/EGL resolved with dlopen, so Vulkan games never load them); `layer_math.h` = their pose/face math, tested on the host by `tests/test_layer_emul.py`. `render_model.c` = XR_FB_render_model emulation (setting `controller_models`, off by default): serves `files/framebridge/controller_{left,right}.glb`, which the agent converts on the Frame from SteamVR's own Frame controller render models (never shipped by FramePort); tested on the host by `tests/test_render_model.py`. Settings: `libframe_settings.so` in the APK + `settings.conf`/`framebridge.conf` on the Frame. |
|
||||
| `vrapi-bridge/` | `arm64-v8a/libvrapi.so` | VrApi → OpenXR bridge from [Android-XR-Bridge/OVRPort](https://github.com/Android-XR-Bridge/OVRPort) `native/vrapi` at 5e7df52 (GPL-3.0, `LICENSE.upstream`; unchanged upstream as of OVRPort v1.2.5, which ships the unpatched code as its opt-in `patch_vrapi_openxr` in experimental CLI builds), with our changes in `upstream-patches/`: GLES sessions + GL texture swapchains, cylinder→quad layers, GL vertical flip, UNORM↔sRGB format twins, 30 s VR-mode deadline, VALID-only recenter, loading-icon layers skipped, `vrapi_PollEvent`/`RecenterPose`/`SetDisplayRefreshRate`/`GetSystemPropertyFloatArray` (BlazeRush imports them, GitHub #57), legacy compositor debug/volume frame flags accepted, full-rate Vulkan foveation images allocated as density attachments (The Climb, GitHub #238), diagnostics behind `-DOVP_GL_DIAG`. `upstream-patches/` reproduces these sources from the fork's `native/vrapi` (checked 2026-10-06 against its latest commit); upstream PRs Android-XR-Bridge/OVRPort#3-#8, tracked in GitHub #75. |
|
||||
| `vrapi-bridge/` | `arm64-v8a/libvrapi.so` | VrApi → OpenXR bridge from [Android-XR-Bridge/OVRPort](https://github.com/Android-XR-Bridge/OVRPort) `native/vrapi` at 5e7df52 (GPL-3.0, `LICENSE.upstream`; unchanged upstream as of OVRPort v1.2.5, which ships the unpatched code as its opt-in `patch_vrapi_openxr` in experimental CLI builds), with our changes in `upstream-patches/`: GLES sessions + GL texture swapchains, cylinder→quad layers, GL vertical flip, UNORM↔sRGB format twins, 30 s VR-mode deadline, VALID-only recenter, loading-icon layers skipped, runtime device extensions no Vulkan device offers left out of `vrapi_GetDeviceExtensionsVulkan` (AXRB's runtime asks for AHB also in its direct mode; not in `upstream-patches/` yet), `vrapi_PollEvent`/`RecenterPose`/`SetDisplayRefreshRate`/`GetSystemPropertyFloatArray` (BlazeRush imports them, GitHub #57), legacy compositor debug/volume frame flags accepted, full-rate Vulkan foveation images allocated as density attachments (The Climb, GitHub #238), diagnostics behind `-DOVP_GL_DIAG`. `upstream-patches/` reproduces these sources from the fork's `native/vrapi` (checked 2026-10-06 against its latest commit); upstream PRs Android-XR-Bridge/OVRPort#3-#8, tracked in GitHub #75. |
|
||||
| `platformcompat/` | `arm64-v8a/libovrplatformcompat.so` | Real `ovrMessageType_ToString` (same fork, `native/platform`). |
|
||||
| `langpack/` | `arm64-v8a/libfp_langpack.so` | Language packs for the Meta Platform SDK (patch `frame.langpacks`, opt-in). overport's platform loader is a dispatcher in front of Meta's own loader and answers `ovr_LanguagePack_GetCurrent/SetCurrent` with `return 0` (no reply ever). This library becomes the loader's first DT_NEEDED; the loader's own exports of the 31 functions it defines are made STB_LOCAL in `.dynsym` (`elf.hide_exports`, nothing moves), so symbol lookups reach the library first. It serves `<tag>.lang` files found in the game's OBB / app files (`$FRAMEPORT_LANGPACK_DIRS` overrides the search path) through `ovr_LanguagePack_*`, `ovr_AssetFile_GetList` (the loader's list + the packs) and `ovr_AssetFile_StatusById`; its own message queue is merged into `ovr_PopMessage`, and every handle that is not ours (an address-range check) goes to the loader's original function, whose address is read at run time from the loader's in-memory `.dynsym`. With patch `frame.asset_files` (marker byte `@FPASSETS@`, or env `FRAMEPORT_ASSET_FILES=1`) it also lists the data's `*.pak` content files as installed `default` asset files and answers `ovr_AssetFile_DownloadById` for them at once (a completed `DownloadUpdate`, then the result with the path). Host-tested against a stand-in loader (`tests/test_langpack.py`, plain `cc`, no NDK); the bionic/headset side is unverified. |
|
||||
| `glshim/` | `arm64-v8a/libglshim.so` | Mesa GLSL compatibility for GLAD engines (hooks eglGetProcAddress): comments out `#pragma` before `#extension`, enables `GL_EXT_shader_implicit_conversions`, hides GL_OVR_multiview (`gl_hide_multiview`, default 1) and logs failed shaders. `-DGLSHIM_TRACE` adds per-FBO draw/error tracing. |
|
||||
| `glmv/` | `arm64-v8a/libfpglmv.so` | Single-view draws of OVR_multiview programs (patch `frame.gl_multiview_fbo`, opt-in, GitHub #77). Mesa enforces OVR_multiview's rule that a draw's program declares as many views as the draw framebuffer has; engines that compile every shader with `num_views=2` and also draw into ordinary 2D framebuffers (Doom3Quest's HUD/PDA pool) lose those draws. The engine library gets it as first DT_NEEDED (direct `gl*` imports) and its `dlopen("libGLESv3.so")` string is rewritten to `libfpglmv.so` (same length; its `qgl*` dlsym table); linked `--no-as-needed` to libGLESv3 so dlsym on its handle finds everything it doesn't wrap. It records stage sources at glLinkProgram, caches the draw framebuffer's color-attachment view count per bind, and when a multiview program draws into a 0-view framebuffer it binds a lazily built twin (`glmv_rewrite.h`: num_views layout blanked, `gl_ViewID_OVR` -> `(0u)`; attribute locations + uniform block bindings copied, default-block uniforms copied before every such draw with a shadow to skip unchanged ones), draws, rebinds the original. Logcat tag `GLMV`; `gl_mv_debug=1`. The rewriter is host-tested on Doom3Quest's 19 shaders (`tests/test_gl_multiview_fbo.py`); untested on the device. |
|
||||
| `tlskeys/` | `arm64-v8a/libfp_tkeys.so` | Thread-key pool for Unity (patch `frame.unity_tls_key_pool`, opt-in, GitHub #198; approach and the first helper by Klownicle). Bionic allows 128 pthread keys per process; Unity 6 plus large native libraries (Firebase, Gecko) and the Frame's own libraries use them up (Wander: `cannot create thread specific key for __cxa_get_globals()`). libunity.so's four key imports are renamed to `fp_tkey_create/_delete/_get/_set` (`elf.rename_imports`, same `.dynstr` bytes, versions set global) and this library is added to its DT_NEEDED: keys without a destructor become slots (512, generation-tagged, `0x40000000 + slot`) in a per-thread table under one real key; keys with a destructor and all other libraries keep real keys. Lock-free get/set. Logs `fp_tkeys: pooling Unity's thread keys` once (tag FrameBridge). Host-tested (rename); not yet run on the device. |
|
||||
| `vkext/` | `arm64-v8a/libfp_vkext.so` | Quest Vulkan device extensions for builds for this PC (patch `frame.vk_android_extensions`, never on the Frame). AXRB's direct mode gives the game the Windows driver's device, which lacks `VK_EXT_fragment_density_map` and Android's external memory; CryEngine (The Climb 2) refuses to create its device without them. The renderer's `vkEnumerateDeviceExtensionProperties` import is renamed to `fpEnumerateDeviceExtensionProperties` (same length, `elf.rename_imports`) and this library added to its DT_NEEDED: it lists the real extensions plus the missing ones; AXRB's vkCreateDevice leaves those out again. Logs `fp_vkext: listing …` (tag FrameBridge). Seen working in direct mode (2026-10-16, headless). |
|
||||
| `zinkfix/` | `arm64-v8a/libVkLayer_fp_shaderfix.so` | Shader-fix Vulkan layer `VK_LAYER_FP_shader_fix` for OpenGL ES games (patch `frame.zink_shader_fix`): sits between Zink (Mesa's GL on Vulkan) and the driver and inserts the words of `zink_shader_fix` (same format as the Vulkan shim's `vk_shader_fix`: size + SHA-256 match) into SPIR-V modules; `zink_shader_dump=1` writes every distinct module to `files/fp_spirv/`. The engine library loads it first (DT_NEEDED); its constructor puts the layer in front of Android's GraphicsEnv debug layer list (private Android 11 `getDebugLayers`/`setDebugLayers`, found through libvulkan.so's dependencies) before EGL starts, so the loader picks it up from the app's lib dir. Exports only the enumeration functions and `VK_LAYER_FP_shader_fixGet*ProcAddr` (never plain `vk*` entry points). Vader Immortal's lightspeed shaders (Klownicle, GitHub #49). |
|
||||
| `xrlayer/` | `linux-arm64/libxr_frameport_timefix.so` + `XR_APILAYER_FRAMEPORT_timefix.json` | OpenXR API layer for Windows PC VR games under Proton on the Frame (glibc aarch64, built freestanding with the NDK's clang), on by default (patch `pcvr.xr_timefix`). Retries `xrCreateInstance` as an OpenXR 1.0 app when the runtime rejects 1.1 (the Frame's SteamVR runtime does, and Proton 11's VR helper asks for 1.1). Also emulates `xrConvertTimespecTimeToTimeKHR`/`xrConvertTimeToTimespecTimeKHR` if the runtime refuses them (the Frame's Android runtime does; its Linux runtime, used by Proton, supports them as of 2026-09-29 — so this part is only a fallback; Proton's wineopenxr needs them for `XR_KHR_win32_convert_performance_counter_time`, which Revive requires) with the adapter's xrWaitFrame-calibrated offset, and drops the extension from xrCreateInstance if the runtime rejects it. Enabled per game by the Proton launch.sh (`XR_API_LAYER_PATH`, `XR_ENABLE_API_LAYERS`). `tests/test_xrlayer.py` builds it for x86_64 and drives it via ctypes. |
|
||||
| `oculushmd/` | `win-x64/fp_oculushmd.exe` | PC VR counterpart of overport's `patch_oculus_unreal` (patch `pcvr.oculus_unreal`, default for Unreal Rift games on the Frame). Unreal's OculusHMD and LibOVR's `ovr_Detect` only start when the Windows named event `OculusHMDConnected` exists and is signalled (the Oculus service creates it). `fp_oculushmd.exe <command line>` creates it (manual reset, signalled), runs the command (Revive's injector) in a job object and keeps the event until every process in the job — the game and its children — has exited (fallback without job support: 3 minutes); returns the command's exit code and logs `FramePort oculushmd: …` to stderr (launch.log). Freestanding Windows x64 console exe (no CRT, no Windows SDK): the NDK's clang + `lld-link /Brepro` with a kernel32 import library generated by `llvm-dlltool`, so it's byte-reproducible. Tested on Windows from WSL with a build whose event name is `-DEVENT_NAME=L"…"` (the Oculus service owns the real event on a PC with the Oculus app). |
|
||||
|
||||
@@ -98,6 +98,15 @@ static int foveation_eye_enabled, foveation_eye_supported;
|
||||
// hide XR_FB_space_warp: games then render every frame themselves (UE5 Application SpaceWarp flickered on the Frame,
|
||||
// e.g. Into The Radius 2; OVRPort's patch_disable_space_warp doesn't reach UE5's OpenXR plugin)
|
||||
static int hide_space_warp = 0;
|
||||
// projection_only: frames with a projection layer and more layers submit the projection layer alone (AXRB 1.0.4's
|
||||
// emulator rejects every multi-layer GLES frame with -2: its GLES path has no layer batches; Accounting+'s OVROverlay
|
||||
// quads made almost every frame fail). The other layers (menus, overlays drawn as quads) are not shown; with
|
||||
// projection_only=2 (GLES) the quads after the projection layer are drawn into its eye images first (quad_compose_gl.c).
|
||||
static int projection_only = 0;
|
||||
// scale_max: the maximum eye size reported is the scaled recommended one too (games that size their eye buffers from
|
||||
// the maximum or scale the recommendation up: Accounting+'s Unity 2017 OVRPlugin made 896x1024 from a 448x504
|
||||
// recommendation). For AXRB's emulator, where every eye pixel is copied.
|
||||
static int scale_max = 0;
|
||||
static int strip_color_bias = 0;
|
||||
// fade_quad.c: draw colour-scale fades (fade to black) as a black quad over the picture; 2 = also remove the scale
|
||||
static int fade_quad = 0;
|
||||
@@ -133,7 +142,6 @@ static int flip_quads = 0;
|
||||
static int flip_emul_setting = 1;
|
||||
static int cylinder_strips_on = 1; // show cylinder layers as flat quad strips (cylinder_strips)
|
||||
static int scene_emul; // scene emulation setting (per game)
|
||||
static int scene_hide_bounds; // per game: the app's STAGE bounds query answers "no play area" (Demeter)
|
||||
static float scene_height = 2.5f; // scene emulation ceiling height (m)
|
||||
static float scene_width, scene_depth; // optional room size override (m)
|
||||
static int64_t xr_time_offset; // XrTime minus CLOCK_MONOTONIC ns, measured at xrWaitFrame
|
||||
@@ -176,6 +184,8 @@ static void read_settings(const char *path) {
|
||||
if (sscanf(line, "foveation_storage_fix=%f", &value) == 1) foveation_storage_fix = value != 0;
|
||||
if (sscanf(line, "foveation_eye=%f", &value) == 1) foveation_eye = value != 0;
|
||||
if (sscanf(line, "hide_space_warp=%f", &value) == 1) hide_space_warp = value != 0;
|
||||
if (sscanf(line, "projection_only=%f", &value) == 1) projection_only = value >= 2 ? 2 : value != 0;
|
||||
if (sscanf(line, "scale_max=%f", &value) == 1) scale_max = value != 0;
|
||||
if (sscanf(line, "strip_color_bias=%f", &value) == 1) strip_color_bias = (int)value;
|
||||
if (sscanf(line, "fade_quad=%f", &value) == 1) fade_quad = value > 0 ? (int)value : 0;
|
||||
if (sscanf(line, "frame_balance=%f", &value) == 1) frame_balance = value != 0;
|
||||
@@ -199,7 +209,6 @@ static void read_settings(const char *path) {
|
||||
if (sscanf(line, "flip_emul=%f", &value) == 1) flip_emul_setting = value != 0;
|
||||
if (sscanf(line, "cylinder_strips=%f", &value) == 1) cylinder_strips_on = value != 0;
|
||||
if (sscanf(line, "scene_emul=%f", &value) == 1) scene_emul = value != 0;
|
||||
if (sscanf(line, "scene_hide_bounds=%f", &value) == 1) scene_hide_bounds = value != 0;
|
||||
if (sscanf(line, "scene_height=%f", &value) == 1 && value > 1.5f && value < 5.0f) scene_height = value;
|
||||
if (sscanf(line, "scene_width=%f", &value) == 1 && value > 0.5f && value < 20.0f) scene_width = value;
|
||||
if (sscanf(line, "scene_depth=%f", &value) == 1 && value > 0.5f && value < 20.0f) scene_depth = value;
|
||||
@@ -275,6 +284,9 @@ static void initialize(void) {
|
||||
if (proximity_emul) LOG("per-game: proximity_emul=%d (finger proximity from capacitive touch: %s)", proximity_emul,
|
||||
proximity_emul > 1 ? "thumb + index" : "thumb");
|
||||
if (hide_space_warp) LOG("per-game: hide_space_warp=1 (XR_FB_space_warp hidden, space warp info removed)");
|
||||
if (projection_only)
|
||||
LOG("per-game: projection_only=%d (frames with more layers submit the projection layer alone%s)", projection_only,
|
||||
projection_only == 2 ? ", quads drawn into it" : "");
|
||||
if (strip_color_bias) LOG("per-game: strip_color_bias=%d (layer color scale/bias removed)", strip_color_bias);
|
||||
if (fade_quad) LOG("per-game: fade_quad=%d (colour-scale fades drawn as a black quad%s)", fade_quad,
|
||||
fade_quad > 1 ? "; the layer's own scale removed" : "");
|
||||
@@ -350,9 +362,8 @@ XRAPI_ATTR XrResult XRAPI_CALL xrCreateInstance(const XrInstanceCreateInfo *info
|
||||
}
|
||||
if (supported) names[kept++] = ext;
|
||||
else if (scene_emul && is_scene_extension(ext)) {
|
||||
if (!emulate_scene) LOG("emulating Meta scene/spatial-entity extensions from room file or guardian bounds");
|
||||
if (!emulate_scene) LOG("emulating Meta scene/spatial-entity extensions from the guardian bounds");
|
||||
emulate_scene = 1;
|
||||
if (!strcmp(ext, "XR_META_spatial_entity_mesh")) scene_app_mesh = 1;
|
||||
} else if (controller_models && render_models_available && !strcmp(ext, XR_FB_RENDER_MODEL_EXTENSION_NAME)) {
|
||||
emulate_render_model = 1;
|
||||
LOG("emulating XR_FB_render_model with Steam Frame controller models");
|
||||
@@ -462,7 +473,12 @@ XRAPI_ATTR XrResult XRAPI_CALL xrEnumerateViewConfigurationViews(XrInstance inst
|
||||
if (h > views[i].maxImageRectHeight) h = views[i].maxImageRectHeight;
|
||||
views[i].recommendedImageRectWidth = w ? w : 1;
|
||||
views[i].recommendedImageRectHeight = h ? h : 1;
|
||||
LOG("view %u recommended %ux%u", i, views[i].recommendedImageRectWidth, views[i].recommendedImageRectHeight);
|
||||
if (scale_max && scale < 1.0f) {
|
||||
views[i].maxImageRectWidth = views[i].recommendedImageRectWidth;
|
||||
views[i].maxImageRectHeight = views[i].recommendedImageRectHeight;
|
||||
}
|
||||
LOG("view %u recommended %ux%u%s", i, views[i].recommendedImageRectWidth, views[i].recommendedImageRectHeight,
|
||||
scale_max && scale < 1.0f ? " (also the maximum)" : "");
|
||||
}
|
||||
}
|
||||
return result;
|
||||
@@ -793,44 +809,15 @@ static int layer_usable(const XrCompositionLayerBaseHeader *layer) {
|
||||
static uint64_t next_fake_handle = 0x7f000001;
|
||||
#define FAKE_HANDLE(type) ((type)(uintptr_t)__atomic_fetch_add(&next_fake_handle, 1, __ATOMIC_RELAXED))
|
||||
|
||||
// The app's passthrough calls, logged (each kind at most 8 times) to see where an MR game stops (NOPE: black).
|
||||
static void passthrough_log(const char *what, uint64_t handle, uint32_t flags, int purpose) {
|
||||
static int counts[8];
|
||||
static const char *const kinds[8] = {"create", "start", "pause", "destroy", "layer create", "layer resume",
|
||||
"layer pause", "layer destroy"};
|
||||
for (int k = 0; k < 8; ++k)
|
||||
if (!strcmp(what, kinds[k]) && counts[k]++ < 8)
|
||||
LOG("passthrough: %s 0x%llx flags=0x%x purpose=%d", what, (unsigned long long)handle, flags, purpose);
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_create_passthrough(XrSession s, const XrPassthroughCreateInfoFB *i, XrPassthroughFB *out) {
|
||||
(void)s; if (!out) return XR_ERROR_VALIDATION_FAILURE; *out = FAKE_HANDLE(XrPassthroughFB);
|
||||
passthrough_log("create", (uint64_t)(uintptr_t)*out, i ? (uint32_t)i->flags : 0, -1);
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_passthrough_start(XrPassthroughFB p) {
|
||||
passthrough_log("start", (uint64_t)(uintptr_t)p, 0, -1); return XR_SUCCESS;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_passthrough_pause(XrPassthroughFB p) {
|
||||
passthrough_log("pause", (uint64_t)(uintptr_t)p, 0, -1); return XR_SUCCESS;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_passthrough_handle(XrPassthroughFB p) {
|
||||
passthrough_log("destroy", (uint64_t)(uintptr_t)p, 0, -1); return XR_SUCCESS;
|
||||
(void)s; (void)i; if (!out) return XR_ERROR_VALIDATION_FAILURE; *out = FAKE_HANDLE(XrPassthroughFB); return XR_SUCCESS;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_passthrough_handle(XrPassthroughFB p) { (void)p; return XR_SUCCESS; }
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_create_passthrough_layer(XrSession s, const XrPassthroughLayerCreateInfoFB *i,
|
||||
XrPassthroughLayerFB *out) {
|
||||
(void)s; if (!out) return XR_ERROR_VALIDATION_FAILURE; *out = FAKE_HANDLE(XrPassthroughLayerFB);
|
||||
passthrough_log("layer create", (uint64_t)(uintptr_t)*out, i ? (uint32_t)i->flags : 0, i ? (int)i->purpose : -1);
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_passthrough_layer_resume(XrPassthroughLayerFB l) {
|
||||
passthrough_log("layer resume", (uint64_t)(uintptr_t)l, 0, -1); return XR_SUCCESS;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_passthrough_layer_pause(XrPassthroughLayerFB l) {
|
||||
passthrough_log("layer pause", (uint64_t)(uintptr_t)l, 0, -1); return XR_SUCCESS;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_passthrough_layer_handle(XrPassthroughLayerFB l) {
|
||||
passthrough_log("layer destroy", (uint64_t)(uintptr_t)l, 0, -1); return XR_SUCCESS;
|
||||
(void)s; (void)i; if (!out) return XR_ERROR_VALIDATION_FAILURE; *out = FAKE_HANDLE(XrPassthroughLayerFB); return XR_SUCCESS;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_passthrough_layer_handle(XrPassthroughLayerFB l) { (void)l; return XR_SUCCESS; }
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_passthrough_layer_style(XrPassthroughLayerFB l, const XrPassthroughStyleFB *st) {
|
||||
(void)l; (void)st; return XR_SUCCESS;
|
||||
}
|
||||
@@ -866,12 +853,12 @@ static PFN_xrVoidFunction passthrough_emulation(const char *name) {
|
||||
static const struct { const char *name; PFN_xrVoidFunction fn; } table[] = {
|
||||
{"xrCreatePassthroughFB", (PFN_xrVoidFunction)emu_create_passthrough},
|
||||
{"xrDestroyPassthroughFB", (PFN_xrVoidFunction)emu_passthrough_handle},
|
||||
{"xrPassthroughStartFB", (PFN_xrVoidFunction)emu_passthrough_start},
|
||||
{"xrPassthroughPauseFB", (PFN_xrVoidFunction)emu_passthrough_pause},
|
||||
{"xrPassthroughStartFB", (PFN_xrVoidFunction)emu_passthrough_handle},
|
||||
{"xrPassthroughPauseFB", (PFN_xrVoidFunction)emu_passthrough_handle},
|
||||
{"xrCreatePassthroughLayerFB", (PFN_xrVoidFunction)emu_create_passthrough_layer},
|
||||
{"xrDestroyPassthroughLayerFB", (PFN_xrVoidFunction)emu_passthrough_layer_handle},
|
||||
{"xrPassthroughLayerPauseFB", (PFN_xrVoidFunction)emu_passthrough_layer_pause},
|
||||
{"xrPassthroughLayerResumeFB", (PFN_xrVoidFunction)emu_passthrough_layer_resume},
|
||||
{"xrPassthroughLayerPauseFB", (PFN_xrVoidFunction)emu_passthrough_layer_handle},
|
||||
{"xrPassthroughLayerResumeFB", (PFN_xrVoidFunction)emu_passthrough_layer_handle},
|
||||
{"xrPassthroughLayerSetStyleFB", (PFN_xrVoidFunction)emu_passthrough_layer_style},
|
||||
{"xrCreateGeometryInstanceFB", (PFN_xrVoidFunction)emu_create_geometry},
|
||||
{"xrDestroyGeometryInstanceFB", (PFN_xrVoidFunction)emu_geometry_handle},
|
||||
@@ -907,13 +894,6 @@ XRAPI_ATTR XrResult XRAPI_CALL xrGetSystemProperties(XrInstance instance, XrSyst
|
||||
((XrSystemPassthroughPropertiesFB *)p)->supportsPassthrough = XR_TRUE;
|
||||
if (p->type == XR_TYPE_SYSTEM_SPATIAL_ENTITY_PROPERTIES_FB && emulate_scene)
|
||||
((XrSystemSpatialEntityPropertiesFB *)p)->supportsSpatialEntity = XR_TRUE;
|
||||
// META scene capability chains used by current MRUK.
|
||||
if (p->type == XR_TYPE_SYSTEM_SPACE_DISCOVERY_PROPERTIES_META && emulate_scene)
|
||||
((XrSystemSpaceDiscoveryPropertiesMETA *)p)->supportsSpaceDiscovery = XR_TRUE;
|
||||
if (p->type == XR_TYPE_SYSTEM_SPACE_PERSISTENCE_PROPERTIES_META && emulate_scene)
|
||||
((XrSystemSpacePersistencePropertiesMETA *)p)->supportsSpacePersistence = XR_TRUE;
|
||||
if (p->type == XR_TYPE_SYSTEM_BOUNDARY_VISIBILITY_PROPERTIES_META && emulate_scene)
|
||||
((XrSystemBoundaryVisibilityPropertiesMETA *)p)->supportsBoundaryVisibility = XR_TRUE;
|
||||
if (p->type == XR_TYPE_SYSTEM_PASSTHROUGH_PROPERTIES2_FB)
|
||||
((XrSystemPassthroughProperties2FB *)p)->capabilities = XR_PASSTHROUGH_CAPABILITY_BIT_FB;
|
||||
if (p->type == XR_TYPE_SYSTEM_RENDER_MODEL_PROPERTIES_FB && emulate_render_model)
|
||||
@@ -960,10 +940,7 @@ XRAPI_ATTR XrResult XRAPI_CALL xrLocateSpace(XrSpace space, XrSpace baseSpace, X
|
||||
pose_time_note("xrLocateSpace", (uint64_t)(uintptr_t)space, (uint64_t)(uintptr_t)baseSpace, time);
|
||||
if (emulate_scene && location) {
|
||||
XrPosef pose; XrSpaceLocationFlags flags;
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
int fake = locate_fake(space, baseSpace, time, &pose, &flags);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
if (fake) {
|
||||
if (locate_fake(space, baseSpace, time, &pose, &flags)) {
|
||||
location->pose = pose;
|
||||
location->locationFlags = flags;
|
||||
return XR_SUCCESS;
|
||||
@@ -985,8 +962,8 @@ static XrResult locate_spaces_common(const char *name, XrSession session, const
|
||||
if (info) pose_time_note(name, info->spaceCount ? (uint64_t)(uintptr_t)info->spaces[0] : 0,
|
||||
(uint64_t)(uintptr_t)info->baseSpace, info->time);
|
||||
if (emulate_scene && info && locations) {
|
||||
any_fake = is_fake_space(info->baseSpace);
|
||||
for (uint32_t i = 0; i < info->spaceCount && !any_fake; ++i) any_fake = is_fake_space(info->spaces[i]);
|
||||
any_fake = fake_space_index(info->baseSpace) >= 0;
|
||||
for (uint32_t i = 0; i < info->spaceCount && !any_fake; ++i) any_fake = fake_space_index(info->spaces[i]) >= 0;
|
||||
}
|
||||
if (!any_fake) {
|
||||
PFN_xrLocateSpaces fn = (PFN_xrLocateSpaces)lookup(active_instance, name);
|
||||
@@ -1009,12 +986,7 @@ static XRAPI_ATTR XrResult XRAPI_CALL emu_locate_spaces_khr(XrSession session, c
|
||||
}
|
||||
|
||||
XRAPI_ATTR XrResult XRAPI_CALL xrDestroySpace(XrSpace space) {
|
||||
if (is_fake_space(space)) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
int valid = fake_space_index(space) >= 0;
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return valid ? XR_SUCCESS : XR_ERROR_HANDLE_INVALID; // entity spaces live for the whole session
|
||||
}
|
||||
if (fake_space_index(space) >= 0) return XR_SUCCESS; // entity spaces live for the whole session
|
||||
PFN_xrDestroySpace fn = (PFN_xrDestroySpace)lookup(active_instance, "xrDestroySpace");
|
||||
return fn ? fn(space) : XR_ERROR_FUNCTION_UNSUPPORTED;
|
||||
}
|
||||
@@ -1024,6 +996,7 @@ XRAPI_ATTR XrResult XRAPI_CALL xrDestroySpace(XrSpace space) {
|
||||
#include "layer_emul_gl.c"
|
||||
#include "cube_standin.c"
|
||||
#include "snapshot_gl.c"
|
||||
#include "quad_compose_gl.c"
|
||||
#include "surface_swapchain.c"
|
||||
#include "fade_quad.c"
|
||||
|
||||
@@ -1654,6 +1627,21 @@ XRAPI_ATTR XrResult XRAPI_CALL xrEndFrame(XrSession session, const XrFrameEndInf
|
||||
frames = 0; drift_sum = drift_max = 0;
|
||||
}
|
||||
}
|
||||
XrFrameEndInfo single;
|
||||
if (projection_only && info && info->layerCount > 1 && info->layers) {
|
||||
for (uint32_t i = 0; i < info->layerCount; ++i) {
|
||||
const XrCompositionLayerBaseHeader *l = info->layers[i];
|
||||
if (!l || l->type != XR_TYPE_COMPOSITION_LAYER_PROJECTION) continue;
|
||||
static int logged;
|
||||
if (!logged++) LOG("projection_only: %u layers -> the projection layer alone", info->layerCount);
|
||||
qc_compose(info, i);
|
||||
single = *info;
|
||||
single.layerCount = 1;
|
||||
single.layers = &info->layers[i];
|
||||
info = &single;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ((!layer_fix && !swap_eyes && !emulate_passthrough && !flip_quads && !flip_emul && !strip_depth && !fade_quad) || !info || !info->layerCount ||
|
||||
info->layerCount > 64)
|
||||
return fn(session, info);
|
||||
@@ -2156,19 +2144,6 @@ __attribute__((visibility("default"))) PFN_xrVoidFunction framebridge_extension_
|
||||
NATIVE_PROC(xrCreateVulkanInstanceKHR)
|
||||
#undef NATIVE_PROC
|
||||
}
|
||||
// The shim bypasses OVRPort's fixed dispatch table for all scene calls, including consumers of fake spaces.
|
||||
if (name && emulate_scene) {
|
||||
PFN_xrVoidFunction scene = scene_emulation(name);
|
||||
if (scene) return scene;
|
||||
#define SCENE_PROC(fn) if (!strcmp(name, #fn)) return (PFN_xrVoidFunction)fn;
|
||||
SCENE_PROC(xrPollEvent)
|
||||
SCENE_PROC(xrGetSystemProperties)
|
||||
SCENE_PROC(xrLocateSpace)
|
||||
SCENE_PROC(xrLocateSpaces)
|
||||
SCENE_PROC(xrDestroySpace)
|
||||
#undef SCENE_PROC
|
||||
if (!strcmp(name, "xrLocateSpacesKHR")) return (PFN_xrVoidFunction)emu_locate_spaces_khr;
|
||||
}
|
||||
return name ? render_model_emulation(name) : NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -126,4 +126,23 @@ static inline int lm_face_visible(int face, XrVector3f forward, float cos_limit)
|
||||
// Cosine of the angle between the face's centre direction and `forward` (unit): sort key, larger = closer to view.
|
||||
static inline float lm_face_score(int face, XrVector3f forward) { return lm_dot(lm_face_dir(face, 0, 0), forward); }
|
||||
|
||||
// Clip-space corners of a quad layer seen from one eye (projection_only=2 draws quads into the projection image):
|
||||
// `quad` = the quad's pose in the projection layer's space, `size` its extent in metres, `eye` + `fov` the view's
|
||||
// pose and angles in that space. out[0..3] = bottom-left, bottom-right, top-left, top-right (a triangle strip),
|
||||
// each x, y, z, w with w = depth in front of the eye (GL then interpolates the texture coordinates
|
||||
// perspective-correctly and clips what lies behind the eye); z = 0 (no depth test).
|
||||
static inline void lm_quad_clip(XrPosef quad, XrExtent2Df size, XrPosef eye, XrFovf fov, float out[4][4]) {
|
||||
const float tl = tanf(fov.angleLeft), tr = tanf(fov.angleRight), tu = tanf(fov.angleUp), td = tanf(fov.angleDown);
|
||||
const XrPosef to_eye = lm_pose_mul(lm_pose_inv(eye), quad);
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
XrVector3f c = {(i & 1 ? 0.5f : -0.5f) * size.width, (i & 2 ? 0.5f : -0.5f) * size.height, 0};
|
||||
XrVector3f r = lm_rotate(to_eye.orientation, c);
|
||||
float x = r.x + to_eye.position.x, y = r.y + to_eye.position.y, z = r.z + to_eye.position.z;
|
||||
out[i][0] = (2 * x + (tr + tl) * z) / (tr - tl);
|
||||
out[i][1] = (2 * y + (tu + td) * z) / (tu - td);
|
||||
out[i][2] = 0;
|
||||
out[i][3] = -z;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,252 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// Included by frame_adapter.c after snapshot_gl.c (whose swapchain image tracking it uses). projection_only=2 (GLES
|
||||
// sessions only): before a frame with a projection layer and more layers is reduced to the projection layer alone,
|
||||
// the quad layers submitted after the projection layer are drawn into its eye images, so menus and overlays drawn as
|
||||
// quads still show. For runtimes that refuse multi-layer GLES frames (AXRB 1.0.4's emulator: -2 for every one;
|
||||
// Path of the Warrior's menus are a VrApi cylinder the VrApi bridge turns into a quad, Accounting+ uses OVROverlay
|
||||
// quads).
|
||||
// * Drawn on the game's thread, in xrEndFrame, on its current GL context (the one the runtime reads the images back
|
||||
// from), with the eye image the game just released as the target: one textured quad per eye and quad layer, at
|
||||
// the eye's view and FOV (lm_quad_clip). No depth test: a quad is drawn over the scene (as a compositor does).
|
||||
// * Blending follows the quad's flags: XR_COMPOSITION_LAYER_BLEND_TEXTURE_SOURCE_ALPHA_BIT blends (premultiplied, or
|
||||
// straight alpha with UNPREMULTIPLIED_ALPHA_BIT), else the quad is opaque. Array quad swapchains are skipped.
|
||||
// * Every GL state it touches is restored and its errors are cleared. A failure (shader, framebuffer) is logged once
|
||||
// and turns the drawing off for the process; the frame still goes out as the projection layer alone.
|
||||
#define QC_GL_FUNCS(X) X(glCreateShader) X(glShaderSource) X(glCompileShader) X(glGetShaderiv) X(glGetShaderInfoLog) \
|
||||
X(glCreateProgram) X(glAttachShader) X(glLinkProgram) X(glGetProgramiv) X(glDeleteShader) X(glUseProgram) \
|
||||
X(glGetUniformLocation) X(glUniform4fv) X(glUniform1i) X(glUniform1f) X(glGenVertexArrays) X(glBindVertexArray) \
|
||||
X(glGenFramebuffers) X(glBindFramebuffer) X(glFramebufferTexture2D) X(glFramebufferTextureLayer) \
|
||||
X(glCheckFramebufferStatus) X(glViewport) X(glGetIntegerv) X(glGetBooleanv) X(glIsEnabled) X(glEnable) \
|
||||
X(glDisable) X(glBlendFuncSeparate) X(glBlendEquationSeparate) X(glColorMask) X(glActiveTexture) \
|
||||
X(glBindTexture) X(glGenSamplers) X(glSamplerParameteri) X(glBindSampler) X(glDrawArrays) X(glGetError)
|
||||
#define QC_DECLARE(fn) static __typeof__(&fn) q_##fn;
|
||||
QC_GL_FUNCS(QC_DECLARE)
|
||||
#undef QC_DECLARE
|
||||
|
||||
static int qc_state; // 0 untried, 1 ok, -1 off for this process
|
||||
static EGLContext qc_context; // the context the objects below belong to (VAOs and FBOs aren't shared)
|
||||
static GLuint qc_program, qc_vao, qc_fb, qc_sampler;
|
||||
static GLint qc_u_v, qc_u_tex, qc_u_opaque;
|
||||
|
||||
static const char *QC_VS =
|
||||
"#version 300 es\n"
|
||||
"uniform vec4 u_v[8];\n" // 0-3 clip-space corners (BL, BR, TL, TR), 4-7 their texture coordinates
|
||||
"out vec2 v_uv;\n"
|
||||
"void main() { gl_Position = u_v[gl_VertexID]; v_uv = u_v[4 + gl_VertexID].xy; }\n";
|
||||
static const char *QC_FS =
|
||||
"#version 300 es\n"
|
||||
"precision mediump float;\n"
|
||||
"uniform sampler2D u_tex;\n"
|
||||
"uniform float u_opaque;\n"
|
||||
"in vec2 v_uv;\n"
|
||||
"out vec4 o_color;\n"
|
||||
"void main() { vec4 c = texture(u_tex, v_uv); o_color = vec4(c.rgb, max(c.a, u_opaque)); }\n";
|
||||
|
||||
static void qc_off(const char *why) {
|
||||
qc_state = -1;
|
||||
LOG("projection_only=2: %s, quad layers are dropped instead of drawn into the main picture", why);
|
||||
}
|
||||
|
||||
static GLuint qc_shader(GLenum type, const char *src) {
|
||||
GLuint s = q_glCreateShader(type);
|
||||
q_glShaderSource(s, 1, &src, NULL);
|
||||
q_glCompileShader(s);
|
||||
GLint ok = 0;
|
||||
q_glGetShaderiv(s, GL_COMPILE_STATUS, &ok);
|
||||
if (!ok) {
|
||||
char log[256] = {0};
|
||||
q_glGetShaderInfoLog(s, sizeof(log) - 1, NULL, log);
|
||||
LOG("projection_only=2: shader: %s", log);
|
||||
q_glDeleteShader(s);
|
||||
return 0;
|
||||
}
|
||||
return s;
|
||||
}
|
||||
|
||||
// GL entry points + this context's objects. 1 = ready.
|
||||
static int qc_setup(void) {
|
||||
if (qc_state < 0) return 0;
|
||||
if (!qc_state) {
|
||||
if (!snap_load_gl()) { qc_off("OpenGL ES not available"); return 0; }
|
||||
void *gles = dlopen("libGLESv3.so", RTLD_NOW | RTLD_LOCAL);
|
||||
int ok = gles != NULL;
|
||||
#define QC_RESOLVE(fn) ok &= gles && (q_##fn = (__typeof__(q_##fn))dlsym(gles, #fn)) != NULL;
|
||||
QC_GL_FUNCS(QC_RESOLVE)
|
||||
#undef QC_RESOLVE
|
||||
if (!ok) { qc_off("GL functions missing"); return 0; }
|
||||
qc_state = 1;
|
||||
}
|
||||
EGLContext ctx = s_eglGetCurrentContext();
|
||||
if (!ctx) return 0;
|
||||
if (ctx == qc_context && qc_program) return 1;
|
||||
// a new context (or the first): build the program and objects there (the old ones belonged to another context)
|
||||
GLint old_program = 0;
|
||||
q_glGetIntegerv(GL_CURRENT_PROGRAM, &old_program);
|
||||
GLuint vs = qc_shader(GL_VERTEX_SHADER, QC_VS), fs = qc_shader(GL_FRAGMENT_SHADER, QC_FS);
|
||||
GLuint program = 0;
|
||||
if (vs && fs) {
|
||||
program = q_glCreateProgram();
|
||||
q_glAttachShader(program, vs);
|
||||
q_glAttachShader(program, fs);
|
||||
q_glLinkProgram(program);
|
||||
GLint linked = 0;
|
||||
q_glGetProgramiv(program, GL_LINK_STATUS, &linked);
|
||||
if (!linked) program = 0;
|
||||
}
|
||||
if (vs) q_glDeleteShader(vs);
|
||||
if (fs) q_glDeleteShader(fs);
|
||||
if (!program) { while (q_glGetError() != GL_NO_ERROR) {} qc_off("shader program failed"); return 0; }
|
||||
qc_program = program;
|
||||
qc_u_v = q_glGetUniformLocation(program, "u_v");
|
||||
qc_u_tex = q_glGetUniformLocation(program, "u_tex");
|
||||
qc_u_opaque = q_glGetUniformLocation(program, "u_opaque");
|
||||
q_glGenVertexArrays(1, &qc_vao);
|
||||
q_glGenFramebuffers(1, &qc_fb);
|
||||
q_glGenSamplers(1, &qc_sampler);
|
||||
q_glSamplerParameteri(qc_sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR); // no mipmaps needed (and none required)
|
||||
q_glSamplerParameteri(qc_sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
q_glSamplerParameteri(qc_sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
|
||||
q_glSamplerParameteri(qc_sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
|
||||
q_glUseProgram((GLuint)old_program);
|
||||
qc_context = ctx;
|
||||
return 1;
|
||||
}
|
||||
|
||||
// The GL texture (and size) of the image the game last acquired (= just released) from a swapchain; 0 if unknown.
|
||||
static GLuint qc_image(XrSwapchain handle, uint32_t *w, uint32_t *h, uint32_t *array_size) {
|
||||
GLuint tex = 0;
|
||||
pthread_mutex_lock(&snap_lock);
|
||||
int i = snap_find(handle, 0);
|
||||
if (i >= 0 && snap_chains[i].count && snap_chains[i].last_acquired < snap_chains[i].count) {
|
||||
tex = snap_chains[i].images[snap_chains[i].last_acquired];
|
||||
*w = snap_chains[i].width, *h = snap_chains[i].height, *array_size = snap_chains[i].array_size;
|
||||
}
|
||||
pthread_mutex_unlock(&snap_lock);
|
||||
return tex;
|
||||
}
|
||||
|
||||
static void qc_compose(const XrFrameEndInfo *info, uint32_t proj_index) {
|
||||
if (projection_only != 2 || !info || !info->layers) return;
|
||||
const XrCompositionLayerProjection *proj = (const XrCompositionLayerProjection *)info->layers[proj_index];
|
||||
if (!proj || proj->viewCount < 2 || !proj->views) return;
|
||||
uint32_t quads = 0;
|
||||
for (uint32_t i = proj_index + 1; i < info->layerCount; ++i)
|
||||
if (info->layers[i] && info->layers[i]->type == XR_TYPE_COMPOSITION_LAYER_QUAD) ++quads;
|
||||
if (!quads || !qc_setup()) return;
|
||||
|
||||
// the game's state we change
|
||||
GLint draw_fb, viewport[4], program, vao, active_tex, tex2d, sampler, src_rgb, dst_rgb, src_a, dst_a, eq_rgb, eq_a;
|
||||
GLboolean color_mask[4];
|
||||
const GLenum caps[] = {GL_BLEND, GL_DEPTH_TEST, GL_STENCIL_TEST, GL_SCISSOR_TEST, GL_CULL_FACE,
|
||||
GL_SAMPLE_ALPHA_TO_COVERAGE, GL_RASTERIZER_DISCARD};
|
||||
GLboolean cap_on[sizeof(caps) / sizeof(caps[0])];
|
||||
q_glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &draw_fb);
|
||||
q_glGetIntegerv(GL_VIEWPORT, viewport);
|
||||
q_glGetIntegerv(GL_CURRENT_PROGRAM, &program);
|
||||
q_glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &vao);
|
||||
q_glGetIntegerv(GL_ACTIVE_TEXTURE, &active_tex);
|
||||
q_glActiveTexture(GL_TEXTURE0);
|
||||
q_glGetIntegerv(GL_TEXTURE_BINDING_2D, &tex2d);
|
||||
q_glGetIntegerv(GL_SAMPLER_BINDING, &sampler);
|
||||
q_glGetIntegerv(GL_BLEND_SRC_RGB, &src_rgb);
|
||||
q_glGetIntegerv(GL_BLEND_DST_RGB, &dst_rgb);
|
||||
q_glGetIntegerv(GL_BLEND_SRC_ALPHA, &src_a);
|
||||
q_glGetIntegerv(GL_BLEND_DST_ALPHA, &dst_a);
|
||||
q_glGetIntegerv(GL_BLEND_EQUATION_RGB, &eq_rgb);
|
||||
q_glGetIntegerv(GL_BLEND_EQUATION_ALPHA, &eq_a);
|
||||
q_glGetBooleanv(GL_COLOR_WRITEMASK, color_mask);
|
||||
for (size_t c = 0; c < sizeof(caps) / sizeof(caps[0]); ++c) {
|
||||
cap_on[c] = q_glIsEnabled(caps[c]);
|
||||
q_glDisable(caps[c]);
|
||||
}
|
||||
q_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
|
||||
q_glBlendEquationSeparate(GL_FUNC_ADD, GL_FUNC_ADD);
|
||||
q_glUseProgram(qc_program);
|
||||
q_glBindVertexArray(qc_vao);
|
||||
q_glBindSampler(0, qc_sampler);
|
||||
q_glUniform1i(qc_u_tex, 0);
|
||||
q_glBindFramebuffer(GL_DRAW_FRAMEBUFFER, qc_fb);
|
||||
|
||||
PFN_xrLocateSpace locate = (PFN_xrLocateSpace)lookup(active_instance, "xrLocateSpace");
|
||||
int drawn = 0;
|
||||
for (uint32_t eye = 0; eye < 2; ++eye) {
|
||||
const XrCompositionLayerProjectionView *view = &proj->views[eye];
|
||||
uint32_t tw = 0, th = 0, tarray = 1;
|
||||
GLuint target = qc_image(view->subImage.swapchain, &tw, &th, &tarray);
|
||||
if (!target) continue;
|
||||
if (tarray > 1)
|
||||
q_glFramebufferTextureLayer(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, target, 0,
|
||||
(GLint)view->subImage.imageArrayIndex);
|
||||
else
|
||||
q_glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, target, 0);
|
||||
if (q_glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
|
||||
qc_off("eye image not drawable (framebuffer incomplete)");
|
||||
break;
|
||||
}
|
||||
const XrRect2Di *r = &view->subImage.imageRect;
|
||||
q_glViewport(r->offset.x, r->offset.y, r->extent.width, r->extent.height);
|
||||
for (uint32_t i = proj_index + 1; i < info->layerCount; ++i) {
|
||||
const XrCompositionLayerQuad *q = (const XrCompositionLayerQuad *)info->layers[i];
|
||||
if (!q || q->type != XR_TYPE_COMPOSITION_LAYER_QUAD) continue;
|
||||
if (q->eyeVisibility == XR_EYE_VISIBILITY_LEFT && eye != 0) continue;
|
||||
if (q->eyeVisibility == XR_EYE_VISIBILITY_RIGHT && eye != 1) continue;
|
||||
uint32_t sw = 0, sh = 0, sarray = 1;
|
||||
GLuint source = qc_image(q->subImage.swapchain, &sw, &sh, &sarray);
|
||||
if (!source || sarray > 1 || !sw || !sh) continue;
|
||||
XrPosef pose = q->pose; // the quad in the projection layer's space
|
||||
if (q->space != proj->space) {
|
||||
XrSpaceLocation loc = {XR_TYPE_SPACE_LOCATION};
|
||||
if (!locate || XR_FAILED(locate(q->space, proj->space, info->displayTime, &loc))) continue;
|
||||
pose = lm_pose_mul(loc.pose, q->pose);
|
||||
}
|
||||
float v[8][4];
|
||||
lm_quad_clip(pose, q->size, view->pose, view->fov, v);
|
||||
const XrRect2Di *s = &q->subImage.imageRect;
|
||||
float u0 = (float)s->offset.x / sw, u1 = (float)(s->offset.x + s->extent.width) / sw;
|
||||
float v0 = (float)s->offset.y / sh, v1 = (float)(s->offset.y + s->extent.height) / sh;
|
||||
for (int k = 0; k < 4; ++k) {
|
||||
v[4 + k][0] = k & 1 ? u1 : u0;
|
||||
v[4 + k][1] = k & 2 ? v1 : v0; // GL textures: v grows upwards, the quad's top is +Y
|
||||
v[4 + k][2] = v[4 + k][3] = 0;
|
||||
}
|
||||
q_glUniform4fv(qc_u_v, 8, &v[0][0]);
|
||||
const int blend = (q->layerFlags & XR_COMPOSITION_LAYER_BLEND_TEXTURE_SOURCE_ALPHA_BIT) != 0;
|
||||
q_glUniform1f(qc_u_opaque, blend ? 0.0f : 1.0f);
|
||||
if (blend) {
|
||||
q_glEnable(GL_BLEND);
|
||||
if (q->layerFlags & XR_COMPOSITION_LAYER_UNPREMULTIPLIED_ALPHA_BIT)
|
||||
q_glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
|
||||
else
|
||||
q_glBlendFuncSeparate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
|
||||
} else {
|
||||
q_glDisable(GL_BLEND);
|
||||
}
|
||||
q_glBindTexture(GL_TEXTURE_2D, source);
|
||||
q_glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
|
||||
++drawn;
|
||||
}
|
||||
}
|
||||
|
||||
// the game's state back
|
||||
q_glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0);
|
||||
q_glBindFramebuffer(GL_DRAW_FRAMEBUFFER, (GLuint)draw_fb);
|
||||
q_glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
|
||||
q_glBindTexture(GL_TEXTURE_2D, (GLuint)tex2d);
|
||||
q_glBindSampler(0, (GLuint)sampler);
|
||||
q_glActiveTexture((GLenum)active_tex);
|
||||
q_glBindVertexArray((GLuint)vao);
|
||||
q_glUseProgram((GLuint)program);
|
||||
q_glBlendFuncSeparate((GLenum)src_rgb, (GLenum)dst_rgb, (GLenum)src_a, (GLenum)dst_a);
|
||||
q_glBlendEquationSeparate((GLenum)eq_rgb, (GLenum)eq_a);
|
||||
q_glColorMask(color_mask[0], color_mask[1], color_mask[2], color_mask[3]);
|
||||
for (size_t c = 0; c < sizeof(caps) / sizeof(caps[0]); ++c)
|
||||
if (cap_on[c]) q_glEnable(caps[c]); else q_glDisable(caps[c]);
|
||||
GLenum err, first = GL_NO_ERROR;
|
||||
while ((err = q_glGetError()) != GL_NO_ERROR) if (first == GL_NO_ERROR) first = err;
|
||||
static int logged;
|
||||
if (drawn && !logged++) LOG("projection_only=2: %u quad layer(s) drawn into the main picture", quads);
|
||||
if (first != GL_NO_ERROR) {
|
||||
static int errors;
|
||||
if (errors++ < 3) LOG("projection_only=2: GL error 0x%x while drawing quads", first);
|
||||
}
|
||||
}
|
||||
@@ -1,115 +0,0 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// Included by scene_emu.c. Persist only application anchors; scanned entities remain owned by the room file.
|
||||
#include <sys/random.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#ifndef SCENE_EXTERNAL_ROOT
|
||||
#define SCENE_EXTERNAL_ROOT "/sdcard/Android/data"
|
||||
#endif
|
||||
|
||||
static int anchor_path(char *path, size_t size) {
|
||||
char process[256] = {0};
|
||||
FILE *f = fopen("/proc/self/cmdline", "r");
|
||||
if (!f) return 0;
|
||||
size_t n = fread(process, 1, sizeof(process)-1, f);
|
||||
fclose(f);
|
||||
if (!n) return 0;
|
||||
char *colon = strchr(process, ':');
|
||||
if (colon) *colon = 0;
|
||||
// Only package-like process names: never let a command line become a path traversal.
|
||||
if (!strchr(process, '.') || !strcmp(process, ".") || !strcmp(process, "..")) return 0;
|
||||
for (const char *p = process; *p; ++p)
|
||||
if (!((*p >= 'a' && *p <= 'z') || (*p >= 'A' && *p <= 'Z') || (*p >= '0' && *p <= '9') || *p == '.' || *p == '_')) return 0;
|
||||
int len = snprintf(path, size, "%s/%s/files/framebridge-anchors.txt", SCENE_EXTERNAL_ROOT, process);
|
||||
return len > 0 && (size_t)len < size;
|
||||
}
|
||||
static int anchor_uuid(XrUuidEXT *u) {
|
||||
size_t have = 0;
|
||||
while (have < sizeof(u->data)) {
|
||||
ssize_t n = getrandom(u->data + have, sizeof(u->data) - have, 0);
|
||||
if (n < 0 && errno == EINTR) continue;
|
||||
if (n <= 0) break;
|
||||
have += (size_t)n;
|
||||
}
|
||||
if (have < sizeof(u->data)) {
|
||||
FILE *f = fopen("/dev/urandom", "rb");
|
||||
if (!f) return 0;
|
||||
have = fread(u->data, 1, sizeof(u->data), f);
|
||||
fclose(f);
|
||||
if (have != sizeof(u->data)) return 0;
|
||||
}
|
||||
u->data[6] = (uint8_t)((u->data[6] & 15) | 0x40);
|
||||
u->data[8] = (uint8_t)((u->data[8] & 63) | 0x80);
|
||||
for (int i = 0; i < entity_count; ++i) if (uuid_equal(u, &entities[i].uuid)) return 0;
|
||||
return 1;
|
||||
}
|
||||
static int write_anchors(void) {
|
||||
char path[4096], tmp[4128];
|
||||
if (!anchor_path(path, sizeof(path))) return 0;
|
||||
snprintf(tmp, sizeof(tmp), "%s.tmp-XXXXXX", path);
|
||||
int fd = mkstemp(tmp);
|
||||
if (fd < 0) return 0;
|
||||
FILE *f = fdopen(fd, "w");
|
||||
if (!f) { close(fd); unlink(tmp); return 0; }
|
||||
int ok = 1;
|
||||
for (int i = 0; i < entity_count; ++i) {
|
||||
const scene_entity *e = &entities[i];
|
||||
if (!e->is_anchor || !e->saved || e->erased) continue;
|
||||
char uuid[33];
|
||||
for (int k = 0; k < 16; ++k) snprintf(uuid + k*2, 3, "%02x", e->uuid.data[k]);
|
||||
const XrPosef p = e->pose_in_stage;
|
||||
if (fprintf(f, "anchor %s %.9g %.9g %.9g %.9g %.9g %.9g %.9g\n", uuid,
|
||||
p.position.x, p.position.y, p.position.z, p.orientation.x, p.orientation.y, p.orientation.z, p.orientation.w) < 0) ok = 0;
|
||||
}
|
||||
if (fflush(f) || fsync(fd)) ok = 0;
|
||||
if (fclose(f)) ok = 0;
|
||||
if (ok && rename(tmp, path)) ok = 0;
|
||||
if (!ok) { LOG("scene: anchor write failed (%d)", errno); unlink(tmp); }
|
||||
return ok;
|
||||
}
|
||||
static void load_anchors(void) {
|
||||
char path[4096];
|
||||
if (!anchor_path(path, sizeof(path))) return;
|
||||
FILE *f = fopen(path, "r");
|
||||
if (!f) return;
|
||||
char line[1024], *t[10];
|
||||
unsigned loaded = 0;
|
||||
while (fgets(line, sizeof(line), f)) {
|
||||
if (!strchr(line, '\n') && !feof(f)) { int c; while ((c=fgetc(f)) != EOF && c != '\n') {} continue; }
|
||||
XrUuidEXT uuid; float v[7];
|
||||
int n = room_tokens(line, t, 10);
|
||||
if (n != 9 || strcmp(t[0], "anchor") || !room_uuid(t[1], &uuid) || !room_values(t, 2, 7, v)) continue;
|
||||
float norm = sqrtf(v[3]*v[3]+v[4]*v[4]+v[5]*v[5]+v[6]*v[6]);
|
||||
if (norm < 0.0001f) continue;
|
||||
int duplicate = 0;
|
||||
for (int i = 0; i < entity_count; ++i) duplicate |= uuid_equal(&uuid, &entities[i].uuid);
|
||||
if (duplicate) continue;
|
||||
int i = add_entity((XrPosef){{v[3]/norm,v[4]/norm,v[5]/norm,v[6]/norm},{v[0],v[1],v[2]}}, NULL, 0, 0, 0, 1);
|
||||
if (i < 0) break;
|
||||
entities[i].uuid = uuid; entities[i].saved = 1; ++loaded;
|
||||
}
|
||||
fclose(f);
|
||||
LOG("scene: loaded %u saved anchors", loaded);
|
||||
}
|
||||
// Batch writes are atomic both on disk and in memory. Failure never silently destroys the old anchor set.
|
||||
static XrResult persist_spaces(uint32_t count, const XrSpace *spaces, uint32_t uuid_count, const XrUuidEXT *uuids, int erase) {
|
||||
unsigned char selected[MAX_ENTITIES] = {0}, old_saved[MAX_ENTITIES], old_erased[MAX_ENTITIES];
|
||||
for (uint32_t k = 0; k < count; ++k) {
|
||||
int i = fake_space_index(spaces[k]);
|
||||
if (i < 0) return XR_ERROR_HANDLE_INVALID;
|
||||
if (entities[i].is_anchor) selected[i] = 1;
|
||||
}
|
||||
if (erase) for (int i = 0; i < entity_count; ++i)
|
||||
if (entities[i].is_anchor && !entities[i].erased && uuid_matches(uuid_count, uuids, &entities[i])) selected[i] = 1;
|
||||
int changed = 0;
|
||||
for (int i = 0; i < entity_count; ++i) {
|
||||
old_saved[i] = (unsigned char)entities[i].saved; old_erased[i] = (unsigned char)entities[i].erased;
|
||||
if (selected[i]) { entities[i].saved = !erase; entities[i].erased = erase; changed = 1; }
|
||||
}
|
||||
if (changed && !write_anchors()) {
|
||||
for (int i = 0; i < entity_count; ++i) { entities[i].saved = old_saved[i]; entities[i].erased = old_erased[i]; }
|
||||
return XR_ERROR_RUNTIME_FAILURE;
|
||||
}
|
||||
if (changed) LOG("scene: anchors %s", erase ? "erased" : "saved");
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
@@ -1,19 +1,16 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// Included by frame_adapter.c. Emulates Meta's scene / spatial-entity extensions (XR_FB_spatial_entity,
|
||||
// _query, _storage, _container, XR_FB_scene, XR_FB_scene_capture) for mixed-reality apps on runtimes that
|
||||
// lack them (Steam Frame). Room files use STAGE coordinates; absent/invalid files retain the guardian box.
|
||||
// lack them (Steam Frame). The "room" is a box built from the runtime's STAGE bounds (the guardian /
|
||||
// chaperone rectangle): floor, ceiling and four walls, reported as one room anchor with a layout.
|
||||
// Entity spaces are fake handles; every function that consumes a space is intercepted for them.
|
||||
|
||||
static float scene_min_size = 1.5f; // smallest room edge if the guardian is tiny or unavailable
|
||||
static int emulate_scene; // app requested the scene extensions and the runtime lacks them
|
||||
static int scene_app_mesh; // app enabled XR_META_spatial_entity_mesh: only then is the global mesh an entity
|
||||
// (an older SDK's scene loader fails on an anchor it can't place)
|
||||
|
||||
static const char *const scene_extensions[] = {
|
||||
"XR_FB_spatial_entity", "XR_FB_spatial_entity_query", "XR_FB_spatial_entity_storage",
|
||||
"XR_FB_spatial_entity_container", "XR_FB_scene", "XR_FB_scene_capture",
|
||||
"XR_META_spatial_entity_mesh", "XR_META_spatial_entity_discovery", "XR_META_spatial_entity_persistence",
|
||||
"XR_META_boundary_visibility", // MR games hide the guardian before starting (NOPE asks every frame)
|
||||
};
|
||||
#define SCENE_EXTENSION_COUNT (sizeof(scene_extensions) / sizeof(scene_extensions[0]))
|
||||
|
||||
@@ -45,58 +42,38 @@ static XrPosef pose_inv(XrPosef a) {
|
||||
|
||||
// ---------------------------------------------------------------- entities
|
||||
enum { ENT_ROOM, ENT_FLOOR, ENT_CEILING, ENT_WALL0, ENT_WALL1, ENT_WALL2, ENT_WALL3, ENT_FIXED_COUNT };
|
||||
#define MAX_ENTITIES 2048
|
||||
#define MAX_OUTLINE 1024
|
||||
#define MAX_ENTITIES 64
|
||||
|
||||
typedef struct {
|
||||
XrSpace handle; // fake handle given to the app
|
||||
XrUuidEXT uuid;
|
||||
XrPosef pose_in_stage;
|
||||
char label[256]; // comma-separated Meta semantic labels
|
||||
const char *label; // semantic label, NULL if none
|
||||
XrRect2Df bounds; // 2D bounds in the entity's local XY plane
|
||||
XrRect3DfFB bounds3;
|
||||
XrVector2f *boundary;
|
||||
uint32_t boundary_count;
|
||||
XrVector3f *vertices;
|
||||
uint32_t *indices, vertex_count, index_count;
|
||||
int has_bounds, has_bounds3, is_room, is_anchor, is_wall, erased, saved;
|
||||
int has_bounds, is_room, is_anchor;
|
||||
} scene_entity;
|
||||
|
||||
static pthread_mutex_t scene_lock = PTHREAD_MUTEX_INITIALIZER;
|
||||
static scene_entity entities[MAX_ENTITIES];
|
||||
static int entity_count, room_entity_count, wall_count, room_from_file;
|
||||
static char room_source[32];
|
||||
static uint64_t room_universe;
|
||||
static int entity_count;
|
||||
static XrSpace scene_stage = XR_NULL_HANDLE; // real STAGE space used to anchor everything
|
||||
static XrSession scene_session = XR_NULL_HANDLE;
|
||||
static uint64_t next_request = 0x5ce0000001ull;
|
||||
|
||||
// Fit the tag in uintptr_t as the adapter is also built for AArch32. Session generations prevent stale
|
||||
// handles from aliasing new room entities when an engine recreates its session in the same process.
|
||||
#if UINTPTR_MAX > 0xffffffffu
|
||||
#define FAKE_SPACE_TAG ((uintptr_t)0x5ce0000000000000ull)
|
||||
#define FAKE_SPACE_MASK ((uintptr_t)0xfff0000000000000ull)
|
||||
#else
|
||||
#define FAKE_SPACE_TAG ((uintptr_t)0x5ce00000u)
|
||||
#define FAKE_SPACE_MASK ((uintptr_t)0xfff00000u)
|
||||
#endif
|
||||
static unsigned scene_generation;
|
||||
|
||||
static int is_fake_space(XrSpace space) { return ((uintptr_t)space & FAKE_SPACE_MASK) == FAKE_SPACE_TAG; }
|
||||
#define FAKE_SPACE_TAG 0x5ce0000000000000ull
|
||||
static int fake_space_index(XrSpace space) {
|
||||
uintptr_t v = (uintptr_t)space;
|
||||
if ((v & FAKE_SPACE_MASK) != FAKE_SPACE_TAG || ((v >> 12) & 255) != scene_generation) return -1;
|
||||
int i = (int)(v & 4095);
|
||||
return i < entity_count && !entities[i].erased ? i : -1;
|
||||
uint64_t v = (uint64_t)(uintptr_t)space;
|
||||
if ((v & 0xfff0000000000000ull) != FAKE_SPACE_TAG) return -1;
|
||||
int i = (int)(v & 0xffff);
|
||||
return i < entity_count ? i : -1;
|
||||
}
|
||||
static XrSpace fake_space(int index) { return (XrSpace)(FAKE_SPACE_TAG | ((uintptr_t)scene_generation << 12) | (uintptr_t)index); }
|
||||
static XrSpace fake_space(int index) { return (XrSpace)(uintptr_t)(FAKE_SPACE_TAG | (uint64_t)index); }
|
||||
|
||||
static XrUuidEXT make_uuid(int index) {
|
||||
XrUuidEXT u;
|
||||
for (int i = 0; i < XR_UUID_SIZE_EXT; ++i) u.data[i] = (uint8_t)(0x5c ^ (i * 37) ^ (index * 101));
|
||||
u.data[6] = (uint8_t)((u.data[6] & 0x0f) | 0x40); // version 4 style
|
||||
u.data[15] = (uint8_t)index;
|
||||
u.data[14] ^= (uint8_t)((unsigned)index >> 8);
|
||||
return u;
|
||||
}
|
||||
static int uuid_equal(const XrUuidEXT *a, const XrUuidEXT *b) { return !memcmp(a->data, b->data, XR_UUID_SIZE_EXT); }
|
||||
@@ -109,7 +86,7 @@ static int add_entity(XrPosef pose, const char *label, float w, float h, int is_
|
||||
e->handle = fake_space(i);
|
||||
e->uuid = make_uuid(i);
|
||||
e->pose_in_stage = pose;
|
||||
if (label) snprintf(e->label, sizeof(e->label), "%s", label);
|
||||
e->label = label;
|
||||
e->has_bounds = w > 0 && h > 0;
|
||||
e->bounds = (XrRect2Df){{-w / 2, -h / 2}, {w, h}};
|
||||
e->is_room = is_room;
|
||||
@@ -117,23 +94,9 @@ static int add_entity(XrPosef pose, const char *label, float w, float h, int is_
|
||||
return i;
|
||||
}
|
||||
|
||||
static void reset_room(void) {
|
||||
for (int i = 0; i < entity_count; ++i) {
|
||||
free(entities[i].boundary);
|
||||
free(entities[i].vertices);
|
||||
free(entities[i].indices);
|
||||
}
|
||||
memset(entities, 0, sizeof(entities));
|
||||
entity_count = room_entity_count = wall_count = room_from_file = 0;
|
||||
room_universe = 0;
|
||||
}
|
||||
|
||||
#include "scene_room.c"
|
||||
|
||||
// Build the room once the session exists: guardian rectangle -> floor/ceiling/walls.
|
||||
static void build_room(void) {
|
||||
if (entity_count) return;
|
||||
if (load_room_file()) return;
|
||||
float width = 0, depth = 0;
|
||||
PFN_xrGetReferenceSpaceBoundsRect bounds_fn =
|
||||
(PFN_xrGetReferenceSpaceBoundsRect)lookup(active_instance, "xrGetReferenceSpaceBoundsRect");
|
||||
@@ -154,14 +117,10 @@ static void build_room(void) {
|
||||
add_entity((XrPosef){{0, 0, 0, 1}, {0, 0, 0}}, NULL, 0, 0, 1, 0); // ENT_ROOM
|
||||
add_entity((XrPosef){{-s, 0, 0, s}, {0, 0, 0}}, "FLOOR", width, depth, 0, 0); // +Z (normal) -> +Y
|
||||
add_entity((XrPosef){{s, 0, 0, s}, {0, h, 0}}, "CEILING", width, depth, 0, 0); // +Z -> -Y
|
||||
// Walls in loop order around the floor, as Meta's ROOM_LAYOUT lists them (Demeter walks them as an outline).
|
||||
add_entity((XrPosef){{0, 0, 0, 1}, {0, h / 2, -depth / 2}}, "WALL_FACE", width, h, 0, 0); // faces +Z
|
||||
add_entity((XrPosef){{0, -s, 0, s}, {width / 2, h / 2, 0}}, "WALL_FACE", depth, h, 0, 0); // faces -X
|
||||
add_entity((XrPosef){{0, 1, 0, 0}, {0, h / 2, depth / 2}}, "WALL_FACE", width, h, 0, 0); // faces -Z
|
||||
add_entity((XrPosef){{0, s, 0, s}, {-width / 2, h / 2, 0}}, "WALL_FACE", depth, h, 0, 0); // faces +X
|
||||
wall_count = 4;
|
||||
room_entity_count = entity_count;
|
||||
for (int i = ENT_WALL0; i < entity_count; ++i) entities[i].is_wall = 1;
|
||||
add_entity((XrPosef){{0, -s, 0, s}, {width / 2, h / 2, 0}}, "WALL_FACE", depth, h, 0, 0); // faces -X
|
||||
}
|
||||
|
||||
// Supported components per entity.
|
||||
@@ -169,17 +128,12 @@ static int entity_components(const scene_entity *e, XrSpaceComponentTypeFB *out)
|
||||
int n = 0;
|
||||
out[n++] = XR_SPACE_COMPONENT_TYPE_LOCATABLE_FB;
|
||||
out[n++] = XR_SPACE_COMPONENT_TYPE_STORABLE_FB;
|
||||
out[n++] = XR_SPACE_COMPONENT_TYPE_SHARABLE_FB; // Meta's runtime lists it; nothing is shared from here
|
||||
if (e->is_room) {
|
||||
out[n++] = XR_SPACE_COMPONENT_TYPE_ROOM_LAYOUT_FB;
|
||||
out[n++] = XR_SPACE_COMPONENT_TYPE_SPACE_CONTAINER_FB;
|
||||
} else if (!e->is_anchor) {
|
||||
if (e->has_bounds) {
|
||||
out[n++] = XR_SPACE_COMPONENT_TYPE_BOUNDED_2D_FB;
|
||||
}
|
||||
if (e->has_bounds3) out[n++] = XR_SPACE_COMPONENT_TYPE_BOUNDED_3D_FB;
|
||||
if (e->vertex_count) out[n++] = XR_SPACE_COMPONENT_TYPE_TRIANGLE_MESH_META;
|
||||
if (e->label[0]) out[n++] = XR_SPACE_COMPONENT_TYPE_SEMANTIC_LABELS_FB;
|
||||
out[n++] = XR_SPACE_COMPONENT_TYPE_BOUNDED_2D_FB;
|
||||
out[n++] = XR_SPACE_COMPONENT_TYPE_SEMANTIC_LABELS_FB;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
@@ -194,7 +148,6 @@ static int entity_has_component(const scene_entity *e, XrSpaceComponentTypeFB ty
|
||||
#define MAX_EVENTS 64
|
||||
static XrEventDataBuffer scene_events[MAX_EVENTS];
|
||||
static int event_head, event_tail;
|
||||
static int event_free(void) { return (event_head - event_tail - 1 + MAX_EVENTS) % MAX_EVENTS; }
|
||||
static void push_event(const void *event, size_t size) {
|
||||
if ((event_tail + 1) % MAX_EVENTS == event_head) return;
|
||||
memset(&scene_events[event_tail], 0, sizeof(XrEventDataBuffer));
|
||||
@@ -218,7 +171,6 @@ static int stage_pose(XrSpace space, XrTime time, XrPosef *pose, XrSpaceLocation
|
||||
XR_SPACE_LOCATION_ORIENTATION_TRACKED_BIT | XR_SPACE_LOCATION_POSITION_TRACKED_BIT;
|
||||
return 1;
|
||||
}
|
||||
if (is_fake_space(space)) return 0; // erased or from a prior session: never pass a fake handle to SteamVR
|
||||
PFN_xrLocateSpace locate = (PFN_xrLocateSpace)lookup(active_instance, "xrLocateSpace");
|
||||
if (!locate || !scene_stage) return 0;
|
||||
XrSpaceLocation loc = {XR_TYPE_SPACE_LOCATION, NULL, 0, {{0, 0, 0, 1}, {0, 0, 0}}};
|
||||
@@ -229,7 +181,7 @@ static int stage_pose(XrSpace space, XrTime time, XrPosef *pose, XrSpaceLocation
|
||||
}
|
||||
// Locate `space` in `base` when either is fake. Returns 0 if neither is fake (caller forwards).
|
||||
static int locate_fake(XrSpace space, XrSpace base, XrTime time, XrPosef *pose, XrSpaceLocationFlags *flags) {
|
||||
if (!is_fake_space(space) && !is_fake_space(base)) return 0;
|
||||
if (fake_space_index(space) < 0 && fake_space_index(base) < 0) return 0;
|
||||
XrPosef s, b;
|
||||
XrSpaceLocationFlags fs = 0, fb = 0;
|
||||
if (!stage_pose(space, time, &s, &fs) || !stage_pose(base, time, &b, &fb)) {
|
||||
@@ -243,96 +195,99 @@ static int locate_fake(XrSpace space, XrSpace base, XrTime time, XrPosef *pose,
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- emulated entry points
|
||||
// Results are snapshotted before their available event is queued, so callers on another thread cannot
|
||||
// observe a half-stored filter. A bounded request history supports the count/data calls independently.
|
||||
#define MAX_QUERIES 64
|
||||
typedef struct {
|
||||
XrAsyncRequestIdFB id;
|
||||
uint32_t count;
|
||||
XrSpaceQueryResultFB *results;
|
||||
} scene_query;
|
||||
static scene_query queries[MAX_QUERIES];
|
||||
static unsigned query_next;
|
||||
static scene_query *new_query(void) {
|
||||
scene_query *q = &queries[query_next % MAX_QUERIES];
|
||||
XrSpaceQueryResultFB *results = malloc((size_t)entity_count * sizeof(*results));
|
||||
if (!results) return NULL;
|
||||
++query_next;
|
||||
free(q->results);
|
||||
*q = (scene_query){next_request++, 0, results};
|
||||
return q;
|
||||
}
|
||||
static scene_query *find_query(XrAsyncRequestIdFB id) {
|
||||
for (int i = 0; i < MAX_QUERIES; ++i) if (queries[i].id == id) return &queries[i];
|
||||
return NULL;
|
||||
}
|
||||
static int uuid_matches(uint32_t n, const XrUuidEXT *uuids, const scene_entity *e) {
|
||||
for (uint32_t i = 0; i < n; ++i) if (uuid_equal(&uuids[i], &e->uuid)) return 1;
|
||||
return 0;
|
||||
}
|
||||
#include "scene_anchors.c"
|
||||
|
||||
static int fb_filter_matches(const XrSpaceFilterInfoBaseHeaderFB *f, const scene_entity *e) {
|
||||
if (!f) return 1;
|
||||
if (f->type == XR_TYPE_SPACE_COMPONENT_FILTER_INFO_FB)
|
||||
return entity_has_component(e, ((const XrSpaceComponentFilterInfoFB *)f)->componentType);
|
||||
if (f->type == XR_TYPE_SPACE_UUID_FILTER_INFO_FB) {
|
||||
const XrSpaceUuidFilterInfoFB *u = (const XrSpaceUuidFilterInfoFB *)f;
|
||||
return u->uuids && uuid_matches(u->uuidCount, u->uuids, e);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_query_spaces_filtered(XrSession session, const XrSpaceQueryInfoBaseHeaderFB *info,
|
||||
XrAsyncRequestIdFB *request) {
|
||||
if (!info || !request || info->type != XR_TYPE_SPACE_QUERY_INFO_FB) return XR_ERROR_VALIDATION_FAILURE;
|
||||
const XrSpaceQueryInfoFB *info_fb = (const XrSpaceQueryInfoFB *)info;
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_query_spaces(XrSession session, const XrSpaceQueryInfoBaseHeaderFB *info,
|
||||
XrAsyncRequestIdFB *request) {
|
||||
if (!info || !request) return XR_ERROR_VALIDATION_FAILURE;
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
scene_session = session;
|
||||
build_room();
|
||||
if (event_free() < 2) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_LIMIT_REACHED; }
|
||||
scene_query *q = new_query();
|
||||
if (!q) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_OUT_OF_MEMORY; }
|
||||
for (int i = 0; i < entity_count && q->count < info_fb->maxResultCount; ++i) {
|
||||
scene_entity *e = &entities[i];
|
||||
if (!e->erased && fb_filter_matches(info_fb->filter, e))
|
||||
q->results[q->count++] = (XrSpaceQueryResultFB){e->handle, e->uuid};
|
||||
}
|
||||
*request = q->id;
|
||||
*request = next_request++;
|
||||
XrEventDataSpaceQueryResultsAvailableFB avail = {XR_TYPE_EVENT_DATA_SPACE_QUERY_RESULTS_AVAILABLE_FB, NULL, *request};
|
||||
XrEventDataSpaceQueryCompleteFB done = {XR_TYPE_EVENT_DATA_SPACE_QUERY_COMPLETE_FB, NULL, *request, XR_SUCCESS};
|
||||
push_event(&avail, sizeof(avail)); push_event(&done, sizeof(done));
|
||||
LOG("scene: query request=%llu results=%u", (unsigned long long)*request, q->count);
|
||||
push_event(&avail, sizeof(avail));
|
||||
push_event(&done, sizeof(done));
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
// Query filters are kept per request so retrieve can apply them.
|
||||
typedef struct {
|
||||
XrAsyncRequestIdFB id;
|
||||
int has_component;
|
||||
XrSpaceComponentTypeFB component;
|
||||
uint32_t uuid_count;
|
||||
XrUuidEXT uuids[64];
|
||||
} query_filter;
|
||||
static query_filter filters[16];
|
||||
static int filter_next;
|
||||
|
||||
static void store_filter(XrAsyncRequestIdFB id, const XrSpaceQueryInfoFB *q) {
|
||||
query_filter *f = &filters[filter_next++ % 16];
|
||||
memset(f, 0, sizeof(*f));
|
||||
f->id = id;
|
||||
const XrSpaceFilterInfoBaseHeaderFB *flt = q->filter;
|
||||
if (flt && flt->type == XR_TYPE_SPACE_COMPONENT_FILTER_INFO_FB) {
|
||||
f->has_component = 1;
|
||||
f->component = ((const XrSpaceComponentFilterInfoFB *)flt)->componentType;
|
||||
} else if (flt && flt->type == XR_TYPE_SPACE_UUID_FILTER_INFO_FB) {
|
||||
const XrSpaceUuidFilterInfoFB *u = (const XrSpaceUuidFilterInfoFB *)flt;
|
||||
f->uuid_count = u->uuidCount < 64 ? u->uuidCount : 64;
|
||||
for (uint32_t i = 0; i < f->uuid_count; ++i) f->uuids[i] = u->uuids[i];
|
||||
}
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_query_spaces_filtered(XrSession session, const XrSpaceQueryInfoBaseHeaderFB *info,
|
||||
XrAsyncRequestIdFB *request) {
|
||||
XrResult r = emu_query_spaces(session, info, request);
|
||||
if (XR_SUCCEEDED(r) && info->type == XR_TYPE_SPACE_QUERY_INFO_FB) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
store_filter(*request, (const XrSpaceQueryInfoFB *)info);
|
||||
const XrSpaceQueryInfoFB *q = (const XrSpaceQueryInfoFB *)info;
|
||||
LOG("scene: query request=%llu filter=%d", (unsigned long long)*request, q->filter ? q->filter->type : 0);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
static int filter_matches(const query_filter *f, const scene_entity *e) {
|
||||
if (!f) return 1;
|
||||
if (f->has_component) return entity_has_component(e, f->component);
|
||||
if (f->uuid_count) {
|
||||
for (uint32_t i = 0; i < f->uuid_count; ++i) if (uuid_equal(&f->uuids[i], &e->uuid)) return 1;
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_retrieve_results(XrSession session, XrAsyncRequestIdFB request,
|
||||
XrSpaceQueryResultsFB *results) {
|
||||
(void)session;
|
||||
if (!results) return XR_ERROR_VALIDATION_FAILURE;
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
scene_query *q = find_query(request);
|
||||
XrResult r = XR_SUCCESS;
|
||||
if (!q) r = XR_ERROR_VALIDATION_FAILURE;
|
||||
else {
|
||||
results->resultCountOutput = q->count;
|
||||
if (results->resultCapacityInput && results->resultCapacityInput < q->count) r = XR_ERROR_SIZE_INSUFFICIENT;
|
||||
else if (results->resultCapacityInput) {
|
||||
if (!results->results) r = XR_ERROR_VALIDATION_FAILURE;
|
||||
else memcpy(results->results, q->results, q->count * sizeof(*q->results));
|
||||
const query_filter *f = NULL;
|
||||
for (int i = 0; i < 16; ++i) if (filters[i].id == request) f = &filters[i];
|
||||
uint32_t n = 0;
|
||||
for (int i = 0; i < entity_count; ++i) {
|
||||
if (!filter_matches(f, &entities[i])) continue;
|
||||
if (results->resultCapacityInput && n < results->resultCapacityInput && results->results) {
|
||||
results->results[n].space = entities[i].handle;
|
||||
results->results[n].uuid = entities[i].uuid;
|
||||
}
|
||||
++n;
|
||||
}
|
||||
results->resultCountOutput = n;
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return r;
|
||||
return (results->resultCapacityInput && results->resultCapacityInput < n) ? XR_ERROR_SIZE_INSUFFICIENT : XR_SUCCESS;
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL scene_get_uuid(XrSpace space, XrUuidEXT *uuid) {
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_uuid(XrSpace space, XrUuidEXT *uuid) {
|
||||
int i = fake_space_index(space);
|
||||
if (i < 0 || !uuid) return XR_ERROR_HANDLE_INVALID;
|
||||
*uuid = entities[i].uuid;
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL scene_enumerate_components(XrSpace space, uint32_t capacity, uint32_t *count,
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_enumerate_components(XrSpace space, uint32_t capacity, uint32_t *count,
|
||||
XrSpaceComponentTypeFB *types) {
|
||||
int i = fake_space_index(space);
|
||||
if (i < 0 || !count) return XR_ERROR_HANDLE_INVALID;
|
||||
@@ -341,33 +296,16 @@ static XRAPI_ATTR XrResult XRAPI_CALL scene_enumerate_components(XrSpace space,
|
||||
*count = (uint32_t)n;
|
||||
if (!capacity) return XR_SUCCESS;
|
||||
if (capacity < (uint32_t)n) return XR_ERROR_SIZE_INSUFFICIENT;
|
||||
if (!types) return XR_ERROR_VALIDATION_FAILURE;
|
||||
for (int k = 0; k < n; ++k) types[k] = list[k];
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
// Which entity refused which component (the first ones only): an app's scene loader gives up on the whole room over
|
||||
// one of these, and OVRPlugin's own error line doesn't name the component (Demeter, 2026-10-16).
|
||||
static void log_refused_component(const char *op, int i, XrSpaceComponentTypeFB type) {
|
||||
static int logged;
|
||||
if (logged >= 20) return;
|
||||
++logged;
|
||||
const scene_entity *e = &entities[i];
|
||||
LOG("scene: %s component %d refused on %s (entity %d)", op, (int)type,
|
||||
e->is_room ? "room" : e->is_anchor ? "app anchor" : e->label[0] ? e->label : "unlabelled", i);
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_set_component_status(XrSpace space, const XrSpaceComponentStatusSetInfoFB *info,
|
||||
XrAsyncRequestIdFB *request) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
int i = fake_space_index(space);
|
||||
if (i < 0 || !info || !request) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_HANDLE_INVALID; }
|
||||
if (!entity_has_component(&entities[i], info->componentType)) {
|
||||
log_refused_component("set", i, info->componentType);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return XR_ERROR_SPACE_COMPONENT_NOT_SUPPORTED_FB;
|
||||
}
|
||||
if (!event_free()) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_LIMIT_REACHED; }
|
||||
if (i < 0 || !info || !request) return XR_ERROR_HANDLE_INVALID;
|
||||
if (!entity_has_component(&entities[i], info->componentType)) return XR_ERROR_SPACE_COMPONENT_NOT_SUPPORTED_FB;
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
*request = next_request++;
|
||||
XrEventDataSpaceSetStatusCompleteFB e = {XR_TYPE_EVENT_DATA_SPACE_SET_STATUS_COMPLETE_FB, NULL, *request, XR_SUCCESS,
|
||||
space, entities[i].uuid, info->componentType, info->enabled};
|
||||
@@ -376,49 +314,44 @@ static XRAPI_ATTR XrResult XRAPI_CALL emu_set_component_status(XrSpace space, co
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL scene_get_component_status(XrSpace space, XrSpaceComponentTypeFB type,
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_component_status(XrSpace space, XrSpaceComponentTypeFB type,
|
||||
XrSpaceComponentStatusFB *status) {
|
||||
int i = fake_space_index(space);
|
||||
if (i < 0 || !status) return XR_ERROR_HANDLE_INVALID;
|
||||
if (!entity_has_component(&entities[i], type)) {
|
||||
log_refused_component("get", i, type);
|
||||
return XR_ERROR_SPACE_COMPONENT_NOT_SUPPORTED_FB;
|
||||
}
|
||||
if (!entity_has_component(&entities[i], type)) return XR_ERROR_SPACE_COMPONENT_NOT_SUPPORTED_FB;
|
||||
status->enabled = XR_TRUE;
|
||||
status->changePending = XR_FALSE;
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL scene_get_container(XrSession session, XrSpace space, XrSpaceContainerFB *container) {
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_container(XrSession session, XrSpace space, XrSpaceContainerFB *container) {
|
||||
(void)session;
|
||||
int i = fake_space_index(space);
|
||||
if (i < 0 || !container) return XR_ERROR_HANDLE_INVALID;
|
||||
if (!entities[i].is_room) return XR_ERROR_SPACE_COMPONENT_NOT_ENABLED_FB;
|
||||
uint32_t n = room_entity_count - 1; // everything except the room itself
|
||||
uint32_t n = ENT_FIXED_COUNT - 1; // everything except the room itself
|
||||
container->uuidCountOutput = n;
|
||||
if (!container->uuidCapacityInput) return XR_SUCCESS;
|
||||
if (container->uuidCapacityInput < n) return XR_ERROR_SIZE_INSUFFICIENT;
|
||||
if (!container->uuids) return XR_ERROR_VALIDATION_FAILURE;
|
||||
for (uint32_t k = 0; k < n; ++k) container->uuids[k] = entities[ENT_FLOOR + k].uuid;
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL scene_get_room_layout(XrSession session, XrSpace space, XrRoomLayoutFB *layout) {
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_room_layout(XrSession session, XrSpace space, XrRoomLayoutFB *layout) {
|
||||
(void)session;
|
||||
int i = fake_space_index(space);
|
||||
if (i < 0 || !layout) return XR_ERROR_HANDLE_INVALID;
|
||||
if (!entities[i].is_room) return XR_ERROR_SPACE_COMPONENT_NOT_ENABLED_FB;
|
||||
layout->floorUuid = entities[ENT_FLOOR].uuid;
|
||||
layout->ceilingUuid = entities[ENT_CEILING].uuid;
|
||||
layout->wallUuidCountOutput = (uint32_t)wall_count;
|
||||
layout->wallUuidCountOutput = 4;
|
||||
if (!layout->wallUuidCapacityInput) return XR_SUCCESS;
|
||||
if (layout->wallUuidCapacityInput < (uint32_t)wall_count) return XR_ERROR_SIZE_INSUFFICIENT;
|
||||
if (!layout->wallUuids) return XR_ERROR_VALIDATION_FAILURE;
|
||||
for (int k = 0; k < wall_count; ++k) layout->wallUuids[k] = entities[ENT_WALL0 + k].uuid;
|
||||
if (layout->wallUuidCapacityInput < 4) return XR_ERROR_SIZE_INSUFFICIENT;
|
||||
for (int k = 0; k < 4; ++k) layout->wallUuids[k] = entities[ENT_WALL0 + k].uuid;
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL scene_get_bounding_box_2d(XrSession session, XrSpace space, XrRect2Df *rect) {
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_bounding_box_2d(XrSession session, XrSpace space, XrRect2Df *rect) {
|
||||
(void)session;
|
||||
int i = fake_space_index(space);
|
||||
if (i < 0 || !rect) return XR_ERROR_HANDLE_INVALID;
|
||||
@@ -427,29 +360,19 @@ static XRAPI_ATTR XrResult XRAPI_CALL scene_get_bounding_box_2d(XrSession sessio
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL scene_get_bounding_box_3d(XrSession session, XrSpace space, XrRect3DfFB *box) {
|
||||
(void)session;
|
||||
int i = fake_space_index(space);
|
||||
if (i < 0 || !box) return XR_ERROR_HANDLE_INVALID;
|
||||
if (!entities[i].has_bounds3) return XR_ERROR_SPACE_COMPONENT_NOT_ENABLED_FB;
|
||||
*box = entities[i].bounds3;
|
||||
return XR_SUCCESS;
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_bounding_box_3d(XrSession session, XrSpace space, XrRect3DfFB *box) {
|
||||
(void)session; (void)space; (void)box;
|
||||
return XR_ERROR_SPACE_COMPONENT_NOT_ENABLED_FB;
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL scene_get_boundary_2d(XrSession session, XrSpace space, XrBoundary2DFB *boundary) {
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_boundary_2d(XrSession session, XrSpace space, XrBoundary2DFB *boundary) {
|
||||
(void)session;
|
||||
int i = fake_space_index(space);
|
||||
if (i < 0 || !boundary) return XR_ERROR_HANDLE_INVALID;
|
||||
if (!entities[i].has_bounds) return XR_ERROR_SPACE_COMPONENT_NOT_ENABLED_FB;
|
||||
uint32_t n = entities[i].boundary_count ? entities[i].boundary_count : 4;
|
||||
boundary->vertexCountOutput = n;
|
||||
boundary->vertexCountOutput = 4;
|
||||
if (!boundary->vertexCapacityInput) return XR_SUCCESS;
|
||||
if (boundary->vertexCapacityInput < n) return XR_ERROR_SIZE_INSUFFICIENT;
|
||||
if (!boundary->vertices) return XR_ERROR_VALIDATION_FAILURE;
|
||||
if (entities[i].boundary_count) {
|
||||
memcpy(boundary->vertices, entities[i].boundary, n * sizeof(*boundary->vertices));
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
if (boundary->vertexCapacityInput < 4) return XR_ERROR_SIZE_INSUFFICIENT;
|
||||
const XrRect2Df b = entities[i].bounds;
|
||||
boundary->vertices[0] = (XrVector2f){b.offset.x, b.offset.y};
|
||||
boundary->vertices[1] = (XrVector2f){b.offset.x + b.extent.width, b.offset.y};
|
||||
@@ -458,76 +381,16 @@ static XRAPI_ATTR XrResult XRAPI_CALL scene_get_boundary_2d(XrSession session, X
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL scene_get_triangle_mesh(XrSpace space, const XrSpaceTriangleMeshGetInfoMETA *info,
|
||||
XrSpaceTriangleMeshMETA *mesh) {
|
||||
(void)info;
|
||||
int i = fake_space_index(space);
|
||||
if (i < 0 || !mesh) return XR_ERROR_HANDLE_INVALID;
|
||||
const scene_entity *e = &entities[i];
|
||||
if (!e->vertex_count) return XR_ERROR_SPACE_COMPONENT_NOT_ENABLED_FB;
|
||||
mesh->vertexCountOutput = e->vertex_count;
|
||||
mesh->indexCountOutput = e->index_count;
|
||||
if ((mesh->vertexCapacityInput && mesh->vertexCapacityInput < e->vertex_count) ||
|
||||
(mesh->indexCapacityInput && mesh->indexCapacityInput < e->index_count)) return XR_ERROR_SIZE_INSUFFICIENT;
|
||||
if ((mesh->vertexCapacityInput && !mesh->vertices) || (mesh->indexCapacityInput && !mesh->indices))
|
||||
return XR_ERROR_VALIDATION_FAILURE;
|
||||
if (mesh->vertexCapacityInput) memcpy(mesh->vertices, e->vertices, e->vertex_count * sizeof(*e->vertices));
|
||||
if (mesh->indexCapacityInput) memcpy(mesh->indices, e->indices, e->index_count * sizeof(*e->indices));
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
// Labels as Meta's runtime hands them to an app (XR_FB_scene): an app that sends no XrSemanticLabelsSupportInfoFB
|
||||
// knows only the first label set; one that does gets "OTHER" for labels missing from its recognizedLabels, WALL_FACE
|
||||
// for invisible walls unless it accepts them, and DESK for TABLE unless it accepts that migration. Older Meta SDKs
|
||||
// (Demeter, 2026-10-16) rejected a whole scanned room over one INVISIBLE_WALL_FACE and kept asking for Space Setup.
|
||||
static const char *const scene_legacy_labels = "DESK,COUCH,FLOOR,CEILING,WALL_FACE,DOOR_FRAME,WINDOW_FRAME,OTHER";
|
||||
|
||||
static int label_listed(const char *list, const char *label, size_t len) {
|
||||
for (const char *p = list; p && *p;) {
|
||||
const char *end = strchr(p, ',');
|
||||
size_t n = end ? (size_t)(end - p) : strlen(p);
|
||||
if (n == len && !strncmp(p, label, len)) return 1;
|
||||
p = end ? end + 1 : NULL;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void scene_app_labels(const char *label, const XrSemanticLabelsFB *labels, char *out, size_t size) {
|
||||
const XrSemanticLabelsSupportInfoFB *support = NULL;
|
||||
for (const XrBaseInStructure *n = labels->next; n; n = n->next)
|
||||
if (n->type == XR_TYPE_SEMANTIC_LABELS_SUPPORT_INFO_FB) support = (const XrSemanticLabelsSupportInfoFB *)n;
|
||||
const char *known = support ? support->recognizedLabels : scene_legacy_labels;
|
||||
XrSemanticLabelsSupportFlagsFB flags = support ? support->flags : 0;
|
||||
out[0] = 0;
|
||||
for (const char *p = label; *p;) {
|
||||
const char *end = strchr(p, ',');
|
||||
size_t len = end ? (size_t)(end - p) : strlen(p);
|
||||
char one[64];
|
||||
snprintf(one, sizeof(one), "%.*s", (int)len, p);
|
||||
if (!strcmp(one, "INVISIBLE_WALL_FACE") && !(flags & XR_SEMANTIC_LABELS_SUPPORT_ACCEPT_INVISIBLE_WALL_FACE_BIT_FB))
|
||||
snprintf(one, sizeof(one), "WALL_FACE");
|
||||
if (!strcmp(one, "TABLE") && !(flags & XR_SEMANTIC_LABELS_SUPPORT_ACCEPT_DESK_TO_TABLE_MIGRATION_BIT_FB))
|
||||
snprintf(one, sizeof(one), "DESK");
|
||||
if (known && *known && !label_listed(known, one, strlen(one))) snprintf(one, sizeof(one), "OTHER");
|
||||
if (!label_listed(out, one, strlen(one)))
|
||||
snprintf(out + strlen(out), size - strlen(out), "%s%s", out[0] ? "," : "", one);
|
||||
p = end ? end + 1 : p + len;
|
||||
}
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL scene_get_semantic_labels(XrSession session, XrSpace space, XrSemanticLabelsFB *labels) {
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_semantic_labels(XrSession session, XrSpace space, XrSemanticLabelsFB *labels) {
|
||||
(void)session;
|
||||
int i = fake_space_index(space);
|
||||
if (i < 0 || !labels) return XR_ERROR_HANDLE_INVALID;
|
||||
if (!entities[i].label[0]) return XR_ERROR_SPACE_COMPONENT_NOT_ENABLED_FB;
|
||||
char text[sizeof(entities[0].label)];
|
||||
scene_app_labels(entities[i].label, labels, text, sizeof(text));
|
||||
uint32_t n = (uint32_t)strlen(text) + 1;
|
||||
if (!entities[i].label) return XR_ERROR_SPACE_COMPONENT_NOT_ENABLED_FB;
|
||||
uint32_t n = (uint32_t)strlen(entities[i].label) + 1;
|
||||
labels->bufferCountOutput = n;
|
||||
if (!labels->bufferCapacityInput) return XR_SUCCESS;
|
||||
if (labels->bufferCapacityInput < n) return XR_ERROR_SIZE_INSUFFICIENT;
|
||||
if (!labels->buffer) return XR_ERROR_VALIDATION_FAILURE;
|
||||
memcpy(labels->buffer, text, n);
|
||||
memcpy(labels->buffer, entities[i].label, n);
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -538,12 +401,11 @@ static XRAPI_ATTR XrResult XRAPI_CALL emu_request_scene_capture(XrSession sessio
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
scene_session = session;
|
||||
build_room();
|
||||
if (!event_free()) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_LIMIT_REACHED; }
|
||||
*request = next_request++;
|
||||
XrEventDataSceneCaptureCompleteFB e = {XR_TYPE_EVENT_DATA_SCENE_CAPTURE_COMPLETE_FB, NULL, *request, XR_SUCCESS};
|
||||
push_event(&e, sizeof(e));
|
||||
LOG("scene: capture requested -> %s", room_from_file ? "scanned room" : "guardian box");
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
LOG("scene: capture requested -> using guardian room");
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -555,16 +417,9 @@ static XRAPI_ATTR XrResult XRAPI_CALL emu_create_anchor(XrSession session, const
|
||||
build_room();
|
||||
XrPosef base = {{0, 0, 0, 1}, {0, 0, 0}};
|
||||
XrSpaceLocationFlags flags = 0;
|
||||
if (event_free() < 1) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_LIMIT_REACHED; }
|
||||
if (!stage_pose(info->space, info->time, &base, &flags) ||
|
||||
!(flags & XR_SPACE_LOCATION_POSITION_VALID_BIT) || !(flags & XR_SPACE_LOCATION_ORIENTATION_VALID_BIT)) {
|
||||
pthread_mutex_unlock(&scene_lock); return XR_ERROR_POSE_INVALID;
|
||||
}
|
||||
XrUuidEXT uuid;
|
||||
if (!anchor_uuid(&uuid)) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_RUNTIME_FAILURE; }
|
||||
stage_pose(info->space, info->time, &base, &flags);
|
||||
int i = add_entity(pose_mul(base, info->poseInSpace), NULL, 0, 0, 0, 1);
|
||||
*request = next_request++;
|
||||
if (i >= 0) entities[i].uuid = uuid;
|
||||
XrEventDataSpatialAnchorCreateCompleteFB e = {XR_TYPE_EVENT_DATA_SPATIAL_ANCHOR_CREATE_COMPLETE_FB, NULL, *request,
|
||||
i >= 0 ? XR_SUCCESS : XR_ERROR_LIMIT_REACHED, i >= 0 ? entities[i].handle : XR_NULL_HANDLE,
|
||||
i >= 0 ? entities[i].uuid : (XrUuidEXT){{0}}};
|
||||
@@ -576,118 +431,31 @@ static XRAPI_ATTR XrResult XRAPI_CALL emu_create_anchor(XrSession session, const
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_save_space(XrSession session, const XrSpaceSaveInfoFB *info, XrAsyncRequestIdFB *request) {
|
||||
(void)session;
|
||||
if (!info || !request) return XR_ERROR_VALIDATION_FAILURE;
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
int i = fake_space_index(info->space);
|
||||
if (i < 0) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_HANDLE_INVALID; }
|
||||
if (!event_free()) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_LIMIT_REACHED; }
|
||||
XrResult r = persist_spaces(1, &info->space, 0, NULL, 0);
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
*request = next_request++;
|
||||
XrEventDataSpaceSaveCompleteFB e = {XR_TYPE_EVENT_DATA_SPACE_SAVE_COMPLETE_FB, NULL, *request, r, info->space,
|
||||
entities[i].uuid, info->location};
|
||||
XrEventDataSpaceSaveCompleteFB e = {XR_TYPE_EVENT_DATA_SPACE_SAVE_COMPLETE_FB, NULL, *request, XR_SUCCESS, info->space,
|
||||
i >= 0 ? entities[i].uuid : (XrUuidEXT){{0}}, info->location};
|
||||
push_event(&e, sizeof(e));
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_erase_space(XrSession session, const XrSpaceEraseInfoFB *info, XrAsyncRequestIdFB *request) {
|
||||
(void)session;
|
||||
if (!info || !request) return XR_ERROR_VALIDATION_FAILURE;
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
int i = fake_space_index(info->space);
|
||||
if (i < 0) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_HANDLE_INVALID; }
|
||||
if (!event_free()) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_LIMIT_REACHED; }
|
||||
XrResult r = persist_spaces(1, &info->space, 0, NULL, 1);
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
*request = next_request++;
|
||||
XrEventDataSpaceEraseCompleteFB e = {XR_TYPE_EVENT_DATA_SPACE_ERASE_COMPLETE_FB, NULL, *request, r, info->space,
|
||||
entities[i].uuid, info->location};
|
||||
XrEventDataSpaceEraseCompleteFB e = {XR_TYPE_EVENT_DATA_SPACE_ERASE_COMPLETE_FB, NULL, *request, XR_SUCCESS, info->space,
|
||||
i >= 0 ? entities[i].uuid : (XrUuidEXT){{0}}, info->location};
|
||||
push_event(&e, sizeof(e));
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
||||
// Reads share the mutation lock: engine worker threads may retrieve geometry while anchors are saved.
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_uuid(XrSpace space, XrUuidEXT *uuid) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
XrResult r = scene_get_uuid(space, uuid);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return r;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_enumerate_components(XrSpace space, uint32_t capacity, uint32_t *count, XrSpaceComponentTypeFB *types) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
XrResult r = scene_enumerate_components(space, capacity, count, types);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return r;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_component_status(XrSpace space, XrSpaceComponentTypeFB type, XrSpaceComponentStatusFB *status) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
XrResult r = scene_get_component_status(space, type, status);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return r;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_container(XrSession session, XrSpace space, XrSpaceContainerFB *container) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
XrResult r = scene_get_container(session, space, container);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return r;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_room_layout(XrSession session, XrSpace space, XrRoomLayoutFB *layout) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
XrResult r = scene_get_room_layout(session, space, layout);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return r;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_bounding_box_2d(XrSession session, XrSpace space, XrRect2Df *rect) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
XrResult r = scene_get_bounding_box_2d(session, space, rect);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return r;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_bounding_box_3d(XrSession session, XrSpace space, XrRect3DfFB *box) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
XrResult r = scene_get_bounding_box_3d(session, space, box);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return r;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_boundary_2d(XrSession session, XrSpace space, XrBoundary2DFB *boundary) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
XrResult r = scene_get_boundary_2d(session, space, boundary);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return r;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_triangle_mesh(XrSpace space, const XrSpaceTriangleMeshGetInfoMETA *info, XrSpaceTriangleMeshMETA *mesh) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
XrResult r = scene_get_triangle_mesh(space, info, mesh);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return r;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_get_semantic_labels(XrSession session, XrSpace space, XrSemanticLabelsFB *labels) {
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
XrResult r = scene_get_semantic_labels(session, space, labels);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return r;
|
||||
}
|
||||
|
||||
// The app's STAGE bounds: the Frame reports a 1x1 m rect but OVRPlugin can't give its outline ("ovrpBoundary_Outer
|
||||
// is not supported"), so Unity games that trust a configured boundary index an empty array (Demeter's
|
||||
// RemoveObjectNotInGuardian). With an emulated room there is no play area for the app; build_room asks the runtime.
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_stage_bounds(XrSession session, XrReferenceSpaceType type, XrExtent2Df *bounds) {
|
||||
if (type == XR_REFERENCE_SPACE_TYPE_STAGE) {
|
||||
if (!bounds) return XR_ERROR_VALIDATION_FAILURE;
|
||||
static int logged;
|
||||
if (!logged++) LOG("scene: STAGE bounds hidden from the app (no play-area outline on this runtime)");
|
||||
*bounds = (XrExtent2Df){0, 0};
|
||||
return XR_SPACE_BOUNDS_UNAVAILABLE;
|
||||
}
|
||||
PFN_xrGetReferenceSpaceBoundsRect fn =
|
||||
(PFN_xrGetReferenceSpaceBoundsRect)lookup(active_instance, "xrGetReferenceSpaceBoundsRect");
|
||||
return fn ? fn(session, type, bounds) : XR_ERROR_FUNCTION_UNSUPPORTED;
|
||||
}
|
||||
|
||||
#include "scene_meta.c"
|
||||
|
||||
static PFN_xrVoidFunction scene_emulation(const char *name) {
|
||||
if (!emulate_scene) return NULL;
|
||||
if (!strcmp(name, "xrGetReferenceSpaceBoundsRect")) // only for games that trust the 1x1 m rect (NOPE stalled)
|
||||
return scene_hide_bounds ? (PFN_xrVoidFunction)emu_stage_bounds : NULL;
|
||||
static const struct { const char *name; PFN_xrVoidFunction fn; } table[] = {
|
||||
{"xrQuerySpacesFB", (PFN_xrVoidFunction)emu_query_spaces_filtered},
|
||||
{"xrRetrieveSpaceQueryResultsFB", (PFN_xrVoidFunction)emu_retrieve_results},
|
||||
@@ -700,17 +468,11 @@ static PFN_xrVoidFunction scene_emulation(const char *name) {
|
||||
{"xrGetSpaceBoundingBox2DFB", (PFN_xrVoidFunction)emu_get_bounding_box_2d},
|
||||
{"xrGetSpaceBoundingBox3DFB", (PFN_xrVoidFunction)emu_get_bounding_box_3d},
|
||||
{"xrGetSpaceBoundary2DFB", (PFN_xrVoidFunction)emu_get_boundary_2d},
|
||||
{"xrGetSpaceTriangleMeshMETA", (PFN_xrVoidFunction)emu_get_triangle_mesh},
|
||||
{"xrGetSpaceSemanticLabelsFB", (PFN_xrVoidFunction)emu_get_semantic_labels},
|
||||
{"xrRequestSceneCaptureFB", (PFN_xrVoidFunction)emu_request_scene_capture},
|
||||
{"xrCreateSpatialAnchorFB", (PFN_xrVoidFunction)emu_create_anchor},
|
||||
{"xrSaveSpaceFB", (PFN_xrVoidFunction)emu_save_space},
|
||||
{"xrEraseSpaceFB", (PFN_xrVoidFunction)emu_erase_space},
|
||||
{"xrDiscoverSpacesMETA", (PFN_xrVoidFunction)emu_discover_spaces},
|
||||
{"xrRetrieveSpaceDiscoveryResultsMETA", (PFN_xrVoidFunction)emu_retrieve_discovery},
|
||||
{"xrSaveSpacesMETA", (PFN_xrVoidFunction)emu_save_spaces},
|
||||
{"xrEraseSpacesMETA", (PFN_xrVoidFunction)emu_erase_spaces},
|
||||
{"xrRequestBoundaryVisibilityMETA", (PFN_xrVoidFunction)emu_request_boundary_visibility},
|
||||
};
|
||||
for (size_t i = 0; i < sizeof(table) / sizeof(table[0]); ++i)
|
||||
if (!strcmp(name, table[i].name)) return table[i].fn;
|
||||
@@ -723,16 +485,6 @@ static void scene_on_create_session(XrSession session) {
|
||||
PFN_xrCreateReferenceSpace create = (PFN_xrCreateReferenceSpace)lookup(active_instance, "xrCreateReferenceSpace");
|
||||
XrReferenceSpaceCreateInfo ci = {XR_TYPE_REFERENCE_SPACE_CREATE_INFO, NULL, XR_REFERENCE_SPACE_TYPE_STAGE,
|
||||
{{0, 0, 0, 1}, {0, 0, 0}}};
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
reset_room();
|
||||
scene_generation = (scene_generation + 1) & 255;
|
||||
event_head = event_tail = 0;
|
||||
for (int i = 0; i < MAX_QUERIES; ++i) { free(queries[i].results); memset(&queries[i], 0, sizeof(queries[i])); }
|
||||
query_next = 0;
|
||||
scene_session = session;
|
||||
scene_stage = XR_NULL_HANDLE;
|
||||
if (create && XR_SUCCEEDED(create(session, &ci, &scene_stage))) LOG("scene: emulation active (anchored to STAGE)");
|
||||
build_room();
|
||||
load_anchors();
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
}
|
||||
@@ -1,101 +0,0 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// Included by scene_emu.c, using the cached OpenXR registry declarations (no private ABI copies).
|
||||
static int meta_filter_matches(const XrSpaceDiscoveryInfoMETA *info, const scene_entity *e) {
|
||||
for (uint32_t k = 0; k < info->filterCount; ++k) {
|
||||
const XrSpaceFilterBaseHeaderMETA *f = info->filters[k];
|
||||
if (!f) continue;
|
||||
if (f->type == XR_TYPE_SPACE_FILTER_COMPONENT_META &&
|
||||
!entity_has_component(e, ((const XrSpaceFilterComponentMETA *)f)->componentType)) return 0;
|
||||
if (f->type == XR_TYPE_SPACE_FILTER_UUID_META) {
|
||||
const XrSpaceFilterUuidMETA *u = (const XrSpaceFilterUuidMETA *)f;
|
||||
if (!u->uuids || !uuid_matches(u->uuidCount, u->uuids, e)) return 0;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_discover_spaces(XrSession session, const XrSpaceDiscoveryInfoMETA *info,
|
||||
XrAsyncRequestIdFB *request) {
|
||||
if (!info || !request || (info->filterCount && !info->filters)) return XR_ERROR_VALIDATION_FAILURE;
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
scene_session = session;
|
||||
build_room();
|
||||
if (event_free() < 2) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_LIMIT_REACHED; }
|
||||
scene_query *q = new_query();
|
||||
if (!q) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_OUT_OF_MEMORY; }
|
||||
for (int i = 0; i < entity_count; ++i) {
|
||||
scene_entity *e = &entities[i];
|
||||
if (!e->erased && meta_filter_matches(info, e))
|
||||
q->results[q->count++] = (XrSpaceQueryResultFB){e->handle, e->uuid};
|
||||
}
|
||||
*request = q->id;
|
||||
XrEventDataSpaceDiscoveryResultsAvailableMETA avail = {XR_TYPE_EVENT_DATA_SPACE_DISCOVERY_RESULTS_AVAILABLE_META, NULL, *request};
|
||||
XrEventDataSpaceDiscoveryCompleteMETA done = {XR_TYPE_EVENT_DATA_SPACE_DISCOVERY_COMPLETE_META, NULL, *request, XR_SUCCESS};
|
||||
push_event(&avail, sizeof(avail)); push_event(&done, sizeof(done));
|
||||
LOG("scene: discovery request=%llu results=%u", (unsigned long long)*request, q->count);
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_retrieve_discovery(XrSession session, XrAsyncRequestIdFB request,
|
||||
XrSpaceDiscoveryResultsMETA *results) {
|
||||
(void)session;
|
||||
if (!results) return XR_ERROR_VALIDATION_FAILURE;
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
scene_query *q = find_query(request);
|
||||
XrResult r = XR_SUCCESS;
|
||||
if (!q) r = XR_ERROR_VALIDATION_FAILURE;
|
||||
else {
|
||||
results->resultCountOutput = q->count;
|
||||
if (results->resultCapacityInput && results->resultCapacityInput < q->count) r = XR_ERROR_SIZE_INSUFFICIENT;
|
||||
else if (results->resultCapacityInput) {
|
||||
if (!results->results) r = XR_ERROR_VALIDATION_FAILURE;
|
||||
else for (uint32_t i = 0; i < q->count; ++i)
|
||||
results->results[i] = (XrSpaceDiscoveryResultMETA){q->results[i].space, q->results[i].uuid};
|
||||
}
|
||||
}
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return r;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_save_spaces(XrSession session, const XrSpacesSaveInfoMETA *info,
|
||||
XrAsyncRequestIdFB *request) {
|
||||
(void)session;
|
||||
if (!info || !request || !info->spaceCount || !info->spaces) return XR_ERROR_VALIDATION_FAILURE;
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
if (!event_free()) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_LIMIT_REACHED; }
|
||||
XrResult r = persist_spaces(info->spaceCount, info->spaces, 0, NULL, 0);
|
||||
*request = next_request++;
|
||||
XrEventDataSpacesSaveResultMETA done = {XR_TYPE_EVENT_DATA_SPACES_SAVE_RESULT_META, NULL, *request, r};
|
||||
push_event(&done, sizeof(done));
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
// XR_META_boundary_visibility: the Frame shows no guardian over an app anyway, so a request always succeeds; the
|
||||
// change event (once per new state, like Meta's runtime) is what MR games wait for before they start.
|
||||
static XrBoundaryVisibilityMETA boundary_visibility = XR_BOUNDARY_VISIBILITY_NOT_SUPPRESSED_META;
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_request_boundary_visibility(XrSession session, XrBoundaryVisibilityMETA v) {
|
||||
(void)session;
|
||||
if (v != XR_BOUNDARY_VISIBILITY_SUPPRESSED_META && v != XR_BOUNDARY_VISIBILITY_NOT_SUPPRESSED_META)
|
||||
return XR_ERROR_VALIDATION_FAILURE;
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
if (v != boundary_visibility) {
|
||||
boundary_visibility = v;
|
||||
XrEventDataBoundaryVisibilityChangedMETA e = {XR_TYPE_EVENT_DATA_BOUNDARY_VISIBILITY_CHANGED_META, NULL, v};
|
||||
push_event(&e, sizeof(e));
|
||||
LOG("scene: boundary %s", v == XR_BOUNDARY_VISIBILITY_SUPPRESSED_META ? "suppressed" : "shown");
|
||||
}
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
static XRAPI_ATTR XrResult XRAPI_CALL emu_erase_spaces(XrSession session, const XrSpacesEraseInfoMETA *info,
|
||||
XrAsyncRequestIdFB *request) {
|
||||
(void)session;
|
||||
if (!info || !request || (info->spaceCount && !info->spaces) || (info->uuidCount && !info->uuids))
|
||||
return XR_ERROR_VALIDATION_FAILURE;
|
||||
pthread_mutex_lock(&scene_lock);
|
||||
if (!event_free()) { pthread_mutex_unlock(&scene_lock); return XR_ERROR_LIMIT_REACHED; }
|
||||
XrResult r = persist_spaces(info->spaceCount, info->spaces, info->uuidCount, info->uuids, 1);
|
||||
*request = next_request++;
|
||||
XrEventDataSpacesEraseResultMETA done = {XR_TYPE_EVENT_DATA_SPACES_ERASE_RESULT_META, NULL, *request, r};
|
||||
push_event(&done, sizeof(done));
|
||||
pthread_mutex_unlock(&scene_lock);
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
@@ -1,268 +0,0 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// Included by scene_emu.c. Bounded parsing keeps corrupt scan files from exhausting an Android game.
|
||||
#include <errno.h>
|
||||
#include <stdint.h>
|
||||
|
||||
static int room_uuid(const char *s, XrUuidEXT *u) {
|
||||
if (strlen(s) != 32) return 0;
|
||||
for (int i = 0; i < 16; ++i) {
|
||||
unsigned n = 0;
|
||||
for (int k = 0; k < 2; ++k) {
|
||||
char c = s[i * 2 + k];
|
||||
if (c >= '0' && c <= '9') n = n * 16 + (unsigned)(c - '0');
|
||||
else if (c >= 'a' && c <= 'f') n = n * 16 + (unsigned)(c - 'a' + 10);
|
||||
else return 0;
|
||||
}
|
||||
u->data[i] = (uint8_t)n;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
static int room_float(const char *s, float *v) {
|
||||
char *end;
|
||||
errno = 0;
|
||||
*v = strtof(s, &end);
|
||||
return *s && !*end && !errno && isfinite(*v) && fabsf(*v) <= 100000;
|
||||
}
|
||||
static int room_uint(const char *s, uint64_t *v) {
|
||||
char *end;
|
||||
if (*s < '0' || *s > '9') return 0;
|
||||
errno = 0;
|
||||
*v = strtoull(s, &end, 10);
|
||||
return !*end && !errno;
|
||||
}
|
||||
static int room_tokens(char *s, char **t, int cap) {
|
||||
char *comment = strchr(s, '#');
|
||||
if (comment) *comment = 0;
|
||||
int n = 0;
|
||||
char *save;
|
||||
for (char *p = strtok_r(s, " \t\r\n", &save); p; p = strtok_r(NULL, " \t\r\n", &save)) {
|
||||
if (n == cap) return -1;
|
||||
t[n++] = p;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
static int room_values(char **t, int start, int count, float *v) {
|
||||
for (int i = 0; i < count; ++i) if (!room_float(t[start + i], &v[i])) return 0;
|
||||
return 1;
|
||||
}
|
||||
static int room_path(char *out, size_t size, const char *name) {
|
||||
const char *config = getenv("FRAMEBRIDGE_CONFIG");
|
||||
if (!config || !*config || strchr(name, '/') || strchr(name, '\\') || !strcmp(name, "..")) return 0;
|
||||
const char *slash = strrchr(config, '/');
|
||||
int n = slash ? snprintf(out, size, "%.*s/%s", (int)(slash - config), config, name)
|
||||
: snprintf(out, size, "%s", name);
|
||||
return n >= 0 && (size_t)n < size;
|
||||
}
|
||||
static uint32_t room_u32(const unsigned char *p) {
|
||||
return (uint32_t)p[0] | (uint32_t)p[1] << 8 | (uint32_t)p[2] << 16 | (uint32_t)p[3] << 24;
|
||||
}
|
||||
static int room_mesh(scene_entity *e, const char *name, uint64_t nv, uint64_t ni) {
|
||||
// At most 200k triangles and 16 MiB of payload; validate every index before publishing the mesh.
|
||||
if (!nv || nv > 600000 || !ni || ni > 600000 || ni % 3 || nv * 12 + ni * 4 > 16 * 1024 * 1024) return 0;
|
||||
char path[4096];
|
||||
if (!room_path(path, sizeof(path), name)) return 0;
|
||||
FILE *f = fopen(path, "rb");
|
||||
if (!f) return 0;
|
||||
unsigned char header[16], word[4];
|
||||
int ok = fread(header, 1, 16, f) == 16 && !memcmp(header, "FPRM", 4) && room_u32(header + 4) == 1 &&
|
||||
room_u32(header + 8) == nv && room_u32(header + 12) == ni;
|
||||
XrVector3f *verts = ok ? malloc((size_t)nv * sizeof(*verts)) : NULL;
|
||||
uint32_t *indices = ok ? malloc((size_t)ni * sizeof(*indices)) : NULL;
|
||||
ok = ok && verts && indices;
|
||||
for (uint64_t i = 0; ok && i < nv; ++i) {
|
||||
float xyz[3];
|
||||
for (int k = 0; ok && k < 3; ++k) {
|
||||
ok = fread(word, 1, 4, f) == 4;
|
||||
uint32_t bits = ok ? room_u32(word) : 0;
|
||||
memcpy(&xyz[k], &bits, 4);
|
||||
ok = ok && isfinite(xyz[k]) && fabsf(xyz[k]) <= 100000;
|
||||
}
|
||||
if (ok) verts[i] = (XrVector3f){xyz[0], xyz[1], xyz[2]};
|
||||
}
|
||||
for (uint64_t i = 0; ok && i < ni; ++i) {
|
||||
ok = fread(word, 1, 4, f) == 4;
|
||||
indices[i] = ok ? room_u32(word) : 0;
|
||||
ok = ok && indices[i] < nv;
|
||||
}
|
||||
ok = ok && fgetc(f) == EOF && !ferror(f);
|
||||
fclose(f);
|
||||
if (!ok) { free(verts); free(indices); return 0; }
|
||||
e->vertices = verts; e->indices = indices;
|
||||
e->vertex_count = (uint32_t)nv; e->index_count = (uint32_t)ni;
|
||||
return 1;
|
||||
}
|
||||
static int room_set_uuid(int i, XrUuidEXT uuid) {
|
||||
for (int k = 0; k < entity_count; ++k)
|
||||
if (k != i && uuid_equal(&entities[k].uuid, &uuid)) return 0;
|
||||
entities[i].uuid = uuid;
|
||||
return 1;
|
||||
}
|
||||
static int room_wall(XrUuidEXT uuid, const float *v, const char *label) {
|
||||
float dx = v[2] - v[0], dz = v[3] - v[1], length = hypotf(dx, dz);
|
||||
if (length < 0.001f || v[5] <= v[4]) return 0;
|
||||
float angle = atan2f(-dz, dx) / 2;
|
||||
int i = add_entity((XrPosef){{0, sinf(angle), 0, cosf(angle)},
|
||||
{(v[0] + v[2]) / 2, (v[4] + v[5]) / 2, (v[1] + v[3]) / 2}},
|
||||
label, length, v[5] - v[4], 0, 0);
|
||||
if (i < 0) return 0;
|
||||
if (!room_set_uuid(i, uuid)) { --entity_count; return 0; }
|
||||
entities[i].is_wall = 1;
|
||||
return 1;
|
||||
}
|
||||
static int room_outline(scene_entity *e, const XrVector2f *points, int n, float cx, float cz, int ceiling) {
|
||||
e->boundary = malloc((size_t)n * sizeof(*e->boundary));
|
||||
if (!e->boundary) return 0;
|
||||
e->boundary_count = (uint32_t)n;
|
||||
float xmin = INFINITY, ymin = INFINITY, xmax = -INFINITY, ymax = -INFINITY;
|
||||
for (int i = 0; i < n; ++i) {
|
||||
XrVector2f p = {points[i].x - cx, (points[i].y - cz) * (ceiling ? 1 : -1)};
|
||||
e->boundary[i] = p;
|
||||
xmin = fminf(xmin, p.x); xmax = fmaxf(xmax, p.x);
|
||||
ymin = fminf(ymin, p.y); ymax = fmaxf(ymax, p.y);
|
||||
}
|
||||
e->has_bounds = 1;
|
||||
e->bounds = (XrRect2Df){{xmin, ymin}, {xmax - xmin, ymax - ymin}};
|
||||
return 1;
|
||||
}
|
||||
static int load_room_file(void) {
|
||||
char path[4096];
|
||||
if (!room_path(path, sizeof(path), "room.txt")) return 0;
|
||||
FILE *f = fopen(path, "r");
|
||||
if (!f) return 0;
|
||||
// Long enough for a 1024-point outline. Reject whole overlong lines, never interpret their tails.
|
||||
char *line = malloc(65536);
|
||||
char **t = malloc((2 * MAX_OUTLINE + 4) * sizeof(*t));
|
||||
if (!line || !t) { free(line); free(t); fclose(f); return 0; }
|
||||
int ok = fgets(line, 65536, f) != NULL;
|
||||
int n = ok ? room_tokens(line, t, 2 * MAX_OUTLINE + 4) : 0;
|
||||
if (n != 2 || strcmp(t[0], "frameport-room") || strcmp(t[1], "1")) {
|
||||
LOG("scene: bad room magic/version -> guardian box");
|
||||
free(line); free(t); fclose(f); return 0;
|
||||
}
|
||||
const float s = 0.70710678f;
|
||||
add_entity((XrPosef){{0, 0, 0, 1}, {0, 0, 0}}, NULL, 0, 0, 1, 0);
|
||||
add_entity((XrPosef){{-s, 0, 0, s}, {0, 0, 0}}, "FLOOR", 0, 0, 0, 0);
|
||||
add_entity((XrPosef){{s, 0, 0, s}, {0, 2.5f, 0}}, "CEILING", 0, 0, 0, 0);
|
||||
XrVector2f outline[MAX_OUTLINE];
|
||||
int outline_n = 0, ceiling_set = 0, volumes = 0, planes = 0, triangles = 0;
|
||||
unsigned lineno = 1;
|
||||
snprintf(room_source, sizeof(room_source), "manual");
|
||||
while (fgets(line, 65536, f)) {
|
||||
++lineno;
|
||||
if (!strchr(line, '\n') && !feof(f)) {
|
||||
int c; while ((c = fgetc(f)) != EOF && c != '\n') {}
|
||||
LOG("scene: bad room line %u (too long)", lineno); continue;
|
||||
}
|
||||
n = room_tokens(line, t, 2 * MAX_OUTLINE + 4);
|
||||
if (!n) continue;
|
||||
ok = n > 0;
|
||||
float v[10]; XrUuidEXT uuid; uint64_t a, b;
|
||||
if (n < 0) ok = 0;
|
||||
else if (!strcmp(t[0], "source")) {
|
||||
ok = n == 2 && (!strcmp(t[1], "scan") || !strcmp(t[1], "boundary") || !strcmp(t[1], "box") || !strcmp(t[1], "manual"));
|
||||
if (ok) snprintf(room_source, sizeof(room_source), "%s", t[1]);
|
||||
} else if (!strcmp(t[0], "universe")) {
|
||||
ok = n == 2 && room_uint(t[1], &a);
|
||||
if (ok) room_universe = a;
|
||||
} else if (!strcmp(t[0], "room") || !strcmp(t[0], "floor") || !strcmp(t[0], "ceiling")) {
|
||||
int i = !strcmp(t[0], "room") ? ENT_ROOM : !strcmp(t[0], "floor") ? ENT_FLOOR : ENT_CEILING;
|
||||
ok = n == (i == ENT_ROOM ? 2 : 3) && room_uuid(t[1], &uuid) &&
|
||||
(i == ENT_ROOM || room_float(t[2], v)) && room_set_uuid(i, uuid);
|
||||
if (ok && i != ENT_ROOM) entities[i].pose_in_stage.position.y = v[0];
|
||||
if (ok && i == ENT_CEILING) ceiling_set = 1;
|
||||
} else if (!strcmp(t[0], "outline")) {
|
||||
ok = n >= 2 && room_uint(t[1], &a) && a >= 3 && a <= MAX_OUTLINE && n == 2 + 2 * (int)a;
|
||||
XrVector2f parsed[MAX_OUTLINE];
|
||||
for (uint64_t k = 0; ok && k < a; ++k) ok = room_float(t[2 + k * 2], &parsed[k].x) && room_float(t[3 + k * 2], &parsed[k].y);
|
||||
if (ok) { memcpy(outline, parsed, (size_t)a * sizeof(*outline)); outline_n = (int)a; }
|
||||
} else if (!strcmp(t[0], "wall")) {
|
||||
// optional 8th field: WALL_FACE (default) or INVISIBLE_WALL_FACE for an edge the scanner closed itself
|
||||
const char *label = n == 9 ? t[8] : "WALL_FACE";
|
||||
ok = (n == 8 || (n == 9 && (!strcmp(label, "WALL_FACE") || !strcmp(label, "INVISIBLE_WALL_FACE")))) &&
|
||||
room_uuid(t[1], &uuid) && room_values(t, 2, 6, v) && room_wall(uuid, v, label);
|
||||
} else if (!strcmp(t[0], "volume") || !strcmp(t[0], "plane")) {
|
||||
int volume = !strcmp(t[0], "volume");
|
||||
ok = n == (volume ? 10 : 12) && room_uuid(t[1], &uuid) && strlen(t[2]) < sizeof(entities[0].label) && room_values(t, 3, volume ? 7 : 9, v);
|
||||
XrPosef pose = {{0, 0, 0, 1}, {0, 0, 0}};
|
||||
float w = 0, h = 0;
|
||||
if (ok && volume) {
|
||||
float yaw = v[3] * 0.00872664626f;
|
||||
pose = (XrPosef){quat_mul((XrQuaternionf){0, sinf(yaw), 0, cosf(yaw)}, (XrQuaternionf){-s, 0, 0, s}), {v[0], v[2], v[1]}};
|
||||
w = v[4]; h = v[5]; ok = v[6] > 0;
|
||||
} else if (ok) {
|
||||
float norm = sqrtf(v[3]*v[3]+v[4]*v[4]+v[5]*v[5]+v[6]*v[6]);
|
||||
ok = norm > 0.0001f;
|
||||
if (ok) pose = (XrPosef){{v[3]/norm,v[4]/norm,v[5]/norm,v[6]/norm}, {v[0],v[1],v[2]}};
|
||||
w = v[7]; h = v[8];
|
||||
}
|
||||
int i = ok && w > 0 && h > 0 ? add_entity(pose, t[2], w, h, 0, 0) : -1;
|
||||
ok = i >= 0;
|
||||
if (ok && !room_set_uuid(i, uuid)) { --entity_count; ok = 0; }
|
||||
if (ok && volume) {
|
||||
entities[i].has_bounds3 = 1;
|
||||
entities[i].bounds3 = (XrRect3DfFB){{-w/2, -h/2, -v[6]}, {w, h, v[6]}};
|
||||
++volumes;
|
||||
} else if (ok) ++planes;
|
||||
} else if (!strcmp(t[0], "mesh")) {
|
||||
if (!scene_app_mesh) continue; // the app didn't enable XR_META_spatial_entity_mesh
|
||||
ok = n == 5 && room_uuid(t[1], &uuid) && room_uint(t[3], &a) && room_uint(t[4], &b) && !triangles;
|
||||
int i = ok ? add_entity((XrPosef){{0,0,0,1},{0,0,0}}, "GLOBAL_MESH", 0, 0, 0, 0) : -1;
|
||||
ok = i >= 0 && room_set_uuid(i, uuid) && room_mesh(&entities[i], t[2], a, b);
|
||||
if (ok) triangles = (int)b / 3;
|
||||
else if (i >= 0) --entity_count;
|
||||
}
|
||||
if (!ok) LOG("scene: bad room line %u (skipped)", lineno);
|
||||
}
|
||||
ok = !ferror(f);
|
||||
free(line); free(t); fclose(f);
|
||||
// Layout walls must be contiguous and in file order, regardless of where other records occurred.
|
||||
for (int i = ENT_WALL0; i < entity_count; ++i) if (entities[i].is_wall) {
|
||||
scene_entity wall = entities[i];
|
||||
memmove(&entities[ENT_WALL0 + wall_count + 1], &entities[ENT_WALL0 + wall_count],
|
||||
(size_t)(i - ENT_WALL0 - wall_count) * sizeof(wall));
|
||||
entities[ENT_WALL0 + wall_count++] = wall;
|
||||
}
|
||||
if (!outline_n && wall_count) {
|
||||
float xmin = INFINITY, zmin = INFINITY, xmax = -INFINITY, zmax = -INFINITY;
|
||||
for (int i = ENT_WALL0; i < ENT_WALL0 + wall_count; ++i) {
|
||||
scene_entity *e = &entities[i];
|
||||
XrVector3f d = quat_rotate(e->pose_in_stage.orientation, (XrVector3f){e->bounds.extent.width/2,0,0});
|
||||
xmin = fminf(xmin, e->pose_in_stage.position.x - fabsf(d.x)); xmax = fmaxf(xmax, e->pose_in_stage.position.x + fabsf(d.x));
|
||||
zmin = fminf(zmin, e->pose_in_stage.position.z - fabsf(d.z)); zmax = fmaxf(zmax, e->pose_in_stage.position.z + fabsf(d.z));
|
||||
}
|
||||
outline[0]=(XrVector2f){xmin,zmin}; outline[1]=(XrVector2f){xmax,zmin};
|
||||
outline[2]=(XrVector2f){xmax,zmax}; outline[3]=(XrVector2f){xmin,zmax}; outline_n=4;
|
||||
}
|
||||
double area = 0, cx = 0, cz = 0;
|
||||
for (int i = 0; i < outline_n; ++i) {
|
||||
XrVector2f a = outline[i], b = outline[(i+1)%outline_n];
|
||||
double cross = (double)a.x*b.y-(double)b.x*a.y;
|
||||
area += cross; cx += (a.x+b.x)*cross; cz += (a.y+b.y)*cross;
|
||||
}
|
||||
if (!ok || outline_n < 3 || fabs(area) < 0.00001) { reset_room(); return 0; }
|
||||
cx /= 3*area; cz /= 3*area;
|
||||
if (!ceiling_set) entities[ENT_CEILING].pose_in_stage.position.y = entities[ENT_FLOOR].pose_in_stage.position.y + 2.5f;
|
||||
for (int i = ENT_FLOOR; i <= ENT_CEILING; ++i) {
|
||||
entities[i].pose_in_stage.position.x = (float)cx; entities[i].pose_in_stage.position.z = (float)cz;
|
||||
if (!room_outline(&entities[i], outline, outline_n, (float)cx, (float)cz, i == ENT_CEILING)) { reset_room(); return 0; }
|
||||
}
|
||||
if (!wall_count) for (int i = 0; i < outline_n; ++i) {
|
||||
XrVector2f a = outline[i], b = outline[(i+1)%outline_n];
|
||||
float v[] = {a.x,a.y,b.x,b.y,entities[ENT_FLOOR].pose_in_stage.position.y,entities[ENT_CEILING].pose_in_stage.position.y};
|
||||
if (!room_wall(make_uuid(entity_count), v, "WALL_FACE")) { reset_room(); return 0; }
|
||||
++wall_count;
|
||||
}
|
||||
// Move generated walls ahead of furniture as well.
|
||||
if (wall_count && !entities[ENT_WALL0].is_wall) {
|
||||
scene_entity *walls = malloc((size_t)wall_count * sizeof(*walls));
|
||||
if (!walls) { reset_room(); return 0; }
|
||||
memcpy(walls, &entities[entity_count-wall_count], (size_t)wall_count*sizeof(*walls));
|
||||
memmove(&entities[ENT_WALL0+wall_count], &entities[ENT_WALL0], (size_t)(entity_count-wall_count-ENT_WALL0)*sizeof(*walls));
|
||||
memcpy(&entities[ENT_WALL0], walls, (size_t)wall_count*sizeof(*walls)); free(walls);
|
||||
}
|
||||
for (int i = 0; i < entity_count; ++i) entities[i].handle = fake_space(i);
|
||||
room_entity_count = entity_count; room_from_file = 1;
|
||||
LOG("scene: room from %s file (%d walls, %d volumes, %d planes, %d mesh triangles, universe %llu)",
|
||||
room_source, wall_count, volumes, planes, triangles, (unsigned long long)room_universe);
|
||||
return 1;
|
||||
}
|
||||
@@ -17,6 +17,9 @@ SNAP_GL_FUNCS(SNAP_DECLARE)
|
||||
#undef SNAP_DECLARE
|
||||
static EGLContext (*s_eglGetCurrentContext)(void);
|
||||
|
||||
// The swapchain image tracking also serves projection_only=2 (quad_compose_gl.c).
|
||||
#define snap_tracking() (snapshot || projection_only == 2)
|
||||
|
||||
static struct {
|
||||
XrSwapchain handle;
|
||||
uint32_t width, height, array_size, count, last_acquired;
|
||||
@@ -48,7 +51,7 @@ static int snap_find(XrSwapchain handle, int create) {
|
||||
}
|
||||
|
||||
static void snap_on_create(XrSwapchain handle, const XrSwapchainCreateInfo *info) {
|
||||
if (!snapshot || !info) return;
|
||||
if (!snap_tracking() || !info) return;
|
||||
pthread_mutex_lock(&snap_lock);
|
||||
int i = snap_find(handle, 1);
|
||||
if (i >= 0) {
|
||||
@@ -60,7 +63,7 @@ static void snap_on_create(XrSwapchain handle, const XrSwapchainCreateInfo *info
|
||||
}
|
||||
|
||||
static void snap_on_destroy(XrSwapchain handle) {
|
||||
if (!snapshot) return;
|
||||
if (!snap_tracking()) return;
|
||||
pthread_mutex_lock(&snap_lock);
|
||||
int i = snap_find(handle, 0);
|
||||
if (i >= 0) snap_chains[i].handle = XR_NULL_HANDLE;
|
||||
@@ -68,7 +71,7 @@ static void snap_on_destroy(XrSwapchain handle) {
|
||||
}
|
||||
|
||||
static void snap_on_enumerate(XrSwapchain handle, uint32_t count, const XrSwapchainImageBaseHeader *images) {
|
||||
if (!snapshot || !images || !count || images->type != (XrStructureType)1000024002) return; // OPENGL_ES_KHR
|
||||
if (!snap_tracking() || !images || !count || images->type != (XrStructureType)1000024002) return; // OPENGL_ES_KHR
|
||||
pthread_mutex_lock(&snap_lock);
|
||||
int i = snap_find(handle, 1);
|
||||
if (i >= 0) {
|
||||
@@ -81,7 +84,7 @@ static void snap_on_enumerate(XrSwapchain handle, uint32_t count, const XrSwapch
|
||||
}
|
||||
|
||||
static void snap_on_acquire(XrSwapchain handle, uint32_t index) {
|
||||
if (!snapshot) return;
|
||||
if (!snap_tracking()) return;
|
||||
pthread_mutex_lock(&snap_lock);
|
||||
int i = snap_find(handle, 0);
|
||||
if (i >= 0) snap_chains[i].last_acquired = index;
|
||||
|
||||
@@ -199,18 +199,6 @@ def build_venc(tc: Path):
|
||||
f"-ffile-prefix-map={HERE}=native", "fp_venc.c", "convert.c", "sys.c", "-o", out / "fp_venc"], cwd=src)
|
||||
|
||||
|
||||
def build_roomscan(tc: Path):
|
||||
"""Offline room reconstruction (Linux aarch64). No libc, headers, generated tables or fetched dependencies."""
|
||||
src = HERE / "roomscan"
|
||||
out = ART / "linux-arm64-bin"
|
||||
out.mkdir(parents=True, exist_ok=True)
|
||||
run([tc / "bin/clang", "--target=aarch64-linux-gnu", "-ffreestanding", "-nostdlib", "-nostdlibinc", "-static",
|
||||
"-fno-stack-protector", "-fno-builtin", "-ffp-contract=off", "-fno-math-errno", "-O2", "-Wall", "-Wextra", "-Werror",
|
||||
"-fuse-ld=lld", "-Wl,--build-id=none", "-Wl,-z,max-page-size=65536", "-e", "_start",
|
||||
f"-ffile-prefix-map={HERE}=native", "main.c", "fusion.c", "model.c", "mesh.c", "platform.c",
|
||||
"-o", out / "fp_roomscan"], cwd=src)
|
||||
|
||||
|
||||
OCULUSHMD_IMPORTS = ("CreateEventW", "CreateJobObjectW", "AssignProcessToJobObject", "QueryInformationJobObject",
|
||||
"CreateProcessW", "ResumeThread", "WaitForSingleObject", "GetExitCodeProcess", "CloseHandle",
|
||||
"Sleep", "GetCommandLineW", "GetLastError", "GetStdHandle", "WriteFile", "ExitProcess")
|
||||
@@ -392,6 +380,15 @@ def build_tlskeys(tc: Path):
|
||||
"-Wl,-z,max-page-size=16384", "tlskeys.c", "-llog", "-o", ART / "arm64-v8a/libfp_tkeys.so"], cwd=src)
|
||||
|
||||
|
||||
def build_vkext(tc: Path):
|
||||
"""Android-only Vulkan device extensions listed for builds for this PC (see vkext/vkext.c, patch
|
||||
frame.vk_android_extensions)."""
|
||||
src = HERE / "vkext"
|
||||
run([exe(tc, "aarch64-linux-android29-clang"), "-shared", "-fPIC", "-O2", "-Wall", "-Wextra", "-Werror",
|
||||
"-fvisibility=hidden", f"-ffile-prefix-map={HERE}=native", "-Wl,-soname,libfp_vkext.so",
|
||||
"-Wl,-z,max-page-size=16384", "vkext.c", "-lvulkan", "-llog", "-o", ART / "arm64-v8a/libfp_vkext.so"], cwd=src)
|
||||
|
||||
|
||||
def build_luajit(tc: Path):
|
||||
run([sys.executable, HERE / "luajit/build.py", "--clang-dir", tc / "bin",
|
||||
"--out", ART / "arm64-v8a/libfp_luajit.so"])
|
||||
@@ -450,7 +447,7 @@ def write_sums():
|
||||
|
||||
def main():
|
||||
ap = argparse.ArgumentParser()
|
||||
ap.add_argument("--only", default="adapter,bridge,compat,langpack,glshim,eglfmt,glmv,ovrtrace,dex,xrlayer,oculushmd,xrshim,vkshim,zinkfix,foveation,ovrpshim,tlskeys,luajit,vrsettings,venc,roomscan,a32")
|
||||
ap.add_argument("--only", default="adapter,bridge,compat,langpack,glshim,eglfmt,glmv,ovrtrace,dex,xrlayer,oculushmd,xrshim,vkshim,zinkfix,foveation,ovrpshim,tlskeys,vkext,luajit,vrsettings,venc,a32")
|
||||
ap.add_argument("--ndk")
|
||||
args = ap.parse_args()
|
||||
parts = set(args.only.split(","))
|
||||
@@ -463,13 +460,12 @@ def main():
|
||||
"oculushmd": lambda: build_oculushmd(tc), "vkshim": lambda: build_vkshim(tc),
|
||||
"zinkfix": lambda: build_zinkfix(tc),
|
||||
"foveation": lambda: build_foveation(tc),
|
||||
"ovrpshim": lambda: build_ovrpshim(tc), "tlskeys": lambda: build_tlskeys(tc),
|
||||
"ovrpshim": lambda: build_ovrpshim(tc), "tlskeys": lambda: build_tlskeys(tc), "vkext": lambda: build_vkext(tc),
|
||||
"luajit": lambda: build_luajit(tc),
|
||||
"vrsettings": lambda: build_vrsettings(tc), "venc": lambda: build_venc(tc),
|
||||
"roomscan": lambda: build_roomscan(tc),
|
||||
"vroverlay_probe": lambda: build_vroverlay_probe(tc), "a32": lambda: build_a32(tc)}
|
||||
for name in ("adapter", "bridge", "compat", "langpack", "glshim", "eglfmt", "glmv", "ovrtrace", "xrshim", "vkshim", "zinkfix", "foveation", "ovrpshim", "tlskeys", "luajit", "dex", "xrlayer", "oculushmd", "vrsettings", "venc",
|
||||
"roomscan", "vroverlay_probe", "a32"):
|
||||
for name in ("adapter", "bridge", "compat", "langpack", "glshim", "eglfmt", "glmv", "ovrtrace", "xrshim", "vkshim", "zinkfix", "foveation", "ovrpshim", "tlskeys", "vkext", "luajit", "dex", "xrlayer", "oculushmd", "vrsettings", "venc",
|
||||
"vroverlay_probe", "a32"):
|
||||
if name in parts:
|
||||
log(f"build {name}")
|
||||
steps[name]()
|
||||
|
||||
@@ -35,6 +35,7 @@ static const GLubyte *(*real_glGetStringi)(GLenum, GLuint);
|
||||
static void (*real_glGetIntegerv)(GLenum, GLint *);
|
||||
static __eglMustCastToProperFunctionPointerType (*real_eglGetProcAddress)(const char *);
|
||||
static pthread_once_t once = PTHREAD_ONCE_INIT;
|
||||
static int tq_used; // GPU timer-query stand-ins handed out (below): GL_GPU_DISJOINT_EXT reads answer 0
|
||||
|
||||
static int hide_multiview = -1; // -1: not set (Unity and Unreal keep multiview, everything else hides it)
|
||||
static int hide_msrtt = 1;
|
||||
@@ -628,6 +629,21 @@ static int is_hidden(const char *name) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// GL_EXT_disjoint_timer_query listed although the driver lacks it: GLAD loaders only look its functions up when the
|
||||
// extension is listed, and some engines call them unconditionally (Path of the Warrior on AXRB's emulator, whose
|
||||
// gfxstream eglGetProcAddress still returns pointers for the names); the lookups then get the stand-ins below
|
||||
// eglGetProcAddress. Decided once a context answers GL_NUM_EXTENSIONS, by whether the driver lists the extension.
|
||||
static const char TIMER_QUERY_EXT[] = "GL_EXT_disjoint_timer_query";
|
||||
static int added_timer_query = -1;
|
||||
static int add_timer_query(void) {
|
||||
if (added_timer_query < 0 && real_glGetIntegerv && real_glGetStringi) {
|
||||
GLint total = 0;
|
||||
real_glGetIntegerv(GL_NUM_EXTENSIONS, &total);
|
||||
if (total > 0) added_timer_query = !ext_supported(TIMER_QUERY_EXT);
|
||||
}
|
||||
return added_timer_query > 0;
|
||||
}
|
||||
|
||||
// Filtered index table for glGetStringi (built lazily, per process).
|
||||
static GLuint *visible;
|
||||
static GLint visible_count = -1;
|
||||
@@ -641,12 +657,17 @@ static void build_table(void) {
|
||||
const char *name = (const char *)real_glGetStringi(GL_EXTENSIONS, (GLuint)i);
|
||||
if (name && !is_hidden(name)) visible[visible_count++] = (GLuint)i;
|
||||
}
|
||||
LOG("extensions: %d of %d visible to the game", visible_count, total);
|
||||
LOG("extensions: %d of %d visible to the game%s", visible_count, total,
|
||||
add_timer_query() ? " (+ GL_EXT_disjoint_timer_query, stand-ins)" : "");
|
||||
}
|
||||
|
||||
__attribute__((visibility("default"))) void glGetIntegerv(GLenum pname, GLint *data) {
|
||||
pthread_once(&once, init);
|
||||
if (pname == GL_NUM_EXTENSIONS && data) { build_table(); if (visible_count >= 0) { *data = visible_count; return; } }
|
||||
if (pname == GL_NUM_EXTENSIONS && data) {
|
||||
build_table();
|
||||
if (visible_count >= 0) { *data = visible_count + add_timer_query(); return; }
|
||||
}
|
||||
if (pname == 0x8FBB /* GL_GPU_DISJOINT_EXT */ && tq_used && data) { *data = 0; return; }
|
||||
if (real_glGetIntegerv) real_glGetIntegerv(pname, data);
|
||||
}
|
||||
|
||||
@@ -654,7 +675,10 @@ __attribute__((visibility("default"))) const GLubyte *glGetStringi(GLenum name,
|
||||
pthread_once(&once, init);
|
||||
if (name == GL_EXTENSIONS) {
|
||||
build_table();
|
||||
if (visible_count >= 0) return index < (GLuint)visible_count ? real_glGetStringi(name, visible[index]) : NULL;
|
||||
if (visible_count >= 0) {
|
||||
if (index < (GLuint)visible_count) return real_glGetStringi(name, visible[index]);
|
||||
return index == (GLuint)visible_count && add_timer_query() ? (const GLubyte *)TIMER_QUERY_EXT : NULL;
|
||||
}
|
||||
}
|
||||
return real_glGetStringi ? real_glGetStringi(name, index) : NULL;
|
||||
}
|
||||
@@ -665,11 +689,12 @@ __attribute__((visibility("default"))) const GLubyte *glGetString(GLenum name) {
|
||||
if (name != GL_EXTENSIONS || !s) return s;
|
||||
static char *filtered;
|
||||
if (!filtered) {
|
||||
filtered = calloc(strlen((const char *)s) + 1, 1);
|
||||
filtered = calloc(strlen((const char *)s) + sizeof(TIMER_QUERY_EXT) + 2, 1);
|
||||
char *copy = strdup((const char *)s), *save = NULL;
|
||||
for (char *tok = strtok_r(copy, " ", &save); tok; tok = strtok_r(NULL, " ", &save))
|
||||
if (!is_hidden(tok)) { strcat(filtered, tok); strcat(filtered, " "); }
|
||||
free(copy);
|
||||
if (add_timer_query()) { strcat(filtered, TIMER_QUERY_EXT); strcat(filtered, " "); }
|
||||
}
|
||||
return (const GLubyte *)filtered;
|
||||
}
|
||||
@@ -794,13 +819,55 @@ EXPORT void glDrawRangeElements(GLenum m, GLuint s, GLuint e, GLsizei c, GLenum
|
||||
if (d.DrawRangeElements) d.DrawRangeElements(m, s, e, c, t, i);
|
||||
}
|
||||
|
||||
// GPU timer queries (GL_EXT_disjoint_timer_query) the driver doesn't have: GLAD engines call the function pointers
|
||||
// whether or not the extension is listed (Path of the Warrior: glad_glGenQueriesEXT NULL -> SIGSEGV at pc 0 in
|
||||
// EgHalGrTimestampQueryGL on AXRB's emulator, whose gfxstream GLES has no timer queries; Quest and the Frame have
|
||||
// them, so the stand-ins are only handed out when the real lookup fails). Every query is at once available and
|
||||
// measured 0 ns.
|
||||
static GLuint tq_next = 0x7f000000;
|
||||
static void tq_gen(GLsizei n, GLuint *ids) { for (GLsizei i = 0; ids && i < n; i++) ids[i] = __atomic_add_fetch(&tq_next, 1, __ATOMIC_RELAXED); }
|
||||
static void tq_delete(GLsizei n, const GLuint *ids) { (void)n; (void)ids; }
|
||||
static GLboolean tq_is(GLuint id) { return id > 0x7f000000; }
|
||||
static void tq_begin(GLenum target, GLuint id) { (void)target; (void)id; }
|
||||
static void tq_end(GLenum target) { (void)target; }
|
||||
static void tq_counter(GLuint id, GLenum target) { (void)id; (void)target; }
|
||||
static void tq_getiv(GLenum target, GLenum pname, GLint *v) { (void)target; (void)pname; if (v) *v = 0; }
|
||||
#define TQ_RESULT(v, pname) if (v) *(v) = (pname) == 0x8867 /* GL_QUERY_RESULT_AVAILABLE */ ? 1 : 0
|
||||
static void tq_objiv(GLuint id, GLenum pname, GLint *v) { (void)id; TQ_RESULT(v, pname); }
|
||||
static void tq_objuiv(GLuint id, GLenum pname, GLuint *v) { (void)id; TQ_RESULT(v, pname); }
|
||||
static void tq_obji64v(GLuint id, GLenum pname, GLint64 *v) { (void)id; TQ_RESULT(v, pname); }
|
||||
static void tq_objui64v(GLuint id, GLenum pname, GLuint64 *v) { (void)id; TQ_RESULT(v, pname); }
|
||||
static void tq_int64v(GLenum pname, GLint64 *v) { (void)pname; if (v) *v = 0; }
|
||||
static const struct { const char *name; void *fn; } timer_query_standins[] = {
|
||||
{"glGenQueriesEXT", (void *)tq_gen}, {"glDeleteQueriesEXT", (void *)tq_delete}, {"glIsQueryEXT", (void *)tq_is},
|
||||
{"glBeginQueryEXT", (void *)tq_begin}, {"glEndQueryEXT", (void *)tq_end},
|
||||
{"glQueryCounterEXT", (void *)tq_counter}, {"glGetQueryivEXT", (void *)tq_getiv},
|
||||
{"glGetQueryObjectivEXT", (void *)tq_objiv}, {"glGetQueryObjectuivEXT", (void *)tq_objuiv},
|
||||
{"glGetQueryObjecti64vEXT", (void *)tq_obji64v}, {"glGetQueryObjectui64vEXT", (void *)tq_objui64v},
|
||||
{"glGetInteger64vEXT", (void *)tq_int64v},
|
||||
};
|
||||
|
||||
static __eglMustCastToProperFunctionPointerType timer_query_standin(const char *name) {
|
||||
for (size_t i = 0; i < sizeof(timer_query_standins) / sizeof(timer_query_standins[0]); i++)
|
||||
if (!strcmp(name, timer_query_standins[i].name)) {
|
||||
if (!tq_used++) LOG("no GPU timer queries in this driver: %s and the other EXT query functions answer "
|
||||
"'available, 0 ns'", name);
|
||||
return (__eglMustCastToProperFunctionPointerType)timer_query_standins[i].fn;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
__attribute__((visibility("default"))) __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *name) {
|
||||
pthread_once(&once, init);
|
||||
if (name && !strcmp(name, "glGetStringi")) return (__eglMustCastToProperFunctionPointerType)glGetStringi;
|
||||
if (name && !strcmp(name, "glGetString")) return (__eglMustCastToProperFunctionPointerType)glGetString;
|
||||
if (name && !strcmp(name, "glGetIntegerv")) return (__eglMustCastToProperFunctionPointerType)glGetIntegerv;
|
||||
__eglMustCastToProperFunctionPointerType fn = real_eglGetProcAddress ? real_eglGetProcAddress(name) : NULL;
|
||||
if (!fn || !name) return fn;
|
||||
if (name && (!fn || added_timer_query > 0)) {
|
||||
__eglMustCastToProperFunctionPointerType standin = timer_query_standin(name);
|
||||
if (standin || !fn) return standin;
|
||||
}
|
||||
if (!name) return fn;
|
||||
#define WRAP(sym, real, w) if (!strcmp(name, sym)) { real = (void *)fn; return (__eglMustCastToProperFunctionPointerType)w; }
|
||||
if (hide_msrtt && (!strcmp(name, "glFramebufferTexture2DMultisampleEXT") ||
|
||||
!strcmp(name, "glRenderbufferStorageMultisampleEXT"))) {
|
||||
|
||||
@@ -34,6 +34,9 @@ static pthread_once_t once = PTHREAD_ONCE_INIT;
|
||||
// physics update back made the hands lag and the gate made loading screens stutter, so both are off unless the recipe
|
||||
// turns them on (ovrp_begin_gate=1, ovrp_hold_physics=1).
|
||||
static int begin_gate, hold_physics;
|
||||
// ovrp_trace=1 (diagnostics): every 5 s, how many frame-loop calls went through and which are in progress (thread,
|
||||
// frame index, for how long): shows where the main and render threads wait when a game stops after a few frames.
|
||||
static int trace;
|
||||
|
||||
static void read_conf_file(const char *path) {
|
||||
FILE *f = fopen(path, "r");
|
||||
@@ -42,6 +45,7 @@ static void read_conf_file(const char *path) {
|
||||
while (fgets(line, sizeof(line), f)) {
|
||||
if (!strncmp(line, "ovrp_begin_gate=", 16)) begin_gate = atoi(line + 16);
|
||||
if (!strncmp(line, "ovrp_hold_physics=", 18)) hold_physics = atoi(line + 18);
|
||||
if (!strncmp(line, "ovrp_trace=", 11)) trace = atoi(line + 11);
|
||||
}
|
||||
fclose(f);
|
||||
}
|
||||
@@ -73,8 +77,56 @@ static void read_conf(void) {
|
||||
if (env && *env) read_conf_file(env);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- ovrp_trace
|
||||
#include <unistd.h>
|
||||
static long long now_ns(void);
|
||||
enum { T_PHYSICS, T_RENDER, T_WAIT, T_BEGIN, T_END, T_COUNT };
|
||||
static const char *const trace_names[T_COUNT] = {"Update2(physics)", "Update2(render)", "WaitToBeginFrame",
|
||||
"BeginFrame", "EndFrame"};
|
||||
static struct { long long since; int frame, tid, last_frame, last_result; long calls; } traced[T_COUNT];
|
||||
|
||||
static void trace_enter(int k, int frame) {
|
||||
if (!trace) return;
|
||||
traced[k].frame = frame;
|
||||
traced[k].tid = gettid();
|
||||
__atomic_store_n(&traced[k].since, now_ns(), __ATOMIC_RELEASE);
|
||||
}
|
||||
|
||||
static void trace_exit(int k, int result) {
|
||||
if (!trace) return;
|
||||
__atomic_store_n(&traced[k].since, 0, __ATOMIC_RELEASE);
|
||||
traced[k].last_frame = traced[k].frame;
|
||||
traced[k].last_result = result;
|
||||
__atomic_add_fetch(&traced[k].calls, 1, __ATOMIC_RELAXED);
|
||||
}
|
||||
|
||||
static void *trace_watch(void *arg) {
|
||||
(void)arg;
|
||||
for (;;) {
|
||||
sleep(5);
|
||||
char line[700];
|
||||
size_t used = 0;
|
||||
long long now = now_ns();
|
||||
for (int k = 0; k < T_COUNT && used < sizeof(line) - 120; ++k) {
|
||||
long long since = __atomic_load_n(&traced[k].since, __ATOMIC_ACQUIRE);
|
||||
used += (size_t)snprintf(line + used, sizeof(line) - used, " %s %ld (last frame %d: %d)", trace_names[k],
|
||||
__atomic_exchange_n(&traced[k].calls, 0, __ATOMIC_RELAXED), traced[k].last_frame,
|
||||
traced[k].last_result);
|
||||
if (since)
|
||||
used += (size_t)snprintf(line + used, sizeof(line) - used, " [IN frame %d, tid %d, %lld ms]",
|
||||
traced[k].frame, traced[k].tid, (now - since) / 1000000);
|
||||
}
|
||||
LOG("ovrp trace 5s:%s", line);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void init(void) {
|
||||
read_conf();
|
||||
if (trace) {
|
||||
pthread_t watcher;
|
||||
if (!pthread_create(&watcher, NULL, trace_watch, NULL)) pthread_detach(watcher);
|
||||
}
|
||||
void *ovrp = dlopen("libOVRPlugin.so", RTLD_NOW | RTLD_NOLOAD);
|
||||
if (!ovrp) ovrp = dlopen("libOVRPlugin.so", RTLD_NOW);
|
||||
if (ovrp) {
|
||||
@@ -134,7 +186,9 @@ EXPORT int fpov_Update2(int step, int frame_index, double prediction_seconds) {
|
||||
if (step == STEP_RENDER && real_wait && frame_index != last_waited) {
|
||||
last_waited = frame_index;
|
||||
if (last_wait_begun(frame_index)) {
|
||||
trace_enter(T_WAIT, frame_index);
|
||||
int r = real_wait(frame_index);
|
||||
trace_exit(T_WAIT, r);
|
||||
if (logged++ < 3) LOG("ovrp frame loop shim: waited for frame %d: %d", frame_index, r);
|
||||
} else if (skipped++ < 20 || skipped % 1000 == 0) {
|
||||
LOG("ovrp frame loop shim: frame %d: the last waited frame wasn't begun within %d ms, not waiting "
|
||||
@@ -143,7 +197,10 @@ EXPORT int fpov_Update2(int step, int frame_index, double prediction_seconds) {
|
||||
mouse_click_frame();
|
||||
}
|
||||
if (hold_physics && step == STEP_PHYSICS && rendered) return last_result; // see above: keeps the display-time poses
|
||||
const int traced_step = step == STEP_RENDER ? T_RENDER : T_PHYSICS;
|
||||
trace_enter(traced_step, frame_index);
|
||||
int r = real_update2 ? real_update2(step, frame_index, prediction_seconds) : -1000; // ovrpFailure
|
||||
trace_exit(traced_step, r);
|
||||
if (step == STEP_RENDER) rendered = 1, last_result = r;
|
||||
return r;
|
||||
}
|
||||
@@ -173,7 +230,9 @@ EXPORT int fpov_BeginFrame(long frame, long b, long c, long d) {
|
||||
remap_from = remap_to = -1;
|
||||
}
|
||||
pthread_mutex_unlock(&begin_lock);
|
||||
trace_enter(T_BEGIN, (int)index);
|
||||
int r = real ? real(index, b, c, d) : -1000;
|
||||
trace_exit(T_BEGIN, r);
|
||||
if (index != frame && logged++ < 20)
|
||||
LOG("ovrp frame loop shim: begin frame %ld as waited frame %ld: %d", frame, index, r);
|
||||
pthread_mutex_lock(&begin_lock);
|
||||
@@ -186,11 +245,15 @@ EXPORT int fpov_BeginFrame(long frame, long b, long c, long d) {
|
||||
|
||||
EXPORT int fpov_EndFrame(long frame, long b, long c, long d) {
|
||||
static PFN_FrameCall real;
|
||||
pthread_once(&once, init);
|
||||
if (!real) real = ovrp_fn("ovrp_EndFrame");
|
||||
pthread_mutex_lock(&begin_lock);
|
||||
if ((int)frame == remap_from) frame = remap_to;
|
||||
pthread_mutex_unlock(&begin_lock);
|
||||
return real ? real(frame, b, c, d) : -1000;
|
||||
trace_enter(T_END, (int)frame);
|
||||
int r = real ? real(frame, b, c, d) : -1000;
|
||||
trace_exit(T_END, r);
|
||||
return r;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- input diagnostics (pass-through)
|
||||
|
||||
@@ -1,325 +0,0 @@
|
||||
/* SPDX-License-Identifier: GPL-3.0-only */
|
||||
#include "scan.h"
|
||||
|
||||
#define MIN_TRIANGLE_TWICE_AREA 1e-8f
|
||||
#define MIN_RANGE .1f
|
||||
#define MAX_COORDINATE 10000.f
|
||||
#define QUATERNION_NORM_TOLERANCE .1f
|
||||
#define SAMPLE_SPACING_VOXELS .75f
|
||||
#define MAX_SURFEL_WEIGHT 10.f
|
||||
#define FEW_FRAMES 8
|
||||
#define MAX_GRID_XZ 8.f
|
||||
#define MAX_GRID_Y 4.f
|
||||
#define GRID_PADDING_VOXELS 5.f
|
||||
#define NORMAL_PATCH_SIZE 12
|
||||
#define MIN_PATCH_POINTS 24
|
||||
|
||||
float root(float x)
|
||||
{
|
||||
if (x <= 0) return 0;
|
||||
/* -fno-math-errno makes this one hardware sqrt, with no libc/libm symbol on either build. */
|
||||
return __builtin_sqrtf(x);
|
||||
}
|
||||
Vec unit(Vec p) { float n = root(dot(p,p)); return n > 1e-12f ? mul(p,1/n) : vec(0,0,0); }
|
||||
int flo(float x) { int i = (int)x; return x < (float)i ? i-1 : i; }
|
||||
float sine(float x)
|
||||
{
|
||||
while (x > PI) x -= 2*PI;
|
||||
while (x < -PI) x += 2*PI;
|
||||
if (x > PI/2) x = PI-x;
|
||||
if (x < -PI/2) x = -PI-x;
|
||||
float q = x*x;
|
||||
return x*(1-q/6+q*q/120-q*q*q/5040+q*q*q*q/362880);
|
||||
}
|
||||
float cosine(float x) { return sine(x+PI/2); }
|
||||
float angle(float y, float x)
|
||||
{
|
||||
/* atan approximation, maximum error < .012 degrees. */
|
||||
float a = mn(ab(x),ab(y)) / mx(mx(ab(x),ab(y)),1e-20f), q = a*a;
|
||||
float r = a*(.999866f+q*(-.3302995f+q*(.180141f+q*(-.085133f+q*.0208351f))));
|
||||
if (ab(y) > ab(x)) r = PI/2-r;
|
||||
if (x < 0) r = PI-r;
|
||||
return y < 0 ? -r : r;
|
||||
}
|
||||
int same(const char *a, const char *b)
|
||||
{
|
||||
while (*a && *a == *b) a++,b++;
|
||||
return *a == *b;
|
||||
}
|
||||
u32 random_next(Scan *s) { s->rng ^= s->rng<<13; s->rng ^= s->rng>>17; s->rng ^= s->rng<<5; return s->rng; }
|
||||
void warn(Scan *s, const char *m)
|
||||
{
|
||||
for (int i = 0; i < s->nwarnings; i++) if (same(s->warnings[i],m)) return;
|
||||
if (s->nwarnings < 24) s->warnings[s->nwarnings++] = m;
|
||||
}
|
||||
static u32 u32le(const u8 *p) { return (u32)p[0]|(u32)p[1]<<8|(u32)p[2]<<16|(u32)p[3]<<24; }
|
||||
static float f32le(const u8 *p) { union { u32 u; float f; } v = {u32le(p)}; return v.f; }
|
||||
/* 1 = complete, 0 = clean EOF, -1 = I/O error or partial record. */
|
||||
static int exact(int fd, void *p, usize n)
|
||||
{
|
||||
usize done = 0;
|
||||
while (done < n) {
|
||||
long r = io_read(fd,(u8 *)p+done,n-done);
|
||||
if (r < 0 || (!r && done)) return -1;
|
||||
if (!r) return 0;
|
||||
done += (usize)r;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
Vec grid_point(Scan *s, int x, int y, int z)
|
||||
{
|
||||
return add(s->origin,vec(x*s->opt.voxel,y*s->opt.voxel,z*s->opt.voxel));
|
||||
}
|
||||
int cell_index(Scan *s, Vec p)
|
||||
{
|
||||
Vec q = mul(sub(p,s->origin),1/s->opt.voxel);
|
||||
int x = flo(q.x+.5f), y = flo(q.y+.5f), z = flo(q.z+.5f);
|
||||
if (x < 0 || y < 0 || z < 0 || x >= s->nx || y >= s->ny || z >= s->nz) return -1;
|
||||
return (y*s->nz+z)*s->nx+x;
|
||||
}
|
||||
static void sample(Scan *s, Vec p, Vec n, float w)
|
||||
{
|
||||
int i = cell_index(s,p);
|
||||
if (i < 0) { s->clipped++; return; }
|
||||
Cell *c = &s->cells[i];
|
||||
/* Cap repeated views' influence without throwing away later measurements. */
|
||||
float scale = c->weight > MAX_SURFEL_WEIGHT ? MAX_SURFEL_WEIGHT/c->weight : 1;
|
||||
c->p = add(mul(c->p,scale),mul(p,w));
|
||||
c->n = add(mul(c->n,scale),mul(n,w));
|
||||
c->weight = c->weight*scale+w;
|
||||
if(c->last_frame!=s->fuse_frame) { c->last_frame=s->fuse_frame;c->views++; }
|
||||
}
|
||||
static void triangle(Scan *s, Vec a, Vec b, Vec c, Vec eye, Vec patch_normal, int fuse)
|
||||
{
|
||||
Vec abv = sub(b,a), ac = sub(c,a), bc = sub(c,b);
|
||||
float longest = root(mx(dot(abv,abv),mx(dot(ac,ac),dot(bc,bc))));
|
||||
Vec p = mul(add(a,add(b,c)),1.f/3), n = cross(abv,ac);
|
||||
float twice_area = root(dot(n,n));
|
||||
Vec view = sub(eye,p);
|
||||
float distance = root(dot(view,view));
|
||||
if (twice_area < MIN_TRIANGLE_TWICE_AREA || longest > s->opt.max_edge || distance > s->opt.range || distance < MIN_RANGE) {
|
||||
if (!fuse) s->rejected++;
|
||||
return;
|
||||
}
|
||||
n = mul(n,1/twice_area);
|
||||
if(dot(patch_normal,patch_normal)>.5f) n=patch_normal;
|
||||
float facing = dot(n,view)/distance;
|
||||
if (ab(facing) < s->opt.grazing) { if (!fuse) s->rejected++; return; }
|
||||
if (facing < 0) n = mul(n,-1);
|
||||
if (!fuse) {
|
||||
s->accepted++;
|
||||
s->seen++;
|
||||
int slot = s->seen <= MAX_SAMPLES ? (int)s->seen-1 : (int)(random_next(s)%s->seen);
|
||||
if (slot < MAX_SAMPLES) s->samples[slot] = p;
|
||||
s->nsamples = (int)mn((float)s->seen,MAX_SAMPLES);
|
||||
} else {
|
||||
int steps = (int)(longest/(s->opt.voxel*SAMPLE_SPACING_VOXELS))+1;
|
||||
float weight = twice_area*facing*facing / ((steps+1)*(steps+2)*.5f);
|
||||
for (int j = 0; j <= steps; j++) for (int k = 0; k <= steps-j; k++) {
|
||||
Vec q = add(a,add(mul(abv,(float)j/steps),mul(ac,(float)k/steps)));
|
||||
sample(s,q,n,weight);
|
||||
}
|
||||
}
|
||||
}
|
||||
static Vec patch_normal(Vec *points, float *depths, int width, int x0, int y0, int x1, int y1,
|
||||
float tolerance)
|
||||
{
|
||||
Vec mean=vec(0,0,0);int count=0;
|
||||
/* Shift before accumulating the covariance: room positions can be large relative to patch residuals. */
|
||||
Vec origin=points[y0*width+x0];
|
||||
for(int y=y0;y<y1;y++) for(int x=x0;x<x1;x++) if(depths[y*width+x]>0) {
|
||||
mean=add(mean,sub(points[y*width+x],origin));count++;
|
||||
}
|
||||
if(count<MIN_PATCH_POINTS) return vec(0,0,0);
|
||||
mean=mul(mean,1.f/count);
|
||||
float cov[3][3]={{0}},basis[3][3]={{1,0,0},{0,1,0},{0,0,1}};
|
||||
for(int y=y0;y<y1;y++) for(int x=x0;x<x1;x++) if(depths[y*width+x]>0) {
|
||||
Vec p=sub(sub(points[y*width+x],origin),mean);float a[3]={p.x,p.y,p.z};
|
||||
for(int i=0;i<3;i++) for(int j=0;j<3;j++) cov[i][j]+=a[i]*a[j];
|
||||
}
|
||||
for(int sweep=0;sweep<8;sweep++) {
|
||||
int p=0,q=1;
|
||||
if(ab(cov[0][2])>ab(cov[p][q])) { p=0;q=2; }
|
||||
if(ab(cov[1][2])>ab(cov[p][q])) { p=1;q=2; }
|
||||
if(ab(cov[p][q])<1e-10f) break;
|
||||
float phi=.5f*angle(2*cov[p][q],cov[q][q]-cov[p][p]),co=cosine(phi),si=sine(phi);
|
||||
float aa=cov[p][p],bb=cov[q][q],abv=cov[p][q];
|
||||
for(int k=0;k<3;k++) if(k!=p && k!=q) {
|
||||
float a=cov[k][p],b=cov[k][q];
|
||||
cov[k][p]=cov[p][k]=co*a-si*b;cov[k][q]=cov[q][k]=si*a+co*b;
|
||||
}
|
||||
cov[p][p]=co*co*aa-2*si*co*abv+si*si*bb;
|
||||
cov[q][q]=si*si*aa+2*si*co*abv+co*co*bb;cov[p][q]=cov[q][p]=0;
|
||||
for(int k=0;k<3;k++) {
|
||||
float a=basis[k][p],b=basis[k][q];basis[k][p]=co*a-si*b;basis[k][q]=si*a+co*b;
|
||||
}
|
||||
}
|
||||
int least=0;
|
||||
for(int i=1;i<3;i++) if(cov[i][i]<cov[least][least]) least=i;
|
||||
if(cov[least][least]/count>tolerance*tolerance) return vec(0,0,0);
|
||||
return unit(vec(basis[0][least],basis[1][least],basis[2][least]));
|
||||
}
|
||||
static int grid_normals(Scan *s, Vec *points, float *depths, Vec *normals, u32 nv, u32 ni, const u8 *indices)
|
||||
{
|
||||
if(ni<6 || u32le(indices)!=0 || u32le(indices+8)!=1) return 0;
|
||||
u32 width=u32le(indices+4);
|
||||
if(width<3 || width>nv || nv%width || ni!=6*(width-1)*(nv/width-1)) return 0;
|
||||
/* Only a complete regular fan uses patch normals. Other meshes retain ordinary triangle normals. */
|
||||
u32 at=0;
|
||||
for(u32 row=0;row+1<nv/width;row++) for(u32 col=0;col+1<width;col++) {
|
||||
u32 a=row*width+col,expected[6]={a,a+width,a+1,a+1,a+width,a+width+1};
|
||||
for(int k=0;k<6;k++) if(u32le(indices+4*at++)!=expected[k]) return 0;
|
||||
}
|
||||
int height=(int)(nv/width);
|
||||
for(int y=0;y<height;y+=NORMAL_PATCH_SIZE) for(int x=0;x<(int)width;x+=NORMAL_PATCH_SIZE) {
|
||||
int x1=(int)mn(x+NORMAL_PATCH_SIZE,(float)width),y1=(int)mn(y+NORMAL_PATCH_SIZE,height);
|
||||
Vec n=patch_normal(points,depths,(int)width,x,y,x1,y1,s->opt.patch_residual);
|
||||
for(int yy=y;yy<y1;yy++) for(int xx=x;xx<x1;xx++) normals[yy*width+xx]=n;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
const char *read_dump(Scan *s, int fuse)
|
||||
{
|
||||
int fd = io_open(s->opt.input,0);
|
||||
if (fd < 0) return "cannot open scan dump";
|
||||
u8 header[44];
|
||||
const char *error = 0;
|
||||
Vec *vertices = 0,*normals=0;
|
||||
float *depths = 0;
|
||||
u8 *indices = 0;
|
||||
usize vs = 0, is = 0, ds = 0;
|
||||
if (exact(fd,header,8) != 1 || header[0]!='F' || header[1]!='P' || header[2]!='R' || header[3]!='S' ||
|
||||
u32le(header+4) != 1) { error = "invalid FPRS header"; goto done; }
|
||||
unsigned frames = 0;
|
||||
for (;;) {
|
||||
int r = exact(fd,header,44);
|
||||
if (r == 0) break;
|
||||
if (r < 0) { error = "truncated frame header"; break; }
|
||||
/* Tracking can start before poses are available. Consume the entire bounded record before skipping,
|
||||
* so one NaN cannot hide a truncated payload or desynchronize the next frame. */
|
||||
int invalid=(u32le(header+4)&0x7ff00000u) == 0x7ff00000u;
|
||||
float pose[7];
|
||||
for (int i = 0; i < 7; i++) {
|
||||
pose[i] = f32le(header+8+i*4);
|
||||
if (!finite(pose[i]) || ab(pose[i]) > MAX_COORDINATE) invalid=1;
|
||||
}
|
||||
float norm = 0;
|
||||
for (int i = 3; i < 7; i++) norm += pose[i]*pose[i];
|
||||
if (!finite(norm) || ab(norm-1) > QUATERNION_NORM_TOLERANCE) invalid=1;
|
||||
if(!invalid) for (int i = 3; i < 7; i++) pose[i] /= root(norm);
|
||||
u32 nv = u32le(header+36), ni = u32le(header+40);
|
||||
if (nv > MAX_FRAME_VERTICES || ni > MAX_FRAME_INDICES || ni%3 || (!nv && ni)) {
|
||||
error = "invalid frame counts"; break;
|
||||
}
|
||||
usize needv = (usize)nv*12, needi = (usize)ni*4;
|
||||
if (needv > vs) {
|
||||
io_free(vertices,vs);io_free(normals,vs);vs=needv;vertices=io_alloc(vs);normals=io_alloc(vs);
|
||||
}
|
||||
if (needi > is) { io_free(indices,is); is=needi; indices=io_alloc(is); }
|
||||
if((usize)nv*4>ds) { io_free(depths,ds);ds=(usize)nv*4;depths=io_alloc(ds); }
|
||||
if ((nv && (!vertices || !depths || !normals)) || (ni && !indices)) { error = "frame allocation failed"; break; }
|
||||
if ((needv && exact(fd,vertices,needv)!=1) || (needi && exact(fd,indices,needi)!=1)) {
|
||||
error = "truncated frame data"; break;
|
||||
}
|
||||
Vec eye = vec(pose[0],pose[1],pose[2]), q = vec(pose[3],pose[4],pose[5]);
|
||||
u64 far=0;
|
||||
for (u32 i = 0; i < nv; i++) {
|
||||
u8 *p = (u8 *)&vertices[i];
|
||||
Vec v = vec(f32le(p),f32le(p+4),f32le(p+8));
|
||||
if (!finite(v.x) || !finite(v.y) || !finite(v.z) ||
|
||||
ab(v.x)>MAX_COORDINATE || ab(v.y)>MAX_COORDINATE || ab(v.z)>MAX_COORDINATE) {
|
||||
invalid=1;break;
|
||||
}
|
||||
depths[i]=root(dot(v,v));
|
||||
if(depths[i]>s->opt.range || depths[i]<MIN_RANGE) { depths[i]=-1;far++;continue; }
|
||||
Vec t = mul(cross(q,v),2);
|
||||
vertices[i] = add(eye,add(v,add(mul(t,pose[6]),cross(q,t))));
|
||||
}
|
||||
int regular=!invalid && grid_normals(s,vertices,depths,normals,nv,ni,indices);
|
||||
/* Structural errors are fatal even in a frame whose tracking/depth is unusable. */
|
||||
s->fuse_frame=frames+1;
|
||||
for (u32 i = 0; i < ni; i+=3) {
|
||||
u32 a=u32le(indices+4*i), b=u32le(indices+4*(i+1)), c=u32le(indices+4*(i+2));
|
||||
if (a>=nv || b>=nv || c>=nv) { error = "index outside vertex array"; break; }
|
||||
if(invalid) continue;
|
||||
if(depths[a]<0 || depths[b]<0 || depths[c]<0) { if(!fuse) s->rejected++;continue; }
|
||||
float near=mn(depths[a],mn(depths[b],depths[c])),far_depth=mx(depths[a],mx(depths[b],depths[c]));
|
||||
if(far_depth-near>s->opt.depth_jump+s->opt.depth_ratio*near) {
|
||||
if(!fuse) { s->rejected++;s->discontinuities++; }continue;
|
||||
}
|
||||
Vec normal=regular ? normals[a] : vec(0,0,0);
|
||||
if(regular && dot(normal,normal)<.5f) { if(!fuse) s->rejected++;continue; }
|
||||
triangle(s,vertices[a],vertices[b],vertices[c],eye,normal,fuse);
|
||||
}
|
||||
if (error) break;
|
||||
if(!fuse) { if(invalid) s->skipped_frames++;else s->far_vertices+=far; }
|
||||
frames++;
|
||||
}
|
||||
if (!error && !frames) error = "scan contains no frames";
|
||||
if (!error && !fuse) s->frames = frames;
|
||||
done:
|
||||
io_free(vertices,vs);
|
||||
io_free(normals,vs);
|
||||
io_free(indices,is);
|
||||
io_free(depths,ds);
|
||||
io_close(fd);
|
||||
return error;
|
||||
}
|
||||
static float median(Scan *s, int axis)
|
||||
{
|
||||
/* In-place quickselect on the bounded reservoir; no dump-sized allocations. */
|
||||
int lo=0, hi=s->nsamples-1, mid=s->nsamples/2;
|
||||
while (lo < hi) {
|
||||
float pivot = ((float *)&s->samples[(lo+hi)/2])[axis];
|
||||
int i=lo,j=hi;
|
||||
while (i<=j) {
|
||||
while (((float *)&s->samples[i])[axis] < pivot) i++;
|
||||
while (((float *)&s->samples[j])[axis] > pivot) j--;
|
||||
if (i<=j) { Vec t=s->samples[i]; s->samples[i++]=s->samples[j]; s->samples[j--]=t; }
|
||||
}
|
||||
if (mid<=j) hi=j;
|
||||
else if (mid>=i) lo=i;
|
||||
else break;
|
||||
}
|
||||
return ((float *)&s->samples[mid])[axis];
|
||||
}
|
||||
const char *init_grid(Scan *s)
|
||||
{
|
||||
if (!s->nsamples) return "scan contains no usable triangles";
|
||||
float x=median(s,0), y=median(s,1), z=median(s,2), v=s->opt.voxel;
|
||||
Vec low=s->samples[0],high=low;
|
||||
for(int i=1;i<s->nsamples;i++) {
|
||||
Vec p=s->samples[i];
|
||||
low=vec(mn(low.x,p.x),mn(low.y,p.y),mn(low.z,p.z));
|
||||
high=vec(mx(high.x,p.x),mx(high.y,p.y),mx(high.z,p.z));
|
||||
}
|
||||
float pad=v*mx(GRID_PADDING_VOXELS,s->opt.truncation+2);
|
||||
low=sub(low,vec(pad,pad,pad));high=add(high,vec(pad,pad,pad));
|
||||
s->origin=vec(mx(flo(low.x/v)*v,flo((x-MAX_GRID_XZ/2)/v)*v),
|
||||
mx(flo(low.y/v)*v,flo((y-MAX_GRID_Y/2)/v)*v),
|
||||
mx(flo(low.z/v)*v,flo((z-MAX_GRID_XZ/2)/v)*v));
|
||||
s->nx=(int)mn(-flo(-(high.x-s->origin.x)/v)+1,(int)(MAX_GRID_XZ/v)+1);
|
||||
s->ny=(int)mn(-flo(-(high.y-s->origin.y)/v)+1,(int)(MAX_GRID_Y/v)+1);
|
||||
s->nz=(int)mn(-flo(-(high.z-s->origin.z)/v)+1,(int)(MAX_GRID_XZ/v)+1);
|
||||
usize count = (usize)s->nx*s->ny*s->nz;
|
||||
if (count > MAX_CELLS) return "voxel grid exceeds memory budget; increase --voxel";
|
||||
s->count = (int)count;
|
||||
s->cells = io_alloc(count*sizeof(Cell));
|
||||
return s->cells ? 0 : "grid allocation failed";
|
||||
}
|
||||
void finish_fusion(Scan *s)
|
||||
{
|
||||
/* A short look-around cannot expose each surface in many frames. Cap the target at ten percent of usable
|
||||
* views (at least one); long recordings still require repeated evidence rather than transient depth. */
|
||||
unsigned required=(unsigned)mn(s->opt.min_views,mx(1,(s->frames-s->skipped_frames)/10.f));
|
||||
for (int i=0; i<s->count; i++) {
|
||||
Cell *c=&s->cells[i];
|
||||
if(c->views<required) { c->weight=0;continue; }
|
||||
if (c->weight) { c->p=mul(c->p,1/c->weight); c->n=unit(c->n); }
|
||||
}
|
||||
if (s->clipped) warn(s,"scan clipped to 8 x 8 x 4 metre grid");
|
||||
if (s->frames < FEW_FRAMES) warn(s,"few frames; scan more viewpoints");
|
||||
if(s->skipped_frames) warn(s,"non-finite or invalid frames skipped");
|
||||
if(s->far_vertices) warn(s,"out-of-range depth vertices skipped");
|
||||
if (s->accepted < s->rejected) warn(s,"many triangles rejected; check depth quality");
|
||||
}
|
||||
@@ -1,227 +0,0 @@
|
||||
/* SPDX-License-Identifier: GPL-3.0-only */
|
||||
#include "scan.h"
|
||||
|
||||
typedef struct { char data[65536]; usize n; int ok; } Text;
|
||||
static void text(Text *t, const char *p)
|
||||
{
|
||||
while(*p) {
|
||||
if(t->n>=sizeof(t->data)) { t->ok=0;return; }
|
||||
t->data[t->n++]=*p++;
|
||||
}
|
||||
}
|
||||
static void integer(Text *t, u64 value)
|
||||
{
|
||||
char rev[24];int n=0;
|
||||
do { rev[n++]=(char)('0'+value%10);value/=10; } while(value);
|
||||
while(n) { char a[2]={rev[--n],0};text(t,a); }
|
||||
}
|
||||
static void decimal(Text *t, float value)
|
||||
{
|
||||
if(value<0) { text(t,"-");value=-value; }
|
||||
u64 scaled=(u64)(value*10000.f+.5f);
|
||||
integer(t,scaled/10000);text(t,".");
|
||||
u64 fraction=scaled%10000;
|
||||
if(fraction<1000) text(t,"0");
|
||||
if(fraction<100) text(t,"0");
|
||||
if(fraction<10) text(t,"0");
|
||||
integer(t,fraction);
|
||||
}
|
||||
static void space_number(Text *t, float n) { text(t," ");decimal(t,n); }
|
||||
static int uuid(Text *t)
|
||||
{
|
||||
u8 bytes[16];if(!io_random(bytes,sizeof(bytes))) return 0;
|
||||
bytes[6]=(bytes[6]&15)|64;bytes[8]=(bytes[8]&63)|128;
|
||||
const char *hex="0123456789abcdef";
|
||||
for(int i=0;i<16;i++) { char pair[3]={hex[bytes[i]>>4],hex[bytes[i]&15],0};text(t,pair); }
|
||||
return 1;
|
||||
}
|
||||
static int record(Text *t, const char *name)
|
||||
{
|
||||
text(t,name);text(t," ");return uuid(t);
|
||||
}
|
||||
static int path(char *out, const char *dir, const char *name)
|
||||
{
|
||||
usize n=0;
|
||||
while(*dir) { if(n>=3900) return 0;out[n++]=*dir++; }
|
||||
if(n && out[n-1]!='/') out[n++]='/';
|
||||
while(*name) { if(n>=4095) return 0;out[n++]=*name++; }
|
||||
out[n]=0;return 1;
|
||||
}
|
||||
static void le32(u8 *out,u32 v) { for(int i=0;i<4;i++) out[i]=(u8)(v>>(8*i)); }
|
||||
static const char *write_files(Scan *s)
|
||||
{
|
||||
Text t={.ok=1};text(&t,"frameport-room 1\nuniverse ");integer(&t,s->opt.universe);
|
||||
text(&t,"\nsource scan\ntime ");integer(&t,(u64)(io_time(0)/1000000000));text(&t,"\n");
|
||||
if(!record(&t,"room")) return "getrandom failed";
|
||||
text(&t,"\n");if(!record(&t,"floor")) return "getrandom failed";
|
||||
space_number(&t,s->floor);text(&t,"\n");if(!record(&t,"ceiling")) return "getrandom failed";
|
||||
space_number(&t,s->ceiling);text(&t,"\noutline ");integer(&t,(u64)s->noutline);
|
||||
for(int i=0;i<s->noutline;i++) { space_number(&t,s->outline[i].x);space_number(&t,s->outline[i].z); }
|
||||
text(&t,"\n");
|
||||
for(int i=0;i<s->noutline;i++) {
|
||||
Pt a=s->outline[i],b=s->outline[(i+1)%s->noutline];
|
||||
if(!record(&t,"wall")) return "getrandom failed";
|
||||
space_number(&t,a.x);space_number(&t,a.z);space_number(&t,b.x);space_number(&t,b.z);
|
||||
space_number(&t,s->floor);space_number(&t,s->ceiling);
|
||||
if(s->invisible[i]) text(&t," INVISIBLE_WALL_FACE");
|
||||
text(&t,"\n");
|
||||
}
|
||||
for(int i=0;i<s->nvolumes;i++) {
|
||||
Volume *v=&s->volumes[i];
|
||||
if(!record(&t,"volume")) return "getrandom failed";
|
||||
text(&t," ");text(&t,v->label);space_number(&t,v->p.x);space_number(&t,v->p.z);
|
||||
space_number(&t,v->p.y);space_number(&t,v->yaw);space_number(&t,v->w);space_number(&t,v->d);space_number(&t,v->h);
|
||||
text(&t,"\n");
|
||||
}
|
||||
if(!record(&t,"mesh")) return "getrandom failed";
|
||||
text(&t," room-mesh.bin ");integer(&t,(u64)s->nv);text(&t," ");integer(&t,(u64)s->ni);text(&t,"\n");
|
||||
if(!t.ok) return "room text exceeds output budget";
|
||||
Text rname={.ok=1},mname={.ok=1};
|
||||
text(&rname,"room.txt.");text(&mname,"room-mesh.bin.");
|
||||
if(!uuid(&rname) || !uuid(&mname)) return "getrandom failed";
|
||||
text(&rname,".tmp");text(&mname,".tmp");rname.data[rname.n]=0;mname.data[mname.n]=0;
|
||||
char room[4096],mesh[4096],rtmp[4096],mtmp[4096];
|
||||
if(!path(room,s->opt.out,"room.txt") || !path(mesh,s->opt.out,"room-mesh.bin") ||
|
||||
!path(rtmp,s->opt.out,rname.data) || !path(mtmp,s->opt.out,mname.data)) return "output path too long";
|
||||
if(!io_mkdir(s->opt.out)) return "cannot create output directory";
|
||||
int fd=io_open(rtmp,1),ok;
|
||||
if(fd<0) return "cannot open room temporary file";
|
||||
ok=io_write(fd,t.data,t.n);if(io_close(fd)) ok=0;
|
||||
if(!ok) { io_remove(rtmp);return "cannot write room temporary file"; }
|
||||
fd=io_open(mtmp,1);
|
||||
if(fd<0) { io_remove(rtmp);return "cannot open mesh temporary file"; }
|
||||
u8 header[16]={'F','P','R','M'};le32(header+4,1);le32(header+8,(u32)s->nv);le32(header+12,(u32)s->ni);
|
||||
ok=io_write(fd,header,16);
|
||||
/* Both supported targets are little-endian IEEE float32; parser always decodes explicitly. */
|
||||
ok=ok && io_write(fd,s->vertices,(usize)s->nv*sizeof(Vec));
|
||||
ok=ok && io_write(fd,s->indices,(usize)s->ni*sizeof(u32));
|
||||
if(io_close(fd)) ok=0;
|
||||
if(!ok) { io_remove(rtmp);io_remove(mtmp);return "cannot write mesh temporary file"; }
|
||||
if(io_rename(mtmp,mesh)) { io_remove(rtmp);io_remove(mtmp);return "cannot publish mesh"; }
|
||||
if(io_rename(rtmp,room)) { io_remove(rtmp);return "cannot publish room"; }
|
||||
return 0;
|
||||
}
|
||||
static int error_json(const char *error)
|
||||
{
|
||||
Text t={.ok=1};text(&t,"{\"ok\":false,\"error\":\"");text(&t,error);text(&t,"\"}\n");
|
||||
io_write(1,t.data,t.n);return 2;
|
||||
}
|
||||
static int parse_float(const char *p,float *out)
|
||||
{
|
||||
int digits=0;float n=0,scale=1;
|
||||
while(*p>='0' && *p<='9') { n=n*10+*p++-'0';digits++;if(n>10000) return 0; }
|
||||
if(*p=='.') { p++;while(*p>='0' && *p<='9') { scale*=.1f;n+=(*p++-'0')*scale;digits++; } }
|
||||
if(!digits || *p || !finite(n)) return 0;
|
||||
*out=n;return 1;
|
||||
}
|
||||
static int parse_universe(const char *p,u64 *out)
|
||||
{
|
||||
u64 n=0;if(!*p) return 0;
|
||||
for(;*p;p++) {
|
||||
if(*p<'0' || *p>'9') return 0;
|
||||
unsigned digit=(unsigned)(*p-'0');
|
||||
if(n>(~(u64)0-digit)/10) return 0;
|
||||
n=n*10+digit;
|
||||
}
|
||||
*out=n;return 1;
|
||||
}
|
||||
static const char *options(Options *o,int argc,char **argv)
|
||||
{
|
||||
*o=(Options){.voxel=.05f,.ceiling_default=2.5f,.truncation=3,.max_edge=.6f,.grazing=.12f,.range=4.f,
|
||||
.depth_jump=.25f,.depth_ratio=.12f,.min_views=5,.patch_residual=.03f,
|
||||
.plane_distance=.045f,.min_plane_area=.45f,.wall_height=1.5f,.snap_degrees=5,.floor_band=.35f,
|
||||
.ceiling_min=1.8f,.min_volume=.05f,.cluster_gap=.10f,.gap=.65f,.horizontal=.85f};
|
||||
for(int i=1;i<argc;i++) {
|
||||
const char *arg=argv[i];
|
||||
if(same(arg,"--json")) continue;
|
||||
if(i+1==argc) return "option requires a value";
|
||||
const char *value=argv[++i];
|
||||
if(same(arg,"--offline")) o->input=value;
|
||||
else if(same(arg,"--out")) o->out=value;
|
||||
else if(same(arg,"--hint")) o->hint=value;
|
||||
else if(same(arg,"--universe")) { if(!parse_universe(value,&o->universe)) return "invalid universe"; }
|
||||
else {
|
||||
float *dest=0,low=0,high=100;
|
||||
if(same(arg,"--voxel")) { dest=&o->voxel;low=.04f;high=.2f; }
|
||||
else if(same(arg,"--ceiling-default")) { dest=&o->ceiling_default;low=1.8f;high=3.8f; }
|
||||
else if(same(arg,"--truncation")) { dest=&o->truncation;low=1;high=5; }
|
||||
else if(same(arg,"--max-edge")) { dest=&o->max_edge;low=.05f;high=1.5f; }
|
||||
else if(same(arg,"--grazing")) { dest=&o->grazing;low=.01f;high=.9f; }
|
||||
else if(same(arg,"--range")) { dest=&o->range;low=1;high=10; }
|
||||
else if(same(arg,"--depth-jump")) { dest=&o->depth_jump;low=.02f;high=1; }
|
||||
else if(same(arg,"--depth-ratio")) { dest=&o->depth_ratio;high=.5f; }
|
||||
else if(same(arg,"--min-views")) { dest=&o->min_views;low=1;high=16; }
|
||||
else if(same(arg,"--patch-residual")) { dest=&o->patch_residual;low=.005f;high=.1f; }
|
||||
else if(same(arg,"--plane-distance")) { dest=&o->plane_distance;low=.01f;high=.15f; }
|
||||
else if(same(arg,"--min-plane-area")) { dest=&o->min_plane_area;low=.1f;high=4; }
|
||||
else if(same(arg,"--wall-height")) { dest=&o->wall_height;low=.5f;high=3; }
|
||||
else if(same(arg,"--snap-degrees")) { dest=&o->snap_degrees;high=15; }
|
||||
else if(same(arg,"--floor-band")) { dest=&o->floor_band;low=.05f;high=1; }
|
||||
else if(same(arg,"--ceiling-min")) { dest=&o->ceiling_min;low=1.5f;high=3; }
|
||||
else if(same(arg,"--min-volume")) { dest=&o->min_volume;low=.005f;high=1; }
|
||||
else if(same(arg,"--cluster-gap")) { dest=&o->cluster_gap;low=.04f;high=.2f; }
|
||||
else if(same(arg,"--gap")) { dest=&o->gap;low=.1f;high=1.5f; }
|
||||
else if(same(arg,"--horizontal")) { dest=&o->horizontal;low=.6f;high=.99f; }
|
||||
else return "unknown option";
|
||||
if(!parse_float(value,dest) || *dest<low || *dest>high) return "option outside supported range";
|
||||
}
|
||||
}
|
||||
return o->input && o->out ? 0 : "required: --offline dump.fprs --out directory";
|
||||
}
|
||||
static void duration(Text *t,i64 a,i64 b) { decimal(t,(float)(b-a)/1000000); }
|
||||
static void summary(Scan *s)
|
||||
{
|
||||
Text t={.ok=1};text(&t,"{\"ok\":true,\"frames\":");integer(&t,s->frames);
|
||||
text(&t,",\"skipped_frames\":");integer(&t,s->skipped_frames);
|
||||
text(&t,",\"far_vertices\":");integer(&t,s->far_vertices);
|
||||
text(&t,",\"discontinuity_triangles\":");integer(&t,s->discontinuities);
|
||||
text(&t,",\"walls\":");integer(&t,(u64)s->noutline);
|
||||
text(&t,",\"detected_walls\":");integer(&t,(u64)s->nplanes);
|
||||
text(&t,",\"volumes\":");integer(&t,(u64)s->nvolumes);
|
||||
text(&t,",\"floor_y\":");decimal(&t,s->floor);text(&t,",\"ceiling_y\":");decimal(&t,s->ceiling);
|
||||
text(&t,",\"coverage_percent\":");decimal(&t,s->coverage);
|
||||
text(&t,",\"hint_used\":");text(&t,s->hint_used ? "true" : "false");
|
||||
text(&t,",\"triangles\":");integer(&t,(u64)s->ni/3);
|
||||
text(&t,",\"accepted_triangles\":");integer(&t,s->accepted);
|
||||
text(&t,",\"rejected_triangles\":");integer(&t,s->rejected);
|
||||
text(&t,",\"warnings\":[");
|
||||
for(int i=0;i<s->nwarnings;i++) { if(i) text(&t,",");text(&t,"\"");text(&t,s->warnings[i]);text(&t,"\""); }
|
||||
text(&t,"],\"timings_ms\":{\"read\":");duration(&t,s->t0,s->tread);
|
||||
text(&t,",\"fusion\":");duration(&t,s->tread,s->tfuse);
|
||||
text(&t,",\"model\":");duration(&t,s->tfuse,s->tmodel);
|
||||
text(&t,",\"mesh\":");duration(&t,s->tmodel,s->tmesh);
|
||||
text(&t,",\"total\":");duration(&t,s->t0,io_time(1));text(&t,"}}\n");io_write(1,t.data,t.n);
|
||||
}
|
||||
int main(int argc,char **argv)
|
||||
{
|
||||
if(argc==2 && same(argv[1],"--help")) {
|
||||
const char usage[]="fp_roomscan --offline dump.fprs --out directory [--universe N] [--voxel 0.05]\n"
|
||||
" [--ceiling-default 2.5] [--hint outline.txt] [--json]\n"
|
||||
"Tuning: --truncation --max-edge --grazing --range --depth-jump --depth-ratio --plane-distance --min-plane-area\n"
|
||||
" --min-views --patch-residual --wall-height --snap-degrees --floor-band --ceiling-min\n"
|
||||
" --min-volume --cluster-gap --gap --horizontal\n"
|
||||
"Always prints one JSON summary; errors exit 2. See docs/mr/scan.md for units and ranges.\n";
|
||||
io_write(1,usage,sizeof(usage)-1);return 0;
|
||||
}
|
||||
Scan *s=io_alloc(sizeof(Scan));
|
||||
if(!s) return error_json("scan allocation failed");
|
||||
s->rng=0x714ce3u;s->t0=io_time(1);
|
||||
const char *error=options(&s->opt,argc,argv);
|
||||
if(!error) error=read_dump(s,0);
|
||||
s->tread=io_time(1);
|
||||
if(!error) error=init_grid(s);
|
||||
if(!error) error=read_dump(s,1);
|
||||
if(!error) finish_fusion(s);
|
||||
s->tfuse=io_time(1);
|
||||
if(!error) error=make_model(s);
|
||||
s->tmodel=io_time(1);
|
||||
if(!error) error=make_mesh(s);
|
||||
s->tmesh=io_time(1);
|
||||
if(!error) error=write_files(s);
|
||||
int result=0;
|
||||
if(error) result=error_json(error);else summary(s);
|
||||
io_free(s->cells,(usize)s->count*sizeof(Cell));
|
||||
io_free(s->vertices,(usize)MAX_MESH_VERTICES*sizeof(Vec));
|
||||
io_free(s->indices,(usize)MAX_TRIANGLES*3*sizeof(u32));
|
||||
io_free(s,sizeof(Scan));return result;
|
||||
}
|
||||
@@ -1,112 +0,0 @@
|
||||
/* SPDX-License-Identifier: GPL-3.0-only */
|
||||
#include "scan.h"
|
||||
|
||||
#define TANGENT_RADIUS_SQUARED 2.25f
|
||||
#define TANGENT_WEIGHT_RADIUS_SQUARED 2.5f
|
||||
#define MAX_EXTRACTION_STRIDE 4
|
||||
/* Marching cubes without a 256-case table: trace the zero contour on the six faces, then fan each closed loop.
|
||||
* Ambiguous faces choose their diagonal from the face centre. Adjacent cubes therefore make the same choice. */
|
||||
static const int corners[8][3]={{0,0,0},{1,0,0},{1,0,1},{0,0,1},{0,1,0},{1,1,0},{1,1,1},{0,1,1}};
|
||||
static const int edges[12][2]={{0,1},{1,2},{2,3},{3,0},{4,5},{5,6},{6,7},{7,4},{0,4},{1,5},{2,6},{3,7}};
|
||||
static const int faces[6][4]={{0,1,2,3},{4,5,6,7},{0,9,4,8},{1,10,5,9},{2,11,6,10},{3,8,7,11}};
|
||||
|
||||
static void tsdf(Scan *s)
|
||||
{
|
||||
float v=s->opt.voxel,trunc=v*s->opt.truncation;
|
||||
int radius=(int)s->opt.truncation+2;
|
||||
for (int i=0;i<s->count;i++) {
|
||||
Cell *c=&s->cells[i];
|
||||
if (!c->weight) continue;
|
||||
int x=i%s->nx,z=(i/s->nx)%s->nz,y=i/(s->nx*s->nz);
|
||||
for (int dy=-radius;dy<=radius;dy++) for (int dz=-radius;dz<=radius;dz++) for (int dx=-radius;dx<=radius;dx++) {
|
||||
int xx=x+dx,yy=y+dy,zz=z+dz;
|
||||
if (xx<0 || yy<0 || zz<0 || xx>=s->nx || yy>=s->ny || zz>=s->nz) continue;
|
||||
Vec delta=sub(grid_point(s,xx,yy,zz),c->p);
|
||||
float d=dot(delta,c->n),tangent=dot(delta,delta)-d*d;
|
||||
if (ab(d)>trunc || tangent>v*v*TANGENT_RADIUS_SQUARED) continue;
|
||||
Cell *dest=&s->cells[(yy*s->nz+zz)*s->nx+xx];
|
||||
float w=(1-tangent/(v*v*TANGENT_WEIGHT_RADIUS_SQUARED))*mn(c->weight/(v*v),1.f);
|
||||
dest->sdf+=d*w;dest->sw+=w;
|
||||
}
|
||||
}
|
||||
for (int i=0;i<s->count;i++) if(s->cells[i].sw) s->cells[i].sdf/=s->cells[i].sw;
|
||||
}
|
||||
static void connect(int links[12][2], int a, int b)
|
||||
{
|
||||
if(links[a][0]<0) links[a][0]=b;else links[a][1]=b;
|
||||
if(links[b][0]<0) links[b][0]=a;else links[b][1]=a;
|
||||
}
|
||||
static int cube(Scan *s, int x, int y, int z, int stride)
|
||||
{
|
||||
float f[8];Vec p[8],normal=vec(0,0,0);
|
||||
for(int k=0;k<8;k++) {
|
||||
int xx=x+corners[k][0]*stride,yy=y+corners[k][1]*stride,zz=z+corners[k][2]*stride;
|
||||
Cell *c=&s->cells[(yy*s->nz+zz)*s->nx+xx];
|
||||
if (c->sw<=0) return 1; /* Unknown space never creates an invented surface. */
|
||||
f[k]=c->sdf;p[k]=grid_point(s,xx,yy,zz);
|
||||
}
|
||||
Vec cuts[12];int crossing[12],links[12][2],visited[12]={0};
|
||||
for(int e=0;e<12;e++) {
|
||||
int a=edges[e][0],b=edges[e][1];
|
||||
crossing[e]=(f[a]<0)!=(f[b]<0);links[e][0]=links[e][1]=-1;
|
||||
if(crossing[e]) cuts[e]=add(p[a],mul(sub(p[b],p[a]),f[a]/(f[a]-f[b])));
|
||||
}
|
||||
/* Gradient points to positive TSDF: toward the observed free room, including furniture's exterior. */
|
||||
normal.x=f[1]+f[2]+f[5]+f[6]-f[0]-f[3]-f[4]-f[7];
|
||||
normal.y=f[4]+f[5]+f[6]+f[7]-f[0]-f[1]-f[2]-f[3];
|
||||
normal.z=f[2]+f[3]+f[6]+f[7]-f[0]-f[1]-f[4]-f[5];
|
||||
for(int face=0;face<6;face++) {
|
||||
int hit[4],n=0;float centre=0;
|
||||
for(int j=0;j<4;j++) {
|
||||
int e=faces[face][j];
|
||||
if(crossing[e]) hit[n++]=e;
|
||||
centre+=f[edges[e][0]]+f[edges[e][1]];
|
||||
}
|
||||
if(n==2) connect(links,hit[0],hit[1]);
|
||||
else if(n==4) {
|
||||
/* The shared first edge's first corner fixes the phase on this face. */
|
||||
int first=edges[hit[0]][0],second=edges[hit[0]][1];
|
||||
int common=(edges[hit[1]][0]==second || edges[hit[1]][1]==second) ? second : first;
|
||||
if((centre<0)==(f[common]<0)) {
|
||||
connect(links,hit[0],hit[3]);connect(links,hit[1],hit[2]);
|
||||
} else { connect(links,hit[0],hit[1]);connect(links,hit[2],hit[3]); }
|
||||
}
|
||||
}
|
||||
for(int e=0;e<12;e++) if(crossing[e] && !visited[e]) {
|
||||
int loop[12],n=0,prev=-1,cur=e;
|
||||
while(cur>=0 && !visited[cur] && n<12) {
|
||||
visited[cur]=1;loop[n++]=cur;
|
||||
int next=links[cur][0]==prev ? links[cur][1] : links[cur][0];prev=cur;cur=next;
|
||||
}
|
||||
if(cur!=e) continue;
|
||||
for(int k=1;k+1<n;k++) {
|
||||
Vec a=cuts[loop[0]],b=cuts[loop[k]],c=cuts[loop[k+1]];
|
||||
Vec norm=cross(sub(b,a),sub(c,a));
|
||||
if(dot(norm,norm)<1e-14f) continue;
|
||||
if(s->ni/3>=MAX_TRIANGLES) return 0;
|
||||
if(dot(norm,normal)<0) { Vec t=b;b=c;c=t; }
|
||||
s->vertices[s->nv]=a;s->vertices[s->nv+1]=b;s->vertices[s->nv+2]=c;
|
||||
for(int j=0;j<3;j++) s->indices[s->ni++]=(u32)s->nv++;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
const char *make_mesh(Scan *s)
|
||||
{
|
||||
s->vertices=io_alloc((usize)MAX_MESH_VERTICES*sizeof(Vec));
|
||||
s->indices=io_alloc((usize)MAX_TRIANGLES*3*sizeof(u32));
|
||||
if(!s->vertices || !s->indices) return "mesh allocation failed";
|
||||
tsdf(s);
|
||||
for(int stride=1;stride<=MAX_EXTRACTION_STRIDE;stride++) {
|
||||
s->nv=s->ni=0;int ok=1;
|
||||
for(int y=0;y+stride<s->ny && ok;y+=stride)
|
||||
for(int z=0;z+stride<s->nz && ok;z+=stride)
|
||||
for(int x=0;x+stride<s->nx && ok;x+=stride) ok=cube(s,x,y,z,stride);
|
||||
if(ok) {
|
||||
if(stride>1) warn(s,"mesh decimated by coarsening extraction grid");
|
||||
if(!s->ni) warn(s,"no mesh surface; scan denser views");
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return "mesh exceeds triangle budget";
|
||||
}
|
||||