From 41ad12dedec67abe18f508ce5b7a016878f0c71b Mon Sep 17 00:00:00 2001 From: m3ultra Date: Thu, 16 Jul 2026 22:23:20 +1000 Subject: [PATCH] Merge all lanes; add importmap; fix /world/ absolute paths Selftest on merged main: 121 pass / 0 skip / 0 fail. Co-Authored-By: Claude Fable 5 --- .claude/launch.json | 16 +++++++++++++--- THREADS.md | 8 ++++++++ web/world/dev_player.html | 6 +++--- web/world/index.html | 4 ++++ web/world/js/player.js | 4 ++-- web/world/selftest.html | 4 ++++ 6 files changed, 34 insertions(+), 8 deletions(-) diff --git a/.claude/launch.json b/.claude/launch.json index ee4f210..9dd0588 100644 --- a/.claude/launch.json +++ b/.claude/launch.json @@ -4,13 +4,23 @@ { "name": "shades3d", "runtimeExecutable": "python3", - "runtimeArgs": ["server.py"], - "port": 8801 + "runtimeArgs": [ + "server.py", + "--port", + "8809" + ], + "port": 8809 }, { "name": "shades-proto", "runtimeExecutable": "python3", - "runtimeArgs": ["-m", "http.server", "8642", "--directory", "prototype"], + "runtimeArgs": [ + "-m", + "http.server", + "8642", + "--directory", + "prototype" + ], "port": 8642 } ] diff --git a/THREADS.md b/THREADS.md index 437a808..50a0885 100644 --- a/THREADS.md +++ b/THREADS.md @@ -431,3 +431,11 @@ Format: `[lane letter] YYYY-MM-DD — note` `(cos d, sin d)` and contracts puts north at -Z, so a southerly needs `sin(d) < 0`. Worth a second look at anything that reasons about wind direction. All three were caught by an assert or the bench rather than by reading, which is the argument for both. + +[I] 2026-07-16 — **INTEGRATION PASS (main).** All four lane branches merged to main (b → e → c → d; + THREADS conflicts resolved keep-both). Added the importmap D+E asked for to index.html AND + selftest.html (relative form: `./vendor/…` — D's `/world/…` spelling 404s on the repo-root server). + Same absolute-path bug fixed in dev_player.html and player.js GLB URLs (`/world/models/…` → + `./models/…`) — the ped never loaded under `server.py`; it does now, verified in dev_player.html. + Selftest on merged main: **121 pass / 0 skip / 0 fail** (E's suite lit up as promised). + launch.json now runs `--port 8809` (8801 was held by another session). Next work: SPRINT2.md. diff --git a/web/world/dev_player.html b/web/world/dev_player.html index 5307c17..82f9cbf 100644 --- a/web/world/dev_player.html +++ b/web/world/dev_player.html @@ -22,7 +22,7 @@ swap will need it too. --> @@ -45,8 +45,8 @@ -->