Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
  Fr0zkaandClaude Opus 5.5
|
f8cba7c36a | ||
|
Fr0zkaandClaude Opus 5.5
|
0065ee68e6 | ||
|
Fr0zkaandClaude Opus 5.5
|
ebae71b142 | ||
|
Fr0zkaandClaude Opus 5.5
|
81071969fc | ||
|
Fr0zkaandClaude Opus 5.5
|
cbbfd46bd3 | ||
|
Fr0zkaandClaude Opus 5.5
|
044cd6d9c5 |
No files matched your search
+8
-7
@@ -1522,11 +1522,12 @@ collision ring became walkable at 0.632 s. `voxel.StreamingCoarseFirst=1` with
|
||||
residency by about one third on the staged plan, but null-RHI residency does not prove rendered
|
||||
enclosure. Keep coarse-first opt-in until that view is checked in a rendered owner-plan run.
|
||||
|
||||
The separate `voxel.StreamingStartupApplyBoost` switch stays default-off. At `1`, it temporarily allows
|
||||
12 visible mesh submissions / 14 ms while the initial desired set and walkable ring are incomplete,
|
||||
with a 30 second ceiling; at `0`, the authored budget is unchanged. On the matched legacy-order test,
|
||||
the boost changed full-set readiness from 17.412 s to 17.346 s and removed count-cap frames, but did
|
||||
not improve end-to-end residency. Keep the normal 4 / 2 ms guard for play.
|
||||
The separate `voxel.StreamingStartupApplyBoost` switch is default-on in the current code. At `1`, it
|
||||
temporarily allows up to 24 visible mesh submissions / 14 ms while the initial desired set and
|
||||
walkable ring are incomplete, with a 30 second ceiling; at `0`, the authored budget is unchanged.
|
||||
The historical matched S6 run changed full-set readiness from 17.412 s to 17.346 s and removed
|
||||
count-cap frames, but did not improve end-to-end residency. These current defaults are defined in
|
||||
`Source/VoxelForge/Private/VoxelWorld.cpp`; the S6 measurement remains historical context.
|
||||
|
||||
The S6 trace found the shared pool was not saturated: its 10-slot idle estimate was about 132
|
||||
slot-seconds on legacy order and 73 on gated coarse-first, while game-thread tile applies totaled only
|
||||
@@ -1556,8 +1557,8 @@ by its RAII guard when the worker lambda exits. This still counts queued and run
|
||||
results do not consume an admission slot. `voxel.StreamingLegacyPendingResultCap=1` restores the old
|
||||
`PendingTiles` accounting; the test harness's `NearReserveMode=Legacy` also sets
|
||||
`voxel.StreamingDynamicNearReserve=0`, reproducing the S6 path. `StreamingDynamicNearReserve` now
|
||||
defaults to `1`; `StreamingCoarseFirst` remains `0`, and the apply boost remains `0` in the matched
|
||||
measurement.
|
||||
defaults to `1`; `StreamingCoarseFirst` remains `0`. That historical S6 matched measurement disabled
|
||||
the startup apply boost (`voxel.StreamingStartupApplyBoost=0`); the current default is on (§8.27).
|
||||
|
||||
On the 2,578-key owner SurfaceWorld trace, the old-path control reached the full set in 17.527 s,
|
||||
walkable ring in 0.650 s, and full LOD0 in 2.281 s. Dynamic admission reached them in 7.780 s,
|
||||
|
||||
@@ -10,6 +10,7 @@ then wait for his results / pasted errors. Same for in-editor checks — ask for
|
||||
try to run anything.
|
||||
|
||||
## Read first (in order, load only what the task needs)
|
||||
- **[CURRENT-STATE.md](CURRENT-STATE.md) — current shipping snapshot and verification entry point.**
|
||||
- **[CODEMAP.md](CODEMAP.md) — ALWAYS.** Navigation: what it is, data-flow (§2), symbol→`file:line`
|
||||
index (§3), "I want to change X → go here" (§5), conventions & gotchas (§6). Trust **symbol names
|
||||
over line numbers** (lines drift).
|
||||
|
||||
+2
-2
@@ -388,7 +388,7 @@ casse cette arithmetique *structurellement* — `BeginPlay` loggue une **Error**
|
||||
| `AdvanceHeadlessDigMotionTest` / `RecordHeadlessDigMotionFrame` | 3060 / 3217 | Explicit `-voxel.TestDigMotion=1` repro: optional near digs, then repeats underfoot digs and samples `Generator->GetDensityAt` immediately after each edit, on its first subsequent simulated frame, and on every following observation frame. `-voxel.TestDigMotionFieldOverride=1` is a measurement-only prototype that clears `CurrentFloor` and switches CMC to falling when the sampled post-edit density is air; it is inactive by default. The test counts false support, false air and downward velocity beyond one gravity step. `-voxel.TestDigMotionUnderfootDigCount` is clamped to 1–100; `-voxel.TestDigMotionUnderfootIntervalSeconds=0` performs per-frame rapid edits. The accompanying gap audit is scoped to the dig session. |
|
||||
| `MaybeFinishHeadlessStreamingTest` | — | The existing `voxel.TestExitSeconds` diagnostic emits `VoxelForgeStreamingExitDiag` at most every 30 elapsed seconds, including threshold and early-return test flags; no output when the timer is unconfigured. |
|
||||
| `UpdateVisualStalenessAudit` | 5034 | Test-only camera-frustum coverage audit: tracks up to 24 real pre-skirt isosurface points per visible component, then counts frames where no visible tile component covers a previously visible, still-desired point (excluding edited bounds). `voxel.TestVisualGapInjectEarlyHide=1` hides a valid component for three frames and must be caught. `voxel.TestGapAuditLegacyHandoff=1` restores old handoff culling for A/B baselines. |
|
||||
| `ProcessPendingChunks` | 7435 | Drains `CriticalProcessQueue`, `EditedProcessQueue`, `NearProcessQueue`, then `ProcessQueue`; applies under the authored 4-mesh/2 ms budget during normal play and the bounded shared startup budget (12 meshes/14 ms) until the initial desired set and walkable ring are ready. `voxel.StreamingStartupApplyBoost=0` restores the authored budget. `startup_apply_config` traces the actor-read CVar and both budgets; `startup_apply_budget` records activation/end. Reads per-request cancellation before removing its map entry, traces stale/obsolete/aborted discards with epoch and ordinal, then applies via `ApplyTileResult`. Step 1 prequeue still releases here and emits `VFStep1UploadCorpusReleased`. |
|
||||
| `ProcessPendingChunks` | 7435 | Drains `CriticalProcessQueue`, `EditedProcessQueue`, `NearProcessQueue`, then `ProcessQueue`; applies under the authored 4-mesh/2 ms budget during normal play and the default-on bounded startup budget (24 meshes/14 ms, at most 30 s) until the initial desired set and walkable ring are ready. `voxel.StreamingStartupApplyBoost=0` restores the authored budget. `startup_apply_config` traces the actor-read CVar and both budgets; `startup_apply_budget` records activation/end. Reads per-request cancellation before removing its map entry, traces stale/obsolete/aborted discards with epoch and ordinal, then applies via `ApplyTileResult`. Step 1 prequeue still releases here and emits `VFStep1UploadCorpusReleased`. |
|
||||
| `ApplyTileResult` | — | **Shared game-thread apply** for one `FChunkResult` (async drain + sync carve): discards stale generation epochs and keys no longer desired, marks loaded, ingests capture, EMPTY releases the tile's existing component (a re-gen can flip content→empty on band change — old geometry must not linger), else `ApplyMeshToTile`. Returns true iff a visible mesh uploaded (counts the budget). Doesn't touch `PendingTiles` (caller's). |
|
||||
| `FVoxelStackSampler` / `FScopedVoxelStackRegistration` (`VoxelStackSampler.h/.cpp`) | — | **Diagnostic raw stack sampler, off by default.** A sampler thread captures registered generation workers' stacks (`CaptureThreadStackBackTrace`) every N µs and tags each with the tile's LOD. It writes bounded raw PCs to CSV plus a symbolization-free summary under `Saved/`; symbol resolution is deferred until after process exit so the measured process never initializes/calls DbgHelp for this diagnostic. Lifecycle teardown is serialized and registration TLS is session-tagged. Registration is per tile TASK in `LoadTile` (and the export's tasks), never per sample; disabled costs one relaxed atomic load. Game `-voxel.SampleStacks=<us>`, commandlet `-samplestacks[=us]`. |
|
||||
| Room-cache performance (2026-09-13): `VF_FindPlayerFitPointForRoomMemoized` / `GPlayerFitMemo` (`VoxelCaveMorphology.cpp`), `voxel.TileCacheWindow` + `VoxelGenLOD::TileOriginVoxels/TileCellsPerAxis` (`VoxelGenerator.h`), `FChunkSDFSpatialIndex` | — | **Player-fit memo:** exact 97-word key, process-wide, `voxel.PlayerFitMemo`. **Tile cache window:** the room cache covers the requesting tile's footprint plus a fixed collect margin. It is set via `TGuardValue` in `GenerateMesh`/classify, and is window-invariant by construction (the margin does not grow with the tile). **LOD-gated:** fused path at LOD ≥ `voxel.TileCacheWindowMinLOD` (3), op-stack at LOD ≥ `voxel.TileCacheWindowOpStackMinLOD` (4); lower LODs keep the 4-chunk worker window, because the tile window slowed LOD0 evaluation ~6%. Strates whose authored terrain ops exceed the proven 256-voxel extent (or are malformed/unloaded) fall back to the legacy window (`VF_ComputeTerrainOpEnvelope`). `voxel.SpatialIndex` is -1 auto (off at fused LOD0, on elsewhere), 0 or 1. **Spatial index:** ordered XY buckets over cache primitives, exact rejection. The `static_assert` in `VoxelStrateTypes.h` ties `VF_STRATE_PARAM_FIELDS` to `FStrateGenerationParams` (83 fields + 8 B padding). |
|
||||
@@ -396,7 +396,7 @@ casse cette arithmetique *structurellement* — `BeginPlay` loggue une **Error**
|
||||
| `RecordTileHash` / `WriteTileHashDump` | — | Headless `-voxel.TileHashDump=<absolute path>` parity instrument. Records the exact `FVoxelMeshData` used by the streaming result, including empty/classified tiles, then writes sorted absolute tile keys, LOD step/cells, content-band limits, settings digest context, and the shared `VoxelGeometryHash` at `EndPlay`. |
|
||||
| `SyncRemeshTile` | — | **INSTANT DIG**: level-0 same-frame re-mesh on the game thread. Uses `PreEditDensityCache` when the tile is resident in the bounded local cache, replays the current DiffLayer over that exact procedural lattice, then meshes/applies inline so a carve is visible THIS frame. A cache miss uses normal generation; it captures the unedited lattice if the tile needs meshing, while uniform-tile proofs remain enabled. |
|
||||
| `PreEditDensityCache` / `VoxelForgePreEditDensityCache::BuildEditedGrid` | — | Per-world cache of the pawn's current L0 tile: exact 35³ pre-edit samples, max **171,500 bytes**. It is pruned when the pawn crosses chunk boundaries and cleared on `RegenerateAllChunks`. `BuildEditedGrid` snapshots touched diff chunks once and reproduces `GetDensityAt`'s final `pre-edit - EvaluateMods` operation before the per-call shared-grid mesher path. |
|
||||
| `UpdateChunksAroundPosition` / `GetGenerationAdmissionCount` | 10990 / 10971 | Shared Core/legacy scheduler. Builds the desired set and delta-culls leavers; admits the occupied/support tile plus collision-required LOD0 tiles in the pawn's 3×3 XY ring as `CollisionCritical`. S5 coarse-first admission stays opt-in (`voxel.StreamingCoarseFirst=1`). `voxel.StreamingDynamicNearReserve=1` is now the default: it keeps the authored near reserve while moving or until the stationary walkable ring is ready, then makes those slots available to coarse work. Admission counts submitted queued/running tasks, not completed results waiting in the MPSC result queues; `voxel.StreamingLegacyPendingResultCap=1` restores the old `PendingTiles`-based cap for the negative control. `PendingTiles` still lasts through game-thread apply for duplicate suppression and result bookkeeping. The clipmap stays non-overlapping and load-before-unload / `TransitionHold` reconciliation remains authoritative. Standalone has no mirror of this actor scheduler. §8.10 + §8.26–8.28. |
|
||||
| `UpdateChunksAroundPosition` / `GetGenerationAdmissionCount` | 10990 / 10971 | Shared Core/legacy scheduler. Builds the desired set and delta-culls leavers; admits the occupied/support tile plus collision-required LOD0 tiles in the pawn's 3×3 XY ring as `CollisionCritical`. S5 coarse-first admission stays opt-in (`voxel.StreamingCoarseFirst=1`). `voxel.StreamingDynamicNearReserve=1` is the default: it keeps the authored near reserve while moving or until the stationary walkable ring is ready, then makes those slots available to coarse work. Admission counts submitted queued/running tasks, not completed results waiting in the MPSC result queues; `voxel.StreamingLegacyPendingResultCap=1` restores the old `PendingTiles`-based cap for the negative control. `voxel.StreamingFarApplySupplement=1` is the default L121 lane: after the visible-apply cap, at most one far result is admitted when under half the apply-time budget and startup boost is inactive. `PendingTiles` still lasts through game-thread apply for duplicate suppression and result bookkeeping. The clipmap stays non-overlapping and load-before-unload / `TransitionHold` reconciliation remains authoritative. Standalone has no mirror of this actor scheduler. §8.10 + §8.26–8.28. |
|
||||
| `AdvanceHeadlessCollisionGateStressTest` / `ObserveHeadlessCollisionGateStressTest` / `MaybeFinishHeadlessCollisionGateStressTest` / `MeasureHeadlessCollisionGateStressTerrain` | — | Explicit `-voxel.TestCollisionGateStress=1` harness only. The normal spawn-height cvar offsets from the measured density surface; `voxel.TestCollisionGateStressDeepDrop=1` carves a process-local box shaft from above the top to just above the floor tile, extending along the post-landing route so the pawn does not run into the shaft sidewall, temporarily raises only the transient test DiffLayer brush-radius allowance for that fixture, removes only the local pawn's redundant streaming anchor for this isolated repro, proves every sample in two complete outside-ring level-0 tiles is air before seeding their known-empty status, prewarms the known-empty in-ring column, and asserts that the support walk reaches the in-layout floor outside the aligned level-0 render ring before the pawn drops. The log reports whether the fixed gate retains that otherwise out-of-ring target. Other streaming anchors remain active. The fixture rejects a target or floor outside the layout, a non-air empty-tile proof, or a floor inside the aligned level-0 ring. The `GetDensityAt` column at capsule feet defines the local air/solid surface; the deep-drop column crossing is cached after its first exact scan. Each frame records actor position, velocity, direct foot tile and gate support readiness, gate state, signed feet clearance, and a ≤0.5-voxel sweep between positions. PASS requires no measured clearance below −5 cm; deep-drop gate-on also requires horizontal travel during a hold. Result logs include the terminal density column, first crossing below spawn height, hold count/time, and gated horizontal progress. |
|
||||
| `BuildDesiredTiles` | 6482 | Builds `DesiredSorted`+`DesiredStamped` (player clipmap shells), then adds streaming anchors and the pending player's collision-only support column before the leaver sweep. It orders from the true local pawn position and builds `CriticalDesiredTiles` for the unresolved support target, occupied/support and heading tiles. Also rebuilds `DesiredTransitionDescendants` (ancestor → desired descendants, including face/edge-touching replacements) for the reconcile pass. |
|
||||
| `CollisionGateDesiredTiles` / `RequestCollisionGateSupportTile` | 5062 | Retains an unresolved support target and up to three level-0 tiles below it across desired-set rebuilds. The additional keys are hidden collision-only tiles, queued ahead of ordinary streaming, and pruned once resolved or outside the active column. |
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
# VoxelForge current state
|
||||
|
||||
As of 2026-10-31. L131 is on `assembler/world` as `8107196`; this L132 worktree is on `wip/l132-dispatch-truth`, starting at `ebae71b`. Current-state claims below point to their code or measured report.
|
||||
|
||||
## What ships today
|
||||
|
||||
- **Core:** evaluator version **227**. Unreal's `AVoxelWorld::bUseVoxelForgeCore` is opt-in and defaults to `false`; the legacy generator remains the default runtime path. [Core version](Standalone/Core/include/VoxelForgeCore/VoxelForgeCore.h), [runtime switch](Source/VoxelForge/Public/VoxelWorld.h), [L130 report](Standalone/Research/WorldAssemblerM3/Linux130/REPORT.md).
|
||||
- **Verified owner4 generator dispatch (L132):** SW binds `SurfaceWorld-native` because the owner export contains a matching `SurfaceWorld.Heightfield2D` v2 plan. FI binds `compiled-analytic/FloatingIslands` because its `FloatingIslands.ClusterField` v0 layout has no matching native island plan. TN and VS bind `compiled-analytic/TunnelNetwork` and `compiled-analytic/VerticalShafts`; their legacy recipe IDs provide neither a `NativeCaves`/`NativeLattice` graph recipe nor native field capability. The L132 fast-tier report prints the binding and generated tile-center share at each owner strate. [Dispatch](Standalone/Core/src/ShapeWorldInternal.h), [adapter recipe checks](Standalone/Core/include/VoxelForgeCore/VoxelForgeCore.h), [L132 report](Standalone/Research/WorldAssemblerM3/Linux132/REPORT.md).
|
||||
- **Passages:** continuous smooth swept tubes with a continuous floor profile. L125 stamps conservative route slabs and outside sentinels into the tile cache; exact route geometry is still evaluated. All 21,425 route samples passed the open-air walk check; the nine-station floor probe's maximum root offset was 7.884 mm. L130 sets the shared influence reach to **1.0533 m** (0.75 m shell + 0.21 m relief + 0.50 m smooth-max support / 6 + 0.01 m margin), converted once from metres to Core voxels for the proof, feature, fallback, and off-grid bounds. [L125](Standalone/Research/WorldAssemblerM3/Linux125/REPORT.md), [L130](Standalone/Research/WorldAssemblerM3/Linux130/REPORT.md).
|
||||
- **Streaming:** arrival uses a bounded startup apply burst: `voxel.StreamingStartupApplyBoost=1` by default, up to 24 visible meshes or 14 ms per frame for at most 30 seconds, until the initial desired set and walkable ring are ready. `voxel.StreamingFarApplySupplement=1` is also default-on: after the normal visible apply cap, at most one far result applies when under half the apply-time budget; it is inactive during the startup burst. Dynamic near reserve defaults on; coarse-first remains off; the legacy pending-result cap defaults off. The far-apply lane is Unreal-only. [CVar source](Source/VoxelForge/Private/VoxelWorld.cpp), [L121 report](Standalone/Research/WorldAssemblerM3/Linux121/REPORT.md), [architecture](ARCHITECTURE.md).
|
||||
- **Determinism:** proven on Linux with Clang and GCC at W1/W8/W12. L131's unchanged-output comparison covers owner4's SW/FI/TN/VS views in 24 compiler/worker cases; the canonical owner4/owner2 recipe matrix also passes. Windows determinism is unverified. [L131 checks](Standalone/Research/WorldAssemblerM3/Linux131/REPORT.md), [v227 canonical hashes](Standalone/Tools/verify/baselines/owner-hash/canonical/).
|
||||
|
||||
## Current performance references
|
||||
|
||||
Headless medians in seconds, five interleaved L80-style measurements per version in each cell. Near-ready means the complete LOD0–2 set; whole-view is the full requested view. Values below are the edited L131 binary; the paired pre-cleanup comparison is in the [L131 report](Standalone/Research/WorldAssemblerM3/Linux131/REPORT.md) and [timing summary](Saved/Linux/l131/timing/summary.json).
|
||||
|
||||
| Stratum | Near-ready W8 / W12 | Whole-view W8 / W12 |
|
||||
|---|---:|---:|
|
||||
| S0 | 0.804 / 0.848 | 1.811 / 1.832 |
|
||||
| S1 | 1.014 / 1.002 | 1.993 / 1.886 |
|
||||
| S2 | 1.060 / 1.012 | 1.960 / 1.865 |
|
||||
| S3 | 0.917 / 0.884 | 1.887 / 1.782 |
|
||||
|
||||
Across 40 paired runs per metric, the mean relative change from pre-cleanup L130 was −0.22% near-ready (95% CI −1.02% to +0.57%) and −0.29% whole-view (−1.04% to +0.46%); neither indicates a measurable slowdown. The machine gate was load 0.81 and 99.2% idle. [L80 protocol](Standalone/Research/WorldAssemblerM3/Linux80/REPORT.md), [runner and raw runs](Standalone/Research/WorldAssemblerM3/Linux131/RunL131Timing.py).
|
||||
|
||||
The latest recorded Linux Unreal start-to-LOD0–2 values are L127's one run per stratum: S0 2.456 s, S1 2.231 s, S2 2.514 s, S3 2.221 s. L130 did not rerun UE startup or movement. Five L127 runs at 30 m/s, 12 s moving plus 5 s dwell, had median moving near coverage **40.22%**, far holes **3.46%**, tick p99 **10.80 ms**, and worst tick **13.27 ms**. After stopping, near coverage reached 100% and far holes reached 0%. These are the latest UE references, not v227 UE measurements. [L127 report](Standalone/Research/WorldAssemblerM3/Linux127/REPORT.md), [L127 movement summary](Saved/Linux/l127/ue/movement-pairs-summary.json), [L127 start summaries](Saved/Linux/l127/ue/merge/start-summary.json).
|
||||
|
||||
## Open gaps
|
||||
|
||||
- Multiplayer world lifecycle is unfinished: seed/layout replication, authoritative modification RPCs, and serialized diff replay for late join are still open. See [ARCHITECTURE §9.5 and §9.7](ARCHITECTURE.md).
|
||||
- Determinism has not been verified on Windows. Linux Clang/GCC agreement does not establish MSVC agreement.
|
||||
- NullRHI measures residency and apply timing, not the first presented pixel or rendered enclosure. L127 also found four low-contrast views among 23 otherwise verified captures. [L121](Standalone/Research/WorldAssemblerM3/Linux121/REPORT.md), [L127](Standalone/Research/WorldAssemblerM3/Linux127/REPORT.md).
|
||||
- UE startup/movement numbers above predate L130's v227 reach change; there is no L130/L131 UE movement comparison.
|
||||
|
||||
## How to verify
|
||||
|
||||
- Build standalone Clang or GCC with [`Standalone/BuildLinux.sh`](Standalone/BuildLinux.sh), for example `bash Standalone/BuildLinux.sh --compiler=clang++-19 --variant=l132-clang --fp-contract=off --jobs=4`. The script pins CPUs 0–11 and applies `prlimit --as=6442450944` itself.
|
||||
- Fast tier: `python3 Standalone/Tools/verify/verify.py fast --out Saved/Linux/l132 --overall-timeout 1740`. It includes the L132 four-pose owner density-dispatch report; per-run logs and the summary stay under `Saved/Linux/l132`.
|
||||
- Canonical output baselines are the v227 files in `Standalone/Tools/verify/baselines/owner-hash/canonical/`. L131 also provides reproducible pre-cleanup identity matrices for owner4 tile hashes and owner4/owner2 canonical hashes under `Standalone/Research/WorldAssemblerM3/Linux131/`.
|
||||
- Timing follows L80: quiet machine, no overlapping build, one warm-up per version, five interleaved runs per stratum and worker count, W8/W12. Each headless run uses `taskset -c 0-11`, `prlimit --as=6442450944`, and a 1,740 s timeout. See [`RunL131Timing.py`](Standalone/Research/WorldAssemblerM3/Linux131/RunL131Timing.py).
|
||||
- Linux host build: `/home/jahni/UnrealEngine/Engine/Build/BatchFiles/Linux/Build.sh VFHostEditor Linux Development -Project=/home/jahni/VFHost/VFHost.uproject -NoUBA -MaxParallelActions=4 -Log=/home/jahni/VoxelM/Plugins/VoxelForge/Saved/Linux/l131/ubt.log`. Run Unreal without `prlimit`.
|
||||
|
||||
## Closed experiments
|
||||
|
||||
These rejected speed/streaming proposals stay closed unless new evidence changes their measured failure. Reports and surviving patches are linked in the [L131 inventory](Standalone/Research/WorldAssemblerM3/Linux131/REPORT.md).
|
||||
|
||||
| Line | Result |
|
||||
|---|---|
|
||||
| L116 tunnel chord bound and z cache | Pair count fell 20.8%, but stayed 1.96× L109 and readiness was 15–30% slower. Patch: [`chord-bound-zcolumn-not-merged.patch`](Standalone/Research/WorldAssemblerM3/Linux116/patches/chord-bound-zcolumn-not-merged.patch), commit `89504ec`; see [report](Standalone/Research/WorldAssemblerM3/Linux116/REPORT.md). |
|
||||
| L118 pair pruning / deferred floor work | Pruned 17–18% of candidate pairs but remained 17.2–25.7% behind L109 near-ready. [Report](Standalone/Research/WorldAssemblerM3/Linux118/REPORT.md); patch: [`l118-designs.patch`](Standalone/Research/WorldAssemblerM3/Linux118/l118-designs.patch). |
|
||||
| L126 floor-call filters | Cut floor calls 20–23% without reducing pair counts; all eight cells missed L109. Candidate source was restored and no standalone patch was kept; see [report](Standalone/Research/WorldAssemblerM3/Linux126/REPORT.md) and commit `01a5094`. |
|
||||
| L128 half-open slab ownership | Ownership audit passed, but readiness was 14.8–28.0% behind L109 and moving coverage dropped. Report and patch `l128-slab-ownership.patch` are in archived commit `7022d02`. |
|
||||
| L129 2 m physical reach | v225's metre/Core-voxel bounds mismatch made the correctly bounded candidate do more work; it was slower and failed UE movement gates. Report and patch `l129-reach-2m.patch` are in archived commit `0d1140c`. |
|
||||
| L120 priority split / extra worker slots | Neither met coverage and tick gates; 10 slots reached a 16.67 ms worst tick against 15.43 ms baseline. [Report](Standalone/Research/WorldAssemblerM3/Linux120/REPORT.md); no production patch retained. |
|
||||
| L122 admission relaxation | Early admission missed p99 or far-hole gates; no behavior retained. [Report](Standalone/Research/WorldAssemblerM3/Linux122/REPORT.md); patch: [`l122-trace.patch`](Standalone/Research/WorldAssemblerM3/Linux122/l122-trace.patch). |
|
||||
| L123 lookahead / completion gate | Lookahead failed p99 and worsened near/far coverage; queue-only also failed p99. [Report](Standalone/Research/WorldAssemblerM3/Linux123/REPORT.md); patch: [`l123-queue-lookahead.patch`](Standalone/Research/WorldAssemblerM3/Linux123/l123-queue-lookahead.patch). |
|
||||
| L124 early LOD0 pages | Optimistic gain stayed below 100 ms except negative cases; no publication/scheduling implementation was made. [Report](Standalone/Research/WorldAssemblerM3/Linux124/REPORT.md). |
|
||||
@@ -494,7 +494,10 @@ namespace VoxelForgeCore
|
||||
// Version 223 projects the floor onto one continuous arc-length profile and groups
|
||||
// dense passage samples into coarse tile candidates. Version 224 keeps the same
|
||||
// continuous floor while relaxing the spline chord tolerance and bounding shell work.
|
||||
inline constexpr std::uint32_t WorldAssemblyEvaluatorVersion = 225;
|
||||
// Version 226 unifies the passage influence reach in metres and converts it to core
|
||||
// voxels for every broadphase and proof bound. Version 227 uses the exact smooth-max
|
||||
// support width/6 when deriving that reach.
|
||||
inline constexpr std::uint32_t WorldAssemblyEvaluatorVersion = 227;
|
||||
|
||||
enum class FieldChannel : std::uint32_t
|
||||
{
|
||||
|
||||
@@ -33,50 +33,41 @@
|
||||
#include <variant>
|
||||
#include <vector>
|
||||
|
||||
// L88-only composition split. These switches let the timing harness remove passage work and
|
||||
// resolved boundary-band work independently. They are diagnostic only, never world settings.
|
||||
static bool VF_IsL88DiagnosticSwitchEnabled(const char* Name)
|
||||
static bool VF_IsDiagnosticEnvSwitchEnabled(const char* Name)
|
||||
{
|
||||
const char* Value=std::getenv(Name);
|
||||
return Value&&Value[0]=='1'&&Value[1]=='\0';
|
||||
}
|
||||
|
||||
static bool VF_IsL88PassageCompositionDisabled()
|
||||
{
|
||||
static const bool bDisabled=VF_IsL88DiagnosticSwitchEnabled(
|
||||
"VOXELFORGE_L88_DISABLE_PASSAGES")
|
||||
||VF_IsL88DiagnosticSwitchEnabled("VOXELFORGE_L86_DISABLE_PASSAGE_COMPOSITION");
|
||||
return bDisabled;
|
||||
}
|
||||
|
||||
static bool VF_IsL88BoundaryBandsDisabled()
|
||||
{
|
||||
static const bool bDisabled=VF_IsL88DiagnosticSwitchEnabled(
|
||||
"VOXELFORGE_L88_DISABLE_BOUNDARY_BANDS")
|
||||
||VF_IsL88DiagnosticSwitchEnabled("VOXELFORGE_L86_DISABLE_PASSAGE_COMPOSITION");
|
||||
return bDisabled;
|
||||
}
|
||||
|
||||
static bool VF_IsL88AllowPassageAblationWalkabilityFailure()
|
||||
{
|
||||
static const bool bEnabled=VF_IsL88DiagnosticSwitchEnabled(
|
||||
"VOXELFORGE_L88_ALLOW_PASSAGE_ABLATION_WALKABILITY_FAILURE");
|
||||
return bEnabled;
|
||||
}
|
||||
|
||||
|
||||
static bool VF_IsL98PassagePrepareTraceEnabled()
|
||||
{
|
||||
static const bool bEnabled=VF_IsL88DiagnosticSwitchEnabled(
|
||||
static const bool bEnabled=VF_IsDiagnosticEnvSwitchEnabled(
|
||||
"VOXELFORGE_L98_PASSAGE_PREP_TRACE");
|
||||
return bEnabled;
|
||||
}
|
||||
|
||||
static double VF_L93PassageCarveReachMetres()
|
||||
static bool VF_IsL130PassageReachProofAuditEnabled()
|
||||
{
|
||||
// The generated world uses a fixed bounded tube influence. An explicit diagnostic
|
||||
// option can still select the legacy point-evaluation path for comparisons.
|
||||
return 4.0;
|
||||
static const bool bEnabled=VF_IsDiagnosticEnvSwitchEnabled(
|
||||
"VOXELFORGE_L130_PASSAGE_REACH_PROOF_AUDIT");
|
||||
return bEnabled;
|
||||
}
|
||||
|
||||
static constexpr double VF_PassageShellThicknessMetres=0.75;
|
||||
static constexpr double VF_PassageWallReliefMetres=0.21;
|
||||
static constexpr double VF_PassageCornerBlendMetres=0.50;
|
||||
static constexpr double VF_PassageReachMarginMetres=0.01;
|
||||
// Radial support in metres: shell + maximum relief + the smooth-max support
|
||||
// (corner-blend width / 6) + a 1 cm guard for float and bound rounding.
|
||||
static constexpr double VF_PassageInfluenceReachMetres=
|
||||
VF_PassageShellThicknessMetres+VF_PassageWallReliefMetres
|
||||
+VF_PassageCornerBlendMetres/6.0+VF_PassageReachMarginMetres;
|
||||
|
||||
static double VF_PassageInfluenceReachCoreVoxels(
|
||||
std::uint32_t coreVoxelSizeMicrometres)
|
||||
{
|
||||
return VF_PassageInfluenceReachMetres*1000000.0
|
||||
/std::max<std::uint32_t>(1,coreVoxelSizeMicrometres);
|
||||
}
|
||||
|
||||
enum class EPassageDensityQueryCaller : std::size_t
|
||||
@@ -306,22 +297,18 @@ public:
|
||||
profileStats_(profileStats),profileLod_(profileLod),
|
||||
passageCarveReachMetres_(std::isfinite(passageCarveReachMetres)
|
||||
&&passageCarveReachMetres>=0.0?passageCarveReachMetres
|
||||
:VF_L93PassageCarveReachMetres())
|
||||
:VF_PassageInfluenceReachMetres)
|
||||
{
|
||||
mayContainResolvedBoundaryBand_=shape.ResolvedBoundaryBandsIntersectSubvoxelRange(
|
||||
minimumSubvoxels_[2],maximumSubvoxels_[2]);
|
||||
const bool disablePassageComposition=VF_IsL88PassageCompositionDisabled();
|
||||
if(VF_IsL88BoundaryBandsDisabled())mayContainResolvedBoundaryBand_=false;
|
||||
mayContainTransitionPassageFade_=!disablePassageComposition
|
||||
&&shape.ResolvedTransitionPassageFadeIntersectsTileXY(
|
||||
mayContainTransitionPassageFade_=shape.ResolvedTransitionPassageFadeIntersectsTileXY(
|
||||
minimumSubvoxels_,maximumSubvoxels_);
|
||||
if(!disablePassageComposition)
|
||||
featureIndices_=shape.BuildPassageFeatureTileList(
|
||||
minimumSubvoxels_,maximumSubvoxels_);
|
||||
stampIndices_=shape.BuildStampTileList(minimumSubvoxels_,maximumSubvoxels_);
|
||||
cavernFeatureIndices_=shape.BuildCavernFeatureTileList(
|
||||
minimumSubvoxels_,maximumSubvoxels_);
|
||||
passageRoutes_.assign(shape.ResolvedLayout&&!disablePassageComposition
|
||||
passageRoutes_.assign(shape.ResolvedLayout
|
||||
?shape.ResolvedLayout->passages.size():0,0);
|
||||
passageRouteSegments_.resize(passageRoutes_.size());
|
||||
for(const std::uint32_t featureIndex:featureIndices_)
|
||||
@@ -1204,8 +1191,8 @@ public:
|
||||
if(!ResolvedLayout||ResolvedLayout->passages.empty()||!std::isfinite(X)
|
||||
||!std::isfinite(Y)||!std::isfinite(Z))return density;
|
||||
constexpr double Q=static_cast<double>(VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel);
|
||||
constexpr double FloorShellThicknessMetres=0.75;
|
||||
constexpr double WallReliefMetres=0.21;
|
||||
constexpr double FloorShellThicknessMetres=VF_PassageShellThicknessMetres;
|
||||
constexpr double WallReliefMetres=VF_PassageWallReliefMetres;
|
||||
constexpr double OpenAirSideWallHeightMetres=1.0;
|
||||
constexpr double MouthShellBlendMetres=5.0;
|
||||
const double qPerMetre=Q*1000000.0/
|
||||
@@ -1544,12 +1531,8 @@ public:
|
||||
// the generic stratum transition distance creates a discontinuity at a
|
||||
// mouth that crosses a wide transition band. Keep that opt-in field whole;
|
||||
// its host-rock value already supplies the ceiling and bedrock.
|
||||
const bool disablePassageComposition=!nativeLattice
|
||||
&&VF_IsL88PassageCompositionDisabled();
|
||||
const bool disableBoundaryBands=!nativeLattice
|
||||
&&VF_IsL88BoundaryBandsDisabled();
|
||||
float boundary=graphDensity;
|
||||
if(!nativeLattice&&!disableBoundaryBands)
|
||||
if(!nativeLattice)
|
||||
{
|
||||
VoxelForgeCore::Linux77Profiler::FScopedPhase l77BandsPhase(
|
||||
VoxelForgeCore::Linux77Profiler::EPhase::Bands);
|
||||
@@ -1578,7 +1561,6 @@ public:
|
||||
?bound->Resolved->passageCapabilities.hasNativeCaveField
|
||||
:bound->Resolved->passageCapabilities.hasNativeLatticeField))
|
||||
{
|
||||
if(!disablePassageComposition)
|
||||
{
|
||||
VoxelForgeCore::Linux77Profiler::FScopedPhase l77PassagePhase(
|
||||
VoxelForgeCore::Linux77Profiler::EPhase::Passage);
|
||||
@@ -1609,7 +1591,6 @@ public:
|
||||
ELegacyFieldTerm::ComposerPassage);
|
||||
final=ApplyResolvedCavernFloorCaps(stamped,X,Y,Z);
|
||||
}
|
||||
if(!disablePassageComposition)
|
||||
{
|
||||
VoxelForgeCore::Linux77Profiler::FScopedPhase l77PassagePhase(
|
||||
VoxelForgeCore::Linux77Profiler::EPhase::Passage);
|
||||
@@ -1630,8 +1611,8 @@ public:
|
||||
{
|
||||
constexpr double Q=static_cast<double>(
|
||||
VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel);
|
||||
const double qPerMetre=Q*1000000.0/
|
||||
std::max<std::uint32_t>(1,ResolvedLayout->coreVoxelSizeMicrometres);
|
||||
const double reachCoreVoxels=VF_PassageInfluenceReachCoreVoxels(
|
||||
ResolvedLayout->coreVoxelSizeMicrometres);
|
||||
const auto overlaps=[&](const double low[3],const double high[3])
|
||||
{
|
||||
for(int axis=0;axis<3;++axis)
|
||||
@@ -1648,7 +1629,8 @@ public:
|
||||
const auto& p3=passage.controlPoints[
|
||||
std::min(segment+2,passage.controlPoints.size()-1)];
|
||||
const double radius=std::max(static_cast<double>(a.radiusSubvoxels),
|
||||
static_cast<double>(b.radiusSubvoxels))/Q+1.0;
|
||||
static_cast<double>(b.radiusSubvoxels))/Q
|
||||
+reachCoreVoxels+0.01;
|
||||
double low[3]{},high[3]{};
|
||||
for(int axis=0;axis<3;++axis)
|
||||
{
|
||||
@@ -2313,20 +2295,10 @@ public:
|
||||
Substage=Clock::now();
|
||||
const bool bPassageRoutesValid=!bValidatePassageRoutes||ValidatePassageRoutes();
|
||||
if(!bPassageRoutesValid)
|
||||
{
|
||||
if(VF_IsL88PassageCompositionDisabled()
|
||||
&&!VF_IsL88BoundaryBandsDisabled()
|
||||
&&VF_IsL88AllowPassageAblationWalkabilityFailure())
|
||||
{
|
||||
std::printf("[L88PassageAblation] route walkability failed as expected; "
|
||||
"continuing only to measure passage-off/bands-on readiness\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
Error="compiled shape world contains a solid passage centreline sample";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Stats.PassageValidationSeconds=std::chrono::duration<double>(Clock::now()-Substage).count();
|
||||
Built=true;
|
||||
if(bIncludeFarWorld)BuildFarWorld();
|
||||
@@ -3499,7 +3471,7 @@ private:
|
||||
double centerZSubvoxels,double queryZSubvoxels,double floorDepthSubvoxels,
|
||||
double qPerMetre)
|
||||
{
|
||||
constexpr double CornerBlendMetres=0.50;
|
||||
constexpr double CornerBlendMetres=VF_PassageCornerBlendMetres;
|
||||
const float floorDistance=static_cast<float>(centerZSubvoxels
|
||||
-floorDepthSubvoxels-queryZSubvoxels);
|
||||
return SmoothMaxDistance(roundDistanceSubvoxels,floorDistance,
|
||||
@@ -4811,13 +4783,9 @@ private:
|
||||
PassageNearestNodes.resize(ResolvedLayout?ResolvedLayout->passages.size():0);
|
||||
if(!ResolvedLayout||ResolvedLayout->passages.empty())return;
|
||||
constexpr double Q=static_cast<double>(VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel);
|
||||
constexpr double PassageShellMetres=0.75;
|
||||
constexpr double ReliefMetres=0.21;
|
||||
constexpr double SweepReachMetres=4.0;
|
||||
constexpr double CornerBlendMetres=0.50;
|
||||
constexpr std::size_t CandidateFineSamplesPerSpan=5;
|
||||
const double requiredReach=std::max(SweepReachMetres+ReliefMetres
|
||||
+CornerBlendMetres*0.25,PassageShellMetres+ReliefMetres);
|
||||
const double requiredReachCoreVoxels=VF_PassageInfluenceReachCoreVoxels(
|
||||
ResolvedLayout->coreVoxelSizeMicrometres);
|
||||
for(std::size_t passageIndex=0;passageIndex<ResolvedLayout->passages.size();
|
||||
++passageIndex)
|
||||
{
|
||||
@@ -4854,7 +4822,7 @@ private:
|
||||
routeMinimum[axis]=std::min(routeMinimum[axis],localMinimum[axis]);
|
||||
routeMaximum[axis]=std::max(routeMaximum[axis],localMaximum[axis]);
|
||||
}
|
||||
const double localExtent=requiredReach
|
||||
const double localExtent=requiredReachCoreVoxels
|
||||
+std::max(prepared.radiusA,prepared.radiusB)/Q+0.01;
|
||||
FPassageProofBound proof;
|
||||
for(std::size_t axis=0;axis<3;++axis)
|
||||
@@ -4872,7 +4840,8 @@ private:
|
||||
std::ceil((localMaximum[axis]+localExtent)*Q));
|
||||
}
|
||||
}
|
||||
const double routeExtent=maximumRadiusSubvoxels/Q+requiredReach+0.01;
|
||||
const double routeExtent=maximumRadiusSubvoxels/Q
|
||||
+requiredReachCoreVoxels+0.01;
|
||||
const double tileExtent=routeExtent;
|
||||
std::array<std::int64_t,3> featureMinimum{},featureMaximum{};
|
||||
for(std::size_t axis=0;axis<3;++axis)
|
||||
@@ -4899,6 +4868,113 @@ private:
|
||||
BuildPassageFeatureNode(0,PassageFeatureOrder.size());
|
||||
if(!PassageProofBounds.empty())
|
||||
BuildPassageProofNode(0,PassageProofBounds.size());
|
||||
|
||||
if(VF_IsL130PassageReachProofAuditEnabled())
|
||||
{
|
||||
constexpr double Q=static_cast<double>(
|
||||
VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel);
|
||||
constexpr std::array<std::array<double,2>,8> RadialDirections={{
|
||||
{1.0,0.0},{0.7071067811865475,0.7071067811865475},
|
||||
{0.0,1.0},{-0.7071067811865475,0.7071067811865475},
|
||||
{-1.0,0.0},{-0.7071067811865475,-0.7071067811865475},
|
||||
{0.0,-1.0},{0.7071067811865475,-0.7071067811865475}}};
|
||||
constexpr std::array<double,2> CrestHeightsMetres={0.625,0.875};
|
||||
const double qPerMetre=Q*1000000.0/
|
||||
std::max<std::uint32_t>(1,ResolvedLayout->coreVoxelSizeMicrometres);
|
||||
const std::array<double,6> shellOffsetsMetres={0.70,0.78,0.86,0.94,
|
||||
VF_PassageInfluenceReachMetres-0.005,
|
||||
VF_PassageInfluenceReachMetres+0.005};
|
||||
std::uint64_t sampled=0,signRelevant=0,proofMisses=0,featureMisses=0;
|
||||
for(std::size_t passageIndex=0;
|
||||
passageIndex<PassageSegmentData.size();++passageIndex)
|
||||
{
|
||||
const auto& segments=PassageSegmentData[passageIndex];
|
||||
if(segments.empty())continue;
|
||||
const auto& constants=PassageComposerConstants[passageIndex];
|
||||
const std::size_t stride=std::max<std::size_t>(1,
|
||||
(segments.size()+127)/128);
|
||||
for(std::size_t segmentIndex=0;segmentIndex<segments.size();
|
||||
segmentIndex+=stride)
|
||||
{
|
||||
const auto& segment=segments[segmentIndex];
|
||||
if(segment.lengthSq<=1.0e-12)continue;
|
||||
constexpr double T=0.5;
|
||||
const double centerX=segment.a[0]+T*segment.delta[0];
|
||||
const double centerY=segment.a[1]+T*segment.delta[1];
|
||||
const double centerZ=segment.a[2]+T*segment.delta[2];
|
||||
const double radius=segment.radiusA+T*segment.radiusDelta;
|
||||
const double floorDepth=PassageFlatFloorDepthSubvoxels(
|
||||
constants,segmentIndex,T,radius,qPerMetre);
|
||||
const double floorCenterZ=PassageFlatFloorCenterZSubvoxels(
|
||||
constants,segments,segmentIndex,T,segment,centerX,centerY,
|
||||
floorDepth,qPerMetre);
|
||||
for(const double crestHeightMetres:CrestHeightsMetres)
|
||||
{
|
||||
const double sampleZ=floorCenterZ-floorDepth
|
||||
+crestHeightMetres*qPerMetre;
|
||||
const double verticalDelta=sampleZ-centerZ;
|
||||
for(const double shellOffsetMetres:shellOffsetsMetres)
|
||||
{
|
||||
const double radialDistance=radius
|
||||
+shellOffsetMetres*qPerMetre;
|
||||
if(radialDistance*radialDistance
|
||||
<=verticalDelta*verticalDelta)continue;
|
||||
const double horizontalDistance=std::sqrt(
|
||||
radialDistance*radialDistance
|
||||
-verticalDelta*verticalDelta);
|
||||
for(const auto& direction:RadialDirections)
|
||||
{
|
||||
const double sampleQ[3]={
|
||||
centerX+direction[0]*horizontalDistance,
|
||||
centerY+direction[1]*horizontalDistance,sampleZ};
|
||||
const double sampleVoxel[3]={sampleQ[0]/Q,
|
||||
sampleQ[1]/Q,sampleQ[2]/Q};
|
||||
const float contribution=ApplyResolvedStratePassageCarves(
|
||||
0.0f,static_cast<float>(sampleVoxel[0]),
|
||||
static_cast<float>(sampleVoxel[1]),
|
||||
static_cast<float>(sampleVoxel[2]));
|
||||
++sampled;
|
||||
if(std::abs(contribution)<=1.0e-6f)continue;
|
||||
++signRelevant;
|
||||
if(PassageProofNodes.empty()
|
||||
||!PassageProofBoundsOverlapNode(0,sampleVoxel,
|
||||
sampleVoxel))
|
||||
++proofMisses;
|
||||
std::array<std::int64_t,3> sampleMinimum{},sampleMaximum{};
|
||||
for(std::size_t axis=0;axis<3;++axis)
|
||||
{
|
||||
sampleMinimum[axis]=static_cast<std::int64_t>(
|
||||
std::floor(sampleQ[axis]));
|
||||
sampleMaximum[axis]=static_cast<std::int64_t>(
|
||||
std::ceil(sampleQ[axis]));
|
||||
}
|
||||
const auto candidates=BuildPassageFeatureTileList(
|
||||
sampleMinimum,sampleMaximum);
|
||||
const bool featureContainsSample=std::any_of(
|
||||
candidates.begin(),candidates.end(),
|
||||
[&](std::uint32_t featureIndex)
|
||||
{
|
||||
return featureIndex<PassageTileFeatures.size()
|
||||
&&PassageTileFeatures[featureIndex].passageIndex
|
||||
==passageIndex;
|
||||
});
|
||||
if(!featureContainsSample)++featureMisses;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
const bool auditPassed=sampled>0&&signRelevant>0
|
||||
&&proofMisses==0&&featureMisses==0;
|
||||
std::printf("[L130PassageReachProofAudit] reach_m=%.3f sampled=%llu sign_relevant=%llu proof_misses=%llu feature_misses=%llu status=%s\n",
|
||||
VF_PassageInfluenceReachMetres,
|
||||
static_cast<unsigned long long>(sampled),
|
||||
static_cast<unsigned long long>(signRelevant),
|
||||
static_cast<unsigned long long>(proofMisses),
|
||||
static_cast<unsigned long long>(featureMisses),
|
||||
auditPassed?"PASS":"FAIL");
|
||||
if(!auditPassed)std::abort();
|
||||
}
|
||||
}
|
||||
|
||||
bool PassageProofBoundsOverlapNode(int nodeIndex,const double minimum[3],
|
||||
@@ -11442,10 +11518,9 @@ inline void FStandaloneShapeWorld::FScopedPassageTileQueries::prepareSweptTubeBa
|
||||
const FIntVector& origin,std::int32_t step,std::int32_t cells,std::uint32_t seed)
|
||||
{
|
||||
constexpr std::int64_t Q=VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel;
|
||||
constexpr double InfluenceMetres=4.0;
|
||||
constexpr double OpenAirSideWallHeightMetres=1.0;
|
||||
if(!shape_||step<=0||cells<=0||!std::isfinite(passageCarveReachMetres_)
|
||||
||std::abs(passageCarveReachMetres_-InfluenceMetres)>1.0e-9)return;
|
||||
||std::abs(passageCarveReachMetres_-VF_PassageInfluenceReachMetres)>1.0e-9)return;
|
||||
const bool profile=profileStats_!=nullptr;
|
||||
const auto prepareStart=profile?std::chrono::steady_clock::now()
|
||||
:std::chrono::steady_clock::time_point{};
|
||||
@@ -11459,7 +11534,7 @@ inline void FStandaloneShapeWorld::FScopedPassageTileQueries::prepareSweptTubeBa
|
||||
sweep->dimension=cells+3;
|
||||
const std::size_t gridSampleCount=static_cast<std::size_t>(sweep->dimension)
|
||||
*static_cast<std::size_t>(sweep->dimension)*static_cast<std::size_t>(sweep->dimension);
|
||||
sweep->influenceSubvoxels=InfluenceMetres*static_cast<double>(Q)*1000000.0
|
||||
sweep->influenceSubvoxels=passageCarveReachMetres_*static_cast<double>(Q)*1000000.0
|
||||
/std::max<std::uint32_t>(1,shape_->ResolvedLayout
|
||||
?shape_->ResolvedLayout->coreVoxelSizeMicrometres:250000);
|
||||
sweep->passageToSweep.assign(passageRouteSegments_.size(),-1);
|
||||
@@ -11473,7 +11548,7 @@ inline void FStandaloneShapeWorld::FScopedPassageTileQueries::prepareSweptTubeBa
|
||||
const double qPerMetre=static_cast<double>(Q)*1000000.0/
|
||||
std::max<std::uint32_t>(1,shape_->ResolvedLayout
|
||||
?shape_->ResolvedLayout->coreVoxelSizeMicrometres:250000);
|
||||
const double shellThickness=0.75*qPerMetre;
|
||||
const double shellThickness=VF_PassageShellThicknessMetres*qPerMetre;
|
||||
const double stampedOutsideDistance=sweep->influenceSubvoxels+1.0;
|
||||
constexpr double MouthShellBlendMetres=5.0;
|
||||
const double wallReliefShell=0.41*qPerMetre;
|
||||
@@ -11633,7 +11708,7 @@ inline void FStandaloneShapeWorld::FScopedPassageTileQueries::prepareSweptTubeBa
|
||||
// more than cornerWidth/6. Skip its work for pairs outside this exact
|
||||
// support, with a small subvoxel guard for float rounding. The final
|
||||
// shell union only consumes negative distances.
|
||||
constexpr double CornerBlendMetres=0.50;
|
||||
constexpr double CornerBlendMetres=VF_PassageCornerBlendMetres;
|
||||
const float roundDistanceFloat=static_cast<float>(signedDistance);
|
||||
const float floorDistanceFloat=static_cast<float>(floorCenterZ-floorDepth-qz);
|
||||
const double flatDistanceLowerBound=std::max(
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
# VoxelForge — open read-only review: what should be done and focused on now?
|
||||
|
||||
You are an outside reviewer. **Do not edit, create or delete any file, and do not build or run anything.** Read the
|
||||
repository and its reports and reason. Be thorough; mark each claim as [CODE] (with file:line), [MEASURED] (from a
|
||||
report), or [INFERENCE].
|
||||
|
||||
## The project, in the owner's words and goals
|
||||
|
||||
- VoxelForge is a UE5 density-field voxel plugin for a **multiplayer** game. The world is made of stacked "strates"
|
||||
(layers) linked by tunnels. The standalone C++ generator is "Core" (`Standalone/Core`), and it is also compiled into
|
||||
Unreal. Read `CLAUDE.md`, `CODEMAP.md`, `ARCHITECTURE.md`, `GDD.md`, `COMPOSER-NOTES.md` and `fable-idea.md` at the
|
||||
plugin root for the game and design intent. The research reports are in
|
||||
`Standalone/Research/WorldAssemblerM3/Linux*/REPORT.md` and the `Astra*/` reviews.
|
||||
- Owner goals stated over time:
|
||||
- the near terrain (LOD0–2) ready in ~1 s on arrival, then far terrain keeps filling in at low priority;
|
||||
- same seed gives the same world on every machine (byte-identity with older versions is NOT required);
|
||||
- smooth for VR and high-speed travel;
|
||||
- all generators (surface, floating islands, caves, dreamcore/liminal, etc.) working in Core;
|
||||
- the system should eventually *invent* strates and worlds from tagged authored content plus a seed;
|
||||
- keep things simple and avoid over-complication.
|
||||
- The current main line is branch `assembler/world`.
|
||||
|
||||
## Your task
|
||||
|
||||
Look at the whole: code, reports, design docs, and the direction of the last few dozen rounds. Tell the owner what
|
||||
should be done and focused on now, whatever it is. That may be performance, features, generation quality, gameplay
|
||||
foundations, architecture, technical debt, tooling, process, or stopping something. Don't assume the recent focus is
|
||||
the right one; question it if the evidence says so.
|
||||
|
||||
Answer:
|
||||
1. **Where the project actually is**: what works, what's fragile, what's missing for the game to exist.
|
||||
2. **The top 3–5 things to focus on now**, ranked, each with why, a rough size, what "done" looks like, and how to
|
||||
tell it worked.
|
||||
3. **What to stop or deprioritise**, and why.
|
||||
4. **Risks or debts** that will bite later if ignored.
|
||||
|
||||
Write plain Markdown, at most ~1,500 words, readable by a non-specialist owner (explain jargon briefly).
|
||||
@@ -0,0 +1,72 @@
|
||||
[INFERENCE] **Focus now on a small, persistent multiplayer descent, supported by end-to-end Unreal performance work.** VoxelForge has substantial terrain technology. The larger uncertainty is whether it delivers a reliable, interesting shared expedition. Another sequence of tunnel optimizations will not resolve that.
|
||||
|
||||
Read-only review of `assembler/world` at `044cd6d`; no files changed and no builds, tests, or project execution. [CODE] identifies repository evidence; design-document references establish intent, not implementation. [MEASURED] means reported results, not independently reproduced measurements.
|
||||
|
||||
**1. Where the project actually is**
|
||||
|
||||
[CODE] **Core is real and integrated, but generator implementation remains mixed.** Unreal compiles the canonical standalone sources through validated wrappers. Core dispatches to surface, floating-island and native graph evaluators, with a legacy-generator fallback when appropriate. That is useful coverage, but does not mean every family has a complete native implementation. See [VoxelForgeCore.Build.cs:15](/home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForgeCore/VoxelForgeCore.Build.cs:15) and [ShapeWorldInternal.h:600](/home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/ShapeWorldInternal.h:600).
|
||||
|
||||
[MEASURED] **Passage correctness and speed have improved substantially.** L109 simplified tunnels and removed support-restoration machinery, reducing floating-island and tunnel-network near-generation times by approximately 31–38%. L125 reports 21,425/21,425 open route samples, a maximum sampled floor offset of 7.884 mm, and matching cross-compiler/worker hashes. These are meaningful engineering achievements. [L109](Standalone/Research/WorldAssemblerM3/Linux109/REPORT.md), [L125](Standalone/Research/WorldAssemblerM3/Linux125/REPORT.md).
|
||||
|
||||
[MEASURED] **The one-second player experience is not achieved.** L125’s standalone near-ready medians were approximately 0.78–1.03 seconds. L127’s Unreal startup took 2.22–2.51 seconds; at 30 m/s, median near coverage fell from 43.36% to 40.22% after the smooth-tunnel merge. Both versions recovered after stopping. L130 found no measurable timing improvement and skipped Unreal movement. These are different workloads; subtracting their times would not isolate a particular overhead. [L125](Standalone/Research/WorldAssemblerM3/Linux125/REPORT.md), [L127](Standalone/Research/WorldAssemblerM3/Linux127/REPORT.md), [L130](Standalone/Research/WorldAssemblerM3/Linux130/REPORT.md).
|
||||
|
||||
[CODE] **Multiplayer foundations exist; the multiplayer lifecycle remains unfinished here.** There are season hashes, local terrain-edit entry points, and streaming-anchor infrastructure. The architecture explicitly leaves join replication, authoritative edit messages, late-join snapshots and networked season changes open. The edit entry point directly dispatches to local modification paths. [VoxelWorld.h:574](/home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Public/VoxelWorld.h:574), [VoxelWorld.cpp:15771](/home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelWorld.cpp:15771), [ARCHITECTURE.md:2408](/home/jahni/VoxelM/Plugins/VoxelForge/ARCHITECTURE.md:2408).
|
||||
|
||||
[CODE] **The composer is more than a proposal, but less than the full content vision.** It rolls candidates, measures them and rejects failures. The intended system additionally combines tagged geometry, materials, decorations, creatures and audio; theme coherence remains an open design item. [VoxelSeasonManifest.cpp:2523](/home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelSeasonManifest.cpp:2523), [COMPOSER-NOTES.md:1512](/home/jahni/VoxelM/Plugins/VoxelForge/COMPOSER-NOTES.md:1512).
|
||||
|
||||
[INFERENCE] **This repository demonstrates a capable terrain platform, not yet a validated game loop.** I cannot establish what gameplay exists outside the plugin. The GDD itself identifies “Is the descent fun?” as its first unresolved question. [GDD.md:441](/home/jahni/VoxelM/Plugins/VoxelForge/GDD.md:441).
|
||||
|
||||
**2. Ranked priorities**
|
||||
|
||||
All sizes below are [INFERENCE]: rough focused engineering estimates, excluding substantial art production.
|
||||
|
||||
**1 — Deliver one multiplayer expedition that survives reconnecting. Size: 3–6 weeks.**
|
||||
|
||||
[INFERENCE] Use two contrasting strates and their connecting tunnel. Two players descend, find one destination, uncover or collect something, return, and retain their changes after restart. Include a third player joining after terrain has changed. Avoid expanding immediately into the city economy or community backend.
|
||||
|
||||
[INFERENCE] The necessary foundation is a server-approved world identity, ordered authoritative edits, a saved snapshot plus subsequent edits, and collision around separated players. Give edits stable identifiers so retransmission cannot apply them twice. Reuse the existing local edit and anchor systems.
|
||||
|
||||
[INFERENCE] **Done:** host/client edits agree; a late joiner reconstructs the same terrain; restart preserves it; incompatible world versions fail clearly; remote players have ground when away from the host.
|
||||
|
||||
[INFERENCE] **Success:** a complete shared expedition without terrain disagreement, lost progress or collision failures—and players can explain what made them want to descend again. This tests the project’s central assumptions much earlier than a complete RPG would.
|
||||
|
||||
**2 — Close the Unreal arrival and movement gap. Size: 1–3 weeks initially.**
|
||||
|
||||
[MEASURED] L122 found idle generation capacity while admission was blocked; L123 measured approximately 19 ms from region request to game-thread observation despite sub-millisecond median compilation. Simple lookahead and admission relaxations failed their combined coverage/frame-time gates. L121’s modest extra far-apply lane did improve far coverage. [L121](Standalone/Research/WorldAssemblerM3/Linux121/REPORT.md), [L122](Standalone/Research/WorldAssemblerM3/Linux122/REPORT.md), [L123](Standalone/Research/WorldAssemblerM3/Linux123/REPORT.md).
|
||||
|
||||
[INFERENCE] First establish one current-build, rendered Unreal baseline on intended hardware. Measure arrival through **visible terrain and usable collision**, then walking, 30 m/s travel, turns, teleporting and edits. Record near coverage, far gaps, frame-time spikes and memory separately. NullRHI measurements, which omit rendering, cannot certify VR comfort.
|
||||
|
||||
[INFERENCE] Investigate region completion, admission and publication before another broad density rewrite. A game-thread continuation is a candidate experiment, not a proven solution; keep world mutation on its owning thread.
|
||||
|
||||
[INFERENCE] **Done:** approximately one-second LOD0–2 readiness on the agreed hardware, safe collision, steadily filling far terrain, and an explicit movement-coverage target without worsening frame spikes. **Success:** repeated rendered runs meet those limits, including with remote-player collision work. Do not redefine “ready” as only the nearest handful of tiles.
|
||||
|
||||
**3 — Turn generator breadth into playable variety. Size: 2–4 weeks for the first content slice.**
|
||||
|
||||
[INFERENCE] Establish a compact capability matrix for each family: Core dispatch, entrances/exits, interior connectivity, edits, materials/content, far terrain and performance. Include dreamcore/liminal explicitly; motif generation alone does not establish a convincing anomalous place.
|
||||
|
||||
[MEASURED] L58 illustrates the distinction: its lattice route passed reachability checks, but the review described a corkscrew tunnel rather than the intended open vertical shaft. Technical validity and identity are separate acceptance criteria. [L58](Standalone/Research/WorldAssemblerM3/Linux58/REPORT.md).
|
||||
|
||||
[INFERENCE] Extend the existing offline composer with a small tagged library: a grounded cave, an island environment and one liminal identity, each with coherent materials, sound and a destination. Preserve owner review before publishing a season.
|
||||
|
||||
[INFERENCE] **Done:** several seeds produce recognizably different, coherent places with findable progression and usable encounter spaces. **Success:** players navigate them without developer guidance and distinguish their identities without reading labels. Expand families after this works.
|
||||
|
||||
**4 — Consolidate the evidence and remove obsolete complexity incrementally. Size: 2–4 days, then ongoing.**
|
||||
|
||||
[INFERENCE] Maintain one short current-state page: shipped behavior, open defects, active baseline, hardware and next acceptance test. Keep historical reports as history. Remove rejected experimental paths when they no longer serve a specific comparison; extract stable responsibilities when touching oversized files.
|
||||
|
||||
[INFERENCE] **Done:** a contributor can identify the current evaluator, runtime path, multiplayer gaps and performance limits without reconstructing 130 rounds. **Success:** new work no longer repeats rejected experiments or treats old measurements as current.
|
||||
|
||||
**3. Stop or deprioritise**
|
||||
|
||||
- [INFERENCE] **Pause open-ended tunnel micro-optimization.** L125/L126 missed the older speed bar; L130’s reach correction produced no measurable speedup. Keep correctness fixes, but require a current cost account and a bounded experiment before further optimization. [MEASURED: L126](Standalone/Research/WorldAssemblerM3/Linux126/REPORT.md), [L130](Standalone/Research/WorldAssemblerM3/Linux130/REPORT.md).
|
||||
- [INFERENCE] **Do not implement Astra recommendations mechanically.** Astra1’s support-heavy model predates L109’s simplification. Astra2/3 offer hypotheses, not measured wins for today’s code. Re-profile before adopting them.
|
||||
- [INFERENCE] **Defer GPU generation, a mesher replacement, elaborate discovery systems and large-scale backend work.** None currently resolves the missing shared expedition.
|
||||
- [INFERENCE] **Stop requiring old-version byte identity for deliberate generation changes.** Preserve peer agreement within a version and explicit versioned saves; permit reviewed geometry improvements.
|
||||
|
||||
**4. Debts that will bite later**
|
||||
|
||||
[INFERENCE] **Determinism needs a deployment contract.** Linux Clang/GCC and worker-count agreement is strong evidence, not proof across every intended machine. Include Windows/compiler/CPU combinations actually supported. World identity must cover evaluator, content, layout, scale and edit state—not merely seed. [MEASURED: L130](Standalone/Research/WorldAssemblerM3/Linux130/REPORT.md).
|
||||
|
||||
[CODE] **Scale and fallback complexity remain active integration risks.** Core is opt-in, and runtime queries bridge different coordinate conventions. [VoxelWorld.h:300](/home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Public/VoxelWorld.h:300), [VoxelWorld.cpp:15612](/home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelWorld.cpp:15612). [INFERENCE] Test edits, content placement and collision across those boundaries before broadening authoring.
|
||||
|
||||
[INFERENCE] **A passing route audit does not prove a whole strate is enjoyable, connected or suitable for six-player combat.** Retain geometric checks, but add actual traversal, destination discovery and encounter-space evaluation. Those are now more valuable than another polished tunnel benchmark.
|
||||
@@ -1,294 +0,0 @@
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <cmath>
|
||||
#include <cstdint>
|
||||
#include <fstream>
|
||||
#include <iomanip>
|
||||
#include <iostream>
|
||||
#include <limits>
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
struct FSegment
|
||||
{
|
||||
int passage=0,index=0;
|
||||
std::array<double,3> a{},b{};
|
||||
double radiusA=0.0,radiusB=0.0;
|
||||
};
|
||||
struct FTile
|
||||
{
|
||||
int strate=0,x=0,y=0,z=0,lod=0;
|
||||
std::uint64_t baselineFeatures=0,baselineCandidates=0,baselinePairs=0;
|
||||
};
|
||||
struct FTotals
|
||||
{
|
||||
std::uint64_t tiles=0,featureTiles=0,proofTiles=0,groups=0,segments=0;
|
||||
std::uint64_t pairs=0,contributingPairs=0,touched=0,support=0;
|
||||
std::uint64_t overlapPairs=0,crossPassageOverlap=0;
|
||||
std::uint64_t baselineFeatureTiles=0,baselineFeatures=0,baselineCandidates=0;
|
||||
std::uint64_t baselinePairs=0;
|
||||
};
|
||||
|
||||
static bool Intersects(const std::array<double,3>& amin,
|
||||
const std::array<double,3>& amax,const std::array<double,3>& bmin,
|
||||
const std::array<double,3>& bmax)
|
||||
{
|
||||
for(int axis=0;axis<3;++axis)
|
||||
if(amax[axis]<bmin[axis]||amin[axis]>bmax[axis])return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int GridFirst(double bound,const double gridMin[3],double spacing,int axis)
|
||||
{
|
||||
const auto boundSub=static_cast<std::int64_t>(std::floor(bound*1024.0));
|
||||
const auto gridMinSub=static_cast<std::int64_t>(std::llround(gridMin[axis]*1024.0));
|
||||
const auto stepSub=static_cast<std::int64_t>(std::llround(spacing*1024.0));
|
||||
const auto numerator=boundSub-gridMinSub;
|
||||
auto quotient=numerator/stepSub;
|
||||
if(numerator%stepSub>0)++quotient;
|
||||
return static_cast<int>(quotient);
|
||||
}
|
||||
|
||||
static int GridLast(double bound,const double gridMin[3],double spacing,int axis)
|
||||
{
|
||||
const auto boundSub=static_cast<std::int64_t>(std::ceil(bound*1024.0));
|
||||
const auto gridMinSub=static_cast<std::int64_t>(std::llround(gridMin[axis]*1024.0));
|
||||
const auto stepSub=static_cast<std::int64_t>(std::llround(spacing*1024.0));
|
||||
const auto numerator=boundSub-gridMinSub;
|
||||
auto quotient=numerator/stepSub;
|
||||
if(numerator%stepSub<0)--quotient;
|
||||
return static_cast<int>(quotient);
|
||||
}
|
||||
|
||||
int main(int argc,char** argv)
|
||||
{
|
||||
if(argc!=3)
|
||||
{
|
||||
std::cerr<<"usage: CountReachCandidates <input.tsv> <output.csv>\n";
|
||||
return 2;
|
||||
}
|
||||
std::ifstream input(argv[1]);
|
||||
if(!input){std::cerr<<"cannot open input\n";return 2;}
|
||||
std::vector<std::vector<FSegment>> passages(3);
|
||||
std::vector<FTile> tiles;
|
||||
std::string line;
|
||||
while(std::getline(input,line))
|
||||
{
|
||||
std::istringstream row(line);
|
||||
char kind=0;row>>kind;
|
||||
if(kind=='S')
|
||||
{
|
||||
FSegment s;row>>s.passage>>s.index
|
||||
>>s.a[0]>>s.a[1]>>s.a[2]>>s.b[0]>>s.b[1]>>s.b[2]
|
||||
>>s.radiusA>>s.radiusB;
|
||||
if(!row||s.passage<0||s.passage>=static_cast<int>(passages.size()))
|
||||
{std::cerr<<"bad segment row\n";return 2;}
|
||||
passages[static_cast<std::size_t>(s.passage)].push_back(s);
|
||||
}
|
||||
else if(kind=='T')
|
||||
{
|
||||
FTile t;row>>t.strate>>t.x>>t.y>>t.z>>t.lod
|
||||
>>t.baselineFeatures>>t.baselineCandidates>>t.baselinePairs;
|
||||
if(!row){std::cerr<<"bad tile row\n";return 2;}
|
||||
tiles.push_back(t);
|
||||
}
|
||||
else if(kind!='#'&&kind!='\0')
|
||||
{std::cerr<<"unknown row\n";return 2;}
|
||||
}
|
||||
for(auto& p:passages)
|
||||
std::sort(p.begin(),p.end(),[](const auto& a,const auto& b)
|
||||
{return a.index<b.index;});
|
||||
|
||||
std::ofstream output(argv[2]);
|
||||
if(!output){std::cerr<<"cannot open output\n";return 2;}
|
||||
output<<"reach_m,bounds_mode,strate,lod,tiles,feature_tiles,proof_tiles,feature_groups,segment_pairs,contributing_pairs,touched_samples,round_support_samples,overlap_pairs,cross_passage_overlaps,baseline_feature_tiles,baseline_features,baseline_candidates,baseline_pairs\n";
|
||||
constexpr std::array<double,4> reaches={4.0,3.0,2.0,1.5};
|
||||
const std::array<std::pair<const char*,double>,2> boundsModes={{{"v225_core_voxel_units",0.25},
|
||||
{"physical_metres",1.0}}};
|
||||
constexpr double coreVoxelMetres=0.25;
|
||||
constexpr double marginMetres=0.01;
|
||||
for(const auto& [boundsMode,boundsScale]:boundsModes)
|
||||
for(const double reach:reaches)
|
||||
{
|
||||
const double requiredReach=std::max(reach+0.21+0.125,0.75+0.21);
|
||||
std::map<std::pair<int,int>,FTotals> totals;
|
||||
for(const auto& tile:tiles)
|
||||
{
|
||||
const int stepVoxels=1<<tile.lod;
|
||||
const double spacing=stepVoxels*coreVoxelMetres;
|
||||
const int dim=32+3;
|
||||
const double tileOrigin[3]={tile.x*32.0*spacing,tile.y*32.0*spacing,
|
||||
tile.z*32.0*spacing};
|
||||
const double gridMin[3]={tileOrigin[0]-spacing,tileOrigin[1]-spacing,
|
||||
tileOrigin[2]-spacing};
|
||||
const double gridMax[3]={gridMin[0]+(dim-1)*spacing,
|
||||
gridMin[1]+(dim-1)*spacing,gridMin[2]+(dim-1)*spacing};
|
||||
const std::array<double,3> queryMin={gridMin[0],gridMin[1],gridMin[2]};
|
||||
const std::array<double,3> queryMax={gridMax[0],gridMax[1],gridMax[2]};
|
||||
const std::array<double,3> proofMin={tileOrigin[0],tileOrigin[1],tileOrigin[2]};
|
||||
const std::array<double,3> proofMax={tileOrigin[0]+32.0*spacing,
|
||||
tileOrigin[1]+32.0*spacing,tileOrigin[2]+32.0*spacing};
|
||||
|
||||
const std::size_t sampleCount=static_cast<std::size_t>(dim)*dim*dim;
|
||||
std::vector<std::vector<std::uint8_t>> touchedMasks(passages.size(),
|
||||
std::vector<std::uint8_t>(sampleCount,0));
|
||||
std::vector<std::vector<std::uint8_t>> supportMasks(passages.size(),
|
||||
std::vector<std::uint8_t>(sampleCount,0));
|
||||
std::vector<std::uint8_t> unionMask(sampleCount,0);
|
||||
FTotals local;
|
||||
bool anyFeature=false,anyProof=false;
|
||||
|
||||
for(std::size_t p=0;p<passages.size();++p)
|
||||
{
|
||||
const auto& segments=passages[p];
|
||||
const std::size_t groupCount=(segments.size()+4)/5;
|
||||
for(std::size_t group=0;group<groupCount;++group)
|
||||
{
|
||||
const std::size_t begin=group*5,end=std::min(begin+5,segments.size());
|
||||
std::array<double,3> routeMin={
|
||||
std::numeric_limits<double>::infinity(),
|
||||
std::numeric_limits<double>::infinity(),
|
||||
std::numeric_limits<double>::infinity()};
|
||||
std::array<double,3> routeMax={
|
||||
-std::numeric_limits<double>::infinity(),
|
||||
-std::numeric_limits<double>::infinity(),
|
||||
-std::numeric_limits<double>::infinity()};
|
||||
double maxRadius=0.0;
|
||||
for(std::size_t i=begin;i<end;++i)
|
||||
{
|
||||
const auto& s=segments[i];
|
||||
maxRadius=std::max({maxRadius,s.radiusA,s.radiusB});
|
||||
for(int axis=0;axis<3;++axis)
|
||||
{
|
||||
routeMin[axis]=std::min({routeMin[axis],s.a[axis],s.b[axis]});
|
||||
routeMax[axis]=std::max({routeMax[axis],s.a[axis],s.b[axis]});
|
||||
}
|
||||
}
|
||||
// The v225 implementation divides positions and radii by Q
|
||||
// (Core voxels), then adds its *_Metres constants directly.
|
||||
// Reproduce that code-unit behavior here for the baseline check.
|
||||
const double featureExtent=maxRadius
|
||||
+(requiredReach+marginMetres)*boundsScale;
|
||||
for(int axis=0;axis<3;++axis)
|
||||
{routeMin[axis]-=featureExtent;routeMax[axis]+=featureExtent;}
|
||||
if(!Intersects(routeMin,routeMax,queryMin,queryMax))continue;
|
||||
anyFeature=true;++local.groups;
|
||||
|
||||
for(std::size_t i=begin;i<end;++i)
|
||||
{
|
||||
const auto& s=segments[i];
|
||||
const double extent=std::max(s.radiusA,s.radiusB)
|
||||
+(requiredReach+marginMetres)*boundsScale;
|
||||
std::array<double,3> low{},high{};
|
||||
int first[3]{},last[3]{};
|
||||
bool valid=true;
|
||||
for(int axis=0;axis<3;++axis)
|
||||
{
|
||||
low[axis]=std::min(s.a[axis],s.b[axis])-extent;
|
||||
high[axis]=std::max(s.a[axis],s.b[axis])+extent;
|
||||
first[axis]=std::max(0,GridFirst(low[axis],gridMin,spacing,axis));
|
||||
last[axis]=std::min(dim-1,GridLast(high[axis],gridMin,spacing,axis));
|
||||
valid=valid&&first[axis]<=last[axis];
|
||||
}
|
||||
// Proof bounds are per segment and include the same conservative
|
||||
// reach; they test the full tile box without the sample halo.
|
||||
if(Intersects(low,high,proofMin,proofMax))anyProof=true;
|
||||
if(!valid)continue;
|
||||
++local.segments;
|
||||
for(int axis=0;axis<3;++axis)
|
||||
{
|
||||
const auto subLo=static_cast<std::int64_t>(std::floor(low[axis]*1024.0));
|
||||
const auto subHi=static_cast<std::int64_t>(std::ceil(high[axis]*1024.0));
|
||||
const auto gridLo=static_cast<std::int64_t>(std::llround(gridMin[axis]*1024.0));
|
||||
const auto subStep=static_cast<std::int64_t>(std::llround(spacing*1024.0));
|
||||
const auto expectedFirst=std::max<std::int64_t>(0,
|
||||
(subLo-gridLo+subStep-1)/subStep);
|
||||
const auto expectedLast=std::min<std::int64_t>(dim-1,
|
||||
(subHi-gridLo)/subStep);
|
||||
first[axis]=static_cast<int>(expectedFirst);
|
||||
last[axis]=static_cast<int>(expectedLast);
|
||||
}
|
||||
if(first[0]>last[0]||first[1]>last[1]||first[2]>last[2])continue;
|
||||
const std::uint64_t nx=static_cast<std::uint64_t>(last[0]-first[0]+1);
|
||||
const std::uint64_t ny=static_cast<std::uint64_t>(last[1]-first[1]+1);
|
||||
const std::uint64_t nz=static_cast<std::uint64_t>(last[2]-first[2]+1);
|
||||
local.pairs+=nx*ny*nz;
|
||||
|
||||
for(int gz=first[2];gz<=last[2];++gz)
|
||||
for(int gy=first[1];gy<=last[1];++gy)
|
||||
for(int gx=first[0];gx<=last[0];++gx)
|
||||
{
|
||||
const double q[3]={gridMin[0]+gx*spacing,
|
||||
gridMin[1]+gy*spacing,gridMin[2]+gz*spacing};
|
||||
const double dx=s.b[0]-s.a[0],dy=s.b[1]-s.a[1],dz=s.b[2]-s.a[2];
|
||||
const double lengthSq=dx*dx+dy*dy+dz*dz;
|
||||
if(!(lengthSq>0.0))continue;
|
||||
const double projection=(q[0]-s.a[0])*dx+(q[1]-s.a[1])*dy
|
||||
+(q[2]-s.a[2])*dz;
|
||||
const double t=std::clamp(projection/lengthSq,0.0,1.0);
|
||||
const double ex=q[0]-(s.a[0]+t*dx);
|
||||
const double ey=q[1]-(s.a[1]+t*dy);
|
||||
const double ez=q[2]-(s.a[2]+t*dz);
|
||||
const double radius=s.radiusA+t*(s.radiusB-s.radiusA);
|
||||
const double distance=std::sqrt(ex*ex+ey*ey+ez*ez)-radius;
|
||||
const double oneSubvoxel=1.0/1024.0;
|
||||
if(distance<reach+oneSubvoxel)
|
||||
{
|
||||
++local.contributingPairs;
|
||||
const std::size_t index=(static_cast<std::size_t>(gz)*dim+gy)*dim+gx;
|
||||
touchedMasks[p][index]=1;
|
||||
unionMask[index]=1;
|
||||
if(distance<=reach)supportMasks[p][index]=1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
local.tiles=1;
|
||||
local.featureTiles=anyFeature?1:0;
|
||||
local.proofTiles=anyProof?1:0;
|
||||
local.baselineFeatureTiles=tile.baselineFeatures?1:0;
|
||||
local.baselineFeatures=tile.baselineFeatures;
|
||||
local.baselineCandidates=tile.baselineCandidates;
|
||||
local.baselinePairs=tile.baselinePairs;
|
||||
for(const auto& mask:touchedMasks)
|
||||
local.touched+=static_cast<std::uint64_t>(
|
||||
std::count(mask.begin(),mask.end(),static_cast<std::uint8_t>(1)));
|
||||
for(std::size_t p=0;p<passages.size();++p)
|
||||
{
|
||||
const auto& mask=supportMasks[p];
|
||||
local.support+=static_cast<std::uint64_t>(
|
||||
std::count(mask.begin(),mask.end(),static_cast<std::uint8_t>(1)));
|
||||
}
|
||||
const std::uint64_t unique=static_cast<std::uint64_t>(
|
||||
std::count(unionMask.begin(),unionMask.end(),static_cast<std::uint8_t>(1)));
|
||||
local.crossPassageOverlap=local.touched-unique;
|
||||
local.overlapPairs=local.contributingPairs-local.touched;
|
||||
auto& total=totals[{tile.strate,tile.lod}];
|
||||
total.tiles+=local.tiles;total.featureTiles+=local.featureTiles;
|
||||
total.proofTiles+=local.proofTiles;total.groups+=local.groups;
|
||||
total.segments+=local.segments;total.pairs+=local.pairs;
|
||||
total.contributingPairs+=local.contributingPairs;total.touched+=local.touched;
|
||||
total.support+=local.support;total.overlapPairs+=local.overlapPairs;
|
||||
total.crossPassageOverlap+=local.crossPassageOverlap;
|
||||
total.baselineFeatureTiles+=local.baselineFeatureTiles;
|
||||
total.baselineFeatures+=local.baselineFeatures;
|
||||
total.baselineCandidates+=local.baselineCandidates;
|
||||
total.baselinePairs+=local.baselinePairs;
|
||||
}
|
||||
for(const auto& [key,t]:totals)
|
||||
output<<std::fixed<<std::setprecision(2)<<reach<<','<<boundsMode<<','
|
||||
<<key.first<<','<<key.second
|
||||
<<','<<t.tiles<<','<<t.featureTiles<<','<<t.proofTiles<<','<<t.groups
|
||||
<<','<<t.pairs<<','<<t.contributingPairs<<','<<t.touched<<','<<t.support
|
||||
<<','<<t.overlapPairs<<','<<t.crossPassageOverlap<<','
|
||||
<<t.baselineFeatureTiles<<','<<t.baselineFeatures<<','
|
||||
<<t.baselineCandidates<<','<<t.baselinePairs<<'\n';
|
||||
std::cerr<<"[L129Precount] reach_m="<<reach<<" required_reach_m="<<requiredReach
|
||||
<<" grouped_rows="<<totals.size()<<"\n";
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1,310 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Count reach-bound work from the saved v225 layout and L125 tile profiles."""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import math
|
||||
import re
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
HERE = Path(__file__).resolve().parent
|
||||
OUT = ROOT / "Saved/Linux/l129/precount"
|
||||
LAYOUT = ROOT / "Saved/Linux/l125/hashes/owner4-surface-world-w8-clang.layout.json"
|
||||
BASELINE_LOGS = [ROOT / f"Saved/Linux/l125/counts/s{s}-w8-profile1.log" for s in range(4)]
|
||||
CORE_VOXEL_METRES = 0.25
|
||||
SUBVOXELS_PER_METRE = 1024.0
|
||||
PROFILE = re.compile(r"([a-zA-Z0-9_]+)=([^ ]+)")
|
||||
TILE_KEY = re.compile(r"\((-?\d+),(-?\d+),(-?\d+),lod(\d+)\)")
|
||||
|
||||
|
||||
def knot_span(a: list[float], b: list[float], units_per_metre: float) -> float:
|
||||
dx, dy = (b[0] - a[0]) / units_per_metre, (b[1] - a[1]) / units_per_metre
|
||||
return max(1.0e-6, math.sqrt(math.sqrt(dx * dx + dy * dy)))
|
||||
|
||||
|
||||
def evaluate_raw(controls: list[list[float]], span: int, t: float,
|
||||
units_per_metre: float) -> list[float]:
|
||||
p1, p2 = controls[span], controls[span + 1]
|
||||
p0, p3 = controls[max(0, span - 1)], controls[min(span + 2, len(controls) - 1)]
|
||||
dt0, dt1, dt2 = (knot_span(p0, p1, units_per_metre),
|
||||
knot_span(p1, p2, units_per_metre),
|
||||
knot_span(p2, p3, units_per_metre))
|
||||
t2, t3 = t * t, t * t * t
|
||||
result = [0.0, 0.0, 0.0, 0.0]
|
||||
for axis in (0, 1, 3):
|
||||
m1 = dt1 * ((p1[axis] - p0[axis]) / dt0
|
||||
- (p2[axis] - p0[axis]) / (dt0 + dt1)
|
||||
+ (p2[axis] - p1[axis]) / dt1)
|
||||
m2 = dt1 * ((p2[axis] - p1[axis]) / dt1
|
||||
- (p3[axis] - p1[axis]) / (dt1 + dt2)
|
||||
+ (p3[axis] - p2[axis]) / dt2)
|
||||
result[axis] = ((2.0 * t3 - 3.0 * t2 + 1.0) * p1[axis]
|
||||
+ (-2.0 * t3 + 3.0 * t2) * p2[axis]
|
||||
+ (t3 - 2.0 * t2 + t) * m1
|
||||
+ (t3 - t2) * m2)
|
||||
result[2] = p1[2] + (p2[2] - p1[2]) * t
|
||||
result[3] = min(max(result[3], min(p1[3], p2[3])), max(p1[3], p2[3]))
|
||||
return result
|
||||
|
||||
|
||||
def build_raw_segments(controls: list[list[float]], units_per_metre: float,
|
||||
spacing_metres: float = 8.0,
|
||||
chord_error_metres: float = 0.1) -> list[dict]:
|
||||
result: list[dict] = []
|
||||
along_metres = 0.0
|
||||
for span in range(len(controls) - 1):
|
||||
horizontal_arc = [0.0] * 33
|
||||
previous = evaluate_raw(controls, span, 0.0, units_per_metre)
|
||||
for step in range(1, 33):
|
||||
current = evaluate_raw(controls, span, step / 32.0, units_per_metre)
|
||||
dx = (current[0] - previous[0]) / units_per_metre
|
||||
dy = (current[1] - previous[1]) / units_per_metre
|
||||
horizontal_arc[step] = horizontal_arc[step - 1] + math.hypot(dx, dy)
|
||||
previous = current
|
||||
span_length = horizontal_arc[-1]
|
||||
base_count = max(1, math.ceil(span_length / spacing_metres))
|
||||
|
||||
def parameter_at_arc(target: float) -> float:
|
||||
upper = 1
|
||||
while upper < len(horizontal_arc) and horizontal_arc[upper] < target:
|
||||
upper += 1
|
||||
upper = min(upper, 32)
|
||||
lower = upper - 1
|
||||
arc_span = horizontal_arc[upper] - horizontal_arc[lower]
|
||||
arc_t = ((target - horizontal_arc[lower]) / arc_span
|
||||
if arc_span > 1.0e-12 else 0.0)
|
||||
return (lower + min(max(arc_t, 0.0), 1.0)) / 32.0
|
||||
|
||||
parameters = [0.0]
|
||||
|
||||
def append_adaptive(t_a: float, t_b: float, a: list[float], b: list[float],
|
||||
depth: int) -> None:
|
||||
fractions = (0.25, 0.5, 0.75)
|
||||
maximum_error, polyline_length = 0.0, 0.0
|
||||
previous_point = a
|
||||
for fraction in fractions:
|
||||
current = evaluate_raw(controls, span, t_a + (t_b - t_a) * fraction,
|
||||
units_per_metre)
|
||||
dx = (current[0] - (a[0] + (b[0] - a[0]) * fraction)) / units_per_metre
|
||||
dy = (current[1] - (a[1] + (b[1] - a[1]) * fraction)) / units_per_metre
|
||||
dr = (current[3] - (a[3] + (b[3] - a[3]) * fraction)) / units_per_metre
|
||||
maximum_error = max(maximum_error, math.sqrt(dx * dx + dy * dy + dr * dr))
|
||||
sx = (current[0] - previous_point[0]) / units_per_metre
|
||||
sy = (current[1] - previous_point[1]) / units_per_metre
|
||||
polyline_length += math.hypot(sx, sy)
|
||||
previous_point = current
|
||||
sx = (b[0] - previous_point[0]) / units_per_metre
|
||||
sy = (b[1] - previous_point[1]) / units_per_metre
|
||||
polyline_length += math.hypot(sx, sy)
|
||||
split = ((polyline_length > spacing_metres * (1.0 + 1.0e-9)
|
||||
or maximum_error > chord_error_metres) and depth < 12)
|
||||
if split:
|
||||
t_mid = (t_a + t_b) * 0.5
|
||||
middle = evaluate_raw(controls, span, t_mid, units_per_metre)
|
||||
append_adaptive(t_a, t_mid, a, middle, depth + 1)
|
||||
append_adaptive(t_mid, t_b, middle, b, depth + 1)
|
||||
else:
|
||||
parameters.append(t_b)
|
||||
|
||||
for segment in range(1, base_count + 1):
|
||||
target_a = span_length * (segment - 1) / base_count
|
||||
target_b = span_length * segment / base_count
|
||||
t_a, t_b = parameter_at_arc(target_a), parameter_at_arc(target_b)
|
||||
append_adaptive(t_a, t_b,
|
||||
evaluate_raw(controls, span, t_a, units_per_metre),
|
||||
evaluate_raw(controls, span, t_b, units_per_metre), 0)
|
||||
|
||||
points = [evaluate_raw(controls, span, t, units_per_metre) for t in parameters]
|
||||
sampled_arc = [0.0] * len(points)
|
||||
for index in range(1, len(points)):
|
||||
dx = (points[index][0] - points[index - 1][0]) / units_per_metre
|
||||
dy = (points[index][1] - points[index - 1][1]) / units_per_metre
|
||||
sampled_arc[index] = sampled_arc[index - 1] + math.hypot(dx, dy)
|
||||
sampled_span_length = sampled_arc[-1]
|
||||
for index, point in enumerate(points):
|
||||
progress = (sampled_arc[index] / sampled_span_length
|
||||
if sampled_span_length > 1.0e-12 else parameters[index])
|
||||
point[2] = controls[span][2] + (controls[span + 1][2] - controls[span][2]) * progress
|
||||
|
||||
for index in range(1, len(points)):
|
||||
dx = (points[index][0] - points[index - 1][0]) / units_per_metre
|
||||
dy = (points[index][1] - points[index - 1][1]) / units_per_metre
|
||||
dz = (points[index][2] - points[index - 1][2]) / units_per_metre
|
||||
length = math.sqrt(dx * dx + dy * dy + dz * dz)
|
||||
progress_a = (sampled_arc[index - 1] / sampled_span_length
|
||||
if sampled_span_length > 1.0e-12 else parameters[index - 1])
|
||||
progress_b = (sampled_arc[index] / sampled_span_length
|
||||
if sampled_span_length > 1.0e-12 else parameters[index])
|
||||
floor_a = controls[span][2] - controls[span][3]
|
||||
floor_b = controls[span + 1][2] - controls[span + 1][3]
|
||||
result.append({"a": points[index - 1], "b": points[index],
|
||||
"along": along_metres, "length": length, "span": span,
|
||||
"floor_a": floor_a + (floor_b - floor_a) * progress_a,
|
||||
"floor_b": floor_a + (floor_b - floor_a) * progress_b})
|
||||
along_metres += length
|
||||
return result
|
||||
|
||||
|
||||
def closest_route_height(route: list[list[float]], x: float, y: float) -> tuple[float, float]:
|
||||
best_height, best_distance_sq = 0.0, float("inf")
|
||||
for a, b in zip(route, route[1:]):
|
||||
dx, dy = b[0] - a[0], b[1] - a[1]
|
||||
length_sq = dx * dx + dy * dy
|
||||
t = min(max(((x - a[0]) * dx + (y - a[1]) * dy) / length_sq, 0.0), 1.0) \
|
||||
if length_sq > 1.0e-12 else 0.0
|
||||
px, py = a[0] + t * dx, a[1] + t * dy
|
||||
distance_sq = (x - px) ** 2 + (y - py) ** 2
|
||||
if distance_sq < best_distance_sq:
|
||||
best_distance_sq = distance_sq
|
||||
best_height = a[2] + (b[2] - a[2]) * t
|
||||
return best_height, best_distance_sq
|
||||
|
||||
|
||||
def prepared_segments(layout: dict) -> list[list[dict]]:
|
||||
qpm = SUBVOXELS_PER_METRE
|
||||
strata = {item["strate_index"]: item for item in layout["strates"]}
|
||||
all_passages: list[list[dict]] = []
|
||||
for passage in layout["passages"]:
|
||||
controls_q = [[float(value) for value in point["position_q"]]
|
||||
+ [float(point["radius_q"])] for point in passage["control_points"]]
|
||||
controls = [point.copy() for point in controls_q]
|
||||
upper_mouth = [value / qpm for value in passage["upper_mouth_q"]]
|
||||
upper_depth = max(0.0, (controls[0][2] / qpm) - upper_mouth[2] + 1.13)
|
||||
upper_stratum = strata.get(passage["upper_strate_index"], {})
|
||||
if upper_stratum.get("generator_kind") == "FloatingIslands":
|
||||
route = []
|
||||
for anchor in upper_stratum.get("anchors", []):
|
||||
if anchor.get("kind") == "route_point" and len(anchor.get("values", [])) >= 3:
|
||||
route.append([value / qpm for value in anchor["values"][:3]])
|
||||
if route:
|
||||
route_height, distance_sq = closest_route_height(
|
||||
route, controls[0][0] / qpm, controls[0][1] / qpm)
|
||||
if distance_sq <= (controls[0][3] / qpm + 2.0) ** 2:
|
||||
upper_depth = max(upper_depth,
|
||||
controls[0][2] / qpm - route_height + 1.13)
|
||||
controls[0][3] = max(controls[0][3], upper_depth * qpm)
|
||||
|
||||
lower_mouth = [value for value in passage["lower_mouth_q"]]
|
||||
player_center_q = round(1.13 * qpm)
|
||||
route_end = len(controls) - 1
|
||||
for index in range(1, len(controls_q)):
|
||||
p = controls_q[index]
|
||||
if (int(p[0]) == lower_mouth[0] and int(p[1]) == lower_mouth[1]
|
||||
and int(p[2] - p[3] + player_center_q) == lower_mouth[2]):
|
||||
route_end = index
|
||||
|
||||
raw = build_raw_segments(controls, qpm)
|
||||
total_path = 0.0
|
||||
for segment in raw:
|
||||
if segment["span"] + 1 == route_end:
|
||||
total_path = segment["along"] + segment["length"]
|
||||
radii = [(0.0, controls[0][3] / qpm)]
|
||||
for segment in raw:
|
||||
if segment["span"] < route_end:
|
||||
radii.append((segment["along"] + segment["length"],
|
||||
segment["b"][3] / qpm))
|
||||
body_radii = [radius for along, radius in radii
|
||||
if along >= 10.0 and total_path - along >= 10.0]
|
||||
minimum_body = min(body_radii) if body_radii else min(radius for _, radius in radii)
|
||||
floor_depth = max(0.5, minimum_body - 0.23)
|
||||
|
||||
prepared = []
|
||||
for segment in raw:
|
||||
route_segment = segment["span"] < route_end
|
||||
along_b = segment["along"] + segment["length"]
|
||||
|
||||
def effective_z(raw_z: float, radius: float, planned_floor: float,
|
||||
along: float) -> float:
|
||||
raw_z /= qpm
|
||||
radius /= qpm
|
||||
planned_floor /= qpm
|
||||
local_depth = min(floor_depth, max(0.0, radius - 0.23))
|
||||
if route_segment or abs(along - total_path) <= 1.0e-9:
|
||||
return planned_floor + local_depth
|
||||
route_depth = max(0.0, radius - 0.23)
|
||||
return raw_z - route_depth + local_depth
|
||||
|
||||
a = [segment["a"][0] / qpm, segment["a"][1] / qpm,
|
||||
effective_z(segment["a"][2], segment["a"][3],
|
||||
segment["floor_a"], segment["along"])]
|
||||
b = [segment["b"][0] / qpm, segment["b"][1] / qpm,
|
||||
effective_z(segment["b"][2], segment["b"][3],
|
||||
segment["floor_b"], along_b)]
|
||||
prepared.append({"a": a, "b": b, "radius_a": segment["a"][3] / qpm,
|
||||
"radius_b": segment["b"][3] / qpm})
|
||||
all_passages.append(prepared)
|
||||
return all_passages
|
||||
|
||||
|
||||
def profile_tiles() -> list[tuple[int, int, int, int, int, int, int, int]]:
|
||||
result = []
|
||||
for strate, path in enumerate(BASELINE_LOGS):
|
||||
if not path.is_file():
|
||||
raise SystemExit(f"missing baseline profile: {path}")
|
||||
seen = set()
|
||||
for line in path.read_text(encoding="utf-8", errors="replace").splitlines():
|
||||
if not line.startswith("[PassageComposerTile] "):
|
||||
continue
|
||||
row = dict(PROFILE.findall(line))
|
||||
match = TILE_KEY.search(row.get("key", ""))
|
||||
if not match:
|
||||
continue
|
||||
x, y, z, lod = map(int, match.groups())
|
||||
if lod > 2:
|
||||
continue
|
||||
key = (x, y, z, lod)
|
||||
if key in seen:
|
||||
continue
|
||||
seen.add(key)
|
||||
result.append((strate, x, y, z, lod, int(row.get("features", 0)),
|
||||
int(row.get("route_candidates", 0)),
|
||||
int(row.get("sweep_pairs", 0))))
|
||||
return result
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if not LAYOUT.is_file():
|
||||
raise SystemExit(f"missing resolved layout: {LAYOUT}")
|
||||
OUT.mkdir(parents=True, exist_ok=True)
|
||||
layout = json.loads(LAYOUT.read_text(encoding="utf-8"))
|
||||
passages = prepared_segments(layout)
|
||||
tiles = profile_tiles()
|
||||
input_path = OUT / "reach-input.tsv"
|
||||
with input_path.open("w", encoding="utf-8") as output:
|
||||
for passage_index, segments in enumerate(passages):
|
||||
for segment_index, segment in enumerate(segments):
|
||||
values = [*segment["a"], *segment["b"],
|
||||
segment["radius_a"], segment["radius_b"]]
|
||||
output.write("S {} {} {}\n".format(passage_index, segment_index,
|
||||
" ".join(f"{value:.15g}" for value in values)))
|
||||
for tile in tiles:
|
||||
output.write("T {}\n".format(" ".join(str(value) for value in tile)))
|
||||
|
||||
binary = OUT / "CountReachCandidates"
|
||||
compile_log = OUT / "compile.log"
|
||||
with compile_log.open("w", encoding="utf-8") as log:
|
||||
built = subprocess.run(["g++", "-std=c++20", "-O3", "-DNDEBUG",
|
||||
str(HERE / "CountReachCandidates.cpp"), "-o", str(binary)],
|
||||
cwd=ROOT, stdout=log, stderr=subprocess.STDOUT,
|
||||
check=False)
|
||||
if built.returncode:
|
||||
raise SystemExit(f"counter compile failed: {compile_log}")
|
||||
result_path = OUT / "results.csv"
|
||||
run_log = OUT / "counter.log"
|
||||
command = ["taskset", "-c", "0-11", "prlimit", "--as=6442450944", "--",
|
||||
str(binary), str(input_path), str(result_path)]
|
||||
with run_log.open("w", encoding="utf-8") as log:
|
||||
result = subprocess.run(command, cwd=ROOT, stdout=log, stderr=subprocess.STDOUT,
|
||||
check=False, timeout=1740)
|
||||
if result.returncode:
|
||||
raise SystemExit(f"counter failed: {run_log}; exit={result.returncode}")
|
||||
print(f"[L129Precount] segments={[len(x) for x in passages]} "
|
||||
f"profile_tiles={len(tiles)} input={input_path.relative_to(ROOT)} "
|
||||
f"results={result_path.relative_to(ROOT)}")
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -1,54 +0,0 @@
|
||||
# L129 — tunnel reach
|
||||
|
||||
**Decision: no-go for performance.** The 2 m candidate passed the geometry checks, but it was slower than both timing references and failed every UE movement comparison. The count pass also found a units mismatch in v225's reach bounds, so the requested physical reach cannot be cut cheaply against the source as it stands.
|
||||
|
||||
## What the reach includes
|
||||
|
||||
The 4.0 m term is the signed-distance influence cutoff outside the bore. The bound adds 0.21 m for wall relief and reserves 0.125 m for the 0.50 m smooth corner (`width/6` is about 0.083 m). The plain shell is 0.75 m thick, so its minimum reach with relief is 0.96 m. The larger term wins: `r + max(R + 0.21 + 0.125, 0.75 + 0.21) + 0.05 m`. At `R=4 m` and the maximum `r=3.5 m`, that is 7.885 m.
|
||||
|
||||
The mouth blend is 5 m **along the route**, not an added radial reach. The open-air half-pipe's side wall is 1 m high; its rounded crest uses the same reach. L129 leaves the 0.75 m shell rule, smooth floor `h(s)`, rounded crest, and grade limit unchanged. The highest audited grade was 10.695°.
|
||||
|
||||
## Counts before the build
|
||||
|
||||
Counts cover the four owner strata at LOD0–2, with 993 route segments. “Pairs” are route-segment/sample checks; “support” is unique per-passage samples inside the distance cutoff. The v225 model's 29.87M pairs is close to the measured source profile's 29.41M.
|
||||
|
||||
| Reach and bounds | Pairs (M) | Support samples (M) | Overlap pairs (M) | Feature / proof-active tiles |
|
||||
|---|---:|---:|---:|---:|
|
||||
| v225 as coded, nominal 4 m | 29.87 | 8.57 | 20.90 | 721 / 677 |
|
||||
| 4 m, physical bounds | 124.97 | 11.72 | 46.64 | 826 / 791 |
|
||||
| 3 m, physical bounds | 87.06 | 8.84 | 30.42 | 787 / 764 |
|
||||
| 2 m, physical bounds | 56.86 | 6.32 | 18.48 | 755 / 729 |
|
||||
| 1.5 m, physical bounds | 44.74 | 5.21 | 13.93 | 743 / 718 |
|
||||
|
||||
Against a correctly bounded 4 m model, 2 m removes 54.5% of pairs and 60.4% of overlap pairs; 71 feature tiles and 62 proof-active tiles become free. Against the v225-as-coded count model, however, physical 2 m adds 90.3% of raw pairs and leaves 34 more feature tiles and 52 more proof-active tiles. Physical 1.5 m still adds 49.8% of pairs and leaves 22 more feature tiles and 41 more proof-active tiles. So the smaller reach does **not** unlock proofs or tile skips versus the shipped source.
|
||||
|
||||
The cause is in `BuildPassageSpatialIndices`: positions are converted to core voxels before the reach is added, but v225 adds the metre value directly. At 0.25 m per core voxel, the nominal 4.335 m bound is only 1.084 m per axis; the sweep cutoff itself remains 4 m. L129 converts the smaller physical bounds to core voxels. That makes its broadphase boxes larger than v225's, even though its actual influence cutoff is smaller. The extra segment/sample checks erase the predicted saving. The 2 m setting was selected from the pre-build counts and is the only reach fully timed.
|
||||
|
||||
## Timing and quality
|
||||
|
||||
Five interleaved L80 runs per W8/W12 cell were completed on a quiet machine (load 0.71, CPU idle 97.3%). L125 is the `b96dd73` source. Every near-ready cell and every whole-view cell was slower than L109 and b96dd73:
|
||||
|
||||
| Stratum / workers | Near vs L109 / base | Whole view vs L109 / base |
|
||||
|---|---:|---:|
|
||||
| S0 W8 | +11.1% / +9.3% | +7.5% / +7.2% |
|
||||
| S0 W12 | +11.2% / +6.6% | +5.5% / +3.3% |
|
||||
| S1 W8 | +16.7% / +7.8% | +8.7% / +5.3% |
|
||||
| S1 W12 | +17.9% / +9.9% | +9.5% / +5.6% |
|
||||
| S2 W8 | +12.8% / +8.4% | +5.3% / +5.2% |
|
||||
| S2 W12 | +17.1% / +9.1% | +10.3% / +5.7% |
|
||||
| S3 W8 | +13.4% / +4.9% | +6.3% / +2.8% |
|
||||
| S3 W12 | +18.2% / +6.9% | +8.9% / +4.2% |
|
||||
|
||||
Five UE runs at 30 m/s also missed the b96dd73 gate: near coverage 38.05% vs 40.22% (−2.17 points), far holes 4.03% vs 3.46% (+0.58 points), tick p99 11.54 vs 10.80 ms (+0.74 ms), and worst tick 14.12 vs 13.27 ms (+0.85 ms). The Linux UE host build passed after timing with `-NoUBA -MaxParallelActions=4`; Unreal was not run under `prlimit`.
|
||||
|
||||
Fast verification passed (259 checks; 5 historical diagnostics), walkability passed at 21,425/21,425, all three passage grades stayed below 15°, and the seam audit passed 4 joins / 4,900 samples with no mismatches. Clang and GCC hashes matched for W1/W8/W12 across all three tested owner layouts (18 cases). Evaluator version 226 and three canonical owner hash baselines were added.
|
||||
|
||||
The 23 L125 pose captures and six paired mouth close-ups are verified. All before/after PNGs are pixel-identical; these views show no visible change. The floor probe peaked at 7.9 mm, above a strict “few millimetres” reading.
|
||||
|
||||
## Captures and records
|
||||
|
||||
- [L125 poses: before / L129 comparison](captures/COMPARE.html)
|
||||
- [Mouth close-ups: before / L129 comparison](captures/L129-mouth/COMPARE.html)
|
||||
- [L80 timing results](../../../../Saved/Linux/l129/timing/summary.json)
|
||||
- [UE movement results](../../../../Saved/Linux/l129/movement/summary.json)
|
||||
- [Pre-build count results](../../../../Saved/Linux/l129/precount/results.csv)
|
||||
@@ -1,98 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Render the 23 L125 camera poses with the L129 candidate."""
|
||||
from __future__ import annotations
|
||||
|
||||
import importlib.util
|
||||
import json
|
||||
import math
|
||||
import os
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
RESEARCH = Path(__file__).resolve().parent
|
||||
CAPTURES = RESEARCH / "captures"
|
||||
SAVED = ROOT / "Saved/Linux/l129/captures"
|
||||
BASELINE_INDEX = (ROOT / "Standalone/Research/WorldAssemblerM3/Linux125"
|
||||
/ "captures/L125/capture-index.json")
|
||||
LAYOUT = ROOT / "Saved/Linux/l129/hashes/owner4-surface-world-w12-clang.layout.json"
|
||||
CLANG = ROOT / os.environ.get("L129_CAPTURE_CLANG",
|
||||
"Saved/Linux/l129/bin/VoxelForgeCoreHeadless-l129-clang")
|
||||
RENDERER = ROOT / os.environ.get("L129_CAPTURE_RENDERER",
|
||||
"Saved/Linux/l129/bin/VoxelForgeOffscreenCapture-l129-clang")
|
||||
HELPER_PATH = ROOT / "Standalone/Research/WorldAssemblerM3/Linux113/RunL113Captures.py"
|
||||
|
||||
SPEC = importlib.util.spec_from_file_location("l113_capture_helpers", HELPER_PATH)
|
||||
if SPEC is None or SPEC.loader is None:
|
||||
raise SystemExit("cannot load the verified L113 capture helpers")
|
||||
HELPERS = importlib.util.module_from_spec(SPEC)
|
||||
SPEC.loader.exec_module(HELPERS)
|
||||
HELPERS.RESEARCH = RESEARCH
|
||||
HELPERS.CAPTURES = CAPTURES
|
||||
HELPERS.SAVED = SAVED
|
||||
HELPERS.BINARIES = {"L129": CLANG}
|
||||
HELPERS.RENDERERS = {"L129": RENDERER}
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if any(not path.is_file() for path in (BASELINE_INDEX, LAYOUT, CLANG, RENDERER)):
|
||||
raise SystemExit("missing L125 camera set, L129 layout, or capture binary")
|
||||
baseline = json.loads(BASELINE_INDEX.read_text(encoding="utf-8"))
|
||||
layout = json.loads(LAYOUT.read_text(encoding="utf-8"))
|
||||
rows = []
|
||||
CAPTURES.mkdir(parents=True, exist_ok=True)
|
||||
SAVED.mkdir(parents=True, exist_ok=True)
|
||||
for view in baseline["captures"]:
|
||||
row = HELPERS.capture("L129", view, layout)
|
||||
row["variant"] = "L129-v226"
|
||||
if view["kind"] == "rock-floor-close":
|
||||
scene = ROOT / row["scene"]
|
||||
anchor = HELPERS.nearest_surface_anchor(scene, view["target"], margin_m=5.0,
|
||||
preferred_normal=(0.0, 0.0, 1.0), minimum_alignment=0.85)
|
||||
alignment = HELPERS.dot(anchor["normal"], (0.0, 0.0, 1.0))
|
||||
camera_distance = math.dist(row["camera_actual_m"], anchor["position_m"])
|
||||
row.update({"floor_anchor_position_m": anchor["position_m"],
|
||||
"floor_anchor_normal": anchor["normal"],
|
||||
"closeup_camera_to_floor_distance_m": camera_distance,
|
||||
"closeup_floor_normal_alignment": alignment,
|
||||
"verified_upward_floor_normal": alignment >= 0.85})
|
||||
if (not row["verified"] or not 2.0 <= camera_distance <= 3.2
|
||||
or anchor["distance_m"] > 0.25 or alignment < 0.85
|
||||
or row["drawn_triangles"] <= 0
|
||||
or row["pixel_quality_status"] not in
|
||||
("pass", "low_contrast_geometry_visible")):
|
||||
raise RuntimeError(f"L129 floor close-up failed at {view['name']}")
|
||||
rows.append(row)
|
||||
if len(rows) != len(baseline["captures"]) or len(rows) != 23:
|
||||
raise RuntimeError(f"expected all 23 L125 views, captured {len(rows)}")
|
||||
index = CAPTURES / "L129" / "capture-index.json"
|
||||
index.parent.mkdir(parents=True, exist_ok=True)
|
||||
index.write_text(json.dumps({"captures": rows}, indent=2) + "\n",
|
||||
encoding="utf-8")
|
||||
|
||||
html = ["<!doctype html><meta charset='utf-8'>",
|
||||
"<title>L125 / L129 tunnel capture comparison</title>",
|
||||
"<style>body{font:14px system-ui;margin:24px;background:#17191d;color:#eee}"
|
||||
"section{margin:28px 0}h2{font-size:18px}div{display:grid;"
|
||||
"grid-template-columns:1fr 1fr;gap:12px}img{width:100%;height:auto}"
|
||||
"p{color:#bbb}</style>", "<h1>L125 / L129 v226: identical views</h1>"]
|
||||
old_by_name = {Path(row["capture"]).name: row for row in baseline["captures"]}
|
||||
for row in rows:
|
||||
name = Path(row["capture"]).name
|
||||
old = old_by_name[name]
|
||||
old_path = os.path.relpath(ROOT / "Standalone/Research/WorldAssemblerM3/Linux125"
|
||||
/ old["capture"], CAPTURES)
|
||||
new_path = os.path.relpath(RESEARCH / row["capture"], CAPTURES)
|
||||
html.extend(["<section>", f"<h2>{row['passage']} — {row['station']}</h2>",
|
||||
f"<p>{row['kind']} · L125 {old['pixel_quality_status']} · "
|
||||
f"L129 {row['pixel_quality_status']}</p>", "<div>",
|
||||
f"<figure><figcaption>L125</figcaption><img src='{old_path}'></figure>",
|
||||
f"<figure><figcaption>L129 v226</figcaption><img src='{new_path}'></figure>",
|
||||
"</div>", "</section>"])
|
||||
(CAPTURES / "COMPARE.html").write_text("\n".join(html) + "\n", encoding="utf-8")
|
||||
print(f"[L129Captures] rendered={len(rows)} views index={index.relative_to(ROOT)}",
|
||||
flush=True)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -1,78 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Probe reconstructed tunnel floor roots at the nine L119 stations."""
|
||||
from __future__ import annotations
|
||||
|
||||
import csv
|
||||
import json
|
||||
import math
|
||||
import os
|
||||
import re
|
||||
import statistics
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
OUT = ROOT / os.environ.get("L129_PROBE_DIR", "Saved/Linux/l129/density-probe")
|
||||
BINARY = ROOT / os.environ.get("L129_PROBE_BINARY",
|
||||
"Saved/Linux/l129/bin/VoxelForgeCoreHeadless-l129-clang")
|
||||
DATA = ROOT / "Standalone/data/owner_world.json"
|
||||
SLOPE = re.compile(
|
||||
r"^\[L115DensitySlopeSample\] passage=(\S+) station=(\S+) s_m=([\d.]+) "
|
||||
r".*?planned_floor_m=(-?[\d.]+) root_floor_m=(-?[\d.]+|nan) "
|
||||
r"residual_m=(-?[\d.]+|nan)", re.M)
|
||||
|
||||
|
||||
def main() -> int:
|
||||
OUT.mkdir(parents=True, exist_ok=True)
|
||||
log, layout = OUT / "owner4-clang.log", OUT / "layout.json"
|
||||
command = [
|
||||
"taskset", "-c", "0-11", "prlimit", "--as=6442450944", "--",
|
||||
"timeout", "1740s", str(BINARY), str(DATA), "--world-assembler-prototype",
|
||||
"--stream-benchmark", "--stream-pipeline", "--workers=12", "--clip-radius=3",
|
||||
"--max-clip-level=8", "--max-level=8",
|
||||
"--camera=8,16,-372.2626953125,0,0", "--audit-resolved-layout-passages",
|
||||
f"--resolved-layout-output={layout}",
|
||||
]
|
||||
with log.open("w", encoding="utf-8") as stream:
|
||||
result = subprocess.run(command, cwd=ROOT,
|
||||
env={**os.environ, "VOXELFORGE_L115_DENSITY_PROFILE": "1"},
|
||||
stdout=stream, stderr=subprocess.STDOUT, check=False, timeout=1740)
|
||||
if result.returncode:
|
||||
raise SystemExit(f"density probe failed: {log}; exit={result.returncode}")
|
||||
text = log.read_text(encoding="utf-8", errors="replace")
|
||||
groups: dict[tuple[str, str], list[dict]] = {}
|
||||
for passage, station, distance, planned, root, residual in SLOPE.findall(text):
|
||||
root_value = float(root) if root != "nan" else math.nan
|
||||
residual_value = float(residual) if residual != "nan" else math.nan
|
||||
groups.setdefault((passage, station), []).append({
|
||||
"route_s_m": float(distance), "planned_floor_m": float(planned),
|
||||
"root_floor_m": root_value, "offset_m": residual_value})
|
||||
summary = []
|
||||
with (OUT / "zero-crossing-offsets.csv").open("w", newline="", encoding="utf-8") as stream:
|
||||
writer = csv.DictWriter(stream, fieldnames=("passage", "station", "route_s_m",
|
||||
"planned_floor_m", "root_floor_m", "offset_m"))
|
||||
writer.writeheader()
|
||||
for (passage, station), samples in sorted(groups.items()):
|
||||
for sample in samples:
|
||||
writer.writerow({"passage": passage, "station": station, **sample})
|
||||
finite = [sample["offset_m"] for sample in samples
|
||||
if math.isfinite(sample["offset_m"])]
|
||||
summary.append({"passage": passage, "station": station,
|
||||
"samples": len(samples), "finite_roots": len(finite),
|
||||
"max_abs_offset_m": max(map(abs, finite)) if finite else None,
|
||||
"median_abs_offset_m": statistics.median(map(abs, finite))
|
||||
if finite else None,
|
||||
"p95_abs_offset_m": sorted(map(abs, finite))[
|
||||
min(len(finite)-1, math.ceil(0.95*len(finite))-1)]
|
||||
if finite else None})
|
||||
if not summary or any(item["samples"] != 51 for item in summary):
|
||||
raise RuntimeError("density profile is missing 51-sample route stations")
|
||||
(OUT / "zero-crossing-summary.json").write_text(
|
||||
json.dumps(summary, indent=2) + "\n", encoding="utf-8")
|
||||
print(f"[L129DensityProbe] exit={result.returncode} stations={len(summary)} "
|
||||
f"log={log.relative_to(ROOT)}", flush=True)
|
||||
return result.returncode
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -1,119 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Check Clang/GCC W1/W8/W12 hashes and compare the candidate with L119."""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
OUT = ROOT / os.environ.get("L129_HASH_DIR", "Saved/Linux/l129/hashes")
|
||||
DATASETS = {
|
||||
"owner4": ROOT / "Standalone/data/owner_world.json",
|
||||
"owner2": ROOT / "Standalone/data/regression/owner_world_2strate_l61.json",
|
||||
}
|
||||
BINARIES = {
|
||||
"clang": ROOT / os.environ.get("L129_HASH_CLANG",
|
||||
"Saved/Linux/l129/bin/VoxelForgeCoreHeadless-l129-clang"),
|
||||
"gcc": ROOT / os.environ.get("L129_HASH_GCC",
|
||||
"Saved/Linux/l129/bin/VoxelForgeCoreHeadless-l129-gcc"),
|
||||
}
|
||||
HASH = re.compile(r"^\[Pipeline(?:FullDetailHash|WholeViewHash|LODHash|ExactQueryHash)\].*$", re.M)
|
||||
STAMP = re.compile(r"^\[VoxelForgeSourceStamp\] sha256=(\S+)$", re.M)
|
||||
|
||||
|
||||
def run(dataset: str, recipe: str, workers: int, compiler: str) -> dict:
|
||||
OUT.mkdir(parents=True, exist_ok=True)
|
||||
label = f"{dataset}-{recipe}-w{workers}-{compiler}"
|
||||
log = OUT / f"{label}.log"
|
||||
layout = OUT / f"{label}.layout.json"
|
||||
command = [
|
||||
"taskset", "-c", "0-11", "prlimit", "--as=6442450944", "--",
|
||||
"timeout", "1740s", str(BINARIES[compiler]), str(DATASETS[dataset]),
|
||||
f"--workers={workers}", "--world-assembler-prototype", "--stream-benchmark",
|
||||
"--stream-pipeline", "--force-generate", "--clip-radius=3",
|
||||
"--max-clip-level=8", "--max-level=8", f"--recipe={recipe}",
|
||||
"--stream-hash", f"--resolved-layout-output={layout}",
|
||||
]
|
||||
started = time.monotonic()
|
||||
with log.open("w", encoding="utf-8") as stream:
|
||||
result = subprocess.run(command, cwd=ROOT, stdout=stream,
|
||||
stderr=subprocess.STDOUT, check=False, timeout=1740)
|
||||
output = log.read_text(encoding="utf-8", errors="replace")
|
||||
hashes = HASH.findall(output)
|
||||
if result.returncode or len(hashes) != 12:
|
||||
raise SystemExit(f"hash run failed or incomplete: {label}; exit={result.returncode} "
|
||||
f"hashes={len(hashes)} log={log}")
|
||||
row = {"dataset": dataset, "recipe": recipe, "workers": workers,
|
||||
"compiler": compiler, "exit_code": result.returncode, "hashes": hashes,
|
||||
"source_stamp": (STAMP.search(output).group(1)
|
||||
if STAMP.search(output) else None),
|
||||
"elapsed_s": round(time.monotonic() - started, 3),
|
||||
"log": str(log.relative_to(ROOT))}
|
||||
print("[L129HashRun] " + json.dumps(row, sort_keys=True), flush=True)
|
||||
return row
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if any(not path.is_file() for path in (*DATASETS.values(), *BINARIES.values())):
|
||||
raise SystemExit("missing L129 hash input")
|
||||
previous_path = ROOT / "Saved/Linux/l119/hashes/summary.json"
|
||||
previous_doc = json.loads(previous_path.read_text(encoding="utf-8"))
|
||||
previous = {(row["dataset"], row["recipe"], row["workers"], row["compiler"]): row
|
||||
for row in previous_doc["runs"]}
|
||||
rows = []
|
||||
recipes = {"owner4": ("surface-world",),
|
||||
"owner2": ("surface-world", "floating-islands")}
|
||||
for dataset, dataset_recipes in recipes.items():
|
||||
for recipe in dataset_recipes:
|
||||
for workers in (1, 8, 12):
|
||||
for compiler in ("clang", "gcc"):
|
||||
rows.append(run(dataset, recipe, workers, compiler))
|
||||
(OUT / "runs-partial.json").write_text(
|
||||
json.dumps(rows, indent=2) + "\n", encoding="utf-8")
|
||||
groups = {}
|
||||
for dataset, dataset_recipes in recipes.items():
|
||||
for recipe in dataset_recipes:
|
||||
key = f"{dataset}/{recipe}"
|
||||
group = [row for row in rows if row["dataset"] == dataset
|
||||
and row["recipe"] == recipe]
|
||||
reference = group[0]["hashes"]
|
||||
stable = all(row["hashes"] == reference for row in group)
|
||||
old = previous[(dataset, recipe, 12, "clang")]["hashes"]
|
||||
groups[key] = {
|
||||
"all_worker_compiler_hashes_match": stable,
|
||||
"matches_l119_v224": next(row for row in group
|
||||
if row["workers"] == 12 and row["compiler"] == "clang")["hashes"] == old,
|
||||
"source_stamps": sorted({row["source_stamp"] for row in group}),
|
||||
"runs": [{"workers": row["workers"], "compiler": row["compiler"],
|
||||
"log": row["log"]} for row in group],
|
||||
}
|
||||
if not stable:
|
||||
raise SystemExit(f"determinism mismatch: {key}")
|
||||
summary = {"runs": rows, "groups": groups}
|
||||
(OUT / "summary.json").write_text(json.dumps(summary, indent=2) + "\n",
|
||||
encoding="utf-8")
|
||||
baseline_dir = ROOT / "Standalone/Tools/verify/baselines/owner-hash/canonical"
|
||||
for dataset, recipe, style, baseline_name in (
|
||||
("owner4", "surface-world", 1,
|
||||
"owner-hash-owner4-surface-world-style1-v226.baseline"),
|
||||
("owner2", "surface-world", 1,
|
||||
"owner-hash-surface-world-style1-v226.baseline"),
|
||||
("owner2", "floating-islands", 2,
|
||||
"owner-hash-floating-islands-style2-v226.baseline"),
|
||||
):
|
||||
canonical = next(row for row in rows if row["dataset"] == dataset
|
||||
and row["recipe"] == recipe and row["workers"] == 12
|
||||
and row["compiler"] == "clang")
|
||||
baseline = baseline_dir / baseline_name
|
||||
baseline.write_text("\n".join(canonical["hashes"]) + "\n",
|
||||
encoding="utf-8")
|
||||
print("[L129HashSummary] " + json.dumps(groups, sort_keys=True), flush=True)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -1,93 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Render matching baseline and L129 close views of each tunnel mouth."""
|
||||
from __future__ import annotations
|
||||
|
||||
import hashlib
|
||||
import importlib.util
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
RESEARCH = Path(__file__).resolve().parent
|
||||
CAPTURES = RESEARCH / "captures/L129-mouth"
|
||||
SAVED = ROOT / "Saved/Linux/l129/captures/mouth-closeups"
|
||||
BASE_LAYOUT = ROOT / "Saved/Linux/l125/hashes/owner4-surface-world-w12-clang.layout.json"
|
||||
AFTER_LAYOUT = ROOT / "Saved/Linux/l129/hashes/owner4-surface-world-w12-clang.layout.json"
|
||||
HELPER_PATH = ROOT / "Standalone/Research/WorldAssemblerM3/Linux113/RunL113Captures.py"
|
||||
|
||||
SPEC = importlib.util.spec_from_file_location("l113_capture_helpers", HELPER_PATH)
|
||||
if SPEC is None or SPEC.loader is None:
|
||||
raise SystemExit("cannot load verified capture helpers")
|
||||
HELPERS = importlib.util.module_from_spec(SPEC)
|
||||
SPEC.loader.exec_module(HELPERS)
|
||||
|
||||
HELPERS.RESEARCH = RESEARCH
|
||||
HELPERS.CAPTURES = CAPTURES
|
||||
HELPERS.SAVED = SAVED
|
||||
HELPERS.BINARIES = {
|
||||
"before": ROOT / "Saved/Linux/l125/bin/VoxelForgeCoreHeadless-l125-clang",
|
||||
"after": ROOT / "Saved/Linux/l129/bin/VoxelForgeCoreHeadless-l129-clang",
|
||||
}
|
||||
HELPERS.RENDERERS = {
|
||||
"before": ROOT / "Saved/Linux/l125/bin/VoxelForgeOffscreenCapture-l125-clang",
|
||||
"after": ROOT / "Saved/Linux/l129/bin/VoxelForgeOffscreenCapture-l129-clang",
|
||||
}
|
||||
|
||||
|
||||
def main() -> int:
|
||||
required = [BASE_LAYOUT, AFTER_LAYOUT, *HELPERS.BINARIES.values(),
|
||||
*HELPERS.RENDERERS.values()]
|
||||
if any(not path.is_file() for path in required):
|
||||
raise SystemExit("missing baseline/candidate layout or capture binary")
|
||||
before_layout = json.loads(BASE_LAYOUT.read_text(encoding="utf-8"))
|
||||
after_layout = json.loads(AFTER_LAYOUT.read_text(encoding="utf-8"))
|
||||
if before_layout["passages"] != after_layout["passages"]:
|
||||
raise RuntimeError("baseline and candidate passage routes differ")
|
||||
|
||||
views = [view for view in HELPERS.make_views(before_layout, [],
|
||||
use_derived_shape=True, use_spline=True, include_open_air=False)
|
||||
if view["kind"] == "mouth"]
|
||||
if len(views) != 2 * len(before_layout["passages"]):
|
||||
raise RuntimeError("unexpected mouth camera count")
|
||||
|
||||
rows = []
|
||||
CAPTURES.mkdir(parents=True, exist_ok=True)
|
||||
SAVED.mkdir(parents=True, exist_ok=True)
|
||||
for view in views:
|
||||
for variant, layout in (("before", before_layout), ("after", after_layout)):
|
||||
row = HELPERS.capture(variant, view, layout)
|
||||
row["variant"] = "L125-v225" if variant == "before" else "L129-v226"
|
||||
row["view"] = view["name"]
|
||||
image = ROOT / "Standalone/Research/WorldAssemblerM3/Linux129" / row["capture"]
|
||||
row["image_sha256"] = hashlib.sha256(image.read_bytes()).hexdigest()
|
||||
rows.append(row)
|
||||
|
||||
index = CAPTURES / "capture-index.json"
|
||||
index.write_text(json.dumps({"captures": rows}, indent=2) + "\n", encoding="utf-8")
|
||||
old_rows = {row["view"]: row for row in rows if row["variant"] == "L125-v225"}
|
||||
new_rows = {row["view"]: row for row in rows if row["variant"] == "L129-v226"}
|
||||
html = ["<!doctype html><meta charset='utf-8'>",
|
||||
"<title>L125 / L129 mouth close-ups</title>",
|
||||
"<style>body{font:14px system-ui;margin:24px;background:#17191d;color:#eee}"
|
||||
"section{margin:28px 0}div{display:grid;grid-template-columns:1fr 1fr;gap:12px}"
|
||||
"img{width:100%;height:auto}p{color:#bbb}</style>",
|
||||
"<h1>L125 v225 / L129 v226 tunnel mouths</h1>"]
|
||||
for name in old_rows:
|
||||
old, new = old_rows[name], new_rows[name]
|
||||
old_path = os.path.relpath(RESEARCH / old["capture"], CAPTURES)
|
||||
new_path = os.path.relpath(RESEARCH / new["capture"], CAPTURES)
|
||||
equality = "pixel-identical" if old["image_sha256"] == new["image_sha256"] else "pixels differ"
|
||||
html.extend(["<section>", f"<h2>{old['passage']} — {old['station']}</h2>",
|
||||
f"<p>{equality}; {old['pixel_quality_status']} / {new['pixel_quality_status']}</p>",
|
||||
"<div>", f"<figure><figcaption>L125 v225</figcaption><img src='{old_path}'></figure>",
|
||||
f"<figure><figcaption>L129 v226</figcaption><img src='{new_path}'></figure>",
|
||||
"</div>", "</section>"])
|
||||
(CAPTURES / "COMPARE.html").write_text("\n".join(html) + "\n", encoding="utf-8")
|
||||
print(f"[L129MouthCaptures] views={len(views)} paired={len(rows)//2} "
|
||||
f"index={index.relative_to(ROOT)}", flush=True)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -1,136 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Five interleaved L80 readiness runs for L109, L125 and L129."""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import statistics
|
||||
import subprocess
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
OUT = ROOT / os.environ.get("L129_TIMING_DIR", "Saved/Linux/l129/timing")
|
||||
DATA = ROOT / "Standalone/data/owner_world.json"
|
||||
BINARIES = {
|
||||
"L109": ROOT / "Saved/Linux/l109/bin-final/VoxelForgeCoreHeadless-l109-clang",
|
||||
"L125": ROOT / "Saved/Linux/l125/bin/VoxelForgeCoreHeadless-l125-clang",
|
||||
"L129": ROOT / os.environ.get("L129_CANDIDATE_BINARY",
|
||||
"Saved/Linux/l129/bin/VoxelForgeCoreHeadless-l129-clang"),
|
||||
}
|
||||
CAMERAS = {
|
||||
0: (8.0, 16.0, -372.2626953125),
|
||||
1: (25.8369140625, 3.19921875, -737.0),
|
||||
2: (19.166015625, -14.2001953125, -753.3740234375),
|
||||
3: (-20.0625, -5.068359375, -900.353515625),
|
||||
}
|
||||
PIPELINE = re.compile(r"^\[StreamPipeline\] (.*)$", re.M)
|
||||
FIELDS = re.compile(r"([a-zA-Z0-9_]+)=([^ ]+)")
|
||||
NEAR = re.compile(
|
||||
r"^\[WorldAssemblerNearLODReady\] lods=0-2 tiles=(\d+)/(\d+) cold_ready_s=([0-9.]+)$",
|
||||
re.M)
|
||||
|
||||
|
||||
def run(strate: int, workers: int, version: str, phase: str, replicate: int) -> dict:
|
||||
OUT.mkdir(parents=True, exist_ok=True)
|
||||
label = f"s{strate}-w{workers}-{version}-{phase}{replicate}"
|
||||
log = OUT / f"{label}.log"
|
||||
camera = ",".join(f"{value:.12f}" for value in CAMERAS[strate]) + ",0,0"
|
||||
command = [
|
||||
"taskset", "-c", "0-11", "prlimit", "--as=6442450944", "--",
|
||||
"timeout", "1740s", str(BINARIES[version]), str(DATA),
|
||||
"--world-assembler-prototype", "--stream-benchmark", "--stream-pipeline",
|
||||
f"--workers={workers}", "--clip-radius=3", "--max-clip-level=8",
|
||||
"--max-level=8", f"--camera={camera}", "--profile-lod-work",
|
||||
"--stream-scheduler-policy=3",
|
||||
]
|
||||
started = time.monotonic()
|
||||
with log.open("w", encoding="utf-8") as output:
|
||||
result = subprocess.run(command, cwd=ROOT, stdout=output,
|
||||
stderr=subprocess.STDOUT, check=False, timeout=1740)
|
||||
content = log.read_text(encoding="utf-8", errors="replace")
|
||||
pipeline_match, near_match = PIPELINE.search(content), NEAR.search(content)
|
||||
if result.returncode or pipeline_match is None or near_match is None:
|
||||
raise SystemExit(f"readiness run failed or incomplete: {log}; exit={result.returncode}")
|
||||
pipeline = dict(FIELDS.findall(pipeline_match.group(1)))
|
||||
row = {"strate": strate, "workers": workers, "version": version,
|
||||
"phase": phase, "replicate": replicate, "exit_code": result.returncode,
|
||||
"wall_s": round(time.monotonic() - started, 3),
|
||||
"lod02_ready_s": float(near_match.group(3)),
|
||||
"whole_view_ready_s": float(pipeline["whole_view_ready"].removesuffix("s")),
|
||||
"whole_tiles": int(pipeline["whole_tiles"].split("/")[0]),
|
||||
"log": str(log.relative_to(ROOT))}
|
||||
print("[L129TimingRun] " + json.dumps(row, sort_keys=True), flush=True)
|
||||
return row
|
||||
|
||||
|
||||
def cpu_idle_percent(interval_s: float = 2.0) -> float:
|
||||
def totals() -> tuple[int, int]:
|
||||
fields = Path("/proc/stat").read_text(encoding="utf-8").splitlines()[0].split()
|
||||
values = [int(value) for value in fields[1:]]
|
||||
return sum(values), values[3] + (values[4] if len(values) > 4 else 0)
|
||||
before_total, before_idle = totals()
|
||||
time.sleep(interval_s)
|
||||
after_total, after_idle = totals()
|
||||
return 100.0 * (after_idle-before_idle) / max(1, after_total-before_total)
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if not DATA.is_file() or any(not binary.is_file() for binary in BINARIES.values()):
|
||||
raise SystemExit("missing L109/L125/L129 timing input")
|
||||
OUT.mkdir(parents=True, exist_ok=True)
|
||||
load_1m, idle_pct = os.getloadavg()[0], cpu_idle_percent()
|
||||
uptime = subprocess.run(["uptime"], cwd=ROOT, text=True,
|
||||
capture_output=True, check=True).stdout.strip()
|
||||
top = subprocess.run(["ps", "-eo", "pid,pcpu,comm", "--sort=-pcpu"],
|
||||
cwd=ROOT, text=True, capture_output=True, check=True).stdout
|
||||
(OUT / "machine-load-before.txt").write_text(
|
||||
f"uptime: {uptime}\n1-minute load: {load_1m:.2f}\n"
|
||||
f"2-second CPU idle: {idle_pct:.1f}%\ntop CPU users:\n{top}", encoding="utf-8")
|
||||
print(f"[L129TimingGate] load_1m={load_1m:.2f} cpu_idle_2s={idle_pct:.1f}%",
|
||||
flush=True)
|
||||
if load_1m >= 0.9 or idle_pct < 97.0:
|
||||
raise SystemExit("timing refused: machine is above the quiet-load gate")
|
||||
|
||||
rows = []
|
||||
versions = ("L109", "L125", "L129")
|
||||
for strate in range(4):
|
||||
for workers in (8, 12):
|
||||
for version in versions:
|
||||
run(strate, workers, version, "warmup", 0)
|
||||
for replicate in range(1, 6):
|
||||
offset = (replicate - 1) % len(versions)
|
||||
order = versions[offset:] + versions[:offset]
|
||||
for version in order:
|
||||
rows.append(run(strate, workers, version, "measured", replicate))
|
||||
(OUT / "runs-partial.json").write_text(
|
||||
json.dumps(rows, indent=2) + "\n", encoding="utf-8")
|
||||
|
||||
summary = []
|
||||
for strate in range(4):
|
||||
for workers in (8, 12):
|
||||
item = {"strate": strate, "workers": workers, "replicates": 5}
|
||||
medians = {}
|
||||
for version in versions:
|
||||
group = [row for row in rows if row["strate"] == strate
|
||||
and row["workers"] == workers and row["version"] == version]
|
||||
medians[version] = {}
|
||||
for key in ("lod02_ready_s", "whole_view_ready_s"):
|
||||
values = [row[key] for row in group]
|
||||
medians[version][key] = statistics.median(values)
|
||||
item[f"{version}_{key}_values"] = values
|
||||
item[f"{version}_{key}_median"] = medians[version][key]
|
||||
for comparison in ("L109", "L125"):
|
||||
for key in ("lod02_ready_s", "whole_view_ready_s"):
|
||||
item[f"L129_vs_{comparison}_{key}_delta_pct"] = round(
|
||||
100.0 * (medians["L129"][key] / medians[comparison][key]-1.0), 2)
|
||||
summary.append(item)
|
||||
(OUT / "summary.json").write_text(
|
||||
json.dumps({"runs": rows, "summary": summary}, indent=2) + "\n",
|
||||
encoding="utf-8")
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -1,257 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Five 30 m/s UE runs for the L129 tunnel reach candidate."""
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import math
|
||||
import statistics
|
||||
import subprocess
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
HOST = Path("/home/jahni/VFHost")
|
||||
EDITOR = Path("/home/jahni/UnrealEngine/Engine/Binaries/Linux/UnrealEditor-Cmd")
|
||||
SPAWN_TN_M = (19.166015625, -14.2001953125, -753.3740234375)
|
||||
SPAWN_FI_M = (25.8369140625, 3.19921875, -737.0)
|
||||
|
||||
|
||||
def percentile(values: list[float], fraction: float) -> float | None:
|
||||
if not values:
|
||||
return None
|
||||
ordered = sorted(values)
|
||||
return ordered[max(0, min(len(ordered) - 1, math.ceil(len(ordered) * fraction) - 1))]
|
||||
|
||||
|
||||
def read_events(path: Path) -> list[dict]:
|
||||
rows = []
|
||||
if path.is_file():
|
||||
for line in path.read_text(encoding="utf-8", errors="replace").splitlines():
|
||||
if not line.startswith("{"):
|
||||
continue
|
||||
try:
|
||||
rows.append(json.loads(line))
|
||||
except json.JSONDecodeError:
|
||||
pass
|
||||
return rows
|
||||
|
||||
|
||||
def run(scenario: str, condition: str, repetition: int, turn: bool = False) -> dict:
|
||||
lookahead = int(condition in ("lookahead", "turn_lookahead"))
|
||||
if scenario == "movement":
|
||||
speed, start, duration, exit_s, slot, spawn = (
|
||||
3000.0, 6.0, 12.0, 23.0, 0, SPAWN_TN_M)
|
||||
else:
|
||||
speed, start, duration, exit_s, slot, spawn = (
|
||||
140.0, 20.0, 12.0, 37.0, 1, SPAWN_FI_M)
|
||||
|
||||
label = f"{scenario}-{condition}-r{repetition}"
|
||||
output_group = "turn" if turn else scenario
|
||||
out = ROOT / "Saved/Linux/l129" / output_group / condition / "unreal"
|
||||
host_out = HOST / "Plugins/VoxelForge/Saved/Linux/l129" / output_group / condition
|
||||
host_saved = HOST / "Saved/Linux/l129"
|
||||
trace = out / f"{label}.trace.jsonl"
|
||||
abslog = out / f"{label}.log"
|
||||
stdout = out / f"{label}.stdout.log"
|
||||
export = host_out / "output" / label
|
||||
userdir = host_saved / "user" / label
|
||||
zendata = host_saved / "zen" / label
|
||||
ddc = host_saved / "DDC"
|
||||
for path in (out, export, userdir, zendata, ddc):
|
||||
path.mkdir(parents=True, exist_ok=True)
|
||||
trace.unlink(missing_ok=True)
|
||||
spawn_cm = ",".join(f"{value * 100.0:.3f}" for value in spawn)
|
||||
command = [
|
||||
str(EDITOR), str(HOST / "VFHost.uproject"), "-nullrhi", "-unattended",
|
||||
"-nop4", "-nosplash", "-NoSound", "-corelimit=12", "-NoZenAutoLaunch",
|
||||
"-notraceserver", "-nocrashreports", "-DisablePlugins=AndroidFileServer",
|
||||
"-ddc=NoZenLocalFallback", f"-userdir={userdir}", f"-ZenDataPath={zendata}",
|
||||
f"-LocalDataCachePath={ddc}", "-run=VoxelForgeExplore", "-seed=0",
|
||||
"-archetype=TunnelNetwork", f"-slot={slot}", "-modes=export", "-gameconfig=1",
|
||||
"-coreworldtest=1", "-ownerfourstrateplan=1", "-corevoxelsizecm=25",
|
||||
"-coreislandtest=0", "-corefallbacktest=0", "-coreofftest=0", "-coreplantest=0",
|
||||
"-settingsref=/Game/VoxelForge/DA_Settings.DA_Settings", "-corehybridmesher=0",
|
||||
f"-out={export}", "-voxel.StreamingCoarseFirst=1",
|
||||
"-voxel.StreamingDynamicNearReserve=1", "-voxel.StreamingLegacyPendingResultCap=0",
|
||||
"-voxel.CoreRegionConcurrentAdmission=1", "-voxel.StreamingResultBacklogCap=256",
|
||||
"-voxel.StreamingReadyQueueDepth=8", "-voxel.StreamingBackgroundWorkerCap=1",
|
||||
"-voxel.CoreColumnCacheDirectMapped=0", "-voxel.StreamingFarApplySupplement=1",
|
||||
"-voxel.CoreMCGradientMemoization=1", "-voxel.StreamingCollisionLookahead=1",
|
||||
f"-voxel.CoreRegionLookahead={lookahead}", "-voxel.TestMove=1",
|
||||
f"-voxel.TestMoveSpeedCmPerSecond={speed:.1f}",
|
||||
f"-voxel.TestMoveStartSeconds={start:.1f}",
|
||||
f"-voxel.TestMoveDurationSeconds={duration:.1f}",
|
||||
f"-voxel.TestExitSeconds={exit_s:.1f}", "-voxel.TestMoveDirection=1,0,0",
|
||||
"-voxel.StreamingSchedulerPolicy=3", "-voxel.TestExitOnSteady=0",
|
||||
"-coreworldstreamtrace=1", f"-voxel.StartupTraceSpawnCm={spawn_cm}",
|
||||
"-voxel.StartupTraceUntilEndPlay=1", "-voxel.StartupTraceThroughCrossing=1",
|
||||
"-voxel.StartupTraceMaxTiles=16384", f"-voxel.StartupTraceFile={trace}",
|
||||
f"-abslog={abslog}",
|
||||
]
|
||||
if turn:
|
||||
command.extend(["-voxel.TestMoveTurnAfterSeconds=6.0",
|
||||
"-voxel.TestMoveTurnDirection=0,1,0"])
|
||||
started = time.monotonic()
|
||||
wrapped = ["taskset", "-c", "0-11", "timeout", "1740s", *command]
|
||||
with stdout.open("w", encoding="utf-8") as stream:
|
||||
process = subprocess.run(wrapped, cwd=ROOT, stdout=stream,
|
||||
stderr=subprocess.STDOUT, check=False, timeout=1740)
|
||||
events = read_events(trace)
|
||||
samples = [event for event in events if event.get("type") == "streaming_sample"]
|
||||
moving = [event for event in samples if float(event.get("speed_cm_s", 0.0)) >= 50.0]
|
||||
stop_event = next((event for event in events
|
||||
if event.get("type") == "streaming_test_move_stopped"), {})
|
||||
stop_s = float(stop_event.get("t_s", 0.0))
|
||||
move_start = min((float(event.get("t_s", 0.0)) for event in moving), default=float("inf"))
|
||||
dwell = [event for event in samples if float(event.get("t_s", 0.0)) >= stop_s
|
||||
and float(event.get("speed_cm_s", 0.0)) < 50.0]
|
||||
backend = next((event for event in events if event.get("type") == "worker_backend_config"), {})
|
||||
cap = next((event for event in events if event.get("type") == "streaming_worker_cap_readback"), {})
|
||||
if process.returncode or len(moving) < 40 or len(dwell) < 16:
|
||||
raise RuntimeError(f"incomplete UE run {label}: exit={process.returncode}, "
|
||||
f"move={len(moving)}, dwell={len(dwell)}, trace={trace}")
|
||||
if (int(backend.get("streaming_far_apply_supplement", -1)) != 1
|
||||
or int(cap.get("streaming_background_worker_cap", -1)) != 1
|
||||
or int(backend.get("effective_tile_slots", -1)) != 8):
|
||||
raise RuntimeError(f"configuration readback mismatch: {backend}; {cap}")
|
||||
|
||||
moving_rows = []
|
||||
for event in moving:
|
||||
desired = event.get("desired_by_lod", [0] * 9)
|
||||
resident = event.get("resident_by_lod", [0] * 9)
|
||||
covered = event.get("covered_by_lod", resident)
|
||||
moving_rows.append({
|
||||
"near_ready_pct": 100.0 * sum(resident[:3]) / max(1, sum(desired[:3])),
|
||||
"lod0_ready_pct": 100.0 * resident[0] / max(1, desired[0]),
|
||||
"lod1_ready_pct": 100.0 * resident[1] / max(1, desired[1]),
|
||||
"lod2_ready_pct": 100.0 * resident[2] / max(1, desired[2]),
|
||||
"far_hole_pct": 100.0 * (sum(desired[3:]) - sum(covered[3:]))
|
||||
/ max(1, sum(desired[3:])),
|
||||
})
|
||||
work = [event for event in events if event.get("type") == "game_thread_work_frame"
|
||||
and move_start <= float(event.get("t_s", 0.0)) < stop_s]
|
||||
ticks = [float(event.get("tick_ms", 0.0)) for event in work]
|
||||
updates = [float(event.get("update_chunks_ms", 0.0)) for event in work]
|
||||
arrival = [event for event in samples if float(event.get("t_s", 0.0)) < start
|
||||
and float(event.get("speed_cm_s", 0.0)) < 50.0]
|
||||
|
||||
def settled(event: dict, end: int) -> bool:
|
||||
desired = event.get("desired_by_lod", [0] * 9)
|
||||
actual = event.get("settled_by_lod", [0] * 9)
|
||||
return sum(desired[:end]) > 0 and sum(actual[:end]) >= sum(desired[:end])
|
||||
|
||||
def far_holes(event: dict) -> float | None:
|
||||
desired = event.get("desired_by_lod", [0] * 9)[3:]
|
||||
covered = event.get("covered_by_lod", [0] * 9)[3:]
|
||||
return 100.0 * (sum(desired) - sum(covered)) / sum(desired) if sum(desired) else None
|
||||
|
||||
near_settled = next((event for event in arrival if settled(event, 3)), None)
|
||||
whole_settled = next((event for event in arrival if settled(event, 9)), None)
|
||||
far_clear = next((event for event in arrival if far_holes(event) == 0.0), None)
|
||||
compile_done = [event for event in events if event.get("type") == "core_region_compile_complete"
|
||||
and move_start <= float(event.get("t_s", 0.0)) < stop_s]
|
||||
compile_requests = [event for event in events
|
||||
if event.get("type") == "core_region_compile_request"
|
||||
and move_start <= float(event.get("t_s", 0.0)) < stop_s]
|
||||
lookahead_turns = [event for event in events
|
||||
if event.get("type") == "core_region_lookahead_turn"]
|
||||
row = {
|
||||
"scenario": scenario, "condition": condition, "repetition": repetition,
|
||||
"speed_mps": speed / 100.0, "core_region_lookahead": lookahead,
|
||||
"exit_code": process.returncode, "wall_s": round(time.monotonic() - started, 3),
|
||||
"moving_samples": len(moving), "dwell_samples": len(dwell),
|
||||
"near_ready_moving_mean_pct": statistics.mean(r["near_ready_pct"] for r in moving_rows),
|
||||
"lod0_ready_moving_mean_pct": statistics.mean(r["lod0_ready_pct"] for r in moving_rows),
|
||||
"lod1_ready_moving_mean_pct": statistics.mean(r["lod1_ready_pct"] for r in moving_rows),
|
||||
"lod2_ready_moving_mean_pct": statistics.mean(r["lod2_ready_pct"] for r in moving_rows),
|
||||
"far_holes_moving_mean_pct": statistics.mean(r["far_hole_pct"] for r in moving_rows),
|
||||
"game_thread_tick_p99_ms": percentile(ticks, 0.99),
|
||||
"game_thread_tick_max_ms": max(ticks, default=None),
|
||||
"stream_update_p99_ms": percentile(updates, 0.99),
|
||||
"stream_update_max_ms": max(updates, default=None),
|
||||
"lod02_settled_t_s": float(near_settled["t_s"]) if near_settled else None,
|
||||
"whole_view_settled_t_s": float(whole_settled["t_s"]) if whole_settled else None,
|
||||
"far_clear_t_s": float(far_clear["t_s"]) if far_clear else None,
|
||||
"far_holes_at_pre_move_pct": far_holes(arrival[-1]) if arrival else None,
|
||||
"pending_gate_p50_ms": percentile(
|
||||
[float(e.get("pending_gate_elapsed_ms", 0.0)) for e in compile_done], 0.50),
|
||||
"compile_queue_p95_ms": percentile(
|
||||
[float(e.get("compile_queue_ms", 0.0)) for e in compile_done], 0.95),
|
||||
"compile_task_p95_ms": percentile(
|
||||
[float(e.get("compile_task_ms", 0.0)) for e in compile_done], 0.95),
|
||||
"compiled_tiles_total": sum(int(e.get("compiled_tiles", 0)) for e in compile_done),
|
||||
"lookahead_tiles_peak": max((int(e.get("lookahead_region_tiles", 0))
|
||||
for e in compile_requests), default=0),
|
||||
"wasted_prefetch_tiles": sum(int(e.get("wasted_prefetch_tiles", 0))
|
||||
for e in compile_done),
|
||||
"lookahead_turn_events": lookahead_turns,
|
||||
"compile_completion_count": len(compile_done),
|
||||
"trace": str(trace.relative_to(ROOT)), "log": str(abslog.relative_to(ROOT)),
|
||||
}
|
||||
with (ROOT / "Saved/Linux/l129" / "runs.jsonl").open("a", encoding="utf-8") as stream:
|
||||
stream.write(json.dumps(row, sort_keys=True) + "\n")
|
||||
print("[L129Pair] " + json.dumps(row, sort_keys=True), flush=True)
|
||||
return row
|
||||
|
||||
|
||||
def pairs_for(runs: list[dict], scenario: str) -> list[dict]:
|
||||
pairs = []
|
||||
for repetition in range(1, 6):
|
||||
baseline = next(row for row in runs if row["scenario"] == scenario
|
||||
and row["condition"] == "baseline" and row["repetition"] == repetition)
|
||||
candidate = next(row for row in runs if row["scenario"] == scenario
|
||||
and row["condition"] == "lookahead" and row["repetition"] == repetition)
|
||||
pairs.append({"repetition": repetition,
|
||||
"near_ready_delta_pct": candidate["near_ready_moving_mean_pct"]
|
||||
- baseline["near_ready_moving_mean_pct"],
|
||||
"far_holes_delta_pct": candidate["far_holes_moving_mean_pct"]
|
||||
- baseline["far_holes_moving_mean_pct"],
|
||||
"tick_p99_delta_ms": candidate["game_thread_tick_p99_ms"]
|
||||
- baseline["game_thread_tick_p99_ms"],
|
||||
"tick_max_delta_ms": candidate["game_thread_tick_max_ms"]
|
||||
- baseline["game_thread_tick_max_ms"]})
|
||||
return pairs
|
||||
|
||||
|
||||
def main() -> int:
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--scenario", choices=("movement",), default="movement")
|
||||
args = parser.parse_args()
|
||||
if not EDITOR.is_file():
|
||||
raise SystemExit(f"missing Unreal editor: {EDITOR}")
|
||||
root_out = ROOT / "Saved/Linux/l129" / args.scenario
|
||||
root_out.mkdir(parents=True, exist_ok=True)
|
||||
(ROOT / "Saved/Linux/l129").mkdir(parents=True, exist_ok=True)
|
||||
runs = []
|
||||
for repetition in range(1, 6):
|
||||
runs.append(run(args.scenario, "candidate", repetition))
|
||||
(root_out / "runs-partial.json").write_text(
|
||||
json.dumps(runs, indent=2) + "\n", encoding="utf-8")
|
||||
baseline_path = ROOT / "Saved/Linux/l127/ue/movement-pairs-summary.json"
|
||||
baseline = json.loads(baseline_path.read_text(encoding="utf-8"))["summary"]["merge"]["metrics"]
|
||||
metric_names = ("near_ready_moving_mean_pct", "far_holes_moving_mean_pct",
|
||||
"game_thread_tick_p99_ms", "game_thread_tick_max_ms")
|
||||
candidate = {name: statistics.median(row[name] for row in runs) for name in metric_names}
|
||||
reference = {name: baseline[name]["median"] for name in metric_names}
|
||||
deltas = {name: candidate[name] - reference[name] for name in metric_names}
|
||||
bar_pass = (candidate["near_ready_moving_mean_pct"] > reference["near_ready_moving_mean_pct"]
|
||||
and candidate["far_holes_moving_mean_pct"] <= reference["far_holes_moving_mean_pct"]
|
||||
and candidate["game_thread_tick_p99_ms"] <= reference["game_thread_tick_p99_ms"]
|
||||
and candidate["game_thread_tick_max_ms"] <= reference["game_thread_tick_max_ms"])
|
||||
summary = {
|
||||
"design": "L129 R=2.0 m passage influence; five runs at 30 m/s.",
|
||||
"scenario": args.scenario, "runs": runs,
|
||||
"baseline": {"commit": "b96dd73", "source_summary": str(baseline_path),
|
||||
"metrics": reference},
|
||||
"candidate_medians": candidate, "deltas": deltas,
|
||||
"bar_pass": bar_pass,
|
||||
}
|
||||
(root_out / "summary.json").write_text(json.dumps(summary, indent=2) + "\n",
|
||||
encoding="utf-8")
|
||||
print("[L129MovementSummary] " + json.dumps(summary, sort_keys=True), flush=True)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -1,188 +0,0 @@
|
||||
<!doctype html><meta charset='utf-8'>
|
||||
<title>L125 / L129 tunnel capture comparison</title>
|
||||
<style>body{font:14px system-ui;margin:24px;background:#17191d;color:#eee}section{margin:28px 0}h2{font-size:18px}div{display:grid;grid-template-columns:1fr 1fr;gap:12px}img{width:100%;height:auto}p{color:#bbb}</style>
|
||||
<h1>L125 / L129 v226: identical views</h1>
|
||||
<section>
|
||||
<h2>passage/0-1/0 — rock-floor/401.7m</h2>
|
||||
<p>rock-floor-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-rock-floor-station-1.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-0-1-0-rock-floor-station-1.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/0-1/0 — rock-floor/792.8m</h2>
|
||||
<p>rock-floor-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-rock-floor-station-2.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-0-1-0-rock-floor-station-2.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/0-1/0 — rock-floor/1634.5m</h2>
|
||||
<p>rock-floor-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-rock-floor-station-3.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-0-1-0-rock-floor-station-3.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/1-2/0 — rock-floor/27.0m</h2>
|
||||
<p>rock-floor-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-rock-floor-station-1.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-1-2-0-rock-floor-station-1.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/1-2/0 — rock-floor/52.9m</h2>
|
||||
<p>rock-floor-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-rock-floor-station-2.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-1-2-0-rock-floor-station-2.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/1-2/0 — rock-floor/78.9m</h2>
|
||||
<p>rock-floor-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-rock-floor-station-3.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-1-2-0-rock-floor-station-3.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/2-3/0 — rock-floor/323.4m</h2>
|
||||
<p>rock-floor-close · L125 low_contrast_geometry_visible · L129 low_contrast_geometry_visible</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-rock-floor-station-1.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-2-3-0-rock-floor-station-1.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/2-3/0 — rock-floor/333.4m</h2>
|
||||
<p>rock-floor-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-rock-floor-station-2.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-2-3-0-rock-floor-station-2.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/2-3/0 — rock-floor/343.4m</h2>
|
||||
<p>rock-floor-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-rock-floor-station-3.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-2-3-0-rock-floor-station-3.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/0-1/0 — section-1/4m-outside</h2>
|
||||
<p>open-air-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-openair-1-4m-outside.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-0-1-0-openair-1-4m-outside.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/0-1/0 — section-1/4m-interior-wall</h2>
|
||||
<p>open-air-close · L125 low_contrast_geometry_visible · L129 low_contrast_geometry_visible</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-openair-1-4m-interior-wall.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-0-1-0-openair-1-4m-interior-wall.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/0-1/0 — section-2/4m-outside</h2>
|
||||
<p>open-air-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-openair-2-4m-outside.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-0-1-0-openair-2-4m-outside.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/0-1/0 — section-2/4m-interior-wall</h2>
|
||||
<p>open-air-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-openair-2-4m-interior-wall.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-0-1-0-openair-2-4m-interior-wall.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/0-1/0 — section-3/4m-outside</h2>
|
||||
<p>open-air-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-openair-3-4m-outside.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-0-1-0-openair-3-4m-outside.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/0-1/0 — section-3/4m-interior-wall</h2>
|
||||
<p>open-air-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-openair-3-4m-interior-wall.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-0-1-0-openair-3-4m-interior-wall.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/1-2/0 — section-1/4m-outside</h2>
|
||||
<p>open-air-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-openair-1-4m-outside.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-1-2-0-openair-1-4m-outside.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/1-2/0 — section-1/4m-interior-wall</h2>
|
||||
<p>open-air-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-openair-1-4m-interior-wall.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-1-2-0-openair-1-4m-interior-wall.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/1-2/0 — section-2/4m-outside</h2>
|
||||
<p>open-air-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-openair-2-4m-outside.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-1-2-0-openair-2-4m-outside.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/1-2/0 — section-2/4m-interior-wall</h2>
|
||||
<p>open-air-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-openair-2-4m-interior-wall.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-1-2-0-openair-2-4m-interior-wall.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/2-3/0 — section-1/4m-outside</h2>
|
||||
<p>open-air-close · L125 low_contrast_geometry_visible · L129 low_contrast_geometry_visible</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-openair-1-4m-outside.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-2-3-0-openair-1-4m-outside.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/2-3/0 — section-1/4m-interior-wall</h2>
|
||||
<p>open-air-close · L125 low_contrast_geometry_visible · L129 low_contrast_geometry_visible</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-openair-1-4m-interior-wall.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-2-3-0-openair-1-4m-interior-wall.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/2-3/0 — section-2/4m-outside</h2>
|
||||
<p>open-air-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-openair-2-4m-outside.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-2-3-0-openair-2-4m-outside.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/2-3/0 — section-2/4m-interior-wall</h2>
|
||||
<p>open-air-close · L125 pass · L129 pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-openair-2-4m-interior-wall.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='L129/passage-2-3-0-openair-2-4m-interior-wall.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
@@ -1,52 +0,0 @@
|
||||
<!doctype html><meta charset='utf-8'>
|
||||
<title>L125 / L129 mouth close-ups</title>
|
||||
<style>body{font:14px system-ui;margin:24px;background:#17191d;color:#eee}section{margin:28px 0}div{display:grid;grid-template-columns:1fr 1fr;gap:12px}img{width:100%;height:auto}p{color:#bbb}</style>
|
||||
<h1>L125 v225 / L129 v226 tunnel mouths</h1>
|
||||
<section>
|
||||
<h2>passage/0-1/0 — upper-mouth</h2>
|
||||
<p>pixel-identical; pass / pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125 v225</figcaption><img src='before/passage-0-1-0-upper-mouth.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='after/passage-0-1-0-upper-mouth.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/0-1/0 — lower-mouth</h2>
|
||||
<p>pixel-identical; pass / pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125 v225</figcaption><img src='before/passage-0-1-0-lower-mouth.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='after/passage-0-1-0-lower-mouth.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/1-2/0 — upper-mouth</h2>
|
||||
<p>pixel-identical; pass / pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125 v225</figcaption><img src='before/passage-1-2-0-upper-mouth.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='after/passage-1-2-0-upper-mouth.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/1-2/0 — lower-mouth</h2>
|
||||
<p>pixel-identical; pass / pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125 v225</figcaption><img src='before/passage-1-2-0-lower-mouth.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='after/passage-1-2-0-lower-mouth.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/2-3/0 — upper-mouth</h2>
|
||||
<p>pixel-identical; pass / pass</p>
|
||||
<div>
|
||||
<figure><figcaption>L125 v225</figcaption><img src='before/passage-2-3-0-upper-mouth.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='after/passage-2-3-0-upper-mouth.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
<h2>passage/2-3/0 — lower-mouth</h2>
|
||||
<p>pixel-identical; low_contrast_geometry_visible / low_contrast_geometry_visible</p>
|
||||
<div>
|
||||
<figure><figcaption>L125 v225</figcaption><img src='before/passage-2-3-0-lower-mouth.png'></figure>
|
||||
<figure><figcaption>L129 v226</figcaption><img src='after/passage-2-3-0-lower-mouth.png'></figure>
|
||||
</div>
|
||||
</section>
|
||||
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 37 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 225 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 39 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 187 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 37 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 37 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 225 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 39 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 187 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 37 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB |
@@ -1,676 +0,0 @@
|
||||
{
|
||||
"captures": [
|
||||
{
|
||||
"name": "passage-0-1-0-upper-mouth",
|
||||
"passage": "passage/0-1/0",
|
||||
"kind": "mouth",
|
||||
"station": "upper-mouth",
|
||||
"camera": [
|
||||
8.324777182667596,
|
||||
20.450707805615995,
|
||||
-371.842578125
|
||||
],
|
||||
"target": [
|
||||
7.855654585481068,
|
||||
14.021907641948447,
|
||||
-371.942578125
|
||||
],
|
||||
"yaw": -175.82640818958697,
|
||||
"pitch": -0.8888012261216656,
|
||||
"focus": [
|
||||
8.0,
|
||||
16.0,
|
||||
-372.1224609375
|
||||
],
|
||||
"center_z": -372.1224609375,
|
||||
"variant": "L125-v225",
|
||||
"capture": "captures/L129-mouth/before/passage-0-1-0-upper-mouth.png",
|
||||
"scene": "Saved/Linux/l129/captures/mouth-closeups/before/passage-0-1-0-upper-mouth.vfmesh",
|
||||
"drawn_triangles": 243380,
|
||||
"source_triangles": 287904,
|
||||
"verified": true,
|
||||
"pixel_quality_status": "pass",
|
||||
"route_distance_actual_m": null,
|
||||
"route_station_adjustment_m": 0.0,
|
||||
"closeup_camera_target_distance_m": null,
|
||||
"closeup_target_surface_distance_m": null,
|
||||
"closeup_predicted_target_offset_m": null,
|
||||
"closeup_wall_normal_alignment": null,
|
||||
"fallback_kind": null,
|
||||
"fallback_surface_distance_m": null,
|
||||
"camera_actual_m": [
|
||||
8.324777182667596,
|
||||
20.450707805615995,
|
||||
-371.842578125
|
||||
],
|
||||
"target_actual_m": [
|
||||
7.855654585481068,
|
||||
14.021907641948447,
|
||||
-371.942578125
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-0-1-0-upper-mouth-mesh.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-0-1-0-upper-mouth-render.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-0-1-0-upper-mouth-quality.log"
|
||||
],
|
||||
"view": "passage-0-1-0-upper-mouth",
|
||||
"image_sha256": "20a56bb0419cc9c0ccb6a3c3f6a79e7f1614d095a8b233ecc65dc836fee9eb3b"
|
||||
},
|
||||
{
|
||||
"name": "passage-0-1-0-upper-mouth",
|
||||
"passage": "passage/0-1/0",
|
||||
"kind": "mouth",
|
||||
"station": "upper-mouth",
|
||||
"camera": [
|
||||
8.324777182667596,
|
||||
20.450707805615995,
|
||||
-371.842578125
|
||||
],
|
||||
"target": [
|
||||
7.855654585481068,
|
||||
14.021907641948447,
|
||||
-371.942578125
|
||||
],
|
||||
"yaw": -175.82640818958697,
|
||||
"pitch": -0.8888012261216656,
|
||||
"focus": [
|
||||
8.0,
|
||||
16.0,
|
||||
-372.1224609375
|
||||
],
|
||||
"center_z": -372.1224609375,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129-mouth/after/passage-0-1-0-upper-mouth.png",
|
||||
"scene": "Saved/Linux/l129/captures/mouth-closeups/after/passage-0-1-0-upper-mouth.vfmesh",
|
||||
"drawn_triangles": 243380,
|
||||
"source_triangles": 287904,
|
||||
"verified": true,
|
||||
"pixel_quality_status": "pass",
|
||||
"route_distance_actual_m": null,
|
||||
"route_station_adjustment_m": 0.0,
|
||||
"closeup_camera_target_distance_m": null,
|
||||
"closeup_target_surface_distance_m": null,
|
||||
"closeup_predicted_target_offset_m": null,
|
||||
"closeup_wall_normal_alignment": null,
|
||||
"fallback_kind": null,
|
||||
"fallback_surface_distance_m": null,
|
||||
"camera_actual_m": [
|
||||
8.324777182667596,
|
||||
20.450707805615995,
|
||||
-371.842578125
|
||||
],
|
||||
"target_actual_m": [
|
||||
7.855654585481068,
|
||||
14.021907641948447,
|
||||
-371.942578125
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-0-1-0-upper-mouth-mesh.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-0-1-0-upper-mouth-render.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-0-1-0-upper-mouth-quality.log"
|
||||
],
|
||||
"view": "passage-0-1-0-upper-mouth",
|
||||
"image_sha256": "20a56bb0419cc9c0ccb6a3c3f6a79e7f1614d095a8b233ecc65dc836fee9eb3b"
|
||||
},
|
||||
{
|
||||
"name": "passage-0-1-0-lower-mouth",
|
||||
"passage": "passage/0-1/0",
|
||||
"kind": "mouth",
|
||||
"station": "lower-mouth",
|
||||
"camera": [
|
||||
32.68834531966199,
|
||||
9.553722879000034,
|
||||
-735.4805084803569
|
||||
],
|
||||
"target": [
|
||||
24.394507482044844,
|
||||
1.8614284070526241,
|
||||
-736.6798828125
|
||||
],
|
||||
"yaw": -132.84502956130385,
|
||||
"pitch": -6.05232406255234,
|
||||
"focus": [
|
||||
25.8369140625,
|
||||
3.19921875,
|
||||
-736.2672500132622
|
||||
],
|
||||
"center_z": -736.2672500132622,
|
||||
"variant": "L125-v225",
|
||||
"capture": "captures/L129-mouth/before/passage-0-1-0-lower-mouth.png",
|
||||
"scene": "Saved/Linux/l129/captures/mouth-closeups/before/passage-0-1-0-lower-mouth.vfmesh",
|
||||
"drawn_triangles": 549170,
|
||||
"source_triangles": 582732,
|
||||
"verified": true,
|
||||
"pixel_quality_status": "pass",
|
||||
"route_distance_actual_m": null,
|
||||
"route_station_adjustment_m": 0.0,
|
||||
"closeup_camera_target_distance_m": null,
|
||||
"closeup_target_surface_distance_m": null,
|
||||
"closeup_predicted_target_offset_m": null,
|
||||
"closeup_wall_normal_alignment": null,
|
||||
"fallback_kind": null,
|
||||
"fallback_surface_distance_m": null,
|
||||
"camera_actual_m": [
|
||||
32.68834531966199,
|
||||
9.553722879000034,
|
||||
-735.4805084803569
|
||||
],
|
||||
"target_actual_m": [
|
||||
24.394507482044844,
|
||||
1.8614284070526241,
|
||||
-736.6798828125
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-0-1-0-lower-mouth-mesh.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-0-1-0-lower-mouth-render.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-0-1-0-lower-mouth-quality.log"
|
||||
],
|
||||
"view": "passage-0-1-0-lower-mouth",
|
||||
"image_sha256": "01e5f52b7c9080cb34ed9fb92b60360426ef21bc8934309542cd8736a116fc29"
|
||||
},
|
||||
{
|
||||
"name": "passage-0-1-0-lower-mouth",
|
||||
"passage": "passage/0-1/0",
|
||||
"kind": "mouth",
|
||||
"station": "lower-mouth",
|
||||
"camera": [
|
||||
32.68834531966199,
|
||||
9.553722879000034,
|
||||
-735.4805084803569
|
||||
],
|
||||
"target": [
|
||||
24.394507482044844,
|
||||
1.8614284070526241,
|
||||
-736.6798828125
|
||||
],
|
||||
"yaw": -132.84502956130385,
|
||||
"pitch": -6.05232406255234,
|
||||
"focus": [
|
||||
25.8369140625,
|
||||
3.19921875,
|
||||
-736.2672500132622
|
||||
],
|
||||
"center_z": -736.2672500132622,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129-mouth/after/passage-0-1-0-lower-mouth.png",
|
||||
"scene": "Saved/Linux/l129/captures/mouth-closeups/after/passage-0-1-0-lower-mouth.vfmesh",
|
||||
"drawn_triangles": 549170,
|
||||
"source_triangles": 582732,
|
||||
"verified": true,
|
||||
"pixel_quality_status": "pass",
|
||||
"route_distance_actual_m": null,
|
||||
"route_station_adjustment_m": 0.0,
|
||||
"closeup_camera_target_distance_m": null,
|
||||
"closeup_target_surface_distance_m": null,
|
||||
"closeup_predicted_target_offset_m": null,
|
||||
"closeup_wall_normal_alignment": null,
|
||||
"fallback_kind": null,
|
||||
"fallback_surface_distance_m": null,
|
||||
"camera_actual_m": [
|
||||
32.68834531966199,
|
||||
9.553722879000034,
|
||||
-735.4805084803569
|
||||
],
|
||||
"target_actual_m": [
|
||||
24.394507482044844,
|
||||
1.8614284070526241,
|
||||
-736.6798828125
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-0-1-0-lower-mouth-mesh.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-0-1-0-lower-mouth-render.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-0-1-0-lower-mouth-quality.log"
|
||||
],
|
||||
"view": "passage-0-1-0-lower-mouth",
|
||||
"image_sha256": "01e5f52b7c9080cb34ed9fb92b60360426ef21bc8934309542cd8736a116fc29"
|
||||
},
|
||||
{
|
||||
"name": "passage-1-2-0-upper-mouth",
|
||||
"passage": "passage/1-2/0",
|
||||
"kind": "mouth",
|
||||
"station": "upper-mouth",
|
||||
"camera": [
|
||||
23.39180762797774,
|
||||
-15.509524798921928,
|
||||
-731.7810546875
|
||||
],
|
||||
"target": [
|
||||
17.28788584589878,
|
||||
-13.618271096312476,
|
||||
-731.8810546875
|
||||
],
|
||||
"yaw": -72.7848029211395,
|
||||
"pitch": -0.8965458221544697,
|
||||
"focus": [
|
||||
19.166015625,
|
||||
-14.2001953125,
|
||||
-730.5610546875
|
||||
],
|
||||
"center_z": -730.5610546875,
|
||||
"variant": "L125-v225",
|
||||
"capture": "captures/L129-mouth/before/passage-1-2-0-upper-mouth.png",
|
||||
"scene": "Saved/Linux/l129/captures/mouth-closeups/before/passage-1-2-0-upper-mouth.vfmesh",
|
||||
"drawn_triangles": 593026,
|
||||
"source_triangles": 638590,
|
||||
"verified": true,
|
||||
"pixel_quality_status": "pass",
|
||||
"route_distance_actual_m": null,
|
||||
"route_station_adjustment_m": 0.0,
|
||||
"closeup_camera_target_distance_m": null,
|
||||
"closeup_target_surface_distance_m": null,
|
||||
"closeup_predicted_target_offset_m": null,
|
||||
"closeup_wall_normal_alignment": null,
|
||||
"fallback_kind": null,
|
||||
"fallback_surface_distance_m": null,
|
||||
"camera_actual_m": [
|
||||
23.39180762797774,
|
||||
-15.509524798921928,
|
||||
-731.7810546875
|
||||
],
|
||||
"target_actual_m": [
|
||||
17.28788584589878,
|
||||
-13.618271096312476,
|
||||
-731.8810546875
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-1-2-0-upper-mouth-mesh.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-1-2-0-upper-mouth-render.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-1-2-0-upper-mouth-quality.log"
|
||||
],
|
||||
"view": "passage-1-2-0-upper-mouth",
|
||||
"image_sha256": "8314a919e0c4b16390622371be96c89459ddef922c20711db281c55227e29de2"
|
||||
},
|
||||
{
|
||||
"name": "passage-1-2-0-upper-mouth",
|
||||
"passage": "passage/1-2/0",
|
||||
"kind": "mouth",
|
||||
"station": "upper-mouth",
|
||||
"camera": [
|
||||
23.39180762797774,
|
||||
-15.509524798921928,
|
||||
-731.7810546875
|
||||
],
|
||||
"target": [
|
||||
17.28788584589878,
|
||||
-13.618271096312476,
|
||||
-731.8810546875
|
||||
],
|
||||
"yaw": -72.7848029211395,
|
||||
"pitch": -0.8965458221544697,
|
||||
"focus": [
|
||||
19.166015625,
|
||||
-14.2001953125,
|
||||
-730.5610546875
|
||||
],
|
||||
"center_z": -730.5610546875,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129-mouth/after/passage-1-2-0-upper-mouth.png",
|
||||
"scene": "Saved/Linux/l129/captures/mouth-closeups/after/passage-1-2-0-upper-mouth.vfmesh",
|
||||
"drawn_triangles": 593026,
|
||||
"source_triangles": 638590,
|
||||
"verified": true,
|
||||
"pixel_quality_status": "pass",
|
||||
"route_distance_actual_m": null,
|
||||
"route_station_adjustment_m": 0.0,
|
||||
"closeup_camera_target_distance_m": null,
|
||||
"closeup_target_surface_distance_m": null,
|
||||
"closeup_predicted_target_offset_m": null,
|
||||
"closeup_wall_normal_alignment": null,
|
||||
"fallback_kind": null,
|
||||
"fallback_surface_distance_m": null,
|
||||
"camera_actual_m": [
|
||||
23.39180762797774,
|
||||
-15.509524798921928,
|
||||
-731.7810546875
|
||||
],
|
||||
"target_actual_m": [
|
||||
17.28788584589878,
|
||||
-13.618271096312476,
|
||||
-731.8810546875
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-1-2-0-upper-mouth-mesh.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-1-2-0-upper-mouth-render.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-1-2-0-upper-mouth-quality.log"
|
||||
],
|
||||
"view": "passage-1-2-0-upper-mouth",
|
||||
"image_sha256": "8314a919e0c4b16390622371be96c89459ddef922c20711db281c55227e29de2"
|
||||
},
|
||||
{
|
||||
"name": "passage-1-2-0-lower-mouth",
|
||||
"passage": "passage/1-2/0",
|
||||
"kind": "mouth",
|
||||
"station": "lower-mouth",
|
||||
"camera": [
|
||||
27.129937681588373,
|
||||
-19.073450175278364,
|
||||
-751.8771866414096
|
||||
],
|
||||
"target": [
|
||||
17.48940045519192,
|
||||
-13.174246920336135,
|
||||
-753.05390625
|
||||
],
|
||||
"yaw": -58.53685078395012,
|
||||
"pitch": -5.943870452561027,
|
||||
"focus": [
|
||||
19.166015625,
|
||||
-14.2001953125,
|
||||
-751.73390625
|
||||
],
|
||||
"center_z": -751.73390625,
|
||||
"variant": "L125-v225",
|
||||
"capture": "captures/L129-mouth/before/passage-1-2-0-lower-mouth.png",
|
||||
"scene": "Saved/Linux/l129/captures/mouth-closeups/before/passage-1-2-0-lower-mouth.vfmesh",
|
||||
"drawn_triangles": 544808,
|
||||
"source_triangles": 576830,
|
||||
"verified": true,
|
||||
"pixel_quality_status": "pass",
|
||||
"route_distance_actual_m": null,
|
||||
"route_station_adjustment_m": 0.0,
|
||||
"closeup_camera_target_distance_m": null,
|
||||
"closeup_target_surface_distance_m": null,
|
||||
"closeup_predicted_target_offset_m": null,
|
||||
"closeup_wall_normal_alignment": null,
|
||||
"fallback_kind": null,
|
||||
"fallback_surface_distance_m": null,
|
||||
"camera_actual_m": [
|
||||
27.129937681588373,
|
||||
-19.073450175278364,
|
||||
-751.8771866414096
|
||||
],
|
||||
"target_actual_m": [
|
||||
17.48940045519192,
|
||||
-13.174246920336135,
|
||||
-753.05390625
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-1-2-0-lower-mouth-mesh.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-1-2-0-lower-mouth-render.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-1-2-0-lower-mouth-quality.log"
|
||||
],
|
||||
"view": "passage-1-2-0-lower-mouth",
|
||||
"image_sha256": "dc1e5b79bb9afa6e1aa66edac7e0d84e1161ece0147b1ea58e4e60b93dca399b"
|
||||
},
|
||||
{
|
||||
"name": "passage-1-2-0-lower-mouth",
|
||||
"passage": "passage/1-2/0",
|
||||
"kind": "mouth",
|
||||
"station": "lower-mouth",
|
||||
"camera": [
|
||||
27.129937681588373,
|
||||
-19.073450175278364,
|
||||
-751.8771866414096
|
||||
],
|
||||
"target": [
|
||||
17.48940045519192,
|
||||
-13.174246920336135,
|
||||
-753.05390625
|
||||
],
|
||||
"yaw": -58.53685078395012,
|
||||
"pitch": -5.943870452561027,
|
||||
"focus": [
|
||||
19.166015625,
|
||||
-14.2001953125,
|
||||
-751.73390625
|
||||
],
|
||||
"center_z": -751.73390625,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129-mouth/after/passage-1-2-0-lower-mouth.png",
|
||||
"scene": "Saved/Linux/l129/captures/mouth-closeups/after/passage-1-2-0-lower-mouth.vfmesh",
|
||||
"drawn_triangles": 544808,
|
||||
"source_triangles": 576830,
|
||||
"verified": true,
|
||||
"pixel_quality_status": "pass",
|
||||
"route_distance_actual_m": null,
|
||||
"route_station_adjustment_m": 0.0,
|
||||
"closeup_camera_target_distance_m": null,
|
||||
"closeup_target_surface_distance_m": null,
|
||||
"closeup_predicted_target_offset_m": null,
|
||||
"closeup_wall_normal_alignment": null,
|
||||
"fallback_kind": null,
|
||||
"fallback_surface_distance_m": null,
|
||||
"camera_actual_m": [
|
||||
27.129937681588373,
|
||||
-19.073450175278364,
|
||||
-751.8771866414096
|
||||
],
|
||||
"target_actual_m": [
|
||||
17.48940045519192,
|
||||
-13.174246920336135,
|
||||
-753.05390625
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-1-2-0-lower-mouth-mesh.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-1-2-0-lower-mouth-render.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-1-2-0-lower-mouth-quality.log"
|
||||
],
|
||||
"view": "passage-1-2-0-lower-mouth",
|
||||
"image_sha256": "dc1e5b79bb9afa6e1aa66edac7e0d84e1161ece0147b1ea58e4e60b93dca399b"
|
||||
},
|
||||
{
|
||||
"name": "passage-2-3-0-upper-mouth",
|
||||
"passage": "passage/2-3/0",
|
||||
"kind": "mouth",
|
||||
"station": "upper-mouth",
|
||||
"camera": [
|
||||
-24.455025526892644,
|
||||
-5.631774473341657,
|
||||
-811.975390625
|
||||
],
|
||||
"target": [
|
||||
-18.110266432492157,
|
||||
-4.81795266462593,
|
||||
-812.075390625
|
||||
],
|
||||
"yaw": 82.6907653180847,
|
||||
"pitch": -0.8956299428824654,
|
||||
"focus": [
|
||||
-20.0625,
|
||||
-5.068359375,
|
||||
-810.755390625
|
||||
],
|
||||
"center_z": -810.755390625,
|
||||
"variant": "L125-v225",
|
||||
"capture": "captures/L129-mouth/before/passage-2-3-0-upper-mouth.png",
|
||||
"scene": "Saved/Linux/l129/captures/mouth-closeups/before/passage-2-3-0-upper-mouth.vfmesh",
|
||||
"drawn_triangles": 59554,
|
||||
"source_triangles": 71494,
|
||||
"verified": true,
|
||||
"pixel_quality_status": "pass",
|
||||
"route_distance_actual_m": null,
|
||||
"route_station_adjustment_m": 0.0,
|
||||
"closeup_camera_target_distance_m": null,
|
||||
"closeup_target_surface_distance_m": null,
|
||||
"closeup_predicted_target_offset_m": null,
|
||||
"closeup_wall_normal_alignment": null,
|
||||
"fallback_kind": null,
|
||||
"fallback_surface_distance_m": null,
|
||||
"camera_actual_m": [
|
||||
-24.455025526892644,
|
||||
-5.631774473341657,
|
||||
-811.975390625
|
||||
],
|
||||
"target_actual_m": [
|
||||
-18.110266432492157,
|
||||
-4.81795266462593,
|
||||
-812.075390625
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-2-3-0-upper-mouth-mesh.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-2-3-0-upper-mouth-render.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-2-3-0-upper-mouth-quality.log"
|
||||
],
|
||||
"view": "passage-2-3-0-upper-mouth",
|
||||
"image_sha256": "954c7be05d77c4ccf5d3a7a486cc7cd1e32f108120e02daac2bb2cf18ed2a325"
|
||||
},
|
||||
{
|
||||
"name": "passage-2-3-0-upper-mouth",
|
||||
"passage": "passage/2-3/0",
|
||||
"kind": "mouth",
|
||||
"station": "upper-mouth",
|
||||
"camera": [
|
||||
-24.455025526892644,
|
||||
-5.631774473341657,
|
||||
-811.975390625
|
||||
],
|
||||
"target": [
|
||||
-18.110266432492157,
|
||||
-4.81795266462593,
|
||||
-812.075390625
|
||||
],
|
||||
"yaw": 82.6907653180847,
|
||||
"pitch": -0.8956299428824654,
|
||||
"focus": [
|
||||
-20.0625,
|
||||
-5.068359375,
|
||||
-810.755390625
|
||||
],
|
||||
"center_z": -810.755390625,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129-mouth/after/passage-2-3-0-upper-mouth.png",
|
||||
"scene": "Saved/Linux/l129/captures/mouth-closeups/after/passage-2-3-0-upper-mouth.vfmesh",
|
||||
"drawn_triangles": 59554,
|
||||
"source_triangles": 71494,
|
||||
"verified": true,
|
||||
"pixel_quality_status": "pass",
|
||||
"route_distance_actual_m": null,
|
||||
"route_station_adjustment_m": 0.0,
|
||||
"closeup_camera_target_distance_m": null,
|
||||
"closeup_target_surface_distance_m": null,
|
||||
"closeup_predicted_target_offset_m": null,
|
||||
"closeup_wall_normal_alignment": null,
|
||||
"fallback_kind": null,
|
||||
"fallback_surface_distance_m": null,
|
||||
"camera_actual_m": [
|
||||
-24.455025526892644,
|
||||
-5.631774473341657,
|
||||
-811.975390625
|
||||
],
|
||||
"target_actual_m": [
|
||||
-18.110266432492157,
|
||||
-4.81795266462593,
|
||||
-812.075390625
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-2-3-0-upper-mouth-mesh.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-2-3-0-upper-mouth-render.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-2-3-0-upper-mouth-quality.log"
|
||||
],
|
||||
"view": "passage-2-3-0-upper-mouth",
|
||||
"image_sha256": "954c7be05d77c4ccf5d3a7a486cc7cd1e32f108120e02daac2bb2cf18ed2a325"
|
||||
},
|
||||
{
|
||||
"name": "passage-2-3-0-lower-mouth",
|
||||
"passage": "passage/2-3/0",
|
||||
"kind": "mouth",
|
||||
"station": "lower-mouth",
|
||||
"camera": [
|
||||
-28.589162628136368,
|
||||
-1.22631300593053,
|
||||
-898.8116843726575
|
||||
],
|
||||
"target": [
|
||||
-18.26741313091866,
|
||||
-5.87721124217252,
|
||||
-900.0333984375
|
||||
],
|
||||
"yaw": 114.25594846721253,
|
||||
"pitch": -6.159177031829821,
|
||||
"focus": [
|
||||
-20.0625,
|
||||
-5.068359375,
|
||||
-898.7133984375
|
||||
],
|
||||
"center_z": -898.7133984375,
|
||||
"variant": "L125-v225",
|
||||
"capture": "captures/L129-mouth/before/passage-2-3-0-lower-mouth.png",
|
||||
"scene": "Saved/Linux/l129/captures/mouth-closeups/before/passage-2-3-0-lower-mouth.vfmesh",
|
||||
"drawn_triangles": 293832,
|
||||
"source_triangles": 314658,
|
||||
"verified": true,
|
||||
"pixel_quality_status": "low_contrast_geometry_visible",
|
||||
"route_distance_actual_m": null,
|
||||
"route_station_adjustment_m": 0.0,
|
||||
"closeup_camera_target_distance_m": null,
|
||||
"closeup_target_surface_distance_m": null,
|
||||
"closeup_predicted_target_offset_m": null,
|
||||
"closeup_wall_normal_alignment": null,
|
||||
"fallback_kind": null,
|
||||
"fallback_surface_distance_m": null,
|
||||
"camera_actual_m": [
|
||||
-28.589162628136368,
|
||||
-1.22631300593053,
|
||||
-898.8116843726575
|
||||
],
|
||||
"target_actual_m": [
|
||||
-18.26741313091866,
|
||||
-5.87721124217252,
|
||||
-900.0333984375
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-2-3-0-lower-mouth-mesh.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-2-3-0-lower-mouth-render.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/before/passage-2-3-0-lower-mouth-quality.log"
|
||||
],
|
||||
"view": "passage-2-3-0-lower-mouth",
|
||||
"image_sha256": "295bc7662d9b699212110c61e60c7bd19e99d13ebe94d41201fa93e109bf707e"
|
||||
},
|
||||
{
|
||||
"name": "passage-2-3-0-lower-mouth",
|
||||
"passage": "passage/2-3/0",
|
||||
"kind": "mouth",
|
||||
"station": "lower-mouth",
|
||||
"camera": [
|
||||
-28.589162628136368,
|
||||
-1.22631300593053,
|
||||
-898.8116843726575
|
||||
],
|
||||
"target": [
|
||||
-18.26741313091866,
|
||||
-5.87721124217252,
|
||||
-900.0333984375
|
||||
],
|
||||
"yaw": 114.25594846721253,
|
||||
"pitch": -6.159177031829821,
|
||||
"focus": [
|
||||
-20.0625,
|
||||
-5.068359375,
|
||||
-898.7133984375
|
||||
],
|
||||
"center_z": -898.7133984375,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129-mouth/after/passage-2-3-0-lower-mouth.png",
|
||||
"scene": "Saved/Linux/l129/captures/mouth-closeups/after/passage-2-3-0-lower-mouth.vfmesh",
|
||||
"drawn_triangles": 293832,
|
||||
"source_triangles": 314658,
|
||||
"verified": true,
|
||||
"pixel_quality_status": "low_contrast_geometry_visible",
|
||||
"route_distance_actual_m": null,
|
||||
"route_station_adjustment_m": 0.0,
|
||||
"closeup_camera_target_distance_m": null,
|
||||
"closeup_target_surface_distance_m": null,
|
||||
"closeup_predicted_target_offset_m": null,
|
||||
"closeup_wall_normal_alignment": null,
|
||||
"fallback_kind": null,
|
||||
"fallback_surface_distance_m": null,
|
||||
"camera_actual_m": [
|
||||
-28.589162628136368,
|
||||
-1.22631300593053,
|
||||
-898.8116843726575
|
||||
],
|
||||
"target_actual_m": [
|
||||
-18.26741313091866,
|
||||
-5.87721124217252,
|
||||
-900.0333984375
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-2-3-0-lower-mouth-mesh.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-2-3-0-lower-mouth-render.log",
|
||||
"Saved/Linux/l129/captures/mouth-closeups/after/passage-2-3-0-lower-mouth-quality.log"
|
||||
],
|
||||
"view": "passage-2-3-0-lower-mouth",
|
||||
"image_sha256": "295bc7662d9b699212110c61e60c7bd19e99d13ebe94d41201fa93e109bf707e"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,174 +0,0 @@
|
||||
diff --git a/Standalone/Core/include/VoxelForgeCore/VoxelForgeCore.h b/Standalone/Core/include/VoxelForgeCore/VoxelForgeCore.h
|
||||
index dc4ca32..aac34ff 100644
|
||||
--- a/Standalone/Core/include/VoxelForgeCore/VoxelForgeCore.h
|
||||
+++ b/Standalone/Core/include/VoxelForgeCore/VoxelForgeCore.h
|
||||
@@ -494,7 +494,8 @@ namespace VoxelForgeCore
|
||||
// Version 223 projects the floor onto one continuous arc-length profile and groups
|
||||
// dense passage samples into coarse tile candidates. Version 224 keeps the same
|
||||
// continuous floor while relaxing the spline chord tolerance and bounding shell work.
|
||||
- inline constexpr std::uint32_t WorldAssemblyEvaluatorVersion = 225;
|
||||
+ // Version 226 bounds smooth-passage influence in physical metres and narrows its reach.
|
||||
+ inline constexpr std::uint32_t WorldAssemblyEvaluatorVersion = 226;
|
||||
|
||||
enum class FieldChannel : std::uint32_t
|
||||
{
|
||||
diff --git a/Standalone/Core/src/ShapeWorldInternal.h b/Standalone/Core/src/ShapeWorldInternal.h
|
||||
index 517f375..dc258a1 100644
|
||||
--- a/Standalone/Core/src/ShapeWorldInternal.h
|
||||
+++ b/Standalone/Core/src/ShapeWorldInternal.h
|
||||
@@ -72,11 +72,11 @@ static bool VF_IsL98PassagePrepareTraceEnabled()
|
||||
return bEnabled;
|
||||
}
|
||||
|
||||
-static double VF_L93PassageCarveReachMetres()
|
||||
+static double VF_L129PassageCarveReachMetres()
|
||||
{
|
||||
- // The generated world uses a fixed bounded tube influence. An explicit diagnostic
|
||||
- // option can still select the legacy point-evaluation path for comparisons.
|
||||
- return 4.0;
|
||||
+ // Keep the sweep cutoff and its spatial bounds on one physical reach. Diagnostic
|
||||
+ // comparisons can still select another bounded reach or the point-evaluation path.
|
||||
+ return 2.0;
|
||||
}
|
||||
|
||||
enum class EPassageDensityQueryCaller : std::size_t
|
||||
@@ -306,7 +306,7 @@ public:
|
||||
profileStats_(profileStats),profileLod_(profileLod),
|
||||
passageCarveReachMetres_(std::isfinite(passageCarveReachMetres)
|
||||
&&passageCarveReachMetres>=0.0?passageCarveReachMetres
|
||||
- :VF_L93PassageCarveReachMetres())
|
||||
+ :VF_L129PassageCarveReachMetres())
|
||||
{
|
||||
mayContainResolvedBoundaryBand_=shape.ResolvedBoundaryBandsIntersectSubvoxelRange(
|
||||
minimumSubvoxels_[2],maximumSubvoxels_[2]);
|
||||
@@ -4813,11 +4813,14 @@ private:
|
||||
constexpr double Q=static_cast<double>(VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel);
|
||||
constexpr double PassageShellMetres=0.75;
|
||||
constexpr double ReliefMetres=0.21;
|
||||
- constexpr double SweepReachMetres=4.0;
|
||||
+ const double SweepReachMetres=VF_L129PassageCarveReachMetres();
|
||||
constexpr double CornerBlendMetres=0.50;
|
||||
constexpr std::size_t CandidateFineSamplesPerSpan=5;
|
||||
+ const double qPerMetre=Q*1000000.0/
|
||||
+ std::max<std::uint32_t>(1,ResolvedLayout->coreVoxelSizeMicrometres);
|
||||
const double requiredReach=std::max(SweepReachMetres+ReliefMetres
|
||||
+CornerBlendMetres*0.25,PassageShellMetres+ReliefMetres);
|
||||
+ const double requiredReachCoreVoxels=requiredReach*qPerMetre/Q;
|
||||
for(std::size_t passageIndex=0;passageIndex<ResolvedLayout->passages.size();
|
||||
++passageIndex)
|
||||
{
|
||||
@@ -4854,7 +4857,7 @@ private:
|
||||
routeMinimum[axis]=std::min(routeMinimum[axis],localMinimum[axis]);
|
||||
routeMaximum[axis]=std::max(routeMaximum[axis],localMaximum[axis]);
|
||||
}
|
||||
- const double localExtent=requiredReach
|
||||
+ const double localExtent=requiredReachCoreVoxels
|
||||
+std::max(prepared.radiusA,prepared.radiusB)/Q+0.01;
|
||||
FPassageProofBound proof;
|
||||
for(std::size_t axis=0;axis<3;++axis)
|
||||
@@ -4872,7 +4875,8 @@ private:
|
||||
std::ceil((localMaximum[axis]+localExtent)*Q));
|
||||
}
|
||||
}
|
||||
- const double routeExtent=maximumRadiusSubvoxels/Q+requiredReach+0.01;
|
||||
+ const double routeExtent=maximumRadiusSubvoxels/Q
|
||||
+ +requiredReachCoreVoxels+0.01;
|
||||
const double tileExtent=routeExtent;
|
||||
std::array<std::int64_t,3> featureMinimum{},featureMaximum{};
|
||||
for(std::size_t axis=0;axis<3;++axis)
|
||||
@@ -11442,7 +11446,7 @@ inline void FStandaloneShapeWorld::FScopedPassageTileQueries::prepareSweptTubeBa
|
||||
const FIntVector& origin,std::int32_t step,std::int32_t cells,std::uint32_t seed)
|
||||
{
|
||||
constexpr std::int64_t Q=VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel;
|
||||
- constexpr double InfluenceMetres=4.0;
|
||||
+ const double InfluenceMetres=VF_L129PassageCarveReachMetres();
|
||||
constexpr double OpenAirSideWallHeightMetres=1.0;
|
||||
if(!shape_||step<=0||cells<=0||!std::isfinite(passageCarveReachMetres_)
|
||||
||std::abs(passageCarveReachMetres_-InfluenceMetres)>1.0e-9)return;
|
||||
diff --git a/Standalone/Tools/verify/baselines/README.md b/Standalone/Tools/verify/baselines/README.md
|
||||
index 45fbb9f..fc7a59a 100644
|
||||
--- a/Standalone/Tools/verify/baselines/README.md
|
||||
+++ b/Standalone/Tools/verify/baselines/README.md
|
||||
@@ -4,7 +4,7 @@ These inputs are byte-for-byte copies of the historical files consumed by the
|
||||
verification gates. The gates now read this tracked directory instead of
|
||||
`Saved/Linux`, which is generated and is not present in a fresh checkout.
|
||||
|
||||
-- `owner-hash/`: L46, L52 and L53 diagnostics plus the pinned v212/v214 owner hash baselines.
|
||||
+- `owner-hash/`: L46, L52 and L53 diagnostics plus the pinned v212/v214 and L129 v226 owner hash baselines.
|
||||
- `historical-controls/`: L35, L36 and L38 regression-control logs.
|
||||
- `fixtures/`: Linux25 owner JSON inputs and L33 style-override fixtures.
|
||||
- `landmarks/`: L45–L48 landmark mesh and layout controls.
|
||||
diff --git a/Standalone/Tools/verify/baselines/owner-hash/canonical/owner-hash-floating-islands-style2-v226.baseline b/Standalone/Tools/verify/baselines/owner-hash/canonical/owner-hash-floating-islands-style2-v226.baseline
|
||||
new file mode 100644
|
||||
index 0000000..9d3b87b
|
||||
--- /dev/null
|
||||
+++ b/Standalone/Tools/verify/baselines/owner-hash/canonical/owner-hash-floating-islands-style2-v226.baseline
|
||||
@@ -0,0 +1,12 @@
|
||||
+[PipelineFullDetailHash] tiles=960 density=0x91931a57a067fd92 mesh=0xa818654be89790ac payload=0x370ff80451105a39 topology=0x06e507557aa70173
|
||||
+[PipelineWholeViewHash] tiles=2370 density=0x1573b570e1cbbf7e mesh=0xd88bf8bcf69ce1ce payload=0x347541780c9d8d71 topology=0x6b8ff8640be6e9d4
|
||||
+[PipelineLODHash] lod=0 tiles=512 density=0x2fd4c78685a43cfe mesh=0x50478cff1c1f8ca0 payload=0x54e48e57e0af26de topology=0x860c011cfdb9833a
|
||||
+[PipelineLODHash] lod=1 tiles=448 density=0x4b8d9a6dcd2942ad mesh=0x17e89b7087bfe711 payload=0x2389c109eb780db6 topology=0x7eccd4cf560d0630
|
||||
+[PipelineLODHash] lod=2 tiles=320 density=0x600ce5633a8f9e83 mesh=0xcd40f163b4cf3e0e payload=0xbe81dc276737a33a topology=0x942806963fedb92d
|
||||
+[PipelineLODHash] lod=3 tiles=208 density=0xf778be0581c49ed8 mesh=0x9aacf9e2a23034f8 payload=0xc1d4a985f2db3df5 topology=0xcdfdb412d3784023
|
||||
+[PipelineLODHash] lod=4 tiles=240 density=0xfb11591772a3d18e mesh=0xebf2baee8764591b payload=0xe491d7ac9c0061ad topology=0xd618ac33b95ce494
|
||||
+[PipelineLODHash] lod=5 tiles=144 density=0x2f8b7b7fb1e67258 mesh=0x4cd508cbe97344fd payload=0x2b6e96a6050458c9 topology=0x4ff6d0eda8988573
|
||||
+[PipelineLODHash] lod=6 tiles=96 density=0x0114a34c8b8d6113 mesh=0xb1fec4d01ae1fa44 payload=0x3e50cfd429b8e950 topology=0x08090c96d15c1618
|
||||
+[PipelineLODHash] lod=7 tiles=96 density=0x3836ed8cfce73418 mesh=0x40bc6589c5fc1aac payload=0x677349bcae16790f topology=0x36e3aa53192e6a6b
|
||||
+[PipelineLODHash] lod=8 tiles=306 density=0x144f3c1fd722708b mesh=0xef77b28bf7fd9453 payload=0xe3f47b37fcd61489 topology=0x5a3c73e295494e04
|
||||
+[PipelineExactQueryHash] probes=9 density=0x7b7c50ac24ccadcc unclamped=0x7b7c50ac24ccadcc detail=0xefcba20c0c70c415 collision=0xe604823a249029bf path=direct-Core-queries
|
||||
diff --git a/Standalone/Tools/verify/baselines/owner-hash/canonical/owner-hash-owner4-surface-world-style1-v226.baseline b/Standalone/Tools/verify/baselines/owner-hash/canonical/owner-hash-owner4-surface-world-style1-v226.baseline
|
||||
new file mode 100644
|
||||
index 0000000..128c807
|
||||
--- /dev/null
|
||||
+++ b/Standalone/Tools/verify/baselines/owner-hash/canonical/owner-hash-owner4-surface-world-style1-v226.baseline
|
||||
@@ -0,0 +1,12 @@
|
||||
+[PipelineFullDetailHash] tiles=960 density=0xe1aa01ac806a84fb mesh=0x453624e695910639 payload=0x2f5793602ea13144 topology=0x31a43376cb129e55
|
||||
+[PipelineWholeViewHash] tiles=2578 density=0xb82dc1dcdadda8ff mesh=0xe74e85bf3cb0909b payload=0x40bc3871dd9dccbe topology=0x855e712b549606c3
|
||||
+[PipelineLODHash] lod=0 tiles=512 density=0x8119a4f12c4661f4 mesh=0xc074e3705293bef2 payload=0x36c965f6b43875ea topology=0x38bed0df168486d0
|
||||
+[PipelineLODHash] lod=1 tiles=448 density=0x6270dd0856c53432 mesh=0xa803bb427deeba9a payload=0xf4718f1ce85d4f4f topology=0x7b770585aafd8174
|
||||
+[PipelineLODHash] lod=2 tiles=320 density=0xf774df80811a61c1 mesh=0xb223f0f68d0310f8 payload=0x6c3fd8c4aa100ee9 topology=0x923485084c866600
|
||||
+[PipelineLODHash] lod=3 tiles=272 density=0x62088ea9f38d2ed0 mesh=0x19bb327ba4ba3287 payload=0xd04c1223d50da0ea topology=0xf3817d1351cc89c5
|
||||
+[PipelineLODHash] lod=4 tiles=272 density=0xb743eb64967bddcd mesh=0xf6b5bd36b0ebfead payload=0xd1284c1540f50636 topology=0x4a6e197e2a1a9500
|
||||
+[PipelineLODHash] lod=5 tiles=208 density=0x38706b628a74dd17 mesh=0x445b1c7b51489cbb payload=0x713efc66290768f7 topology=0x56486b919146bb1e
|
||||
+[PipelineLODHash] lod=6 tiles=144 density=0xd53849b2002a1faa mesh=0xaa210abc8498c415 payload=0xd109aef8639706d1 topology=0x61a4d75fbbc35268
|
||||
+[PipelineLODHash] lod=7 tiles=96 density=0xb0ea9a140275c9cc mesh=0x3ffd8365c8b0ec29 payload=0x3577afb0a2e4a420 topology=0x97530aafde15b7e0
|
||||
+[PipelineLODHash] lod=8 tiles=306 density=0x8b3d1816799d67a0 mesh=0x80bf554f17700e1e payload=0xccbe22c3333a9c34 topology=0xcb11b28f6b6bcc50
|
||||
+[PipelineExactQueryHash] probes=9 density=0xf2df67b38b7802df unclamped=0x48b347986345b557 detail=0xefcba20c0c70c415 collision=0x137e8f6c0b03a624 path=direct-Core-queries
|
||||
diff --git a/Standalone/Tools/verify/baselines/owner-hash/canonical/owner-hash-surface-world-style1-v226.baseline b/Standalone/Tools/verify/baselines/owner-hash/canonical/owner-hash-surface-world-style1-v226.baseline
|
||||
new file mode 100644
|
||||
index 0000000..49f85bb
|
||||
--- /dev/null
|
||||
+++ b/Standalone/Tools/verify/baselines/owner-hash/canonical/owner-hash-surface-world-style1-v226.baseline
|
||||
@@ -0,0 +1,12 @@
|
||||
+[PipelineFullDetailHash] tiles=960 density=0xace56c8f205238ad mesh=0xa9c603a1248de6b8 payload=0xea55f1f4fcc6a894 topology=0x5ea7bc78a1b678ae
|
||||
+[PipelineWholeViewHash] tiles=2370 density=0x637fdf29ccba949b mesh=0xb02cf034b0c9e375 payload=0x74240706eac0c770 topology=0xe607e19fd4684210
|
||||
+[PipelineLODHash] lod=0 tiles=512 density=0xcd6ab28cfa504aca mesh=0xf03dc80a669fca31 payload=0x397aded1c3d2d297 topology=0xb4a1dc84fabc1fe3
|
||||
+[PipelineLODHash] lod=1 tiles=448 density=0xce6e713828b2a20a mesh=0x1cf408c25d67d18c payload=0x8a2b5d20571c997e topology=0x51cd985fe8e7d100
|
||||
+[PipelineLODHash] lod=2 tiles=320 density=0x353ee7ab408a9da1 mesh=0x8d355a8d598d56d5 payload=0x458f26e32d815635 topology=0x2e89b3cba09efcfe
|
||||
+[PipelineLODHash] lod=3 tiles=208 density=0xfe4f53b3ec010392 mesh=0xbd04d2da98d5b2e0 payload=0x10627f36d82200e8 topology=0xd625f3434ac0a893
|
||||
+[PipelineLODHash] lod=4 tiles=240 density=0x0be8798407724eaf mesh=0x131c303cbbe51434 payload=0x2a90ecf0a2411ca0 topology=0xe3e054a371152e08
|
||||
+[PipelineLODHash] lod=5 tiles=144 density=0xf20897ad272103a9 mesh=0x13d00b6253ae1f72 payload=0x0db3880693a962fa topology=0x462bd87a80f15e89
|
||||
+[PipelineLODHash] lod=6 tiles=96 density=0xc040fcac457d6313 mesh=0x1ed132eeb718fb62 payload=0xcd0214e35577c6e3 topology=0x2c56c69e6fdcfd64
|
||||
+[PipelineLODHash] lod=7 tiles=96 density=0xc2d419446355fdb8 mesh=0x4ea44452574fc84b payload=0xfd9779bedfc9ae0f topology=0x8948546e770c9b72
|
||||
+[PipelineLODHash] lod=8 tiles=306 density=0x62db31696f2da831 mesh=0xd373f9e9481532fe payload=0x540a60526e0e3e46 topology=0xc725cb901e6dc335
|
||||
+[PipelineExactQueryHash] probes=9 density=0xc949c4df2ce6f9d9 unclamped=0xc949c4df2ce6f9d9 detail=0x114c501e2d830d94 collision=0xe6011d3a248d4849 path=direct-Core-queries
|
||||
diff --git a/Standalone/Tools/verify/verify.py b/Standalone/Tools/verify/verify.py
|
||||
index 5fc1584..70f6a69 100644
|
||||
--- a/Standalone/Tools/verify/verify.py
|
||||
+++ b/Standalone/Tools/verify/verify.py
|
||||
@@ -122,11 +122,11 @@ RECIPE_RE = re.compile(
|
||||
|
||||
def owner_hash_baseline(recipe: str, style: int) -> tuple[Path, str]:
|
||||
if recipe == "surface-world" and style == 1:
|
||||
- return (BASELINES / "owner-hash/canonical/owner-hash-surface-world-style1-v225.baseline",
|
||||
- "L125-v225-stamped-passage-sweep")
|
||||
+ return (BASELINES / "owner-hash/canonical/owner-hash-surface-world-style1-v226.baseline",
|
||||
+ "L129-v226-physical-passage-reach")
|
||||
if recipe == "floating-islands" and style == 2:
|
||||
- return (BASELINES / "owner-hash/canonical/owner-hash-floating-islands-style2-v225.baseline",
|
||||
- "L125-v225-stamped-passage-sweep")
|
||||
+ return (BASELINES / "owner-hash/canonical/owner-hash-floating-islands-style2-v226.baseline",
|
||||
+ "L129-v226-physical-passage-reach")
|
||||
raise VerificationFailure(f"no pinned owner hash baseline for {recipe} style {style}")
|
||||
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
# Linux130 — passage reach
|
||||
|
||||
On `wip/l130-reach-units` from `b96dd73`, passage influence is now **1.0533 m**: 0.75 m shell + 0.21 m relief + 0.50 m smooth-max support (`width/6`) + 0.01 m margin. One metres-to-core-voxels conversion feeds proof, feature, fallback and off-grid bounds; the sweep cutoff uses the same metre value. The dead 4 m cutoff is removed. Evaluator version is 227.
|
||||
|
||||
The debug shell/crest audit sampled 25,728 points, including 5 mm inside and outside the reach; 18,993 had sign-relevant passage contribution. Proof and feature bounds missed none. The nine-station floor probe still peaks at **7.884 mm**, matching L125. The 23 L125 views and six L129 mouth close-ups are byte-identical. Fast verification, walkability and shell audits pass; the seam audit found 0 mismatches across 4 pairs / 4,900 shared samples.
|
||||
|
||||
Clang/GCC W1/W8/W12 hashes agree across all 18 runs. Versus v225, hashes changed for owner4 full-detail, whole-view and LOD0–3; owner2 surface-world and floating-islands whole-view and LOD2–3. Exact-query hashes stayed unchanged. The v227 canonical baselines are recorded; changed hashes reflect the shorter density influence halo, while sampled sign-relevant bounds and captured surfaces remain covered.
|
||||
|
||||
L80 timing used 10 interleaved pairs per stratum/worker count. Across the eight case medians, the weighted deltas were +0.33% for LOD0–2 and +0.31% whole-view. Across 80 paired runs, mean deltas were +0.26% (95% interval −0.44% to +0.96%) and +0.47% (−0.06% to +1.00%); both intervals include zero. No measurable timing change; UE movement was skipped. The Linux UE host build succeeded in 76.30 s with `-NoUBA -MaxParallelActions=4`, without `prlimit`. `ARCHITECTURE.md` and `CODEMAP.md` had no note for this optimized influence reach, so they were unchanged.
|
||||
@@ -0,0 +1,95 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Run Clang/GCC owner hashes at W1/W8/W12 and compare with b96dd73."""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import re
|
||||
import subprocess
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
OUT = ROOT / "Saved/Linux/l130/hashes"
|
||||
BASELINE = json.loads((ROOT / "Saved/Linux/l125/hashes/summary.json").read_text())
|
||||
DATASETS = {
|
||||
"owner4": ROOT / "Standalone/data/owner_world.json",
|
||||
"owner2": ROOT / "Standalone/data/regression/owner_world_2strate_l61.json",
|
||||
}
|
||||
RECIPES = {"owner4": ("surface-world",),
|
||||
"owner2": ("surface-world", "floating-islands")}
|
||||
BINARIES = {
|
||||
"clang": ROOT / "Saved/Linux/l130/bin/VoxelForgeCoreHeadless-l130-clang",
|
||||
"gcc": ROOT / "Saved/Linux/l130/bin/VoxelForgeCoreHeadless-l130-gcc",
|
||||
}
|
||||
HASH_RE = re.compile(r"^\[Pipeline(?:FullDetailHash|WholeViewHash|LODHash|ExactQueryHash)\].*$", re.M)
|
||||
STAMP_RE = re.compile(r"^\[VoxelForgeSourceStamp\] sha256=(\S+)$", re.M)
|
||||
|
||||
|
||||
def run(dataset: str, recipe: str, workers: int, compiler: str) -> dict:
|
||||
OUT.mkdir(parents=True, exist_ok=True)
|
||||
label = f"{dataset}-{recipe}-w{workers}-{compiler}"
|
||||
log = OUT / f"{label}.log"
|
||||
layout = OUT / f"{label}.layout.json"
|
||||
command = ["taskset", "-c", "0-11", "prlimit", "--as=6442450944", "--",
|
||||
"timeout", "1740s", str(BINARIES[compiler]), str(DATASETS[dataset]),
|
||||
f"--workers={workers}", "--world-assembler-prototype", "--stream-benchmark",
|
||||
"--stream-pipeline", "--force-generate", "--clip-radius=3",
|
||||
"--max-clip-level=8", "--max-level=8", f"--recipe={recipe}",
|
||||
"--stream-hash", f"--resolved-layout-output={layout}"]
|
||||
started = time.monotonic()
|
||||
with log.open("w", encoding="utf-8") as stream:
|
||||
result = subprocess.run(command, cwd=ROOT, stdout=stream,
|
||||
stderr=subprocess.STDOUT, check=False, timeout=1740)
|
||||
output = log.read_text(encoding="utf-8", errors="replace")
|
||||
hashes = HASH_RE.findall(output)
|
||||
if result.returncode or len(hashes) != 12:
|
||||
raise SystemExit(f"hash run failed: {label}; exit={result.returncode} "
|
||||
f"hashes={len(hashes)} log={log}")
|
||||
stamp = STAMP_RE.search(output)
|
||||
row = {"dataset": dataset, "recipe": recipe, "workers": workers,
|
||||
"compiler": compiler, "exit_code": result.returncode, "hashes": hashes,
|
||||
"source_stamp": stamp.group(1) if stamp else None,
|
||||
"elapsed_s": round(time.monotonic() - started, 3),
|
||||
"log": str(log.relative_to(ROOT))}
|
||||
print("[L130HashRun] " + json.dumps(row, sort_keys=True), flush=True)
|
||||
return row
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if any(not path.is_file() for path in (*DATASETS.values(), *BINARIES.values())):
|
||||
raise SystemExit("missing L130 hash input")
|
||||
old = {(row["dataset"], row["recipe"], row["workers"], row["compiler"]): row
|
||||
for row in BASELINE["runs"]}
|
||||
rows = []
|
||||
for dataset, recipes in RECIPES.items():
|
||||
for recipe in recipes:
|
||||
for workers in (1, 8, 12):
|
||||
for compiler in ("clang", "gcc"):
|
||||
rows.append(run(dataset, recipe, workers, compiler))
|
||||
(OUT / "runs-partial.json").write_text(
|
||||
json.dumps(rows, indent=2) + "\n", encoding="utf-8")
|
||||
groups = {}
|
||||
for dataset, recipes in RECIPES.items():
|
||||
for recipe in recipes:
|
||||
group = [row for row in rows if row["dataset"] == dataset
|
||||
and row["recipe"] == recipe]
|
||||
key = f"{dataset}/{recipe}"
|
||||
stable = all(row["hashes"] == group[0]["hashes"] for row in group)
|
||||
baseline = old[(dataset, recipe, 12, "clang")]["hashes"]
|
||||
changed = [i for i, (before, after) in enumerate(zip(baseline,
|
||||
group[0]["hashes"])) if before != after]
|
||||
groups[key] = {"all_workers_and_compilers_match": stable,
|
||||
"matches_b96dd73_v225": not changed,
|
||||
"changed_hash_rows_from_v225": changed,
|
||||
"source_stamps": sorted({row["source_stamp"] for row in group})}
|
||||
if not stable:
|
||||
raise SystemExit(f"worker/compiler hash mismatch: {key}")
|
||||
(OUT / "summary.json").write_text(
|
||||
json.dumps({"baseline_source": "b96dd73", "runs": rows,
|
||||
"groups": groups}, indent=2) + "\n", encoding="utf-8")
|
||||
print("[L130HashSummary] " + json.dumps(groups, sort_keys=True), flush=True)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,136 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Render the six L129 b96dd73 mouth views against the L130 meshes."""
|
||||
from __future__ import annotations
|
||||
|
||||
import hashlib
|
||||
import html
|
||||
import json
|
||||
import re
|
||||
import subprocess
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
SOURCE = ROOT / "Saved/Linux/l129/captures/mouth-closeups/before"
|
||||
SAVED = ROOT / "Saved/Linux/l130/captures/mouth-closeups"
|
||||
CAPTURES = ROOT / "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups"
|
||||
DATA = ROOT / "Standalone/data/owner_world.json"
|
||||
HEADLESS = ROOT / "Saved/Linux/l130/bin/VoxelForgeCoreHeadless-l130-clang"
|
||||
RENDERER = ROOT / "Saved/Linux/l130/bin/VoxelForgeOffscreenCapture-l130-clang"
|
||||
HEADLESS_CONFIG = re.compile(
|
||||
r"^\[HeadlessConfig\].*?camera_m=\(([^)]*)\) camera_rotation_deg=\(([^)]*)\)", re.M)
|
||||
SCENE = re.compile(r"^\[OffscreenScene\].*?height_center_m=(-?[\d.]+)", re.M)
|
||||
DRAWN = re.compile(r"drawn_triangles=(\d+)")
|
||||
|
||||
|
||||
def wrapped(command: list[str]) -> list[str]:
|
||||
return ["taskset", "-c", "0-11", "prlimit", "--as=6442450944", "--",
|
||||
"timeout", "1740s", *map(str, command)]
|
||||
|
||||
|
||||
def run(label: str, command: list[str], log: Path) -> str:
|
||||
started = time.monotonic()
|
||||
log.parent.mkdir(parents=True, exist_ok=True)
|
||||
with log.open("w", encoding="utf-8") as output:
|
||||
result = subprocess.run(wrapped(command), cwd=ROOT, stdout=output,
|
||||
stderr=subprocess.STDOUT, check=False, timeout=1740)
|
||||
content = log.read_text(encoding="utf-8", errors="replace")
|
||||
if result.returncode:
|
||||
raise SystemExit(f"{label} failed exit={result.returncode}: {log}")
|
||||
print(f"[L130MouthProcess] {label} elapsed_s={time.monotonic()-started:.2f}",
|
||||
flush=True)
|
||||
return content
|
||||
|
||||
|
||||
def parse_vector(text: str) -> tuple[float, ...]:
|
||||
return tuple(float(value) for value in text.split(","))
|
||||
|
||||
|
||||
def sha256(path: Path) -> str:
|
||||
return hashlib.sha256(path.read_bytes()).hexdigest()
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if any(not path.is_file() for path in (DATA, HEADLESS, RENDERER)):
|
||||
raise SystemExit("missing L130 mouth capture input")
|
||||
(CAPTURES / "b96dd73").mkdir(parents=True, exist_ok=True)
|
||||
(CAPTURES / "L130").mkdir(parents=True, exist_ok=True)
|
||||
rows = []
|
||||
for source_log in sorted(SOURCE.glob("*-mouth-mesh.log")):
|
||||
name = source_log.name.removesuffix("-mesh.log")
|
||||
source_render = SOURCE / f"{name}-render.log"
|
||||
baseline_mesh = SOURCE / f"{name}.vfmesh"
|
||||
if not all(path.is_file() for path in (source_render, baseline_mesh)):
|
||||
raise SystemExit(f"missing b96dd73 source artifact for {name}")
|
||||
config = HEADLESS_CONFIG.search(source_log.read_text())
|
||||
scene = SCENE.search(source_render.read_text())
|
||||
if config is None or scene is None:
|
||||
raise SystemExit(f"missing camera metadata for {name}")
|
||||
camera = parse_vector(config.group(1))
|
||||
yaw, pitch = parse_vector(config.group(2))
|
||||
height_center = float(scene.group(1))
|
||||
camera_arg = ",".join(f"{value:.6f}" for value in (*camera, yaw, pitch))
|
||||
candidate_mesh = SAVED / "L130" / f"{name}.vfmesh"
|
||||
candidate_mesh.parent.mkdir(parents=True, exist_ok=True)
|
||||
run(f"{name}-mesh", [HEADLESS, DATA, "--world-assembler-prototype",
|
||||
"--stream-benchmark", "--stream-pipeline", "--workers=12",
|
||||
"--clip-radius=3", "--max-clip-level=0", "--max-level=0",
|
||||
"--force-generate", "--recipe=surface-world", f"--camera={camera_arg}",
|
||||
"--render-distance-chunks=1", f"--mesh-export={candidate_mesh}"],
|
||||
SAVED / "L130" / f"{name}-mesh.log")
|
||||
if not candidate_mesh.is_file() or candidate_mesh.stat().st_size == 0:
|
||||
raise SystemExit(f"empty L130 mesh for {name}")
|
||||
|
||||
render_args = ["--size=1920x1080",
|
||||
f"--camera-m={','.join(f'{value:.6f}' for value in camera)}",
|
||||
f"--yaw-deg={yaw:.6f}", f"--pitch-deg={pitch:.6f}",
|
||||
"--shade=readable", "--headlamp=on", "--height-tint=on",
|
||||
f"--height-center-m={height_center:.6f}", "--height-range-m=32"]
|
||||
images = {}
|
||||
draw_counts = {}
|
||||
for variant, mesh in (("b96dd73", baseline_mesh), ("L130", candidate_mesh)):
|
||||
image = CAPTURES / variant / f"{name}.png"
|
||||
render_log = SAVED / variant / f"{name}-render.log"
|
||||
content = run(f"{name}-{variant}-render",
|
||||
[RENDERER, mesh, image, *render_args], render_log)
|
||||
drawn = DRAWN.search(content)
|
||||
if drawn is None or int(drawn.group(1)) <= 0 or not image.is_file():
|
||||
raise SystemExit(f"render has no visible triangles for {name}/{variant}")
|
||||
images[variant] = image
|
||||
draw_counts[variant] = int(drawn.group(1))
|
||||
equal = images["b96dd73"].read_bytes() == images["L130"].read_bytes()
|
||||
row = {"name": name, "camera_m": camera, "yaw_deg": yaw,
|
||||
"pitch_deg": pitch, "height_center_m": height_center,
|
||||
"source_mesh": str(baseline_mesh.relative_to(ROOT)),
|
||||
"candidate_mesh": str(candidate_mesh.relative_to(ROOT)),
|
||||
"baseline_png": str(images["b96dd73"].relative_to(ROOT)),
|
||||
"candidate_png": str(images["L130"].relative_to(ROOT)),
|
||||
"baseline_sha256": sha256(images["b96dd73"]),
|
||||
"candidate_sha256": sha256(images["L130"]),
|
||||
"byte_identical": equal, "drawn_triangles": draw_counts}
|
||||
rows.append(row)
|
||||
print(f"[L130MouthCompare] {name} byte_identical={equal} "
|
||||
f"sha256={row['candidate_sha256']}", flush=True)
|
||||
|
||||
if len(rows) != 6:
|
||||
raise SystemExit(f"expected six L129 mouth views, found {len(rows)}")
|
||||
(CAPTURES / "summary.json").write_text(json.dumps(rows, indent=2) + "\n")
|
||||
sections = []
|
||||
for row in rows:
|
||||
name = html.escape(row["name"])
|
||||
sections.append(f"<section><h2>{name}</h2><p>byte identical: "
|
||||
f"{str(row['byte_identical']).lower()}</p><div>"
|
||||
f"<figure><figcaption>b96dd73 source mesh</figcaption><img src='b96dd73/{name}.png'></figure>"
|
||||
f"<figure><figcaption>L130 reach units</figcaption><img src='L130/{name}.png'></figure>"
|
||||
"</div></section>")
|
||||
page = ("<!doctype html><meta charset='utf-8'><title>L130 mouth closeups</title>"
|
||||
"<style>body{font:14px system-ui;margin:24px;background:#17191d;color:#eee}"
|
||||
"section{margin:28px 0}div{display:grid;grid-template-columns:1fr 1fr;gap:12px}"
|
||||
"img{width:100%;height:auto}p{color:#bbb}</style>"
|
||||
"<h1>L129 mouth closeups: b96dd73 vs L130</h1>" + "\n".join(sections))
|
||||
(CAPTURES / "COMPARE.html").write_text(page)
|
||||
return 0 if all(row["byte_identical"] for row in rows) else 1
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,98 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Render the 23 L125 camera poses with the L130 evaluator and compare them."""
|
||||
from __future__ import annotations
|
||||
|
||||
import html
|
||||
import importlib.util
|
||||
import json
|
||||
import shutil
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
RESEARCH = Path(__file__).resolve().parent
|
||||
CAPTURES = RESEARCH / "captures"
|
||||
SAVED = ROOT / "Saved/Linux/l130/captures"
|
||||
BASELINE_INDEX = (ROOT / "Standalone/Research/WorldAssemblerM3/Linux119"
|
||||
/ "captures/L119/capture-index.json")
|
||||
REFERENCE = ROOT / "Standalone/Research/WorldAssemblerM3/Linux125/captures/L125"
|
||||
LAYOUT = ROOT / "Saved/Linux/l130/hashes/owner4-surface-world-w12-clang.layout.json"
|
||||
HEADLESS = ROOT / "Saved/Linux/l130/bin/VoxelForgeCoreHeadless-l130-clang"
|
||||
RENDERER = ROOT / "Saved/Linux/l130/bin/VoxelForgeOffscreenCapture-l130-clang"
|
||||
HELPER_PATH = ROOT / "Standalone/Research/WorldAssemblerM3/Linux113/RunL113Captures.py"
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if any(not path.is_file() for path in
|
||||
(BASELINE_INDEX, REFERENCE / "passage-0-1-0-rock-floor-station-1.png",
|
||||
LAYOUT, HEADLESS, RENDERER)):
|
||||
raise SystemExit("missing pose, layout, or L130 capture input")
|
||||
spec = importlib.util.spec_from_file_location("l125_capture_runner",
|
||||
ROOT / "Standalone/Research/WorldAssemblerM3/Linux125/RunL125Captures.py")
|
||||
if spec is None or spec.loader is None:
|
||||
raise SystemExit("cannot load the verified L125 pose set")
|
||||
runner = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(runner)
|
||||
runner.RESEARCH = RESEARCH
|
||||
runner.CAPTURES = CAPTURES
|
||||
runner.SAVED = SAVED
|
||||
runner.LAYOUT = LAYOUT
|
||||
runner.CLANG = HEADLESS
|
||||
runner.RENDERER = RENDERER
|
||||
runner.HELPERS.RESEARCH = RESEARCH
|
||||
runner.HELPERS.CAPTURES = CAPTURES
|
||||
runner.HELPERS.SAVED = SAVED
|
||||
runner.HELPERS.BINARIES = {"L125": HEADLESS}
|
||||
runner.HELPERS.RENDERERS = {"L125": RENDERER}
|
||||
if runner.main() != 0:
|
||||
raise SystemExit("L130 pose generation failed")
|
||||
|
||||
new_captures = CAPTURES / "L125"
|
||||
new_saved = SAVED / "L125"
|
||||
index_path = new_captures / "capture-index.json"
|
||||
data = json.loads(index_path.read_text())
|
||||
if len(data["captures"]) != 23:
|
||||
raise SystemExit(f"expected 23 poses, found {len(data['captures'])}")
|
||||
identical = 0
|
||||
sections = []
|
||||
for row in data["captures"]:
|
||||
name = row["name"]
|
||||
old_image = REFERENCE / f"{name}.png"
|
||||
new_image = new_captures / f"{name}.png"
|
||||
if not old_image.is_file() or not new_image.is_file():
|
||||
raise SystemExit(f"missing comparison image for {name}")
|
||||
same = old_image.read_bytes() == new_image.read_bytes()
|
||||
identical += int(same)
|
||||
row["variant"] = "L130-v227"
|
||||
row["capture"] = row["capture"].replace("captures/L125/", "captures/L130/")
|
||||
row["scene"] = row["scene"].replace("captures/L125/", "captures/L130/")
|
||||
row["logs"] = [path.replace("captures/L125/", "captures/L130/")
|
||||
for path in row.get("logs", [])]
|
||||
sections.append(f"<section><h2>{html.escape(row['passage'])} — "
|
||||
f"{html.escape(row.get('station', ''))}</h2><p>{html.escape(row['kind'])} · "
|
||||
f"byte identical: {str(same).lower()}</p><div>"
|
||||
f"<figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/{html.escape(name)}.png'></figure>"
|
||||
f"<figure><figcaption>L130 v227</figcaption><img src='L130/{html.escape(name)}.png'></figure>"
|
||||
"</div></section>")
|
||||
if identical != 23:
|
||||
raise SystemExit(f"only {identical}/23 L125 pose captures are byte-identical")
|
||||
|
||||
index_path.write_text(json.dumps(data, indent=2) + "\n")
|
||||
old_captures, old_saved = CAPTURES / "L130", SAVED / "L130"
|
||||
if old_captures.exists():
|
||||
shutil.rmtree(old_captures)
|
||||
if old_saved.exists():
|
||||
shutil.rmtree(old_saved)
|
||||
new_captures.rename(old_captures)
|
||||
new_saved.rename(old_saved)
|
||||
page = ("<!doctype html><meta charset='utf-8'><title>L130 passage captures</title>"
|
||||
"<style>body{font:14px system-ui;margin:24px;background:#17191d;color:#eee}"
|
||||
"section{margin:28px 0}div{display:grid;grid-template-columns:1fr 1fr;gap:12px}"
|
||||
"img{width:100%;height:auto}p{color:#bbb}</style>"
|
||||
"<h1>L125 v225 vs L130 v227: passage captures</h1>" + "\n".join(sections))
|
||||
(CAPTURES / "COMPARE.html").write_text(page)
|
||||
print(f"[L130PoseCapture] poses=23 byte_identical={identical}/23", flush=True)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,137 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Five interleaved L80 near-ready runs per stratum/worker vs b96dd73."""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import statistics
|
||||
import subprocess
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
OUT = ROOT / "Saved/Linux/l130/timing"
|
||||
PASS_ID = int(os.environ.get("VOXELFORGE_L130_TIMING_PASS", "1"))
|
||||
REPLICATE_FIRST = (PASS_ID - 1) * 5 + 1
|
||||
DATA = ROOT / "Standalone/data/owner_world.json"
|
||||
BINARIES = {
|
||||
"b96dd73": ROOT / "Saved/Linux/l125/bin/VoxelForgeCoreHeadless-l125-clang",
|
||||
"L130": ROOT / "Saved/Linux/l130/bin/VoxelForgeCoreHeadless-l130-clang",
|
||||
}
|
||||
CAMERAS = {
|
||||
0: (8.0, 16.0, -372.2626953125),
|
||||
1: (25.8369140625, 3.19921875, -737.0),
|
||||
2: (19.166015625, -14.2001953125, -753.3740234375),
|
||||
3: (-20.0625, -5.068359375, -900.353515625),
|
||||
}
|
||||
PIPELINE_RE = re.compile(r"^\[StreamPipeline\] (.*)$", re.M)
|
||||
FIELDS_RE = re.compile(r"([a-zA-Z0-9_]+)=([^ ]+)")
|
||||
NEAR_RE = re.compile(
|
||||
r"^\[WorldAssemblerNearLODReady\] lods=0-2 tiles=(\d+)/(\d+) cold_ready_s=([0-9.]+)$",
|
||||
re.M)
|
||||
|
||||
|
||||
def run(strate: int, workers: int, version: str, phase: str, replicate: int) -> dict:
|
||||
OUT.mkdir(parents=True, exist_ok=True)
|
||||
pass_suffix = "" if PASS_ID == 1 else f"-p{PASS_ID}"
|
||||
label = f"s{strate}-w{workers}-{version}-{phase}{replicate}-l130-v227{pass_suffix}"
|
||||
log = OUT / f"{label}.log"
|
||||
camera = ",".join(f"{value:.12f}" for value in CAMERAS[strate]) + ",0,0"
|
||||
command = ["taskset", "-c", "0-11", "prlimit", "--as=6442450944", "--",
|
||||
"timeout", "1740s", str(BINARIES[version]), str(DATA),
|
||||
"--world-assembler-prototype", "--stream-benchmark", "--stream-pipeline",
|
||||
f"--workers={workers}", "--clip-radius=3", "--max-clip-level=8",
|
||||
"--max-level=8", f"--camera={camera}", "--profile-lod-work",
|
||||
"--stream-scheduler-policy=3"]
|
||||
started = time.monotonic()
|
||||
with log.open("w", encoding="utf-8") as output:
|
||||
result = subprocess.run(command, cwd=ROOT, stdout=output,
|
||||
stderr=subprocess.STDOUT, check=False, timeout=1740)
|
||||
content = log.read_text(encoding="utf-8", errors="replace")
|
||||
pipeline, near = PIPELINE_RE.search(content), NEAR_RE.search(content)
|
||||
if result.returncode or pipeline is None or near is None:
|
||||
raise SystemExit(f"timing run failed: {log}; exit={result.returncode}")
|
||||
fields = dict(FIELDS_RE.findall(pipeline.group(1)))
|
||||
row = {"strate": strate, "workers": workers, "version": version,
|
||||
"phase": phase, "replicate": replicate, "exit_code": result.returncode,
|
||||
"wall_s": round(time.monotonic() - started, 3),
|
||||
"lod02_ready_s": float(near.group(3)),
|
||||
"whole_view_ready_s": float(fields["whole_view_ready"].removesuffix("s")),
|
||||
"log": str(log.relative_to(ROOT))}
|
||||
print("[L130TimingRun] " + json.dumps(row, sort_keys=True), flush=True)
|
||||
return row
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if any(not path.is_file() for path in (DATA, *BINARIES.values())):
|
||||
raise SystemExit("missing L130 timing input")
|
||||
OUT.mkdir(parents=True, exist_ok=True)
|
||||
load_1m = __import__("os").getloadavg()[0]
|
||||
def cpu_idle(interval: float = 2.0) -> float:
|
||||
def totals() -> tuple[int, int]:
|
||||
fields = Path("/proc/stat").read_text().splitlines()[0].split()
|
||||
values = [int(value) for value in fields[1:]]
|
||||
return sum(values), values[3] + (values[4] if len(values) > 4 else 0)
|
||||
before = totals()
|
||||
time.sleep(interval)
|
||||
after = totals()
|
||||
return 100.0 * (after[1] - before[1]) / max(1, after[0] - before[0])
|
||||
idle = cpu_idle()
|
||||
pass_suffix = "" if PASS_ID == 1 else f"-p{PASS_ID}"
|
||||
(OUT / f"machine-load-v227{pass_suffix}-before.txt").write_text(
|
||||
f"1-minute load: {load_1m:.2f}\n2-second CPU idle: {idle:.1f}%\n")
|
||||
print(f"[L130TimingGate] load_1m={load_1m:.2f} cpu_idle_2s={idle:.1f}%",
|
||||
flush=True)
|
||||
if load_1m >= 0.9 or idle < 97.0:
|
||||
raise SystemExit("timing refused: machine is above the quiet-load gate")
|
||||
|
||||
rows = []
|
||||
for strate in range(4):
|
||||
for workers in (8, 12):
|
||||
for version in BINARIES:
|
||||
run(strate, workers, version, "warmup", 0)
|
||||
for replicate in range(REPLICATE_FIRST, REPLICATE_FIRST + 5):
|
||||
order = tuple(BINARIES) if replicate % 2 else tuple(reversed(BINARIES))
|
||||
for version in order:
|
||||
rows.append(run(strate, workers, version, "measured", replicate))
|
||||
(OUT / f"runs-v227{pass_suffix}-partial.json").write_text(
|
||||
json.dumps(rows, indent=2) + "\n", encoding="utf-8")
|
||||
prior_runs = []
|
||||
if PASS_ID > 1:
|
||||
previous = OUT / ("v227-summary.json" if PASS_ID == 2
|
||||
else "v227-combined-summary.json")
|
||||
if previous.is_file():
|
||||
prior_runs = json.loads(previous.read_text(encoding="utf-8")).get("runs", [])
|
||||
all_rows = prior_runs + rows
|
||||
measured_rows = [row for row in all_rows if row["phase"] == "measured"]
|
||||
summary = []
|
||||
for strate in range(4):
|
||||
for workers in (8, 12):
|
||||
group_size = sum(row["strate"] == strate and row["workers"] == workers
|
||||
for row in measured_rows) // 2
|
||||
item = {"strate": strate, "workers": workers,
|
||||
"replicates_per_version": group_size}
|
||||
medians = {}
|
||||
for version in BINARIES:
|
||||
group = [row for row in measured_rows if row["strate"] == strate
|
||||
and row["workers"] == workers and row["version"] == version]
|
||||
medians[version] = {}
|
||||
for key in ("lod02_ready_s", "whole_view_ready_s"):
|
||||
values = [row[key] for row in group]
|
||||
medians[version][key] = statistics.median(values)
|
||||
item[f"{version}_{key}_values"] = values
|
||||
item[f"{version}_{key}_median"] = medians[version][key]
|
||||
for key in ("lod02_ready_s", "whole_view_ready_s"):
|
||||
item[f"L130_vs_b96dd73_{key}_delta_pct"] = round(
|
||||
100.0*(medians["L130"][key]/medians["b96dd73"][key]-1.0), 2)
|
||||
summary.append(item)
|
||||
summary_path = OUT / ("v227-summary.json" if PASS_ID == 1
|
||||
else f"v227-combined-summary.json")
|
||||
summary_path.write_text(json.dumps(
|
||||
{"runs": all_rows, "summary": summary}, indent=2) + "\n", encoding="utf-8")
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,23 @@
|
||||
<!doctype html><meta charset='utf-8'><title>L130 passage captures</title><style>body{font:14px system-ui;margin:24px;background:#17191d;color:#eee}section{margin:28px 0}div{display:grid;grid-template-columns:1fr 1fr;gap:12px}img{width:100%;height:auto}p{color:#bbb}</style><h1>L125 v225 vs L130 v227: passage captures</h1><section><h2>passage/0-1/0 — rock-floor/401.7m</h2><p>rock-floor-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-rock-floor-station-1.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-0-1-0-rock-floor-station-1.png'></figure></div></section>
|
||||
<section><h2>passage/0-1/0 — rock-floor/792.8m</h2><p>rock-floor-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-rock-floor-station-2.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-0-1-0-rock-floor-station-2.png'></figure></div></section>
|
||||
<section><h2>passage/0-1/0 — rock-floor/1634.5m</h2><p>rock-floor-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-rock-floor-station-3.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-0-1-0-rock-floor-station-3.png'></figure></div></section>
|
||||
<section><h2>passage/1-2/0 — rock-floor/27.0m</h2><p>rock-floor-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-rock-floor-station-1.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-1-2-0-rock-floor-station-1.png'></figure></div></section>
|
||||
<section><h2>passage/1-2/0 — rock-floor/52.9m</h2><p>rock-floor-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-rock-floor-station-2.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-1-2-0-rock-floor-station-2.png'></figure></div></section>
|
||||
<section><h2>passage/1-2/0 — rock-floor/78.9m</h2><p>rock-floor-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-rock-floor-station-3.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-1-2-0-rock-floor-station-3.png'></figure></div></section>
|
||||
<section><h2>passage/2-3/0 — rock-floor/323.4m</h2><p>rock-floor-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-rock-floor-station-1.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-2-3-0-rock-floor-station-1.png'></figure></div></section>
|
||||
<section><h2>passage/2-3/0 — rock-floor/333.4m</h2><p>rock-floor-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-rock-floor-station-2.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-2-3-0-rock-floor-station-2.png'></figure></div></section>
|
||||
<section><h2>passage/2-3/0 — rock-floor/343.4m</h2><p>rock-floor-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-rock-floor-station-3.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-2-3-0-rock-floor-station-3.png'></figure></div></section>
|
||||
<section><h2>passage/0-1/0 — section-1/4m-outside</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-openair-1-4m-outside.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-0-1-0-openair-1-4m-outside.png'></figure></div></section>
|
||||
<section><h2>passage/0-1/0 — section-1/4m-interior-wall</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-openair-1-4m-interior-wall.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-0-1-0-openair-1-4m-interior-wall.png'></figure></div></section>
|
||||
<section><h2>passage/0-1/0 — section-2/4m-outside</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-openair-2-4m-outside.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-0-1-0-openair-2-4m-outside.png'></figure></div></section>
|
||||
<section><h2>passage/0-1/0 — section-2/4m-interior-wall</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-openair-2-4m-interior-wall.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-0-1-0-openair-2-4m-interior-wall.png'></figure></div></section>
|
||||
<section><h2>passage/0-1/0 — section-3/4m-outside</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-openair-3-4m-outside.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-0-1-0-openair-3-4m-outside.png'></figure></div></section>
|
||||
<section><h2>passage/0-1/0 — section-3/4m-interior-wall</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-0-1-0-openair-3-4m-interior-wall.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-0-1-0-openair-3-4m-interior-wall.png'></figure></div></section>
|
||||
<section><h2>passage/1-2/0 — section-1/4m-outside</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-openair-1-4m-outside.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-1-2-0-openair-1-4m-outside.png'></figure></div></section>
|
||||
<section><h2>passage/1-2/0 — section-1/4m-interior-wall</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-openair-1-4m-interior-wall.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-1-2-0-openair-1-4m-interior-wall.png'></figure></div></section>
|
||||
<section><h2>passage/1-2/0 — section-2/4m-outside</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-openair-2-4m-outside.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-1-2-0-openair-2-4m-outside.png'></figure></div></section>
|
||||
<section><h2>passage/1-2/0 — section-2/4m-interior-wall</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-1-2-0-openair-2-4m-interior-wall.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-1-2-0-openair-2-4m-interior-wall.png'></figure></div></section>
|
||||
<section><h2>passage/2-3/0 — section-1/4m-outside</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-openair-1-4m-outside.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-2-3-0-openair-1-4m-outside.png'></figure></div></section>
|
||||
<section><h2>passage/2-3/0 — section-1/4m-interior-wall</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-openair-1-4m-interior-wall.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-2-3-0-openair-1-4m-interior-wall.png'></figure></div></section>
|
||||
<section><h2>passage/2-3/0 — section-2/4m-outside</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-openair-2-4m-outside.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-2-3-0-openair-2-4m-outside.png'></figure></div></section>
|
||||
<section><h2>passage/2-3/0 — section-2/4m-interior-wall</h2><p>open-air-close · byte identical: true</p><div><figure><figcaption>L125 v225</figcaption><img src='../../Linux125/captures/L125/passage-2-3-0-openair-2-4m-interior-wall.png'></figure><figure><figcaption>L130 v227</figcaption><img src='L130/passage-2-3-0-openair-2-4m-interior-wall.png'></figure></div></section>
|
||||
+138
-138
@@ -28,9 +28,9 @@
|
||||
"route_length_m": 2026.6238040154117,
|
||||
"planned_floor_m": -445.66373993191075,
|
||||
"planned_grade_deg": 10.372328677972732,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-0-1-0-rock-floor-station-1.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-0-1-0-rock-floor-station-1.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-0-1-0-rock-floor-station-1.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-0-1-0-rock-floor-station-1.vfmesh",
|
||||
"drawn_triangles": 122294,
|
||||
"source_triangles": 146798,
|
||||
"verified": true,
|
||||
@@ -54,9 +54,9 @@
|
||||
-445.66373993191075
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-rock-floor-station-1-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-rock-floor-station-1-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-rock-floor-station-1-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-rock-floor-station-1-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-rock-floor-station-1-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-rock-floor-station-1-quality.log"
|
||||
],
|
||||
"floor_anchor_position_m": [
|
||||
-7.026885053959959,
|
||||
@@ -100,9 +100,9 @@
|
||||
"route_length_m": 2026.6238040154117,
|
||||
"planned_floor_m": -516.0616688299093,
|
||||
"planned_grade_deg": 10.367725129664787,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-0-1-0-rock-floor-station-2.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-0-1-0-rock-floor-station-2.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-0-1-0-rock-floor-station-2.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-0-1-0-rock-floor-station-2.vfmesh",
|
||||
"drawn_triangles": 586092,
|
||||
"source_triangles": 626196,
|
||||
"verified": true,
|
||||
@@ -126,9 +126,9 @@
|
||||
-516.0616688299093
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-rock-floor-station-2-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-rock-floor-station-2-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-rock-floor-station-2-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-rock-floor-station-2-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-rock-floor-station-2-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-rock-floor-station-2-quality.log"
|
||||
],
|
||||
"floor_anchor_position_m": [
|
||||
-2.471476828908,
|
||||
@@ -172,9 +172,9 @@
|
||||
"route_length_m": 2026.6238040154117,
|
||||
"planned_floor_m": -667.5348848643227,
|
||||
"planned_grade_deg": 10.360515186362372,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-0-1-0-rock-floor-station-3.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-0-1-0-rock-floor-station-3.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-0-1-0-rock-floor-station-3.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-0-1-0-rock-floor-station-3.vfmesh",
|
||||
"drawn_triangles": 137288,
|
||||
"source_triangles": 166736,
|
||||
"verified": true,
|
||||
@@ -198,9 +198,9 @@
|
||||
-667.5348848643227
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-rock-floor-station-3-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-rock-floor-station-3-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-rock-floor-station-3-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-rock-floor-station-3-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-rock-floor-station-3-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-rock-floor-station-3-quality.log"
|
||||
],
|
||||
"floor_anchor_position_m": [
|
||||
17.33622182815858,
|
||||
@@ -244,9 +244,9 @@
|
||||
"route_length_m": 114.99063175809309,
|
||||
"planned_floor_m": -738.1970266319915,
|
||||
"planned_grade_deg": 10.657740387934142,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-1-2-0-rock-floor-station-1.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-1-2-0-rock-floor-station-1.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-1-2-0-rock-floor-station-1.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-1-2-0-rock-floor-station-1.vfmesh",
|
||||
"drawn_triangles": 652056,
|
||||
"source_triangles": 719660,
|
||||
"verified": true,
|
||||
@@ -270,9 +270,9 @@
|
||||
-738.1970266319915
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-rock-floor-station-1-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-rock-floor-station-1-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-rock-floor-station-1-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-rock-floor-station-1-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-rock-floor-station-1-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-rock-floor-station-1-quality.log"
|
||||
],
|
||||
"floor_anchor_position_m": [
|
||||
15.354124807038394,
|
||||
@@ -316,9 +316,9 @@
|
||||
"route_length_m": 114.99063175809309,
|
||||
"planned_floor_m": -742.995373541633,
|
||||
"planned_grade_deg": 10.645569354114926,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-1-2-0-rock-floor-station-2.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-1-2-0-rock-floor-station-2.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-1-2-0-rock-floor-station-2.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-1-2-0-rock-floor-station-2.vfmesh",
|
||||
"drawn_triangles": 636162,
|
||||
"source_triangles": 700558,
|
||||
"verified": true,
|
||||
@@ -342,9 +342,9 @@
|
||||
-742.995373541633
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-rock-floor-station-2-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-rock-floor-station-2-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-rock-floor-station-2-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-rock-floor-station-2-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-rock-floor-station-2-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-rock-floor-station-2-quality.log"
|
||||
],
|
||||
"floor_anchor_position_m": [
|
||||
-4.766428465537912,
|
||||
@@ -388,9 +388,9 @@
|
||||
"route_length_m": 114.99063175809309,
|
||||
"planned_floor_m": -747.7963166548619,
|
||||
"planned_grade_deg": 10.659092990906162,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-1-2-0-rock-floor-station-3.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-1-2-0-rock-floor-station-3.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-1-2-0-rock-floor-station-3.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-1-2-0-rock-floor-station-3.vfmesh",
|
||||
"drawn_triangles": 580472,
|
||||
"source_triangles": 639376,
|
||||
"verified": true,
|
||||
@@ -414,9 +414,9 @@
|
||||
-747.7963166548619
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-rock-floor-station-3-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-rock-floor-station-3-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-rock-floor-station-3-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-rock-floor-station-3-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-rock-floor-station-3-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-rock-floor-station-3-quality.log"
|
||||
],
|
||||
"floor_anchor_position_m": [
|
||||
-12.283352972838873,
|
||||
@@ -460,9 +460,9 @@
|
||||
"route_length_m": 494.0722798830563,
|
||||
"planned_floor_m": -871.0755965556104,
|
||||
"planned_grade_deg": 10.274530613220444,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-2-3-0-rock-floor-station-1.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-2-3-0-rock-floor-station-1.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-2-3-0-rock-floor-station-1.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-2-3-0-rock-floor-station-1.vfmesh",
|
||||
"drawn_triangles": 474964,
|
||||
"source_triangles": 502362,
|
||||
"verified": true,
|
||||
@@ -486,9 +486,9 @@
|
||||
-871.0755965556104
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-rock-floor-station-1-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-rock-floor-station-1-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-rock-floor-station-1-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-rock-floor-station-1-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-rock-floor-station-1-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-rock-floor-station-1-quality.log"
|
||||
],
|
||||
"floor_anchor_position_m": [
|
||||
9.103799793973732,
|
||||
@@ -532,9 +532,9 @@
|
||||
"route_length_m": 494.0722798830563,
|
||||
"planned_floor_m": -872.8561420785873,
|
||||
"planned_grade_deg": 10.266334408339132,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-2-3-0-rock-floor-station-2.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-2-3-0-rock-floor-station-2.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-2-3-0-rock-floor-station-2.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-2-3-0-rock-floor-station-2.vfmesh",
|
||||
"drawn_triangles": 494504,
|
||||
"source_triangles": 524342,
|
||||
"verified": true,
|
||||
@@ -558,9 +558,9 @@
|
||||
-872.8561420785873
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-rock-floor-station-2-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-rock-floor-station-2-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-rock-floor-station-2-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-rock-floor-station-2-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-rock-floor-station-2-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-rock-floor-station-2-quality.log"
|
||||
],
|
||||
"floor_anchor_position_m": [
|
||||
15.204108325185125,
|
||||
@@ -604,9 +604,9 @@
|
||||
"route_length_m": 494.0722798830563,
|
||||
"planned_floor_m": -874.6379150751349,
|
||||
"planned_grade_deg": 10.259484647608062,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-2-3-0-rock-floor-station-3.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-2-3-0-rock-floor-station-3.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-2-3-0-rock-floor-station-3.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-2-3-0-rock-floor-station-3.vfmesh",
|
||||
"drawn_triangles": 485356,
|
||||
"source_triangles": 512664,
|
||||
"verified": true,
|
||||
@@ -630,9 +630,9 @@
|
||||
-874.6379150751349
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-rock-floor-station-3-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-rock-floor-station-3-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-rock-floor-station-3-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-rock-floor-station-3-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-rock-floor-station-3-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-rock-floor-station-3-quality.log"
|
||||
],
|
||||
"floor_anchor_position_m": [
|
||||
15.464091528009144,
|
||||
@@ -682,9 +682,9 @@
|
||||
"route_distance_m": 8.3545,
|
||||
"requested_route_distance_m": 8.3545,
|
||||
"route_length_m": 2026.6238040154117,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-0-1-0-openair-1-4m-outside.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-0-1-0-openair-1-4m-outside.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-0-1-0-openair-1-4m-outside.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-0-1-0-openair-1-4m-outside.vfmesh",
|
||||
"drawn_triangles": 275333,
|
||||
"source_triangles": 327745,
|
||||
"verified": true,
|
||||
@@ -708,9 +708,9 @@
|
||||
-373.75
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-1-4m-outside-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-1-4m-outside-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-1-4m-outside-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-1-4m-outside-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-1-4m-outside-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-1-4m-outside-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -747,9 +747,9 @@
|
||||
"route_distance_m": 8.3545,
|
||||
"requested_route_distance_m": 8.3545,
|
||||
"route_length_m": 2026.6238040154117,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-0-1-0-openair-1-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-0-1-0-openair-1-4m-interior-wall.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-0-1-0-openair-1-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-0-1-0-openair-1-4m-interior-wall.vfmesh",
|
||||
"drawn_triangles": 308012,
|
||||
"source_triangles": 368124,
|
||||
"verified": true,
|
||||
@@ -773,9 +773,9 @@
|
||||
-373.75
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-1-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-1-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-1-4m-interior-wall-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-1-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-1-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-1-4m-interior-wall-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -812,9 +812,9 @@
|
||||
"route_distance_m": 14.4925,
|
||||
"requested_route_distance_m": 14.4925,
|
||||
"route_length_m": 2026.6238040154117,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-0-1-0-openair-2-4m-outside.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-0-1-0-openair-2-4m-outside.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-0-1-0-openair-2-4m-outside.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-0-1-0-openair-2-4m-outside.vfmesh",
|
||||
"drawn_triangles": 275333,
|
||||
"source_triangles": 327745,
|
||||
"verified": true,
|
||||
@@ -838,9 +838,9 @@
|
||||
-376.0
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-2-4m-outside-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-2-4m-outside-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-2-4m-outside-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-2-4m-outside-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-2-4m-outside-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-2-4m-outside-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -877,9 +877,9 @@
|
||||
"route_distance_m": 14.4925,
|
||||
"requested_route_distance_m": 14.4925,
|
||||
"route_length_m": 2026.6238040154117,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-0-1-0-openair-2-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-0-1-0-openair-2-4m-interior-wall.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-0-1-0-openair-2-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-0-1-0-openair-2-4m-interior-wall.vfmesh",
|
||||
"drawn_triangles": 345026,
|
||||
"source_triangles": 414658,
|
||||
"verified": true,
|
||||
@@ -903,9 +903,9 @@
|
||||
-376.0
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-2-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-2-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-2-4m-interior-wall-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-2-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-2-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-2-4m-interior-wall-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -942,9 +942,9 @@
|
||||
"route_distance_m": 1265.3425000000002,
|
||||
"requested_route_distance_m": 1265.3425000000002,
|
||||
"route_length_m": 2026.6238040154117,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-0-1-0-openair-3-4m-outside.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-0-1-0-openair-3-4m-outside.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-0-1-0-openair-3-4m-outside.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-0-1-0-openair-3-4m-outside.vfmesh",
|
||||
"drawn_triangles": 149234,
|
||||
"source_triangles": 181128,
|
||||
"verified": true,
|
||||
@@ -968,9 +968,9 @@
|
||||
-600.5734332352072
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-3-4m-outside-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-3-4m-outside-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-3-4m-outside-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-3-4m-outside-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-3-4m-outside-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-3-4m-outside-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -1007,9 +1007,9 @@
|
||||
"route_distance_m": 1265.3425000000002,
|
||||
"requested_route_distance_m": 1265.3425000000002,
|
||||
"route_length_m": 2026.6238040154117,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-0-1-0-openair-3-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-0-1-0-openair-3-4m-interior-wall.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-0-1-0-openair-3-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-0-1-0-openair-3-4m-interior-wall.vfmesh",
|
||||
"drawn_triangles": 148100,
|
||||
"source_triangles": 180244,
|
||||
"verified": true,
|
||||
@@ -1033,9 +1033,9 @@
|
||||
-600.6947104389109
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-3-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-3-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-0-1-0-openair-3-4m-interior-wall-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-3-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-3-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-0-1-0-openair-3-4m-interior-wall-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -1072,9 +1072,9 @@
|
||||
"route_distance_m": 83.504,
|
||||
"requested_route_distance_m": 83.504,
|
||||
"route_length_m": 114.99063175809309,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-1-2-0-openair-1-4m-outside.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-1-2-0-openair-1-4m-outside.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-1-2-0-openair-1-4m-outside.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-1-2-0-openair-1-4m-outside.vfmesh",
|
||||
"drawn_triangles": 620814,
|
||||
"source_triangles": 684776,
|
||||
"verified": true,
|
||||
@@ -1098,9 +1098,9 @@
|
||||
-747.5006103515625
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-openair-1-4m-outside-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-openair-1-4m-outside-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-openair-1-4m-outside-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-openair-1-4m-outside-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-openair-1-4m-outside-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-openair-1-4m-outside-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -1137,9 +1137,9 @@
|
||||
"route_distance_m": 83.504,
|
||||
"requested_route_distance_m": 83.504,
|
||||
"route_length_m": 114.99063175809309,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-1-2-0-openair-1-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-1-2-0-openair-1-4m-interior-wall.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-1-2-0-openair-1-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-1-2-0-openair-1-4m-interior-wall.vfmesh",
|
||||
"drawn_triangles": 609757,
|
||||
"source_triangles": 668131,
|
||||
"verified": true,
|
||||
@@ -1163,9 +1163,9 @@
|
||||
-748.1744141343152
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-openair-1-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-openair-1-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-openair-1-4m-interior-wall-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-openair-1-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-openair-1-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-openair-1-4m-interior-wall-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -1202,9 +1202,9 @@
|
||||
"route_distance_m": 104.362,
|
||||
"requested_route_distance_m": 104.362,
|
||||
"route_length_m": 114.99063175809309,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-1-2-0-openair-2-4m-outside.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-1-2-0-openair-2-4m-outside.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-1-2-0-openair-2-4m-outside.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-1-2-0-openair-2-4m-outside.vfmesh",
|
||||
"drawn_triangles": 584542,
|
||||
"source_triangles": 637002,
|
||||
"verified": true,
|
||||
@@ -1228,9 +1228,9 @@
|
||||
-752.0293187551489
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-openair-2-4m-outside-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-openair-2-4m-outside-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-openair-2-4m-outside-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-openair-2-4m-outside-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-openair-2-4m-outside-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-openair-2-4m-outside-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -1267,9 +1267,9 @@
|
||||
"route_distance_m": 104.362,
|
||||
"requested_route_distance_m": 104.362,
|
||||
"route_length_m": 114.99063175809309,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-1-2-0-openair-2-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-1-2-0-openair-2-4m-interior-wall.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-1-2-0-openair-2-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-1-2-0-openair-2-4m-interior-wall.vfmesh",
|
||||
"drawn_triangles": 572258,
|
||||
"source_triangles": 618646,
|
||||
"verified": true,
|
||||
@@ -1293,9 +1293,9 @@
|
||||
-752.0074179101423
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-openair-2-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-openair-2-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-1-2-0-openair-2-4m-interior-wall-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-openair-2-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-openair-2-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-1-2-0-openair-2-4m-interior-wall-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -1332,9 +1332,9 @@
|
||||
"route_distance_m": 16.616500000000002,
|
||||
"requested_route_distance_m": 16.616500000000002,
|
||||
"route_length_m": 494.0722798830563,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-2-3-0-openair-1-4m-outside.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-2-3-0-openair-1-4m-outside.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-2-3-0-openair-1-4m-outside.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-2-3-0-openair-1-4m-outside.vfmesh",
|
||||
"drawn_triangles": 104612,
|
||||
"source_triangles": 129326,
|
||||
"verified": true,
|
||||
@@ -1358,9 +1358,9 @@
|
||||
-816.1078690565205
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-openair-1-4m-outside-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-openair-1-4m-outside-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-openair-1-4m-outside-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-openair-1-4m-outside-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-openair-1-4m-outside-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-openair-1-4m-outside-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -1397,9 +1397,9 @@
|
||||
"route_distance_m": 16.616500000000002,
|
||||
"requested_route_distance_m": 16.616500000000002,
|
||||
"route_length_m": 494.0722798830563,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-2-3-0-openair-1-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-2-3-0-openair-1-4m-interior-wall.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-2-3-0-openair-1-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-2-3-0-openair-1-4m-interior-wall.vfmesh",
|
||||
"drawn_triangles": 94962,
|
||||
"source_triangles": 118028,
|
||||
"verified": true,
|
||||
@@ -1423,9 +1423,9 @@
|
||||
-815.6327986602337
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-openair-1-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-openair-1-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-openair-1-4m-interior-wall-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-openair-1-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-openair-1-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-openair-1-4m-interior-wall-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -1462,9 +1462,9 @@
|
||||
"route_distance_m": 374.929,
|
||||
"requested_route_distance_m": 374.929,
|
||||
"route_length_m": 494.0722798830563,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-2-3-0-openair-2-4m-outside.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-2-3-0-openair-2-4m-outside.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-2-3-0-openair-2-4m-outside.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-2-3-0-openair-2-4m-outside.vfmesh",
|
||||
"drawn_triangles": 475860,
|
||||
"source_triangles": 504244,
|
||||
"verified": true,
|
||||
@@ -1488,9 +1488,9 @@
|
||||
-879.7662205769708
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-openair-2-4m-outside-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-openair-2-4m-outside-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-openair-2-4m-outside-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-openair-2-4m-outside-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-openair-2-4m-outside-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-openair-2-4m-outside-quality.log"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -1527,9 +1527,9 @@
|
||||
"route_distance_m": 374.929,
|
||||
"requested_route_distance_m": 374.929,
|
||||
"route_length_m": 494.0722798830563,
|
||||
"variant": "L129-v226",
|
||||
"capture": "captures/L129/passage-2-3-0-openair-2-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l129/captures/L129/passage-2-3-0-openair-2-4m-interior-wall.vfmesh",
|
||||
"variant": "L130-v227",
|
||||
"capture": "captures/L130/passage-2-3-0-openair-2-4m-interior-wall.png",
|
||||
"scene": "Saved/Linux/l130/captures/L130/passage-2-3-0-openair-2-4m-interior-wall.vfmesh",
|
||||
"drawn_triangles": 486480,
|
||||
"source_triangles": 513552,
|
||||
"verified": true,
|
||||
@@ -1553,9 +1553,9 @@
|
||||
-879.75
|
||||
],
|
||||
"logs": [
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-openair-2-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-openair-2-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l129/captures/L129/passage-2-3-0-openair-2-4m-interior-wall-quality.log"
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-openair-2-4m-interior-wall-mesh.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-openair-2-4m-interior-wall-render.log",
|
||||
"Saved/Linux/l130/captures/L130/passage-2-3-0-openair-2-4m-interior-wall-quality.log"
|
||||
]
|
||||
}
|
||||
]
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,6 @@
|
||||
<!doctype html><meta charset='utf-8'><title>L130 mouth closeups</title><style>body{font:14px system-ui;margin:24px;background:#17191d;color:#eee}section{margin:28px 0}div{display:grid;grid-template-columns:1fr 1fr;gap:12px}img{width:100%;height:auto}p{color:#bbb}</style><h1>L129 mouth closeups: b96dd73 vs L130</h1><section><h2>passage-0-1-0-lower-mouth</h2><p>byte identical: true</p><div><figure><figcaption>b96dd73 source mesh</figcaption><img src='b96dd73/passage-0-1-0-lower-mouth.png'></figure><figure><figcaption>L130 reach units</figcaption><img src='L130/passage-0-1-0-lower-mouth.png'></figure></div></section>
|
||||
<section><h2>passage-0-1-0-upper-mouth</h2><p>byte identical: true</p><div><figure><figcaption>b96dd73 source mesh</figcaption><img src='b96dd73/passage-0-1-0-upper-mouth.png'></figure><figure><figcaption>L130 reach units</figcaption><img src='L130/passage-0-1-0-upper-mouth.png'></figure></div></section>
|
||||
<section><h2>passage-1-2-0-lower-mouth</h2><p>byte identical: true</p><div><figure><figcaption>b96dd73 source mesh</figcaption><img src='b96dd73/passage-1-2-0-lower-mouth.png'></figure><figure><figcaption>L130 reach units</figcaption><img src='L130/passage-1-2-0-lower-mouth.png'></figure></div></section>
|
||||
<section><h2>passage-1-2-0-upper-mouth</h2><p>byte identical: true</p><div><figure><figcaption>b96dd73 source mesh</figcaption><img src='b96dd73/passage-1-2-0-upper-mouth.png'></figure><figure><figcaption>L130 reach units</figcaption><img src='L130/passage-1-2-0-upper-mouth.png'></figure></div></section>
|
||||
<section><h2>passage-2-3-0-lower-mouth</h2><p>byte identical: true</p><div><figure><figcaption>b96dd73 source mesh</figcaption><img src='b96dd73/passage-2-3-0-lower-mouth.png'></figure><figure><figcaption>L130 reach units</figcaption><img src='L130/passage-2-3-0-lower-mouth.png'></figure></div></section>
|
||||
<section><h2>passage-2-3-0-upper-mouth</h2><p>byte identical: true</p><div><figure><figcaption>b96dd73 source mesh</figcaption><img src='b96dd73/passage-2-3-0-upper-mouth.png'></figure><figure><figcaption>L130 reach units</figcaption><img src='L130/passage-2-3-0-upper-mouth.png'></figure></div></section>
|
||||
BIN
Binary file not shown.
|
After Width: | Height: | Size: 37 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 225 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 39 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 187 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 37 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 44 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 37 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 225 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 39 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 187 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 37 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 44 KiB |
@@ -0,0 +1,134 @@
|
||||
[
|
||||
{
|
||||
"name": "passage-0-1-0-lower-mouth",
|
||||
"camera_m": [
|
||||
32.688347,
|
||||
9.553723,
|
||||
-735.48053
|
||||
],
|
||||
"yaw_deg": -132.845,
|
||||
"pitch_deg": -6.052,
|
||||
"height_center_m": -736.267,
|
||||
"source_mesh": "Saved/Linux/l129/captures/mouth-closeups/before/passage-0-1-0-lower-mouth.vfmesh",
|
||||
"candidate_mesh": "Saved/Linux/l130/captures/mouth-closeups/L130/passage-0-1-0-lower-mouth.vfmesh",
|
||||
"baseline_png": "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups/b96dd73/passage-0-1-0-lower-mouth.png",
|
||||
"candidate_png": "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups/L130/passage-0-1-0-lower-mouth.png",
|
||||
"baseline_sha256": "aff7310b94e1b57e9cd1e42d3294e10964aed4a56e74bec8c1cdc0a5b2bffa98",
|
||||
"candidate_sha256": "aff7310b94e1b57e9cd1e42d3294e10964aed4a56e74bec8c1cdc0a5b2bffa98",
|
||||
"byte_identical": true,
|
||||
"drawn_triangles": {
|
||||
"b96dd73": 549170,
|
||||
"L130": 549170
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "passage-0-1-0-upper-mouth",
|
||||
"camera_m": [
|
||||
8.324777,
|
||||
20.450708,
|
||||
-371.84259
|
||||
],
|
||||
"yaw_deg": -175.826,
|
||||
"pitch_deg": -0.889,
|
||||
"height_center_m": -372.122,
|
||||
"source_mesh": "Saved/Linux/l129/captures/mouth-closeups/before/passage-0-1-0-upper-mouth.vfmesh",
|
||||
"candidate_mesh": "Saved/Linux/l130/captures/mouth-closeups/L130/passage-0-1-0-upper-mouth.vfmesh",
|
||||
"baseline_png": "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups/b96dd73/passage-0-1-0-upper-mouth.png",
|
||||
"candidate_png": "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups/L130/passage-0-1-0-upper-mouth.png",
|
||||
"baseline_sha256": "76dbb3263eb4f2018d13496f42b6eff7eb875e2029358776e22337aea8893a6d",
|
||||
"candidate_sha256": "76dbb3263eb4f2018d13496f42b6eff7eb875e2029358776e22337aea8893a6d",
|
||||
"byte_identical": true,
|
||||
"drawn_triangles": {
|
||||
"b96dd73": 243380,
|
||||
"L130": 243380
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "passage-1-2-0-lower-mouth",
|
||||
"camera_m": [
|
||||
27.129938,
|
||||
-19.07345,
|
||||
-751.877197
|
||||
],
|
||||
"yaw_deg": -58.537,
|
||||
"pitch_deg": -5.944,
|
||||
"height_center_m": -751.734,
|
||||
"source_mesh": "Saved/Linux/l129/captures/mouth-closeups/before/passage-1-2-0-lower-mouth.vfmesh",
|
||||
"candidate_mesh": "Saved/Linux/l130/captures/mouth-closeups/L130/passage-1-2-0-lower-mouth.vfmesh",
|
||||
"baseline_png": "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups/b96dd73/passage-1-2-0-lower-mouth.png",
|
||||
"candidate_png": "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups/L130/passage-1-2-0-lower-mouth.png",
|
||||
"baseline_sha256": "1c193b6fcb65b98b1c721704990392dc816486639e047b53bb72b4a17d89ae4c",
|
||||
"candidate_sha256": "1c193b6fcb65b98b1c721704990392dc816486639e047b53bb72b4a17d89ae4c",
|
||||
"byte_identical": true,
|
||||
"drawn_triangles": {
|
||||
"b96dd73": 544808,
|
||||
"L130": 544808
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "passage-1-2-0-upper-mouth",
|
||||
"camera_m": [
|
||||
23.391808,
|
||||
-15.509525,
|
||||
-731.781067
|
||||
],
|
||||
"yaw_deg": -72.785,
|
||||
"pitch_deg": -0.897,
|
||||
"height_center_m": -730.561,
|
||||
"source_mesh": "Saved/Linux/l129/captures/mouth-closeups/before/passage-1-2-0-upper-mouth.vfmesh",
|
||||
"candidate_mesh": "Saved/Linux/l130/captures/mouth-closeups/L130/passage-1-2-0-upper-mouth.vfmesh",
|
||||
"baseline_png": "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups/b96dd73/passage-1-2-0-upper-mouth.png",
|
||||
"candidate_png": "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups/L130/passage-1-2-0-upper-mouth.png",
|
||||
"baseline_sha256": "28576cefb1b59601d2e68981a7b77fc28a1d667c58ab27292deac0acd9deb338",
|
||||
"candidate_sha256": "28576cefb1b59601d2e68981a7b77fc28a1d667c58ab27292deac0acd9deb338",
|
||||
"byte_identical": true,
|
||||
"drawn_triangles": {
|
||||
"b96dd73": 593026,
|
||||
"L130": 593026
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "passage-2-3-0-lower-mouth",
|
||||
"camera_m": [
|
||||
-28.589163,
|
||||
-1.226313,
|
||||
-898.811707
|
||||
],
|
||||
"yaw_deg": 114.256,
|
||||
"pitch_deg": -6.159,
|
||||
"height_center_m": -898.713,
|
||||
"source_mesh": "Saved/Linux/l129/captures/mouth-closeups/before/passage-2-3-0-lower-mouth.vfmesh",
|
||||
"candidate_mesh": "Saved/Linux/l130/captures/mouth-closeups/L130/passage-2-3-0-lower-mouth.vfmesh",
|
||||
"baseline_png": "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups/b96dd73/passage-2-3-0-lower-mouth.png",
|
||||
"candidate_png": "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups/L130/passage-2-3-0-lower-mouth.png",
|
||||
"baseline_sha256": "58cd3ea88c754afab20d1cdcaf5f0edf676f0303d9f392d3632a6f2257205766",
|
||||
"candidate_sha256": "58cd3ea88c754afab20d1cdcaf5f0edf676f0303d9f392d3632a6f2257205766",
|
||||
"byte_identical": true,
|
||||
"drawn_triangles": {
|
||||
"b96dd73": 293832,
|
||||
"L130": 293832
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "passage-2-3-0-upper-mouth",
|
||||
"camera_m": [
|
||||
-24.455027,
|
||||
-5.631774,
|
||||
-811.975403
|
||||
],
|
||||
"yaw_deg": 82.691,
|
||||
"pitch_deg": -0.896,
|
||||
"height_center_m": -810.755,
|
||||
"source_mesh": "Saved/Linux/l129/captures/mouth-closeups/before/passage-2-3-0-upper-mouth.vfmesh",
|
||||
"candidate_mesh": "Saved/Linux/l130/captures/mouth-closeups/L130/passage-2-3-0-upper-mouth.vfmesh",
|
||||
"baseline_png": "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups/b96dd73/passage-2-3-0-upper-mouth.png",
|
||||
"candidate_png": "Standalone/Research/WorldAssemblerM3/Linux130/captures/mouth-closeups/L130/passage-2-3-0-upper-mouth.png",
|
||||
"baseline_sha256": "6b903c68fac1a20783185afbac8cdad717c6e9374e665e3618e118c5a6aadf51",
|
||||
"candidate_sha256": "6b903c68fac1a20783185afbac8cdad717c6e9374e665e3618e118c5a6aadf51",
|
||||
"byte_identical": true,
|
||||
"drawn_triangles": {
|
||||
"b96dd73": 59554,
|
||||
"L130": 59554
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,50 @@
|
||||
# Linux131 — current state and dead experiment cleanup
|
||||
|
||||
Branch `wip/l131-current-state`, based on `cbbfd46`; Core evaluator remains v227. The root [`CURRENT-STATE.md`](../../../../CURRENT-STATE.md) consolidates the shipping behavior, current references, verification commands, open gaps, and closed proposals.
|
||||
|
||||
## Removed
|
||||
|
||||
- Removed `VOXELFORGE_L86_DISABLE_PASSAGE_COMPOSITION`, `VOXELFORGE_L88_DISABLE_PASSAGES`, `VOXELFORGE_L88_DISABLE_BOUNDARY_BANDS`, and `VOXELFORGE_L88_ALLOW_PASSAGE_ABLATION_WALKABILITY_FAILURE`. These only supported archived passage/boundary ablations in `Linux86/RunL86Ceiling.py`, `Linux87/RunL87Timeline.py`, and `Linux88/RunL88CeilingSplit.py`; no current `verify.py` gate or live comparison uses them. Passage feature selection, passage composition, and boundary bands now run on the normal path, and passage-route validation cannot be waived by the old ablation flag.
|
||||
- Removed the `VOXELFORGE_AUDIT_LEGACY_ROUTE_GRADE` block from `Standalone/Source/WorldAssemblyPrototype.h`. The source contained its only reference; no test, current tool, or report invoked it.
|
||||
- Kept route-candidate grading and all user-visible behavior. This cleanup adds no evaluator version or baseline change.
|
||||
|
||||
## Switch and hook inventory
|
||||
|
||||
### Environment switches in compiled Core/Source
|
||||
|
||||
| Switch | Effect and consumer | Keep decision |
|
||||
|---|---|---|
|
||||
| `VOXELFORGE_L74_TIGHT_PROOF_CONTROL` | Proof negative control. `Linux74/FalsifierL74.py` and `Linux75/FalsifierL75.py`. | Keep for falsifier reproducibility; not a current fast-tier input. |
|
||||
| `VOXELFORGE_L75_TN_BLOCK_REGRESSION` | Fixed TunnelNetwork regression path in Core and mesher. `RunTnBlockRegressionL75.py` and `FalsifierL75.py`. | Keep; the regression tools still consume it. |
|
||||
| `VOXELFORGE_L98_PASSAGE_PREP_TRACE` | Emits preparation-stage timing/count data. `RunL98Hashes.py` and `RunL98ReuseCounts.py`. | Keep as a focused profiler for future preparation comparisons. |
|
||||
| `VOXELFORGE_L98_PASSAGE_REUSE_PROBE` | Compares the prepared projection with direct scalar queries. `RunL98ReuseCounts.py`. | Keep for exactness probes. |
|
||||
| `VOXELFORGE_L104_FAR_HIT_CACHE` | Selects indexed versus linear far-hit candidate lookup. `RunL104ReadinessPairs.py` and `RunL104ProbeStats.py`. | Keep for reproducible A/B comparisons; cache defaults on. |
|
||||
| `VOXELFORGE_L104_FAR_HIT_STATS` | Emits far-hit candidate/query counters. `RunL104ProbeStats.py`. | Keep for the measurement tool. |
|
||||
| `VOXELFORGE_L115_DENSITY_PROFILE` | Enables density and floor-query profiling. `RunL115DensityProbe.py`, `RunL119DensityProbe.py`, and `RunL125DensityProbe.py`. | Keep; these remain the focused floor-probe path. |
|
||||
| `VOXELFORGE_L130_PASSAGE_REACH_PROOF_AUDIT` | Checks passage proof/feature influence bounds. L130's reach audit and report. | Keep for reach changes and audit reproduction. |
|
||||
|
||||
Archived runners also set `VOXELFORGE_L81_PASSAGE_BOUND_PADDING_VOXELS`, `VOXELFORGE_L86_PASSAGE_RESULT_CACHE`, `VOXELFORGE_L90_PASSAGE_BRICK_METRES`, `VOXELFORGE_L90_PASSAGE_CANDIDATE_CENSUS`, `VOXELFORGE_L90_PASSAGE_REACH_METRES`, `VOXELFORGE_L91_PASSAGE_SOURCE_FLOOR_VOXELS`, `VOXELFORGE_L93_PASSAGE_CARVE_REACH_METRES`, `VOXELFORGE_L98_PASSAGE_REUSE_COUNTS`, `VOXELFORGE_L114_DENSITY_PROFILE`, and `VOXELFORGE_L118_TAG_TIMING`. None has a compiled-source reader at `cbbfd46`; they are inert historical runner strings.
|
||||
|
||||
### Other experiments, diagnostics, and legacy paths retained
|
||||
|
||||
- **World-changing tunnel ablations:** all 14 `voxel.TunnelAblate*` controls remain (`CaveWarp`, `DetailOps`, `RoomSDF`, `TunnelSDF`, `TunnelCore`, `PassageCarving`, `PassageStructuralPosts`, `NativeFloor`, `Disturbances`, `OriginSpine`, `BoundarySeal`, `LandingPosts`, `XYEdgeSeal`, `PitChimneySDF`). The editor commandlet writes their resolved mask into export and result manifests; the archived `PERF-SAMPLED.md` and `WORK-NEXT.md` record their measurements. No current runner invokes an ablation. Keep for manifest attribution and historical reproduction; removing it needs a metadata migration. Source: [`VoxelDensityAblation.cpp`](../../../../Source/VoxelForge/Private/VoxelDensityAblation.cpp), [`VoxelForgeExploreCommandlet.cpp`](../../../../Source/VoxelForgeEditor/Private/VoxelForgeExploreCommandlet.cpp).
|
||||
- **Research fields:** `voxel.ResearchRedefinedDensityField`, `voxel.ResearchRedefinedDensityDetailScale`, `voxel.ResearchParameterizedCave`, and `voxel.ResearchParameterizedCaveSet` are default-off and used by `Tools/VoxelForgeTest.ps1` steps 2d/2e/2f. The region-eval commandlet consumes `SetResearchBrickBinningEnabled`, `SetResearchBrickRoomReachScale`, and `SetResearchRegionCacheWindowEnabled`; keep these editor-only experiment paths. Source: [`VoxelForgeRegionEvalExperiment.cpp`](../../../../Source/VoxelForgeEditor/Private/VoxelForgeRegionEvalExperiment.cpp), [`VoxelForgeTest.ps1`](../../../../Tools/VoxelForgeTest.ps1).
|
||||
- **Runtime profiling and trace:** `voxel.SampleStacks` still starts `FVoxelStackSampler` (the guarded `Tools/VoxelForgeTest.ps1 -SampleDensityStacks` path consumes it); `voxel.ProfileDensity`, `voxel.ProfileDensityFull`, `voxel.ProfileTileGeneration`, `voxel.ProfileCollisionCookStages`, and `voxel.PerfAttribution` remain opt-in. `voxel.StartupTraceFile`, `voxel.StartupTraceMaxTiles`, and `voxel.StartupTraceUntilEndPlay` feed the Unreal startup trace used by the arrival/movement runners. Keep. Build-time `VOXELFORGE_PROFILE_LEGACY_TERMS` (L76) and `VOXELFORGE_PROFILE_L77`/`--linux77-profile` (stack sampler and route census) remain in `Standalone/BuildLinux.sh` and Core.
|
||||
- **Standalone profiles and timelines:** retained `--profile-column-overlap`, `--profile-lod-work`, `--profile-passage-composer`, `--instrument-tile-drain`, `--cold-worker-timeline`, `--linux77-profile`, `--tls-probe=N`, `--tls-probe-touch=...`, and `--diagnostic-slow-shape-compile-ms=N`. The viewer's `--profile-attribution`, `--profile-detail-band`, and `--profile-far-column-overlap` remain. The L77 profiler, tile drain instrumentation, timelines, and TLS probe are measurement hooks; archived reports and runners still provide reproducible consumers.
|
||||
- **Standalone audits:** all source-advertised hooks remain: `--audit-ore-vein-yield`, `--audit-resolved-layout-boundaries`, `--audit-strate-transitions`, `--audit-resolved-layout-passages`, `--audit-heightfield-profile`, `--audit-motif-intervals`, `--audit-landmark-reachability`, `--audit-native-caves`, `--audit-native-lattice`, `--audit-surface-clearance`, `--audit-uniform-block-proofs`, `--audit-base-page-equivalence`, `--audit-route-parity`, `--audit-passage-tile-seams`, `--audit-passage-source-clamp`, `--audit-passage-carve-reach`, `--audit-tile-shape-readiness`, and the mesher's `--audit-raw-skirts`. `verify.py fast` consumes the current route, passage, block-proof, transition, native-field and negative-control subset; dedicated L37/L75/L125/L130 runners exercise the specialized audits. Keep the whole audit set.
|
||||
- **Evaluator A/B controls:** `voxel.FastIsFinite`, `voxel.UseFusedEvaluator`, `voxel.WormBlockSkip`, `voxel.TileCacheWindow` / its two minimum-LOD controls, `voxel.SpatialIndex`, `voxel.ChunkRoutingCache`, `voxel.UseOperatorBlock`, `voxel.CoreColumnCacheDirectMapped`, `voxel.CoreMCGradientMemoization`, `voxel.FloorRound1PassageProjectionCache`, `voxel.PlayerFitMemo`, `voxel.UseBlockEarlyOut`, `voxel.OuterClassifierMode`, and `voxel.SealedSolidProof` remain. They select optimized or comparison paths; the density block equivalence test explicitly forces `UseFusedEvaluator=0`, while most others are production defaults or historical measurement controls. `voxel.WormsForceOff` is a world-changing development measurement override. Kept; no current L131 gate changes them.
|
||||
- **Standalone A/B and geometry controls:** `--exact-midpoint-density-memo`, `--no-exact-midpoint-density-memo`, `--active-lane-batching`, `--proof-block-cells=N`, `--parallel-sign-edge-repair`, `--serial-sign-edge-repair`, and `--shape-helper-limit=8|12` remain. The L94 report documents serial edge repair; no current `verify.py` consumer was found for the other CLI A/B controls, so they remain pending a separately reviewed removal. `voxel.TilePostReachDebug`, `voxel.TilePostReachScale`, and `voxel.TileReachCostDiagnostics` remain for the tile-post-reach test; `voxel.TunnelMouthTrim` remains a development-only room-mouth geometry control. No L131 gate uses these.
|
||||
- `FLegacyGeneratorFieldAdapter` remains the Core fallback for unsupported generator/recipe combinations, and Unreal's Core switch remains default-off. `voxel.StreamingLegacyPendingResultCap=1` remains the L120–L123 admission negative control; `voxel.StreamingCoarseFirst` remains opt-in pending a rendered owner-plan check. `bStandaloneResearchRoundTunnels` and `bStandaloneResearchEnhancedWalls` remain consumed by the standalone viewer/Core adapter.
|
||||
|
||||
## Checks
|
||||
|
||||
- Clang 19 and GCC standalone builds passed with the L131 source stamp `5119cee164406856cbca496d160c0e0a8124ae2529fa7c0ebd51634a7c65a6cb`. `Standalone/BuildLinux.sh` applied the required CPU and address-space limits.
|
||||
- L80 timing: one warm-up per binary and five interleaved pairs in each of four strata × W8/W12 cells, comparing the pre-cleanup L130 binary with L131. Load was 0.81; CPU idle was 99.2%. Across 40 pairs per metric, mean relative change was −0.22% near-ready (95% CI −1.02% to +0.57%) and −0.29% whole-view (−1.04% to +0.46%); the intervals include zero. [Raw timing summary](../../../../Saved/Linux/l131/timing/summary.json).
|
||||
- Exact hashes: **24/24** owner4 SW/FI/TN/VS × Clang/GCC × W1/W8/W12 tile and whole-view identities; **18/18** canonical cases across owner4 SurfaceWorld and owner2 SurfaceWorld/FloatingIslands. All match the pre-cleanup L130 binary and agree across compiler/worker combinations. For transparency, forcing the owner4 dataset through `--recipe=floating-islands` exited during setup with “could not find a finite SurfaceWorld strate”, before hashing; it is not a valid canonical case. [Tile matrix](../../../../Saved/Linux/l131/hash-matrix/summary.json), [canonical matrix](../../../../Saved/Linux/l131/canonical-matrix/summary.json).
|
||||
- Walkability: **21,425/21,425** passage centerline samples open. Seam audit: **4 pairs / 4,900** shared samples, zero mismatches. [Audit log](../../../../Saved/Linux/l131/seam-audit.log).
|
||||
- Fast tier: **PASS**, 259 gated checks plus 5 diagnostics, 80 runs, 371.0 s. The five diagnostic-only comparisons are historical baselines; all required checks pass. [Summary](../../../../Saved/Linux/l131/fast-summary.json).
|
||||
- Linux `VFHostEditor`: **PASS**, 27/27 actions, 78.81 s with `-NoUBA -MaxParallelActions=4`, no `prlimit`. UBT's default log rotation first failed before compilation in the read-only user config directory; the successful rerun set `-Log=.../Saved/Linux/l131/ubt.log`. Three existing RealtimeMesh deprecation warnings remain. [Build log](../../../../Saved/Linux/l131/ue-build.log).
|
||||
- Unreal `Source/` files changed: **none**. No Windows compile is requested by this diff; Windows determinism remains unverified.
|
||||
- `git diff --check` passes. No commit, push, or stash was made.
|
||||
|
||||
Builds, per-run logs, timing records, hash records, and audit output are under `Saved/Linux/l131/`.
|
||||
@@ -0,0 +1,75 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Compare 18 canonical owner4/owner2 hashes with the pre-cleanup L130 binary."""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import re
|
||||
import subprocess
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
OUT = ROOT / "Saved/Linux/l131/canonical-matrix"
|
||||
DATASETS = {
|
||||
"owner4": ROOT / "Standalone/data/owner_world.json",
|
||||
"owner2": ROOT / "Standalone/data/regression/owner_world_2strate_l61.json",
|
||||
}
|
||||
RECIPES = {"owner4": ("surface-world",), "owner2": ("surface-world", "floating-islands")}
|
||||
BINARIES = {
|
||||
"base": ROOT / "Saved/Linux/l130/bin/VoxelForgeCoreHeadless-l130-{compiler}",
|
||||
"l131": ROOT / "Saved/Linux/l131/bin/VoxelForgeCoreHeadless-l131-{compiler}",
|
||||
}
|
||||
HASH_RE = re.compile(r"^\[Pipeline(?:FullDetailHash|WholeViewHash|LODHash|ExactQueryHash)\].*$", re.M)
|
||||
|
||||
|
||||
def run(dataset: str, recipe: str, compiler: str, workers: int, version: str) -> tuple[list[str], float]:
|
||||
binary = Path(str(BINARIES[version]).format(compiler=compiler))
|
||||
label = f"{dataset}-{recipe}-{compiler}-w{workers}-{version}"
|
||||
log = OUT / f"{label}.log"
|
||||
command = ["taskset", "-c", "0-11", "prlimit", "--as=6442450944", "--",
|
||||
"timeout", "1740s", str(binary), str(DATASETS[dataset]),
|
||||
"--world-assembler-prototype", "--stream-benchmark", "--stream-pipeline",
|
||||
"--force-generate", f"--workers={workers}", "--clip-radius=3",
|
||||
"--max-clip-level=8", "--max-level=8", f"--recipe={recipe}", "--stream-hash"]
|
||||
started = time.monotonic()
|
||||
with log.open("w", encoding="utf-8") as stream:
|
||||
process = subprocess.run(command, cwd=ROOT, stdout=stream,
|
||||
stderr=subprocess.STDOUT, check=False, timeout=1740)
|
||||
hashes = HASH_RE.findall(log.read_text(encoding="utf-8", errors="replace"))
|
||||
if process.returncode or len(hashes) != 12:
|
||||
raise RuntimeError(f"hash run failed: {log}; exit={process.returncode}; rows={len(hashes)}")
|
||||
return hashes, time.monotonic() - started
|
||||
|
||||
|
||||
def main() -> int:
|
||||
OUT.mkdir(parents=True, exist_ok=True)
|
||||
rows = []
|
||||
groups = {}
|
||||
for dataset, recipes in RECIPES.items():
|
||||
for recipe in recipes:
|
||||
signatures = []
|
||||
for workers in (1, 8, 12):
|
||||
for compiler in ("clang", "gcc"):
|
||||
before, before_s = run(dataset, recipe, compiler, workers, "base")
|
||||
after, after_s = run(dataset, recipe, compiler, workers, "l131")
|
||||
row = {"dataset": dataset, "recipe": recipe, "compiler": compiler,
|
||||
"workers": workers, "hash_mismatches": sum(a != b for a, b in zip(before, after)),
|
||||
"rows": len(after), "base_s": round(before_s, 3), "l131_s": round(after_s, 3),
|
||||
"base_log": f"Saved/Linux/l131/canonical-matrix/{dataset}-{recipe}-{compiler}-w{workers}-base.log",
|
||||
"l131_log": f"Saved/Linux/l131/canonical-matrix/{dataset}-{recipe}-{compiler}-w{workers}-l131.log"}
|
||||
rows.append(row)
|
||||
signatures.append((compiler, workers, after))
|
||||
print("[L131CanonicalHash] " + json.dumps(row, sort_keys=True), flush=True)
|
||||
(OUT / "runs-partial.json").write_text(json.dumps(rows, indent=2) + "\n")
|
||||
first = signatures[0][2]
|
||||
stable = all(sig == first for _, _, sig in signatures)
|
||||
groups[f"{dataset}/{recipe}"] = {"base_equals_l131": all(row["hash_mismatches"] == 0 for row in rows if row["dataset"] == dataset and row["recipe"] == recipe),
|
||||
"all_clang_gcc_workers_agree": stable}
|
||||
failures = [row for row in rows if row["hash_mismatches"]]
|
||||
(OUT / "summary.json").write_text(json.dumps({"runs": rows, "groups": groups,
|
||||
"passed": len(rows)-len(failures), "failed": len(failures)}, indent=2) + "\n")
|
||||
return 1 if failures or not all(group["all_clang_gcc_workers_agree"] for group in groups.values()) else 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,84 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Compare 24 owner4 tile-hash cases with the pre-cleanup L130 binary."""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import re
|
||||
import subprocess
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
OUT = ROOT / "Saved/Linux/l131/hash-matrix"
|
||||
DATA = ROOT / "Standalone/data/owner_world.json"
|
||||
BINARIES = {
|
||||
"base": ROOT / "Saved/Linux/l130/bin/VoxelForgeCoreHeadless-l130-{compiler}",
|
||||
"l131": ROOT / "Saved/Linux/l131/bin/VoxelForgeCoreHeadless-l131-{compiler}",
|
||||
}
|
||||
CAMERAS = {
|
||||
"sw": ((8.0, 16.0, -372.2626953125), 2850),
|
||||
"fi": ((25.8369140625, 3.19921875, -737.0), 2249),
|
||||
"tn": ((19.166015625, -14.2001953125, -753.3740234375), 2233),
|
||||
"vs": ((-20.0625, -5.068359375, -900.353515625), 2329),
|
||||
}
|
||||
TILE_RE = re.compile(
|
||||
r"^\[PipelineTileHash\] lod=(-?\d+) x=(-?\d+) y=(-?\d+) z=(-?\d+) "
|
||||
r"density=(0x[0-9a-f]+) mesh=(0x[0-9a-f]+) payload=(0x[0-9a-f]+) "
|
||||
r"topology=(0x[0-9a-f]+)$", re.M)
|
||||
WHOLE_RE = re.compile(
|
||||
r"^\[PipelineWholeViewHash\] tiles=(\d+) density=(0x[0-9a-f]+) "
|
||||
r"mesh=(0x[0-9a-f]+) payload=(0x[0-9a-f]+) topology=(0x[0-9a-f]+)$", re.M)
|
||||
|
||||
|
||||
def capture(camera_name: str, compiler: str, workers: int, version: str) -> tuple[dict, tuple[str, ...], float]:
|
||||
camera, expected_tiles = CAMERAS[camera_name]
|
||||
camera_arg = ",".join(f"{value:.12f}" for value in camera) + ",0,0"
|
||||
binary = Path(str(BINARIES[version]).format(compiler=compiler))
|
||||
log = OUT / f"owner4-{camera_name}-{compiler}-w{workers}-{version}.log"
|
||||
command = ["taskset", "-c", "0-11", "prlimit", "--as=6442450944", "--",
|
||||
"timeout", "1740s", str(binary), str(DATA), "--world-assembler-prototype",
|
||||
"--stream-benchmark", "--stream-pipeline", f"--workers={workers}",
|
||||
"--clip-radius=3", "--max-clip-level=8", "--max-level=8",
|
||||
f"--camera={camera_arg}", "--stream-hash-tiles"]
|
||||
started = time.monotonic()
|
||||
with log.open("w", encoding="utf-8") as stream:
|
||||
result = subprocess.run(command, cwd=ROOT, stdout=stream,
|
||||
stderr=subprocess.STDOUT, check=False, timeout=1740)
|
||||
elapsed = time.monotonic() - started
|
||||
output = log.read_text(encoding="utf-8", errors="replace")
|
||||
tiles = {(int(match.group(1)), int(match.group(2)), int(match.group(3)), int(match.group(4))):
|
||||
match.group(5, 6, 7, 8) for match in TILE_RE.finditer(output)}
|
||||
whole = WHOLE_RE.search(output)
|
||||
if result.returncode or whole is None or len(tiles) != expected_tiles or len(tiles) != int(whole.group(1)):
|
||||
raise RuntimeError(f"incomplete {version} {camera_name}/{compiler}/W{workers}: {log}")
|
||||
return tiles, whole.groups(), elapsed
|
||||
|
||||
|
||||
def main() -> int:
|
||||
OUT.mkdir(parents=True, exist_ok=True)
|
||||
rows = []
|
||||
for camera_name in CAMERAS:
|
||||
for compiler in ("clang", "gcc"):
|
||||
for workers in (1, 8, 12):
|
||||
old_tiles, old_whole, old_s = capture(camera_name, compiler, workers, "base")
|
||||
new_tiles, new_whole, new_s = capture(camera_name, compiler, workers, "l131")
|
||||
keys = set(old_tiles) | set(new_tiles)
|
||||
tile_mismatches = sum(old_tiles.get(key) != new_tiles.get(key) for key in keys)
|
||||
row = {"owner": "owner4", "camera": camera_name, "compiler": compiler,
|
||||
"workers": workers, "tiles": len(new_tiles),
|
||||
"tile_mismatches": tile_mismatches,
|
||||
"whole_view_match": old_whole == new_whole,
|
||||
"base_s": round(old_s, 3), "l131_s": round(new_s, 3),
|
||||
"base_log": f"Saved/Linux/l131/hash-matrix/owner4-{camera_name}-{compiler}-w{workers}-base.log",
|
||||
"l131_log": f"Saved/Linux/l131/hash-matrix/owner4-{camera_name}-{compiler}-w{workers}-l131.log"}
|
||||
rows.append(row)
|
||||
print("[L131HashIdentity] " + json.dumps(row, sort_keys=True), flush=True)
|
||||
(OUT / "runs-partial.json").write_text(json.dumps(rows, indent=2) + "\n")
|
||||
failures = [row for row in rows if row["tile_mismatches"] or not row["whole_view_match"]]
|
||||
(OUT / "summary.json").write_text(json.dumps({"runs": rows, "passed": len(rows)-len(failures),
|
||||
"failed": len(failures)}, indent=2) + "\n")
|
||||
return 1 if failures else 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,115 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Five interleaved L80 readiness measurements per stratum and worker count."""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import statistics
|
||||
import subprocess
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
OUT = ROOT / "Saved/Linux/l131/timing"
|
||||
DATA = ROOT / "Standalone/data/owner_world.json"
|
||||
BINARIES = {
|
||||
"base": ROOT / "Saved/Linux/l130/bin/VoxelForgeCoreHeadless-l130-clang",
|
||||
"l131": ROOT / "Saved/Linux/l131/bin/VoxelForgeCoreHeadless-l131-clang",
|
||||
}
|
||||
CAMERAS = {
|
||||
0: (8.0, 16.0, -372.2626953125),
|
||||
1: (25.8369140625, 3.19921875, -737.0),
|
||||
2: (19.166015625, -14.2001953125, -753.3740234375),
|
||||
3: (-20.0625, -5.068359375, -900.353515625),
|
||||
}
|
||||
PIPELINE_RE = re.compile(r"^\[StreamPipeline\] (.*)$", re.M)
|
||||
FIELDS_RE = re.compile(r"([a-zA-Z0-9_]+)=([^ ]+)")
|
||||
NEAR_RE = re.compile(r"^\[WorldAssemblerNearLODReady\] lods=0-2 tiles=(\d+)/(\d+) cold_ready_s=([0-9.]+)$", re.M)
|
||||
|
||||
|
||||
def run(strate: int, workers: int, version: str, phase: str, replicate: int) -> dict:
|
||||
camera = ",".join(f"{value:.12f}" for value in CAMERAS[strate]) + ",0,0"
|
||||
label = f"s{strate}-w{workers}-{version}-{phase}{replicate}-l131-v227"
|
||||
log = OUT / f"{label}.log"
|
||||
command = ["taskset", "-c", "0-11", "prlimit", "--as=6442450944", "--",
|
||||
"timeout", "1740s", str(BINARIES[version]), str(DATA),
|
||||
"--world-assembler-prototype", "--stream-benchmark", "--stream-pipeline",
|
||||
f"--workers={workers}", "--clip-radius=3", "--max-clip-level=8",
|
||||
"--max-level=8", f"--camera={camera}", "--profile-lod-work",
|
||||
"--stream-scheduler-policy=3"]
|
||||
started = time.monotonic()
|
||||
with log.open("w", encoding="utf-8") as output:
|
||||
result = subprocess.run(command, cwd=ROOT, stdout=output,
|
||||
stderr=subprocess.STDOUT, check=False, timeout=1740)
|
||||
content = log.read_text(encoding="utf-8", errors="replace")
|
||||
pipeline, near = PIPELINE_RE.search(content), NEAR_RE.search(content)
|
||||
if result.returncode or pipeline is None or near is None:
|
||||
raise RuntimeError(f"timing run failed: {log}; exit={result.returncode}")
|
||||
fields = dict(FIELDS_RE.findall(pipeline.group(1)))
|
||||
row = {"strate": strate, "workers": workers, "version": version,
|
||||
"phase": phase, "replicate": replicate,
|
||||
"lod02_ready_s": float(near.group(3)),
|
||||
"whole_view_ready_s": float(fields["whole_view_ready"].removesuffix("s")),
|
||||
"wall_s": round(time.monotonic() - started, 3),
|
||||
"log": str(log.relative_to(ROOT))}
|
||||
print("[L131TimingRun] " + json.dumps(row, sort_keys=True), flush=True)
|
||||
return row
|
||||
|
||||
|
||||
def quiet_machine() -> tuple[float, float]:
|
||||
load_1m = os.getloadavg()[0]
|
||||
def totals() -> tuple[int, int]:
|
||||
fields = Path("/proc/stat").read_text().splitlines()[0].split()
|
||||
values = [int(value) for value in fields[1:]]
|
||||
return sum(values), values[3] + (values[4] if len(values) > 4 else 0)
|
||||
before = totals()
|
||||
time.sleep(2.0)
|
||||
after = totals()
|
||||
idle = 100.0 * (after[1] - before[1]) / max(1, after[0] - before[0])
|
||||
return load_1m, idle
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if any(not path.is_file() for path in (DATA, *BINARIES.values())):
|
||||
raise SystemExit("missing timing input")
|
||||
OUT.mkdir(parents=True, exist_ok=True)
|
||||
load_1m, idle = quiet_machine()
|
||||
(OUT / "machine-load-before.txt").write_text(
|
||||
f"1-minute load: {load_1m:.2f}\n2-second CPU idle: {idle:.1f}%\n")
|
||||
print(f"[L131TimingGate] load_1m={load_1m:.2f} cpu_idle_2s={idle:.1f}%", flush=True)
|
||||
if load_1m >= 0.9 or idle < 97.0:
|
||||
raise SystemExit("timing refused: machine is above the L80 quiet-load gate")
|
||||
|
||||
rows = []
|
||||
for strate in range(4):
|
||||
for workers in (8, 12):
|
||||
for version in BINARIES:
|
||||
rows.append(run(strate, workers, version, "warmup", 0))
|
||||
for replicate in range(1, 6):
|
||||
order = tuple(BINARIES) if replicate % 2 else tuple(reversed(BINARIES))
|
||||
for version in order:
|
||||
rows.append(run(strate, workers, version, "measured", replicate))
|
||||
(OUT / "runs-partial.json").write_text(json.dumps(rows, indent=2) + "\n")
|
||||
|
||||
measured = [row for row in rows if row["phase"] == "measured"]
|
||||
summary = []
|
||||
for strate in range(4):
|
||||
for workers in (8, 12):
|
||||
old = [row for row in measured if row["strate"] == strate and row["workers"] == workers and row["version"] == "base"]
|
||||
new = [row for row in measured if row["strate"] == strate and row["workers"] == workers and row["version"] == "l131"]
|
||||
item = {"strate": strate, "workers": workers, "replicates_per_version": 5}
|
||||
for key in ("lod02_ready_s", "whole_view_ready_s"):
|
||||
old_med, new_med = statistics.median(row[key] for row in old), statistics.median(row[key] for row in new)
|
||||
item[f"base_{key}_median"] = old_med
|
||||
item[f"l131_{key}_median"] = new_med
|
||||
item[f"delta_pct_{key}"] = round(100.0 * (new_med / old_med - 1.0), 2)
|
||||
item[f"base_{key}_values"] = [row[key] for row in old]
|
||||
item[f"l131_{key}_values"] = [row[key] for row in new]
|
||||
summary.append(item)
|
||||
(OUT / "summary.json").write_text(json.dumps({"runs": rows, "summary": summary}, indent=2) + "\n")
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,44 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Create the isolated L132 owner snapshot with a native plan for existing FI strate 1."""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
SOURCE = ROOT / "Standalone/data/owner_world.json"
|
||||
MANIFEST = ROOT / "Saved/Linux/l132/fixtures/owner-native-fi.world-assembly.json"
|
||||
LAYOUT = ROOT / "Saved/Linux/l132/fixtures/owner-native-fi.resolved-layout.json"
|
||||
OUTPUT = ROOT / "Saved/Linux/l132/fixtures/owner_world_native_fi.json"
|
||||
|
||||
|
||||
def main() -> int:
|
||||
owner = json.loads(SOURCE.read_text(encoding="utf-8"))
|
||||
manifest_text = MANIFEST.read_text(encoding="utf-8").strip()
|
||||
layout_text = LAYOUT.read_text(encoding="utf-8").strip()
|
||||
manifest = json.loads(manifest_text)
|
||||
layout = json.loads(layout_text)
|
||||
islands = manifest.get("floating_islands", [])
|
||||
native = [row for row in islands if row.get("strate_index") == 1]
|
||||
resolved = [row for row in layout.get("strates", [])
|
||||
if row.get("strate_index") == 1]
|
||||
if len(native) != 1 or len(resolved) != 1:
|
||||
raise SystemExit("native FI snapshot must contain exactly one strate-1 island plan/layout")
|
||||
if (resolved[0].get("generator_kind") != "FloatingIslands"
|
||||
or resolved[0].get("recipe_id") != "FloatingIslands.ClusterField"
|
||||
or resolved[0].get("recipe_version") != 8):
|
||||
raise SystemExit("resolved strate 1 is not FloatingIslands.ClusterField v8")
|
||||
owner["world_assembly"] = manifest
|
||||
owner["core_world_assembly_json"] = manifest_text
|
||||
owner["resolved_layout_json"] = layout_text
|
||||
OUTPUT.parent.mkdir(parents=True, exist_ok=True)
|
||||
OUTPUT.write_text(json.dumps(owner, separators=(",", ":")) + "\n", encoding="utf-8")
|
||||
print(f"[L132NativeFISnapshot] path={OUTPUT.relative_to(ROOT)} "
|
||||
f"islands={len(native[0].get('manifest', {}).get('plan', {}).get('islands', []))} "
|
||||
"strate=1 recipe=FloatingIslands.ClusterField/v8 status=PASS")
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,41 @@
|
||||
# L132 — owner density dispatch
|
||||
|
||||
## Result
|
||||
|
||||
With Core enabled in the owner headless pipeline, the four strates bind to four paths. Unreal’s `bUseVoxelForgeCore` remains opt-in and defaults off. The fast-tier diagnostic reports the Core bindings at the four L80 owner poses and attributes hashed tiles by tile-center height within the resolved stratum bounds.
|
||||
|
||||
| Strate | Owner recipe | Bound path | Tile centers / share |
|
||||
|---|---|---|---:|
|
||||
| SW (0) | `SurfaceWorld.Heightfield2D` v2 | `SurfaceWorld-native` | 2,640 / 100% |
|
||||
| FI (1) | `FloatingIslands.ClusterField` v0 | `compiled-analytic/FloatingIslands` | 2,128 / 100% |
|
||||
| TN (2) | `legacy.TunnelNetwork` v0 | `compiled-analytic/TunnelNetwork` | 2,208 / 100% |
|
||||
| VS (3) | `legacy.VerticalShafts` v0 | `compiled-analytic/VerticalShafts` | 1,392 / 100% |
|
||||
|
||||
SW has a matching strate/bounds `SurfaceWorld` plan, and its `Heightfield2D` evaluator is valid. FI has a legacy v0 layout record but no matching `FloatingIslandPlan`, so `FloatingIslandFieldV1` cannot bind. The Core owner manifest has zero island plans. TN and VS have legacy recipe IDs, not `Core.Caves.PrimitiveField` v1 or `Core.Lattice.PrimitiveField` v1. Their resolved layouts therefore lack the matching graph recipe and native-field capability. All three fall through to `FLegacyGeneratorFieldAdapter`.
|
||||
|
||||
The dispatch check is in the fast tier and can also be requested from the headless binary with `--density-dispatch-report`. It prints the per-strate bound adapter/path and hashed tile-center path shares. Its tile counts aggregate the four standard owner poses; tiles whose centers fall outside an interior interval are excluded, and a tile spanning a boundary is assigned by its center. Per-view logs are `Saved/Linux/l132/owner-density-dispatch-s*-clang.log`; the printed shares are in `Saved/Linux/l132/logs/verify-fast.log` and `Saved/Linux/l132/fast-summary.json`.
|
||||
|
||||
Across the 8,368 classified tile centers, path shares are 31.5% SurfaceWorld-native, 25.4% compiled-analytic/FloatingIslands, 26.4% compiled-analytic/TunnelNetwork, and 16.6% compiled-analytic/VerticalShafts.
|
||||
|
||||
## Native FI decision
|
||||
|
||||
The native evaluator is present. `BuildFloatingIslandStratumPlan` can convert the owner’s legacy island parameters to a v8 plan, but the owner’s imported manifest does not contain that plan. The existing automatic-plan branch is guarded by `bImportedOverride` inside the generated-assembly branch, so it does not fill this owner’s missing imported plan.
|
||||
|
||||
I built a candidate v8 plan for the existing owner FI strate without changing the default owner data. Its raw island-route audit passed: 29 route points, 78,336 capsule samples, zero blocked samples, zero unsupported probes, and zero grade failures. The composed owner audit did not pass:
|
||||
|
||||
- Existing compiled-analytic owner: all 3 passage interfaces pass; shell floor violations 0; ripple checks 3/3.
|
||||
- Native FI candidate: only 2/3 interfaces pass; the added FI route is not walkable (1/2 strate routes walkable); shell floor violations 13; ripple checks 2/3.
|
||||
- Passage tile seams passed for both bindings: 4 pairs, 4,900 shared samples, zero mismatches.
|
||||
|
||||
Native FI is a quality regression on the owner’s current passages, despite its standalone route plan passing. I did not switch the owner. The conditional captures, W8/W12 timing matrix, and Clang/GCC W1/W8/W12 matrix were not run because the candidate failed the composed walk/shell gate. No Core version or output baseline changed; the default owner output remains on its existing bindings. No Linux UE host build was run because there was no qualifying native change or timing matrix.
|
||||
|
||||
## TN/VS graph translation size
|
||||
|
||||
The active TN `GenerationParams` block has 47 fields; VS `VerticalShaftParams` has 11. Each also has 15 passage settings. Both have `CoreGeometry.GeneratorRecipe=0` and empty `Rooms`, `Tunnels`, and `Stamps` arrays. Native cave/lattice authoring requires at least one explicit room and one edge, with geometry, links, and route data. There is no adapter translating those legacy generator blocks into graph records. This is a substantial procedural migration, not a small recipe mapping, so I did not build it this round.
|
||||
|
||||
## Verification
|
||||
|
||||
- Fast tier: PASS, 304.0 s, 84 runs and 273 checks; includes four-pose dispatch output.
|
||||
- Passage tile seams: compiled-analytic and native FI candidate both PASS at the FI owner pose.
|
||||
- Owner walk/shell comparison: default PASS; native candidate FAIL as detailed above.
|
||||
- Build stamp: `766b94ca7638475975b0345e5907eebb96158360c384f5d916c78eccbb1aa815`.
|
||||
@@ -0,0 +1,7 @@
|
||||
# L133 — native floating islands
|
||||
|
||||
Stopped after the second route design. The native v9 plan binds the owner’s resolved mouths and passes raw route audit, strict layout (0 issues), 3/3 interface audits, shell (0 floor violations), and ripple (3/3). The candidate dispatches FI natively.
|
||||
|
||||
The composed FI walk still fails: 2 capsule collisions, 40 unsupported centers, 0 grade failures; mouth binding passes. The return lane is carved by `passage/0-1/0` near `(19.755, 9.605, -733.553) m` (4.25 m from its 4.5 m tube). At `passage/1-2/0`, the approach has collisions at `(14.402, -10.552, -732.556) m` and `(14.242, -10.712, -732.556) m`; the departure landing probe `(19.166, -14.650, -733.331) m` gets 0/5 support probes. The exact endpoints alone are not enough to place a route clear of both composed passage volumes and retain a supported landing.
|
||||
|
||||
No captures, timing matrix, compiler determinism matrix, baseline update, or UE host build were run after the required composed walk gate failed. The owner’s default import remains on its legacy FI fallback. Logs and candidate fixtures are under `Saved/Linux/l133/`.
|
||||
@@ -0,0 +1,511 @@
|
||||
diff --git a/Standalone/Core/include/VoxelForgeCore/VoxelForgeCore.h b/Standalone/Core/include/VoxelForgeCore/VoxelForgeCore.h
|
||||
index cb2b2dd..5a94ab8 100644
|
||||
--- a/Standalone/Core/include/VoxelForgeCore/VoxelForgeCore.h
|
||||
+++ b/Standalone/Core/include/VoxelForgeCore/VoxelForgeCore.h
|
||||
@@ -496,8 +496,9 @@ namespace VoxelForgeCore
|
||||
// continuous floor while relaxing the spline chord tolerance and bounding shell work.
|
||||
// Version 226 unifies the passage influence reach in metres and converts it to core
|
||||
// voxels for every broadphase and proof bound. Version 227 uses the exact smooth-max
|
||||
- // support width/6 when deriving that reach.
|
||||
- inline constexpr std::uint32_t WorldAssemblyEvaluatorVersion = 227;
|
||||
+ // support width/6 when deriving that reach. Version 228 permits the native FI route
|
||||
+ // planner to bind its fixed endpoints to the resolved passage mouths.
|
||||
+ inline constexpr std::uint32_t WorldAssemblyEvaluatorVersion = 228;
|
||||
|
||||
enum class FieldChannel : std::uint32_t
|
||||
{
|
||||
@@ -788,6 +789,15 @@ namespace VoxelForgeCore
|
||||
std::uint64_t contentHash = 0;
|
||||
};
|
||||
|
||||
+ // The two resolved inter-strate walk points owned by a FloatingIslands slot.
|
||||
+ // The route planner treats these as fixed player-capsule centers and places
|
||||
+ // the island chain between them.
|
||||
+ struct FloatingIslandRouteEndpointsV1
|
||||
+ {
|
||||
+ std::array<std::int64_t, 3> arrivalSubvoxels{};
|
||||
+ std::array<std::int64_t, 3> departureSubvoxels{};
|
||||
+ };
|
||||
+
|
||||
struct WorldAssemblyFeatureGroupBoundsV1
|
||||
{
|
||||
std::array<std::int64_t, 3> minimumSubvoxels{};
|
||||
@@ -1377,6 +1387,9 @@ namespace VoxelForgeCore
|
||||
// Planner output is ordinary reviewed data; clients can load it without re-running the planner.
|
||||
VFCORE_API std::optional<FloatingIslandManifestV1> PlanFloatingIslandCluster(
|
||||
const FloatingIslandRecipeV1& recipe, std::string& error);
|
||||
+ VFCORE_API std::optional<FloatingIslandManifestV1> PlanFloatingIslandCluster(
|
||||
+ const FloatingIslandRecipeV1& recipe,
|
||||
+ const FloatingIslandRouteEndpointsV1& endpoints, std::string& error);
|
||||
VFCORE_API FloatingIslandBoundsAuditResult AuditFloatingIslandBounds(
|
||||
const FloatingIslandFieldV1& field, std::uint32_t boxCount = 256,
|
||||
std::uint64_t seed = 0x49534c414e444231ull);
|
||||
diff --git a/Standalone/Core/src/FloatingIslandsInternal.h b/Standalone/Core/src/FloatingIslandsInternal.h
|
||||
index 33d97d6..42f855a 100644
|
||||
--- a/Standalone/Core/src/FloatingIslandsInternal.h
|
||||
+++ b/Standalone/Core/src/FloatingIslandsInternal.h
|
||||
@@ -285,7 +285,7 @@ namespace floating_island_detail
|
||||
? recipe.ownerVoxelSizeMicrons / ScaleGcd : 0;
|
||||
const std::uint32_t ExpectedDenominator = ScaleGcd > 0
|
||||
? recipe.coreVoxelSizeMicrons / ScaleGcd : 0;
|
||||
- if (recipe.schemaVersion != 1 || recipe.geometryVersion < 1 || recipe.geometryVersion > 8
|
||||
+ if (recipe.schemaVersion != 1 || recipe.geometryVersion < 1 || recipe.geometryVersion > 9
|
||||
|| (recipe.geometryVersion == 1
|
||||
&& (recipe.crustDepthBonusQ16 != 0 || recipe.rootDepthRatioQ16 != 0))
|
||||
|| recipe.unitsPerVoxel != Q
|
||||
@@ -1473,7 +1473,8 @@ namespace floating_island_detail
|
||||
static_cast<double>(anchorIsland->centerSubvoxels[0]),
|
||||
static_cast<double>(anchorIsland->centerSubvoxels[1]));
|
||||
if(anchorDistance>recipe.anchorPlacementRadiusSubvoxels
|
||||
- ||recipe.anchorRootBottomZSubvoxels>=anchorIsland->bottomZSubvoxels
|
||||
+ ||(recipe.geometryVersion<8
|
||||
+ &&recipe.anchorRootBottomZSubvoxels>=anchorIsland->bottomZSubvoxels)
|
||||
||recipe.anchorMouthOffsetSubvoxels+recipe.routeConstraints.capsuleRadiusSubvoxels
|
||||
>=anchorIsland->radiusSubvoxels)
|
||||
{error="floating-island anchor island or its mouth leaves the passage radius or rock envelope";return false;}
|
||||
@@ -1607,7 +1608,7 @@ namespace floating_island_detail
|
||||
||to.ordinal==recipe.anchorIslandOrdinal);
|
||||
const bool westernSupportConnector=WorldAssemblyEvaluatorVersion>=178
|
||||
&&((from.ordinal==0&&to.ordinal==1)||(from.ordinal==1&&to.ordinal==0));
|
||||
- const double routeDeckLift=recipe.geometryVersion>=2
|
||||
+ const double routeDeckLift=recipe.geometryVersion>=9?0.0:recipe.geometryVersion>=2
|
||||
?(WorldAssemblyEvaluatorVersion>=178
|
||||
?(westernSupportConnector
|
||||
?(WorldAssemblyEvaluatorVersion>=181?-1.0
|
||||
@@ -2264,6 +2265,335 @@ std::optional<FloatingIslandManifestV1> PlanFloatingIslandCluster(
|
||||
return manifest;
|
||||
}
|
||||
|
||||
+std::optional<FloatingIslandManifestV1> PlanFloatingIslandCluster(
|
||||
+ const FloatingIslandRecipeV1& inputRecipe,
|
||||
+ const FloatingIslandRouteEndpointsV1& endpoints, std::string& error)
|
||||
+{
|
||||
+ FloatingIslandManifestV1 manifest;
|
||||
+ manifest.recipe = inputRecipe;
|
||||
+ auto& recipe = manifest.recipe;
|
||||
+ recipe.geometryVersion = 9;
|
||||
+ recipe.primaryIslandCount = 9;
|
||||
+ recipe.anchorIslandOrdinal = recipe.primaryIslandCount - 1;
|
||||
+ constexpr std::int64_t step = 192 * floating_island_detail::Q;
|
||||
+ recipe.spacingSubvoxels = step;
|
||||
+ if (recipe.routeConstraints.version == 0)
|
||||
+ {
|
||||
+ recipe.routeConstraints.version = 1;
|
||||
+ recipe.routeConstraints.capsuleRadiusSubvoxels = 348;
|
||||
+ recipe.routeConstraints.capsuleHeightSubvoxels = 1802;
|
||||
+ recipe.routeConstraints.maximumGradeQ16 = 17560;
|
||||
+ recipe.routeConstraints.sweepSpacingSubvoxels = 128;
|
||||
+ recipe.routeConstraints.supportProbeRadiusSubvoxels = 230;
|
||||
+ recipe.routeConstraints.supportSearchDepthSubvoxels = 512;
|
||||
+ recipe.routeConstraints.minimumClearanceSubvoxels = 128;
|
||||
+ recipe.routeConstraints.minimumSupportProbes = 3;
|
||||
+ }
|
||||
+ for (const auto& value : endpoints.arrivalSubvoxels)
|
||||
+ if (!floating_island_detail::ValidScalar(value))
|
||||
+ { error = "resolved floating-island arrival mouth is outside the fixed-point range"; return std::nullopt; }
|
||||
+ for (const auto& value : endpoints.departureSubvoxels)
|
||||
+ if (!floating_island_detail::ValidScalar(value))
|
||||
+ { error = "resolved floating-island departure mouth is outside the fixed-point range"; return std::nullopt; }
|
||||
+
|
||||
+ const double qPerMetre = static_cast<double>(floating_island_detail::Q)
|
||||
+ * 1000000.0 / recipe.coreVoxelSizeMicrons;
|
||||
+ const double dx = static_cast<double>(endpoints.departureSubvoxels[0]
|
||||
+ - endpoints.arrivalSubvoxels[0]);
|
||||
+ const double dy = static_cast<double>(endpoints.departureSubvoxels[1]
|
||||
+ - endpoints.arrivalSubvoxels[1]);
|
||||
+ const double endpointDistance = std::hypot(dx, dy);
|
||||
+ const std::int64_t maximumMouthOffset = 64 * floating_island_detail::Q
|
||||
+ - recipe.routeConstraints.capsuleRadiusSubvoxels - floating_island_detail::Q;
|
||||
+ const std::int64_t desiredMouthOffset = std::max(recipe.anchorMouthOffsetSubvoxels,
|
||||
+ static_cast<std::int64_t>(std::llround(qPerMetre * 6.6)));
|
||||
+ recipe.anchorMouthOffsetSubvoxels = std::min({desiredMouthOffset,
|
||||
+ maximumMouthOffset, static_cast<std::int64_t>(std::llround(endpointDistance))});
|
||||
+ if (recipe.anchorMouthOffsetSubvoxels <= 0)
|
||||
+ { error = "resolved island mouths cannot provide a bounded departure approach"; return std::nullopt; }
|
||||
+ recipe.anchorRootRadiusSubvoxels = std::max(recipe.anchorRootRadiusSubvoxels,
|
||||
+ recipe.anchorMouthOffsetSubvoxels + recipe.routeConstraints.capsuleRadiusSubvoxels
|
||||
+ + floating_island_detail::Q);
|
||||
+ recipe.anchorIslandMinimumRadiusSubvoxels = std::max(recipe.minimumRadiusSubvoxels,
|
||||
+ recipe.anchorMouthOffsetSubvoxels + recipe.routeConstraints.capsuleRadiusSubvoxels
|
||||
+ + floating_island_detail::Q + 1);
|
||||
+ // Keep the resolved fixed mouth on a capsule-grade ramp at the anchor island lip.
|
||||
+ recipe.topFlattenQ16 = std::max<std::int64_t>(recipe.topFlattenQ16, 52429);
|
||||
+ recipe.bridgeHalfWidthSubvoxels = std::max(recipe.bridgeHalfWidthSubvoxels,
|
||||
+ recipe.routeConstraints.capsuleRadiusSubvoxels + 2 * floating_island_detail::Q);
|
||||
+ if (!floating_island_detail::ValidateRecipe(recipe, error)) return std::nullopt;
|
||||
+
|
||||
+ auto& islands = manifest.plan.islands;
|
||||
+ auto& edges = manifest.plan.clusterEdges;
|
||||
+ auto& route = manifest.plan.route;
|
||||
+ constexpr std::uint32_t count = 9;
|
||||
+ double tangentX = endpointDistance > 1.0
|
||||
+ ? dx / endpointDistance : 1.0;
|
||||
+ double tangentY = endpointDistance > 1.0
|
||||
+ ? dy / endpointDistance : 0.0;
|
||||
+ if (endpointDistance <= 1.0)
|
||||
+ {
|
||||
+ const double angle = static_cast<double>(floating_island_detail::UnitQ16(
|
||||
+ recipe.seed, 0x900000000ull, 0x524f555445ull))
|
||||
+ * (2.0 * floating_island_detail::Pi / 65536.0);
|
||||
+ tangentX = std::cos(angle);
|
||||
+ tangentY = std::sin(angle);
|
||||
+ }
|
||||
+ const double normalX = -tangentY;
|
||||
+ const double normalY = tangentX;
|
||||
+ const auto localPoint = [&](double along, double side)
|
||||
+ {
|
||||
+ return std::array<std::int64_t, 2>{
|
||||
+ floating_island_detail::RoundQ(
|
||||
+ static_cast<double>(endpoints.arrivalSubvoxels[0])
|
||||
+ + tangentX * along + normalX * side),
|
||||
+ floating_island_detail::RoundQ(
|
||||
+ static_cast<double>(endpoints.arrivalSubvoxels[1])
|
||||
+ + tangentY * along + normalY * side)};
|
||||
+ };
|
||||
+ std::array<std::array<std::int64_t, 2>, count> primaryXY{};
|
||||
+ primaryXY[0] = {endpoints.arrivalSubvoxels[0], endpoints.arrivalSubvoxels[1]};
|
||||
+ primaryXY[1] = localPoint(0.0, static_cast<double>(step));
|
||||
+ primaryXY[2] = localPoint(static_cast<double>(step), static_cast<double>(step));
|
||||
+ primaryXY[3] = localPoint(static_cast<double>(step), 0.0);
|
||||
+ primaryXY[4] = localPoint(static_cast<double>(step), -static_cast<double>(step));
|
||||
+ primaryXY[5] = localPoint(0.0, -static_cast<double>(step));
|
||||
+ primaryXY[6] = localPoint(-static_cast<double>(step), -static_cast<double>(step));
|
||||
+ // Keep the return lane outside the arrival passage's spiral and on the negative
|
||||
+ // side of the first connector, so the two bridges cannot cross in plan view.
|
||||
+ // Keep the final approach radial at the passage mouth. This lets the shared
|
||||
+ // passage resolver keep its authored route inside the placement disk.
|
||||
+ primaryXY[7] = localPoint(-0.85 * static_cast<double>(step),
|
||||
+ -0.23 * static_cast<double>(step));
|
||||
+ const double departureRadial = std::hypot(
|
||||
+ static_cast<double>(endpoints.departureSubvoxels[0]),
|
||||
+ static_cast<double>(endpoints.departureSubvoxels[1]));
|
||||
+ const double anchorScale = departureRadial > 1.0
|
||||
+ ? std::max(0.0, (departureRadial - recipe.anchorMouthOffsetSubvoxels) / departureRadial)
|
||||
+ : 0.0;
|
||||
+ primaryXY[8] = {
|
||||
+ floating_island_detail::RoundQ(endpoints.departureSubvoxels[0] * anchorScale),
|
||||
+ floating_island_detail::RoundQ(endpoints.departureSubvoxels[1] * anchorScale)};
|
||||
+
|
||||
+ std::array<double, count> cumulative{};
|
||||
+ for (std::uint32_t i = 1; i < count; ++i)
|
||||
+ {
|
||||
+ const double segmentX = static_cast<double>(primaryXY[i][0] - primaryXY[i - 1][0]);
|
||||
+ const double segmentY = static_cast<double>(primaryXY[i][1] - primaryXY[i - 1][1]);
|
||||
+ const double length = std::hypot(segmentX, segmentY);
|
||||
+ if (!(length > 0.0) || length > static_cast<double>(256 * floating_island_detail::Q))
|
||||
+ { error = "resolved island mouths require an unsupported serpentine segment length"; return std::nullopt; }
|
||||
+ cumulative[i] = cumulative[i - 1] + length;
|
||||
+ }
|
||||
+ const double totalLength = cumulative.back();
|
||||
+ if (!(totalLength > 0.0))
|
||||
+ { error = "resolved floating-island mouths do not define a route"; return std::nullopt; }
|
||||
+ const std::int64_t capsuleHalf = recipe.routeConstraints.capsuleHeightSubvoxels / 2;
|
||||
+ const std::int64_t routeOffset = capsuleHalf
|
||||
+ + recipe.routeConstraints.minimumClearanceSubvoxels
|
||||
+ + floating_island_detail::Q / 8;
|
||||
+ const std::int64_t startTop = endpoints.arrivalSubvoxels[2] - routeOffset;
|
||||
+ const std::int64_t endTop = endpoints.departureSubvoxels[2] - routeOffset;
|
||||
+ const std::uint64_t anchorSite = 0x700000000ull + recipe.anchorIslandOrdinal;
|
||||
+ auto anchorShape = floating_island_detail::MakeIsland(recipe,
|
||||
+ recipe.anchorIslandOrdinal, primaryXY.back()[0], primaryXY.back()[1], endTop, anchorSite);
|
||||
+ anchorShape.radiusSubvoxels = std::max(anchorShape.radiusSubvoxels,
|
||||
+ recipe.anchorIslandMinimumRadiusSubvoxels);
|
||||
+ anchorShape.topHalfSubvoxels = std::max<std::int64_t>(1,
|
||||
+ anchorShape.radiusSubvoxels / 5);
|
||||
+ anchorShape.centerSubvoxels[2] = endTop - anchorShape.topHalfSubvoxels;
|
||||
+ std::int64_t anchorTop = endTop;
|
||||
+ for (int iteration = 0; iteration < 4; ++iteration)
|
||||
+ {
|
||||
+ anchorShape.topZSubvoxels = anchorTop;
|
||||
+ anchorShape.centerSubvoxels[2] = anchorTop - anchorShape.topHalfSubvoxels;
|
||||
+ const double mouthSurface = floating_island_detail::IslandTopSurface(recipe,
|
||||
+ anchorShape, static_cast<double>(endpoints.departureSubvoxels[0]),
|
||||
+ static_cast<double>(endpoints.departureSubvoxels[1]));
|
||||
+ anchorTop = endTop + floating_island_detail::RoundQ(
|
||||
+ static_cast<double>(anchorTop) - mouthSurface);
|
||||
+ }
|
||||
+ std::array<std::int64_t, count> tops{};
|
||||
+ for (std::uint32_t i = 0; i < count; ++i)
|
||||
+ {
|
||||
+ const double t = cumulative[i] / totalLength;
|
||||
+ tops[i] = floating_island_detail::RoundQ(static_cast<double>(startTop)
|
||||
+ + static_cast<double>(anchorTop - startTop) * t);
|
||||
+ }
|
||||
+
|
||||
+ islands.reserve(count);
|
||||
+ for (std::uint32_t i = 0; i < count; ++i)
|
||||
+ {
|
||||
+ const std::uint64_t site = 0x700000000ull + i;
|
||||
+ auto island = floating_island_detail::MakeIsland(recipe, i,
|
||||
+ primaryXY[i][0], primaryXY[i][1], tops[i], site);
|
||||
+ if (i == recipe.anchorIslandOrdinal)
|
||||
+ {
|
||||
+ island.radiusSubvoxels = std::max(island.radiusSubvoxels,
|
||||
+ recipe.anchorIslandMinimumRadiusSubvoxels);
|
||||
+ }
|
||||
+ const std::int64_t interiorBottom = recipe.layoutMinimumZSubvoxels
|
||||
+ + recipe.boundarySealSubvoxels;
|
||||
+ while (island.radiusSubvoxels > recipe.minimumRadiusSubvoxels
|
||||
+ && floating_island_detail::IslandBottom(recipe, tops[i], island.radiusSubvoxels)
|
||||
+ < interiorBottom)
|
||||
+ --island.radiusSubvoxels;
|
||||
+ const std::int64_t requiredRadius = i == recipe.anchorIslandOrdinal
|
||||
+ ? recipe.anchorIslandMinimumRadiusSubvoxels : recipe.minimumRadiusSubvoxels;
|
||||
+ if (island.radiusSubvoxels < requiredRadius
|
||||
+ || floating_island_detail::IslandBottom(recipe, tops[i], island.radiusSubvoxels)
|
||||
+ < interiorBottom)
|
||||
+ {
|
||||
+ error = "resolved-mouth island " + std::to_string(i) + " cannot fit above sealed bedrock"
|
||||
+ + " (radius=" + std::to_string(island.radiusSubvoxels)
|
||||
+ + ", required=" + std::to_string(requiredRadius)
|
||||
+ + ", top=" + std::to_string(tops[i])
|
||||
+ + ", bottom=" + std::to_string(floating_island_detail::IslandBottom(
|
||||
+ recipe, tops[i], island.radiusSubvoxels))
|
||||
+ + ", interior_bottom=" + std::to_string(interiorBottom)
|
||||
+ + ", anchor_top=" + std::to_string(anchorTop)
|
||||
+ + ", mouth_offset=" + std::to_string(recipe.anchorMouthOffsetSubvoxels) + ")";
|
||||
+ return std::nullopt;
|
||||
+ }
|
||||
+ island.topHalfSubvoxels = std::max<std::int64_t>(1, island.radiusSubvoxels / 5);
|
||||
+ island.topZSubvoxels = tops[i];
|
||||
+ island.centerSubvoxels[2] = tops[i] - island.topHalfSubvoxels;
|
||||
+ island.bottomZSubvoxels = floating_island_detail::IslandBottom(recipe,
|
||||
+ island.topZSubvoxels, island.radiusSubvoxels);
|
||||
+ floating_island_detail::SetIslandBounds(recipe, island);
|
||||
+ islands.push_back(std::move(island));
|
||||
+ }
|
||||
+ for (std::uint32_t i = 0; i + 1 < count; ++i)
|
||||
+ edges.push_back(floating_island_detail::MakeConnector(recipe,
|
||||
+ islands[i], islands[i + 1], 0x600000000ull + i));
|
||||
+
|
||||
+ FloatingIslandFieldV1 planningField(recipe, manifest.plan);
|
||||
+ if (!planningField.isValid())
|
||||
+ { error = "resolved-mouth island field did not pass the Core field contract"; return std::nullopt; }
|
||||
+ const std::int64_t routeRadius = 4 * floating_island_detail::Q;
|
||||
+ std::uint32_t ordinal = 0;
|
||||
+ for (std::uint32_t segment = 0; segment + 1 < count; ++segment)
|
||||
+ {
|
||||
+ const double segmentX = static_cast<double>(primaryXY[segment + 1][0]
|
||||
+ - primaryXY[segment][0]);
|
||||
+ const double segmentY = static_cast<double>(primaryXY[segment + 1][1]
|
||||
+ - primaryXY[segment][1]);
|
||||
+ const double length = std::hypot(segmentX, segmentY);
|
||||
+ const std::uint32_t pieces = static_cast<std::uint32_t>(std::max(1.0,
|
||||
+ std::ceil(length / (4.0 * floating_island_detail::Q))));
|
||||
+ for (std::uint32_t piece = segment == 0 ? 0 : 1; piece <= pieces; ++piece)
|
||||
+ {
|
||||
+ const double t = static_cast<double>(piece) / pieces;
|
||||
+ const auto x = floating_island_detail::RoundQ(
|
||||
+ static_cast<double>(primaryXY[segment][0]) + segmentX * t);
|
||||
+ const auto y = floating_island_detail::RoundQ(
|
||||
+ static_cast<double>(primaryXY[segment][1]) + segmentY * t);
|
||||
+ const auto surface = floating_island_detail::FindCapsuleFootingTopZ(
|
||||
+ recipe, manifest.plan, x, y);
|
||||
+ if (!surface)
|
||||
+ { error = "resolved-mouth island chain has no capsule-width support along a connector"; return std::nullopt; }
|
||||
+ WorldAssemblyRoutePointV1 point;
|
||||
+ point.stableFeatureId = floating_island_detail::StableId(recipe.seed,
|
||||
+ 0x800000000ull + ordinal, 0x524f555445ull);
|
||||
+ point.positionSubvoxels = {x, y, *surface + routeOffset};
|
||||
+ point.radiusSubvoxels = routeRadius;
|
||||
+ if (segment == 0 && piece == 0)
|
||||
+ point.positionSubvoxels = endpoints.arrivalSubvoxels;
|
||||
+ route.push_back(point);
|
||||
+ ++ordinal;
|
||||
+ }
|
||||
+ }
|
||||
+ const double mouthLegX = static_cast<double>(endpoints.departureSubvoxels[0]
|
||||
+ - primaryXY.back()[0]);
|
||||
+ const double mouthLegY = static_cast<double>(endpoints.departureSubvoxels[1]
|
||||
+ - primaryXY.back()[1]);
|
||||
+ const double mouthLegLength = std::hypot(mouthLegX, mouthLegY);
|
||||
+ const std::uint32_t mouthLegPieces = static_cast<std::uint32_t>(std::max(1.0,
|
||||
+ std::ceil(mouthLegLength / (4.0 * floating_island_detail::Q))));
|
||||
+ for (std::uint32_t piece = 1; piece <= mouthLegPieces; ++piece)
|
||||
+ {
|
||||
+ const double t = static_cast<double>(piece) / mouthLegPieces;
|
||||
+ const auto x = floating_island_detail::RoundQ(static_cast<double>(primaryXY.back()[0])
|
||||
+ + mouthLegX * t);
|
||||
+ const auto y = floating_island_detail::RoundQ(static_cast<double>(primaryXY.back()[1])
|
||||
+ + mouthLegY * t);
|
||||
+ const auto surface = floating_island_detail::FindCapsuleFootingTopZ(
|
||||
+ recipe, manifest.plan, x, y);
|
||||
+ if (!surface)
|
||||
+ { error = "resolved island passage mouth has no capsule-width support along its anchor landing at x="
|
||||
+ + std::to_string(x) + ", y=" + std::to_string(y) + ", piece="
|
||||
+ + std::to_string(piece) + "/" + std::to_string(mouthLegPieces)
|
||||
+ + ", anchor_radius=" + std::to_string(anchorShape.radiusSubvoxels); return std::nullopt; }
|
||||
+ WorldAssemblyRoutePointV1 point;
|
||||
+ point.stableFeatureId = floating_island_detail::StableId(recipe.seed,
|
||||
+ 0x800000000ull + ordinal, 0x524f555445ull);
|
||||
+ point.positionSubvoxels = {x, y, *surface + routeOffset};
|
||||
+ point.radiusSubvoxels = routeRadius;
|
||||
+ if (piece == mouthLegPieces)
|
||||
+ point.positionSubvoxels = endpoints.departureSubvoxels;
|
||||
+ route.push_back(point);
|
||||
+ ++ordinal;
|
||||
+ }
|
||||
+
|
||||
+ const double maximumGrade = floating_island_detail::Q16ToDouble(
|
||||
+ recipe.routeConstraints.maximumGradeQ16) * 0.95;
|
||||
+ std::vector<std::int64_t> baseHeights;
|
||||
+ std::vector<double> routeDistance(route.size(), 0.0);
|
||||
+ baseHeights.reserve(route.size());
|
||||
+ for (std::size_t i = 0; i < route.size(); ++i)
|
||||
+ {
|
||||
+ baseHeights.push_back(route[i].positionSubvoxels[2]);
|
||||
+ if (i > 0)
|
||||
+ {
|
||||
+ const double dx = static_cast<double>(route[i].positionSubvoxels[0]
|
||||
+ - route[i - 1].positionSubvoxels[0]);
|
||||
+ const double dy = static_cast<double>(route[i].positionSubvoxels[1]
|
||||
+ - route[i - 1].positionSubvoxels[1]);
|
||||
+ routeDistance[i] = routeDistance[i - 1] + std::hypot(dx, dy);
|
||||
+ }
|
||||
+ }
|
||||
+ for (std::size_t i = 0; i < route.size(); ++i)
|
||||
+ {
|
||||
+ double profile = static_cast<double>(baseHeights[i]);
|
||||
+ std::size_t profileSource = i;
|
||||
+ for (std::size_t j = 0; j < route.size(); ++j)
|
||||
+ {
|
||||
+ const double pathDistance = std::abs(routeDistance[i] - routeDistance[j]);
|
||||
+ const double candidate = static_cast<double>(baseHeights[j])
|
||||
+ - maximumGrade * pathDistance;
|
||||
+ if (candidate > profile)
|
||||
+ {
|
||||
+ profile = candidate;
|
||||
+ profileSource = j;
|
||||
+ }
|
||||
+ }
|
||||
+ const std::int64_t plannedHeight = floating_island_detail::RoundQ(profile);
|
||||
+ const bool fixedEndpoint = i == 0 || i + 1 == route.size();
|
||||
+ if (fixedEndpoint && plannedHeight != baseHeights[i])
|
||||
+ {
|
||||
+ error = "resolved fixed island mouth endpoint " + std::to_string(i)
|
||||
+ + " needs " + std::to_string(plannedHeight - baseHeights[i])
|
||||
+ + " extra subvoxels from route sample " + std::to_string(profileSource)
|
||||
+ + " at z=" + std::to_string(baseHeights[profileSource])
|
||||
+ + " and path distance=" + std::to_string(static_cast<std::int64_t>(
|
||||
+ std::abs(routeDistance[i] - routeDistance[profileSource])))
|
||||
+ + " (arrival_z="
|
||||
+ + std::to_string(endpoints.arrivalSubvoxels[2]) + ", departure_z="
|
||||
+ + std::to_string(endpoints.departureSubvoxels[2]) + ", path_length="
|
||||
+ + std::to_string(static_cast<std::int64_t>(routeDistance.back())) + ")";
|
||||
+ return std::nullopt;
|
||||
+ }
|
||||
+ route[i].positionSubvoxels[2] = plannedHeight;
|
||||
+ }
|
||||
+ if (!manifest.finalize(error)) return std::nullopt;
|
||||
+ const std::string encoded = manifest.ToJson();
|
||||
+ const auto roundTrip = FloatingIslandManifestV1::FromJson(encoded, error);
|
||||
+ if (!roundTrip || roundTrip->ToJson() != encoded
|
||||
+ || roundTrip->contentHash != manifest.contentHash)
|
||||
+ { if (error.empty()) error = "resolved-mouth floating-island plan did not canonical-round-trip"; return std::nullopt; }
|
||||
+ return manifest;
|
||||
+}
|
||||
+
|
||||
FloatingIslandFieldV1::FloatingIslandFieldV1(const FloatingIslandRecipeV1& recipe,
|
||||
const FloatingIslandPlanV1& plan) noexcept : recipe_(&recipe), plan_(&plan)
|
||||
{}
|
||||
diff --git a/Standalone/Source/StreamBenchmarkHeadless.cpp b/Standalone/Source/StreamBenchmarkHeadless.cpp
|
||||
index a0cb0a7..468e315 100644
|
||||
--- a/Standalone/Source/StreamBenchmarkHeadless.cpp
|
||||
+++ b/Standalone/Source/StreamBenchmarkHeadless.cpp
|
||||
@@ -1826,12 +1826,59 @@ int main(int argc,char** argv)
|
||||
else if(!StandaloneWorldAssemblyPrototype::AttachRound1WorldAssemblyPrototype(
|
||||
*ownerWorld,ownerJsonRoot,error,{},&worldAssembly))
|
||||
{std::fprintf(stderr,"World assembler prototype setup failed: %s\n",error.c_str());return 2;}
|
||||
- if(((!useExportedCorePlan&&options.FloatingIslandsRecipe)
|
||||
- ||(options.NativeOwnerFloatingIslandsRecipe
|
||||
- &&worldAssembly.floatingIslands.empty()))
|
||||
- &&!StandaloneWorldAssemblyPrototype::AttachFloatingIslandWorldAssembly(
|
||||
- *ownerWorld,ownerJsonRoot,worldAssembly,error))
|
||||
- {std::fprintf(stderr,"Floating-island assembly setup failed: %s\n",error.c_str());return 2;}
|
||||
+ const bool attachFloatingIslandPlan=(!useExportedCorePlan&&options.FloatingIslandsRecipe)
|
||||
+ ||(options.NativeOwnerFloatingIslandsRecipe&&worldAssembly.floatingIslands.empty());
|
||||
+ if(attachFloatingIslandPlan)
|
||||
+ {
|
||||
+ const FStrateSlot* islandSlot=nullptr;
|
||||
+ if(ownerWorld->Manager)
|
||||
+ for(const FStrateSlot& slot:ownerWorld->Manager->GetLayout())
|
||||
+ if(slot.Definition&&slot.Definition->GeneratorType==ECaveGeneratorType::FloatingIslands)
|
||||
+ {islandSlot=&slot;break;}
|
||||
+ if(!islandSlot)
|
||||
+ {std::fprintf(stderr,"Floating-island endpoint resolution found no FloatingIslands strate.\n");return 2;}
|
||||
+ VoxelForgeCore::ResolvedLayoutSnapshotV3 mouthLayout;
|
||||
+ if(!StandaloneWorldAssemblyPrototype::BuildResolvedLayoutSnapshot(
|
||||
+ *ownerWorld,worldAssembly,"floating-islands",mouthLayout,error))
|
||||
+ {std::fprintf(stderr,"Pre-plan passage layout failed: %s\n",error.c_str());return 2;}
|
||||
+ VoxelForgeCore::FloatingIslandRouteEndpointsV1 endpoints;
|
||||
+ bool hasArrival=false,hasDeparture=false;
|
||||
+ for(const auto& passage:mouthLayout.passages)
|
||||
+ {
|
||||
+ const std::size_t lastSlash=passage.stableId.rfind('/');
|
||||
+ if(lastSlash==std::string::npos||passage.stableId.substr(lastSlash+1)!="0")continue;
|
||||
+ if(passage.lowerStrateIndex==islandSlot->StrateIndex&&!hasArrival)
|
||||
+ {
|
||||
+ endpoints.arrivalSubvoxels=passage.lowerMouthSubvoxels;
|
||||
+ hasArrival=true;
|
||||
+ }
|
||||
+ if(passage.upperStrateIndex==islandSlot->StrateIndex&&!hasDeparture)
|
||||
+ {
|
||||
+ endpoints.departureSubvoxels=passage.upperMouthSubvoxels;
|
||||
+ hasDeparture=true;
|
||||
+ }
|
||||
+ }
|
||||
+ if(!hasArrival||!hasDeparture)
|
||||
+ {std::fprintf(stderr,"Resolved passage layout does not provide both FI route mouths (arrival=%s departure=%s).\n",
|
||||
+ hasArrival?"yes":"no",hasDeparture?"yes":"no");return 2;}
|
||||
+ std::printf("[FloatingIslandResolvedMouths] strate=%d arrival_m=(%.3f,%.3f,%.3f) departure_m=(%.3f,%.3f,%.3f) status=PASS\n",
|
||||
+ islandSlot->StrateIndex,
|
||||
+ endpoints.arrivalSubvoxels[0]*ownerWorld->CoreVoxelSizeMicrons
|
||||
+ /(1.0e6*VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel),
|
||||
+ endpoints.arrivalSubvoxels[1]*ownerWorld->CoreVoxelSizeMicrons
|
||||
+ /(1.0e6*VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel),
|
||||
+ endpoints.arrivalSubvoxels[2]*ownerWorld->CoreVoxelSizeMicrons
|
||||
+ /(1.0e6*VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel),
|
||||
+ endpoints.departureSubvoxels[0]*ownerWorld->CoreVoxelSizeMicrons
|
||||
+ /(1.0e6*VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel),
|
||||
+ endpoints.departureSubvoxels[1]*ownerWorld->CoreVoxelSizeMicrons
|
||||
+ /(1.0e6*VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel),
|
||||
+ endpoints.departureSubvoxels[2]*ownerWorld->CoreVoxelSizeMicrons
|
||||
+ /(1.0e6*VoxelForgeCore::WorldAssemblySubvoxelsPerVoxel));
|
||||
+ if(!StandaloneWorldAssemblyPrototype::AttachFloatingIslandWorldAssembly(
|
||||
+ *ownerWorld,ownerJsonRoot,worldAssembly,endpoints,error))
|
||||
+ {std::fprintf(stderr,"Floating-island assembly setup failed: %s\n",error.c_str());return 2;}
|
||||
+ }
|
||||
if(!options.WorldAssemblyManifestOutputPath.empty())
|
||||
{
|
||||
const std::string manifestText=worldAssembly.ToJson();
|
||||
diff --git a/Standalone/Source/WorldAssemblyPrototype.h b/Standalone/Source/WorldAssemblyPrototype.h
|
||||
index dbe2a7c..9790f2f 100644
|
||||
--- a/Standalone/Source/WorldAssemblyPrototype.h
|
||||
+++ b/Standalone/Source/WorldAssemblyPrototype.h
|
||||
@@ -923,7 +923,8 @@ namespace StandaloneWorldAssemblyPrototype
|
||||
}
|
||||
|
||||
inline bool AttachFloatingIslandWorldAssembly(FStandaloneOwnerWorld& owner,
|
||||
- VFJson::Value& root,VoxelForgeCore::WorldAssemblyManifest& assembly,std::string& error)
|
||||
+ VFJson::Value& root,VoxelForgeCore::WorldAssemblyManifest& assembly,
|
||||
+ const VoxelForgeCore::FloatingIslandRouteEndpointsV1& endpoints,std::string& error)
|
||||
{
|
||||
if(!owner.Manager)
|
||||
{error="floating-island assembly needs the resolved standalone strate manager";return false;}
|
||||
@@ -996,7 +997,7 @@ namespace StandaloneWorldAssemblyPrototype
|
||||
recipe.anchorRootBottomZSubvoxels=recipe.layoutMinimumZSubvoxels
|
||||
+recipe.boundarySealSubvoxels;
|
||||
|
||||
- auto planned=VoxelForgeCore::PlanFloatingIslandCluster(recipe,error);
|
||||
+ auto planned=VoxelForgeCore::PlanFloatingIslandCluster(recipe,endpoints,error);
|
||||
if(!planned)return false;
|
||||
const VoxelForgeCore::FloatingIslandFieldV1 routeField(
|
||||
planned->recipe,planned->plan);
|
||||
@@ -1217,6 +1218,7 @@ namespace StandaloneWorldAssemblyPrototype
|
||||
:it->manifest.plan.route.size()-1;
|
||||
std::size_t resolvedRoutePointCount=it->manifest.plan.route.size();
|
||||
if(it->manifest.recipe.geometryVersion>=5
|
||||
+ &&it->manifest.recipe.geometryVersion<9
|
||||
&&!it->manifest.plan.route.empty()
|
||||
&&it->manifest.recipe.anchorIslandOrdinal<it->manifest.plan.islands.size())
|
||||
{
|
||||
@@ -0,0 +1,35 @@
|
||||
# VoxelForge — research R46 (read-only): generator capability matrix
|
||||
|
||||
You are a researcher. **Read only: do not edit, create or delete any file, and do not build, run or test anything.**
|
||||
Read the code, reports and design docs. Be thorough: verify each claim by hand in the code, and mark each one
|
||||
[CODE] file:line, [MEASURED] report, or [INFERENCE]. Branch `assembler/world` (`cbbfd46`).
|
||||
|
||||
## Why
|
||||
|
||||
The owner approved the next focus (from `Standalone/Research/WorldAssemblerM3/Astra4/REVIEW.md` #3): turn generator
|
||||
breadth into playable variety. First we need an honest picture of what each strate/generator family can do today.
|
||||
|
||||
## Task
|
||||
|
||||
Find every generator family / strate type: surface world, floating islands, caves/cavern, tunnel network, vertical
|
||||
shafts, dreamcore/liminal, and any others in the code (Core native, legacy fallback, op stack, composer). For each,
|
||||
fill one row:
|
||||
- **Core path:** native Core evaluator, legacy fallback, or not in Core at all? Where is it dispatched?
|
||||
- **Entrances/exits:** arrival and departure mouths, and the primordial law (arrival → departure walkable).
|
||||
- **Interior connectivity:** walkable, and audited by what?
|
||||
- **Edits:** does digging (diff layer) work on it in the Core path?
|
||||
- **Materials/content:** material IDs, decorations, foliage, lights, anything placeable.
|
||||
- **Far terrain:** does it have far LOD/shells?
|
||||
- **Performance:** latest measured near-ready, with the report.
|
||||
- **Identity:** what makes it look and feel distinct today; is it recognisable without a label?
|
||||
- **Owner world:** used in `Standalone/data/owner_world.json`? Which strate letter (SW/FI/TN/VS)?
|
||||
- **Gaps:** what's missing for it to be a "place" with its own identity and a destination.
|
||||
|
||||
Then:
|
||||
1. Which three families are closest to being distinct places (the owner's example: a grounded cave, an island
|
||||
environment, one liminal identity)? What is the smallest work to get each there?
|
||||
2. What does the composer (`VoxelSeasonManifest.cpp`, `COMPOSER-NOTES.md`) already do for tagged content, and what's
|
||||
the smallest next step?
|
||||
3. Risks: places where the Core path silently falls back, or where a family exists in docs but not in code.
|
||||
|
||||
Write plain Markdown: the matrix plus ≤ ~800 words of findings.
|
||||
@@ -0,0 +1,41 @@
|
||||
# VoxelForge R46 — generator capability matrix
|
||||
|
||||
Read-only review of `assembler/world` at `cbbfd46`; no files changed, and no builds, runs, or tests were performed.
|
||||
|
||||
## Shared dispatch and contracts
|
||||
|
||||
[CODE] The eight `ECaveGeneratorType` values are TunnelNetwork, FlatPlain, CrystalChamber, Maze, SurfaceWorld, VerticalShafts, FloatingIslands, and Underwater. `NativeCaves`, `NativeLattice`, and `ProfiledHeightfield` are optional Core recipes layered onto those types, not additional strate types. [VoxelStrateTypes.h:175](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Public/VoxelStrateTypes.h:175>) [VoxelStrateTypes.h:203](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Public/VoxelStrateTypes.h:203>)
|
||||
|
||||
[CODE] Core binds native SurfaceWorld and FloatingIslands evaluators when matching plans exist; it binds native cave/lattice graph fields when their capabilities are present. Otherwise it attaches a legacy generator adapter. The density dispatcher exposes paths such as `SurfaceWorld-native`, `SurfaceWorld-legacy`, `Caves-native`, and `compiled-analytic/<kind>`. [ShapeWorldInternal.h:600](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/ShapeWorldInternal.h:600>) [ShapeWorldInternal.h:640](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/ShapeWorldInternal.h:640>) [ShapeWorldInternal.h:649](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/ShapeWorldInternal.h:649>) [ShapeWorldInternal.h:3101](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/ShapeWorldInternal.h:3101>)
|
||||
|
||||
[CODE] The adapter plans inter-strate passages and resolves the layout before Core evaluates it. The composer’s primordial law checks a player-fit, walk-only path between the center-column interior endpoints; it is an arrival-to-departure test, not a requirement that every disconnected room or shaft join the largest component. [VoxelForgeCoreAdapter.cpp:1545](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelForgeCoreAdapter.cpp:1545>) [VoxelSeasonManifest.cpp:2194](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelSeasonManifest.cpp:2194>) [VoxelStrateMeasure.h:315](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Public/VoxelStrateMeasure.h:315>)
|
||||
|
||||
[CODE] Core edit transactions become density brushes applied after field composition. The same stage covers native and fallback density paths. [VoxelForgeCore.cpp:3307](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/VoxelForgeCore.cpp:3307>) [ShapeWorldInternal.h:3036](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/ShapeWorldInternal.h:3036>) [ShapeWorldInternal.h:5201](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/ShapeWorldInternal.h:5201>)
|
||||
|
||||
[CODE] Any strate can author decorations, landmarks, ambient actors, and creatures. Placement supports actors or instanced meshes; Core material samples default to host ID 1 and can carry two resource IDs. These are shared content hooks, not a distinct palette per generator family. [VoxelStrateDefinition.h:352](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Public/VoxelStrateDefinition.h:352>) [VoxelStrateTypes.h:2204](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Public/VoxelStrateTypes.h:2204>) [VoxelForgeCore.h:1273](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/include/VoxelForgeCore/VoxelForgeCore.h:1273>)
|
||||
|
||||
**Performance key:** L125 is the latest absolute owner four-strata LOD0–2 timing table I found; L130’s paired comparison found no measurable change. L125 labels rows S0–S3, so mapping them to SW/FI/TN/VS in the explicit L109 order is an **[INFERENCE]**. Values below are W8/W12 medians in seconds; they measure the owner layout, not isolated native evaluator costs. [L125:24](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux125/REPORT.md:24>) [L125:28](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux125/REPORT.md:28>) [L125:35](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux125/REPORT.md:35>) [L130:9](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux130/REPORT.md:9>) [L109:21](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux109/REPORT.md:21>)
|
||||
|
||||
## Matrix
|
||||
|
||||
| Family / owner | Core path | Entrances, connectivity, and primordial law | Edits, materials, and content | Far terrain and performance | Identity and gaps |
|
||||
|---|---|---|---|---|---|
|
||||
| **SurfaceWorld — SW** | [CODE] Native `Heightfield2D` when a matching surface plan binds; legacy SurfaceWorld fallback otherwise. [ShapeWorldInternal.h:600](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/ShapeWorldInternal.h:600>) [ShapeWorldInternal.h:6685](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/ShapeWorldInternal.h:6685>) | [CODE] Owner export enables an open surface entry; SW also supplies the 0–1 departure mouth. [MEASURED] The shared route audit passed 21,425/21,425 centerline samples. [owner_world.json:1](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/data/owner_world.json:1>) [L125:39](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux125/REPORT.md:39>) | [CODE] Digging works. Surface supports biome terrain/material signals, water, and the shared placement hooks; no family-specific content pack is proven in the owner export. [VoxelStrateTypes.h:1609](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Public/VoxelStrateTypes.h:1609>) | [CODE] Common mesh LOD and far shells; native surface plans also get far ground/cap refinement. [MEASURED] **SW:** 0.780/0.807 near-ready. [VoxelForgeCore.cpp:2996](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/VoxelForgeCore.cpp:2996>) [VoxelForgeCore.cpp:3073](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/VoxelForgeCore.cpp:3073>) | [INFERENCE] Outdoor hills, mountains, rivers, and beaches have a legible silhouette. It still needs distinctive foliage/materials, sound, and a destination to read as a complete place. |
|
||||
| **FloatingIslands — FI** | [CODE] Native island field when a matching island plan binds; otherwise falls through to the legacy analytic path. [ShapeWorldInternal.h:620](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/ShapeWorldInternal.h:620>) [ShapeWorldInternal.h:6692](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/ShapeWorldInternal.h:6692>) | [CODE] Owner route enters from SW and departs toward TN; native island route audits check capsule clearance and support. [MEASURED] The owner passage checks passed. [MEASURED] L67 reported the owner FI path as `compiled-analytic/FloatingIslands`, not native; the reason was unresolved in R36. [L67:5](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux67/REPORT.md:5>) [Research36:11](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Research36/REPORT.md:11>) | [CODE] Digging works; foliage, landmarks, ambient actors, and lights can use shared placement systems. [INFERENCE] No island-specific owner palette/content is established by the export. | [CODE] Common far mesh and shell paths. [MEASURED] **FI:** 0.981/0.962 near-ready in the owner layout. | [INFERENCE] Floating land silhouettes can be immediately recognizable. Confirm native dispatch, then add an island ecology, a landmark, and a clear route/destination. |
|
||||
| **TunnelNetwork — TN** | [CODE] The owner’s regular path is Core’s legacy/compiled-analytic fallback. `NativeCaves` is optional for TN/Underwater and evaluates authored room/tunnel graphs. [VoxelForgeCoreAdapter.cpp:145](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelForgeCoreAdapter.cpp:145>) [VoxelGenerator.cpp:2645](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelGenerator.cpp:2645>) | [CODE] Owner arrival from FI and departure toward VS. [MEASURED] Inter-strate walkability passes; that does not prove every interior room is connected. Native cave fixture flood-fill connected its chosen arrival/departure pair. [L54:21](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux54/REPORT.md:21>) | [CODE] Digging works. Generic cave decorations/landmarks/lighting are available; there is no family-specific Core material palette. | [CODE] Common far LOD/shells. [MEASURED] **TN:** 1.025/0.965 near-ready in the owner layout. Optional native-cave fixture: 0.177 s near ring and 0.706 s cold whole view, a different workload. [L54:37](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux54/REPORT.md:37>) | [INFERENCE] Rooms and tunnels read as caves, but the owner route lacks a content-defined destination. Small cave graph and a landmark/content pack would make it a place; translating the owner’s legacy parameters to native cave records remains separate work. |
|
||||
| **FlatPlain** | [CODE] Legacy fallback/op stack only; it uses the slab builder. [VoxelGenerator.cpp:2600](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelGenerator.cpp:2600>) [VoxelDensityOpStack.cpp:9373](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelDensityOpStack.cpp:9373>) | [CODE] No intrinsic mouths; shared passage planner supplies endpoints. [INFERENCE] Its open floor/ceiling band may connect the selected endpoints, but no family-specific arrival/departure audit was found. | [CODE] Digging works; shared decorations/landmarks can populate the chamber. | [CODE] Common far LOD/shells. [MEASURED] No separate near-ready timing found. | [INFERENCE] Open underground plain with columns. Needs a distinctive floor/ceiling profile, content, and destination; it has no native Core slab recipe. |
|
||||
| **CrystalChamber** | [CODE] Same slab op-stack builder as FlatPlain; distinctness comes from parameter values, especially ceiling roughness. [VoxelGenerator.cpp:2600](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelGenerator.cpp:2600>) | [CODE] Same shared-mouth arrangement as FlatPlain; no family-specific walk audit found. | [CODE] Digging works. Crystal decoration is authorable through shared placement, not guaranteed by the geometry type. [VoxelStrateTypes.h:169](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Public/VoxelStrateTypes.h:169>) | [CODE] Common far LOD/shells. [MEASURED] No separate near-ready timing found. | [INFERENCE] Hanging formations could distinguish it, but parameters alone do not supply crystal materials, lighting, or a destination. |
|
||||
| **Maze** | [CODE] Legacy maze op stack; optional `NativeLattice` graph recipe, which is shared with VerticalShafts rather than a dedicated native maze generator. [VoxelForgeCoreAdapter.cpp:159](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelForgeCoreAdapter.cpp:159>) [VoxelGenerator.cpp:2592](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelGenerator.cpp:2592>) | [CODE] Mouths are shared-planner endpoints; native lattice fixtures test capsule reachability between chosen endpoints. [MEASURED] L60 native lattice fixture: 0.561 s near ring, 1.701 s whole view—not the owner near-ready workload. [L60:19](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux60/REPORT.md:19>) [L60:36](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux60/REPORT.md:36>) | [CODE] Digging works; common content hooks apply. | [CODE] Common far LOD/shells; L60 streamed the lattice fixture through LOD0–8. [L60:15](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux60/REPORT.md:15>) | [INFERENCE] Tight branching corridors are a recognizable grammar, but the native fixture’s helix/maze graph needs a content destination and stronger per-seed identity. |
|
||||
| **VerticalShafts — VS** | [CODE] Legacy shaft op stack; optional `NativeLattice` is a generic authored graph, not a shaft-specific Core evaluator. [VoxelGenerator.cpp:2622](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelGenerator.cpp:2622>) | [CODE] Owner arrival comes from TN; the four-strata export has no lower fifth-stratum passage. [MEASURED] The composer found a VerticalShafts arrival/departure violation; L58’s lattice route passed but was a helix. [COMPOSER-NOTES.md:1437](</home/jahni/VoxelM/Plugins/VoxelForge/COMPOSER-NOTES.md:1437>) [Linux58:11](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux58/REPORT.md:11>) | [CODE] Digging works; generic props and lights can be placed. | [CODE] Common far LOD/shells. [MEASURED] **VS:** 0.879/0.838 near-ready in owner layout. | [INFERENCE] Vertical silhouettes could distinguish it, but the native graph example is not an open shaft. Needs a shaft-specific core, safe landings, and a proven route. |
|
||||
| **Underwater** | [CODE] TunnelNetwork density plus water behavior; optional NativeCaves recipe is accepted. No separate native water generator recipe. [VoxelGenerator.cpp:2638](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelGenerator.cpp:2638>) [Unreal1:131](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Unreal1/REPORT.md:131>) | [CODE] Shared passage mouths; composer’s law is walk-only, so it does not certify swimming or water traversal. [INFERENCE] A flooded route needs dry walkable sections or a separate traversal rule. | [CODE] Digging works; water and shared content are available, but the native assembly recipe does not itself provide an authored water feature. | [CODE] Common far terrain; far water presentation is not established here. [MEASURED] No separate near-ready timing found. | [INFERENCE] “Flooded cave” is a plausible identity, but water, lighting, air pockets, and destination spaces need authored treatment. |
|
||||
| **Dreamcore / liminal** | [CODE] No `Dreamcore` generator type. Existing Core stamps/motif fields are overlays; motif override currently requires a resolved SurfaceWorld strate. [VoxelStrateTypes.h:175](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Public/VoxelStrateTypes.h:175>) [WorldAssemblyPrototype.h:568](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Source/WorldAssemblyPrototype.h:568>) | [CODE] Inherits mouths and connectivity from its base family; motif fixtures preserve route keepouts. [MEASURED] L60 motif overlay: 0.493 s near ring, 1.326 s whole view. [Linux56:21](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux56/REPORT.md:21>) [L60:35](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux60/REPORT.md:35>) | [CODE] Digging applies to the composed field; current motif kinds include carve arch/ellipsoid and fill pillar/dais/monolith/platform. [VoxelStrateTypes.h:222](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Public/VoxelStrateTypes.h:222>) | [CODE] Base field uses common far LOD/shells. Motifs have LOD coverage, but no liminal-specific far treatment. | [INFERENCE] Motifs alone do not read as dreamcore. It needs a repeated spatial grammar, coherent palette/light/sound, and an explorable destination. Not in owner world. |
|
||||
|
||||
Owner mapping: [MEASURED] the owner export references four fixed strata and opens the surface; the named four-family owner route is SW/FI/TN/VS. [CODE] The L125–L130 timings are for that owner layout. [owner_world.json:1](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/data/owner_world.json:1>) [L109:21](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux109/REPORT.md:21>) [L120:23](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux120/REPORT.md:23>)
|
||||
|
||||
## Findings
|
||||
|
||||
1. **Closest to distinct places: TN caves, FI, and liminal overlays.** [INFERENCE] TN already has cave geometry and route proof: add one authored destination chamber plus a small landmark/material/light kit. FI already has a distinctive suspended-land silhouette and route support: first confirm its native dispatch, then add foliage, a landmark, and route cues. Liminal is the smallest overlay slice: reuse the flat/profiled base and existing monolith/platform stamps, then define one repeatable anomaly pattern and a matching content kit. These need authored destinations and themes more than new density families.
|
||||
|
||||
2. **Composer status and smallest next step.** [CODE] `VoxelSeasonManifest.cpp` rolls candidates from a corpus, measures them, rejects vacuous/fragmented/primordial-law failures, and selects for grounded/outlier mix plus archetype/recipe variety. Promoted records carry an archetype tag and corpus provenance is tagged `project`, `default`, or `promoted`. [VoxelSeasonManifest.cpp:2523](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Private/VoxelSeasonManifest.cpp:2523>) [COMPOSER-NOTES.md:431](</home/jahni/VoxelM/Plugins/VoxelForge/COMPOSER-NOTES.md:431>) [COMPOSER-NOTES.md:1466](</home/jahni/VoxelM/Plugins/VoxelForge/COMPOSER-NOTES.md:1466>) Strate and biome gameplay tags are stored, but theme draws for materials, creatures, decorations, and audio are still open. [VoxelStrateDefinition.h:389](</home/jahni/VoxelM/Plugins/VoxelForge/Source/VoxelForge/Public/VoxelStrateDefinition.h:389>) [COMPOSER-NOTES.md:1484](</home/jahni/VoxelM/Plugins/VoxelForge/COMPOSER-NOTES.md:1484>) [INFERENCE] Smallest step: tag one real content class with multiple theme tags and let one seed-selected family draw a coherent, reviewable mini-pack.
|
||||
|
||||
3. **Risks.** [CODE] Missing native plans/capabilities reach the legacy binding; path diagnostics are needed to distinguish them. [ShapeWorldInternal.h:649](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Core/src/ShapeWorldInternal.h:649>) [MEASURED] The latest explicit owner dispatch note I found says FI/TN/VS used compiled analytic fields; L130 reports timing but not dispatch, so that path should be rechecked before calling those owner generators native. [Linux67:5](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux67/REPORT.md:5>) [Linux130:9](</home/jahni/VoxelM/Plugins/VoxelForge/Standalone/Research/WorldAssemblerM3/Linux130/REPORT.md:9>) [INFERENCE] Dreamcore exists as a design goal, not a generator; NativeLattice proves routes but not a shaft identity; FlatPlain/CrystalChamber remain legacy slab fields; and water presentation remains outside the native Core recipe.
|
||||
@@ -70,6 +70,8 @@ namespace
|
||||
bool HasRenderDistanceOverride=false;
|
||||
int RenderDistanceOverride=0;
|
||||
bool FloatingIslandsRecipe=false;
|
||||
bool NativeOwnerFloatingIslandsRecipe=false;
|
||||
bool DensityDispatchReport=false;
|
||||
bool CavesRecipe=false;
|
||||
bool LatticeRecipe=false;
|
||||
int LatticeStrateIndex=-1;
|
||||
@@ -1432,6 +1434,8 @@ namespace
|
||||
" --core-snapshot=FILE (benchmark the exact resolved Core snapshot from Unreal)\n"
|
||||
" --profile-column-overlap --far-horizon-lod8-step=N --force-generate\n"
|
||||
" --seed=N --recipe=surface-world|floating-islands|caves|lattice\n"
|
||||
" --native-owner-fi (build the existing owner FI plan; leave other strates intact)\n"
|
||||
" --density-dispatch-report (print bound path per strate and tile hashes)\n"
|
||||
" --lattice-strate=N (opt one Maze or VerticalShafts strate into Core.Lattice)\n"
|
||||
" --landmark-chamber-demo (opt-in SW cavern room and swept tunnel)\n"
|
||||
" --ore-veins-demo (opt-in material-only SW capsule veins)\n"
|
||||
@@ -1490,6 +1494,9 @@ namespace
|
||||
else if(arg=="--resolved-layout-only")options.ResolvedLayoutOnly=true;
|
||||
else if(arg=="--audit-resolved-layout-boundaries")options.AuditResolvedLayoutBoundaries=true;
|
||||
else if(arg=="--audit-resolved-layout-passages")options.AuditResolvedLayoutPassages=true;
|
||||
else if(arg=="--native-owner-fi")options.NativeOwnerFloatingIslandsRecipe=true;
|
||||
else if(arg=="--density-dispatch-report")
|
||||
{options.DensityDispatchReport=true;options.StreamHash=true;options.StreamHashTiles=true;}
|
||||
else if(arg=="--audit-landmark-reachability")options.AuditLandmarkReachability=true;
|
||||
else if(arg=="--audit-native-caves")options.AuditNativeCaves=true;
|
||||
else if(arg=="--audit-native-lattice")options.AuditNativeLattice=true;
|
||||
@@ -1819,7 +1826,9 @@ int main(int argc,char** argv)
|
||||
else if(!StandaloneWorldAssemblyPrototype::AttachRound1WorldAssemblyPrototype(
|
||||
*ownerWorld,ownerJsonRoot,error,{},&worldAssembly))
|
||||
{std::fprintf(stderr,"World assembler prototype setup failed: %s\n",error.c_str());return 2;}
|
||||
if(!useExportedCorePlan&&options.FloatingIslandsRecipe
|
||||
if(((!useExportedCorePlan&&options.FloatingIslandsRecipe)
|
||||
||(options.NativeOwnerFloatingIslandsRecipe
|
||||
&&worldAssembly.floatingIslands.empty()))
|
||||
&&!StandaloneWorldAssemblyPrototype::AttachFloatingIslandWorldAssembly(
|
||||
*ownerWorld,ownerJsonRoot,worldAssembly,error))
|
||||
{std::fprintf(stderr,"Floating-island assembly setup failed: %s\n",error.c_str());return 2;}
|
||||
@@ -1852,15 +1861,17 @@ int main(int argc,char** argv)
|
||||
const std::string variant=options.LatticeRecipe
|
||||
?"lattice/"+std::to_string(options.LatticeStrateIndex)
|
||||
:options.CavesRecipe?"caves"
|
||||
:options.FloatingIslandsRecipe?"floating-islands":"surface-world";
|
||||
:(options.FloatingIslandsRecipe||options.NativeOwnerFloatingIslandsRecipe)
|
||||
?"floating-islands":"surface-world";
|
||||
const bool layoutResolved=useExportedCorePlan
|
||||
&&!options.NativeOwnerFloatingIslandsRecipe
|
||||
?StandaloneWorldAssemblyPrototype::ImportExportedResolvedLayout(
|
||||
ownerJsonRoot,resolvedLayout,error)
|
||||
:StandaloneWorldAssemblyPrototype::BuildResolvedLayoutSnapshot(
|
||||
*ownerWorld,worldAssembly,variant,resolvedLayout,error);
|
||||
if(!layoutResolved)
|
||||
{std::fprintf(stderr,"Resolved-layout snapshot failed: %s\n",error.c_str());return 2;}
|
||||
if(useExportedCorePlan
|
||||
if(useExportedCorePlan&&!options.NativeOwnerFloatingIslandsRecipe
|
||||
&&!StandaloneWorldAssemblyPrototype::ValidateExportedCorePlanMatchesOwner(
|
||||
*ownerWorld,worldAssembly,resolvedLayout,error))
|
||||
{std::fprintf(stderr,"Unreal-resolved Core plan/owner slot validation failed: %s\n",error.c_str());return 2;}
|
||||
@@ -2113,6 +2124,65 @@ int main(int argc,char** argv)
|
||||
controls.controlsRejectedAsExpected,controls.controlsRun,controls.passed?"PASS":"FAIL");
|
||||
if(!controls.passed)
|
||||
{for(const auto& failure:controls.failures)std::printf("[ResolvedLayoutValidatorControlFailure] %s %s\n",failure.code.c_str(),failure.detail.c_str());return 2;}
|
||||
if(options.DensityDispatchReport)
|
||||
{
|
||||
const auto& slots=ownerWorld->Manager->GetLayout();
|
||||
for(const auto& stratum:resolvedLayout.strates)
|
||||
{
|
||||
const auto slot=std::find_if(slots.begin(),slots.end(),[&](const auto& candidate)
|
||||
{return candidate.StrateIndex==stratum.strateIndex;});
|
||||
bool native=false;
|
||||
std::string path,adapter;
|
||||
if(slot!=slots.end()&&stratum.generatorKind=="SurfaceWorld")
|
||||
{
|
||||
const auto plan=std::find_if(worldAssembly.plan.strates.begin(),
|
||||
worldAssembly.plan.strates.end(),[&](const auto& candidate)
|
||||
{return candidate.strateIndex==stratum.strateIndex
|
||||
&&candidate.bottomChunkZ==slot->BottomChunkZ
|
||||
&&candidate.topChunkZ==slot->TopChunkZ;});
|
||||
if(plan!=worldAssembly.plan.strates.end())
|
||||
{
|
||||
const VoxelForgeCore::Heightfield2D field(worldAssembly.recipe,*plan);
|
||||
native=field.isValid();
|
||||
}
|
||||
if(native){path="SurfaceWorld-native";adapter="FSurfaceWorldFieldAdapter";}
|
||||
}
|
||||
else if(slot!=slots.end()&&stratum.generatorKind=="FloatingIslands")
|
||||
{
|
||||
const auto plan=std::find_if(worldAssembly.floatingIslands.begin(),
|
||||
worldAssembly.floatingIslands.end(),[&](const auto& candidate)
|
||||
{return candidate.strateIndex==stratum.strateIndex
|
||||
&&candidate.bottomChunkZ==slot->BottomChunkZ
|
||||
&&candidate.topChunkZ==slot->TopChunkZ;});
|
||||
if(plan!=worldAssembly.floatingIslands.end())
|
||||
{
|
||||
const VoxelForgeCore::FloatingIslandFieldV1 field(
|
||||
plan->manifest.recipe,plan->manifest.plan);
|
||||
native=field.isValid();
|
||||
}
|
||||
if(native){path="FloatingIslands-native";adapter="FFloatingIslandFieldAdapter";}
|
||||
}
|
||||
else if(VoxelForgeCore::HasNativeGraphField(stratum)
|
||||
&&(VoxelForgeCore::IsNativeCaveFieldStratum(stratum)
|
||||
?stratum.passageCapabilities.hasNativeCaveField
|
||||
:stratum.passageCapabilities.hasNativeLatticeField))
|
||||
{
|
||||
native=true;
|
||||
path=VoxelForgeCore::IsNativeLatticeFieldStratum(stratum)
|
||||
?"Lattice-native":"Caves-native";
|
||||
adapter="FCavesFieldAdapter";
|
||||
}
|
||||
if(!native)
|
||||
{
|
||||
path=stratum.generatorKind=="SurfaceWorld"
|
||||
?"SurfaceWorld-legacy":"compiled-analytic/"+stratum.generatorKind;
|
||||
adapter="FLegacyGeneratorFieldAdapter";
|
||||
}
|
||||
std::printf("[DensityDispatch] strate=%d generator=%s recipe=%s version=%u bound_path=%s adapter=%s\n",
|
||||
stratum.strateIndex,stratum.generatorKind.c_str(),stratum.recipeId.c_str(),
|
||||
stratum.recipeVersion,path.c_str(),adapter.c_str());
|
||||
}
|
||||
}
|
||||
if(!options.ResolvedLayoutOutputPath.empty())
|
||||
std::printf("[ResolvedLayoutSnapshotOutput] path=%s\n",options.ResolvedLayoutOutputPath.c_str());
|
||||
if(auto* root=std::get_if<VFJson::Value::Object>(&ownerJsonRoot.Data))
|
||||
|
||||
@@ -2566,15 +2566,9 @@ namespace StandaloneStreamBenchmark
|
||||
ShapeRequest.detail=DetailVariant;ShapeRequest.includeFarWorld=bIncludeFarWorld&&!bDeferFarWorld;
|
||||
ShapeRequest.roundTunnels=bRoundTunnels;
|
||||
ShapeRequest.enhancedTunnelWalls=bEnhancedTunnelWalls;
|
||||
const char* L86DisablePassages=std::getenv(
|
||||
"VOXELFORGE_L86_DISABLE_PASSAGE_COMPOSITION");
|
||||
const bool bL86DisablePassages=L86DisablePassages
|
||||
&&L86DisablePassages[0]=='1'&&L86DisablePassages[1]=='\0';
|
||||
ShapeRequest.validatePassageRoutes=!bCaptureSkipWalkability&&!bL86DisablePassages;
|
||||
ShapeRequest.validatePassageRoutes=!bCaptureSkipWalkability;
|
||||
if(bCaptureSkipWalkability)
|
||||
std::printf("[CaptureWalkabilityGate] validation=deferred geometry_input=unchanged mode=mesh-export\n");
|
||||
if(bL86DisablePassages)
|
||||
std::printf("[L86PassageCeiling] validation=skipped geometry=passage_composition_disabled diagnostic_only=true\n");
|
||||
FStandaloneStreamingGenerator Streamer(World,WorkerCount,bHashDensity,nullptr,MaxLevel,
|
||||
bSkipUvAndColors,bSkipMaterialGroups,bSkipUV,bSkipColors,&Shape,bProfileColumnOverlap,
|
||||
FarHorizonLOD8InteriorStepVoxels,bUseSharedColumnCache,
|
||||
|
||||
@@ -153,80 +153,6 @@ namespace StandaloneWorldAssemblyPrototype
|
||||
candidateCenterSpacing=32;
|
||||
}
|
||||
const double coreVoxelMetres=static_cast<double>(coreVoxelSizeMicrons)/1000000.0;
|
||||
if(std::getenv("VOXELFORGE_AUDIT_LEGACY_ROUTE_GRADE"))
|
||||
{
|
||||
constexpr std::int32_t legacyCenterSpacing=64;
|
||||
constexpr std::int32_t legacyWaypointSpacing=8;
|
||||
std::array<GradeSegmentAudit,32> legacySegments{};
|
||||
std::uint64_t legacyGradeFailCandidates=0;
|
||||
double legacyMinimumGround=std::numeric_limits<double>::infinity();
|
||||
double legacyMaximumGround=-std::numeric_limits<double>::infinity();
|
||||
for(std::int32_t centerY=-256;centerY<=256;centerY+=legacyCenterSpacing)
|
||||
for(std::int32_t centerX=-256;centerX<=256;centerX+=legacyCenterSpacing)
|
||||
for(const Direction& direction:directions)
|
||||
{
|
||||
bool candidateGradeFail=false;
|
||||
std::int64_t previousGround=0,previousX=0,previousY=0;
|
||||
for(std::int32_t index=0;index<=32;++index)
|
||||
{
|
||||
const std::int64_t along=(index-16)*legacyWaypointSpacing;
|
||||
const std::int64_t x=centerX+std::llround(
|
||||
static_cast<double>(along)*direction.x/65536.0);
|
||||
const std::int64_t y=centerY+std::llround(
|
||||
static_cast<double>(along)*direction.y/65536.0);
|
||||
const auto column=finalField.point(WorldAssemblyFixed(static_cast<double>(x)),
|
||||
WorldAssemblyFixed(static_cast<double>(y)),0);
|
||||
const double groundMetres=static_cast<double>(column.groundHeightSubvoxels)
|
||||
*coreVoxelMetres/WorldAssemblySubvoxelsPerVoxel;
|
||||
legacyMinimumGround=std::min(legacyMinimumGround,groundMetres);
|
||||
legacyMaximumGround=std::max(legacyMaximumGround,groundMetres);
|
||||
if(index>0)
|
||||
{
|
||||
const std::int64_t horizontalQ=static_cast<std::int64_t>(std::llround(
|
||||
std::hypot(static_cast<double>(x-previousX),
|
||||
static_cast<double>(y-previousY))*WorldAssemblySubvoxelsPerVoxel));
|
||||
const std::int64_t riseQ=std::abs(
|
||||
column.groundHeightSubvoxels-previousGround);
|
||||
if(horizontalQ==0||riseQ*65536>horizontalQ*GradeQ16)
|
||||
{
|
||||
candidateGradeFail=true;
|
||||
GradeSegmentAudit& segment=legacySegments[
|
||||
static_cast<std::size_t>(index-1)];
|
||||
++segment.failures;
|
||||
const double grade=horizontalQ>0
|
||||
?static_cast<double>(riseQ)/static_cast<double>(horizontalQ)
|
||||
:std::numeric_limits<double>::infinity();
|
||||
if(grade>segment.maximumGrade)
|
||||
{
|
||||
segment.maximumGrade=grade;
|
||||
segment.fromGround=previousGround;
|
||||
segment.toGround=column.groundHeightSubvoxels;
|
||||
segment.fromX=previousX;segment.fromY=previousY;
|
||||
segment.toX=x;segment.toY=y;
|
||||
}
|
||||
}
|
||||
}
|
||||
previousGround=column.groundHeightSubvoxels;previousX=x;previousY=y;
|
||||
}
|
||||
if(candidateGradeFail)++legacyGradeFailCandidates;
|
||||
}
|
||||
std::printf("[WorldAssemblerLegacyRouteGradeProfile] candidates=648 grade_fail_candidates=%llu ground_range_m=%.3f..%.3f grade_limit_deg=15.000 chord_m=%.3f waypoint_step_m=%.3f center_step_m=%.3f\n",
|
||||
static_cast<unsigned long long>(legacyGradeFailCandidates),
|
||||
legacyMinimumGround,legacyMaximumGround,256.0*coreVoxelMetres,
|
||||
legacyWaypointSpacing*coreVoxelMetres,legacyCenterSpacing*coreVoxelMetres);
|
||||
const double metresPerSubvoxel=coreVoxelMetres/WorldAssemblySubvoxelsPerVoxel;
|
||||
for(std::size_t segmentIndex=0;segmentIndex<legacySegments.size();++segmentIndex)
|
||||
{
|
||||
const GradeSegmentAudit& segment=legacySegments[segmentIndex];
|
||||
if(segment.failures==0)continue;
|
||||
std::printf("[WorldAssemblerLegacyRouteGradeSegment] index=%zu rejected_candidates=%llu max_grade_deg=%.3f ground_m=%.3f->%.3f xy_m=(%.3f,%.3f)->(%.3f,%.3f)\n",
|
||||
segmentIndex,static_cast<unsigned long long>(segment.failures),
|
||||
std::atan(segment.maximumGrade)*57.29577951308232,
|
||||
segment.fromGround*metresPerSubvoxel,segment.toGround*metresPerSubvoxel,
|
||||
segment.fromX*coreVoxelMetres,segment.fromY*coreVoxelMetres,
|
||||
segment.toX*coreVoxelMetres,segment.toY*coreVoxelMetres);
|
||||
}
|
||||
}
|
||||
std::printf("[WorldAssemblerRouteCandidateEnvelope] max_chord_m=%.3f length_variants=%zu center_step_m=%.3f arrival_radius_m=%.3f departure_radius_m=%.3f\n",
|
||||
2.0*candidateHalfLengths.front()*coreVoxelMetres,candidateHalfLengths.size(),
|
||||
candidateCenterSpacing*coreVoxelMetres,
|
||||
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
[PipelineFullDetailHash] tiles=960 density=0x91931a57a067fd92 mesh=0xa818654be89790ac payload=0x370ff80451105a39 topology=0x06e507557aa70173
|
||||
[PipelineWholeViewHash] tiles=2370 density=0xf4d3d09d3f31d9bc mesh=0x520f545165440f40 payload=0x6a45502e6bb7ae01 topology=0x8f7d03ba1e2000f3
|
||||
[PipelineLODHash] lod=0 tiles=512 density=0x2fd4c78685a43cfe mesh=0x50478cff1c1f8ca0 payload=0x54e48e57e0af26de topology=0x860c011cfdb9833a
|
||||
[PipelineLODHash] lod=1 tiles=448 density=0x4b8d9a6dcd2942ad mesh=0x17e89b7087bfe711 payload=0x2389c109eb780db6 topology=0x7eccd4cf560d0630
|
||||
[PipelineLODHash] lod=2 tiles=320 density=0x7640a0646ee5ac17 mesh=0x9b63c5aa29160969 payload=0x91cd7ca9a828149b topology=0xcb558843c345a327
|
||||
[PipelineLODHash] lod=3 tiles=208 density=0xdd07fe8f31ede73a mesh=0xfaa2f90438226625 payload=0x86904d144f5db47c topology=0xcfd10c90d38f3fca
|
||||
[PipelineLODHash] lod=4 tiles=240 density=0xfb11591772a3d18e mesh=0xebf2baee8764591b payload=0xe491d7ac9c0061ad topology=0xd618ac33b95ce494
|
||||
[PipelineLODHash] lod=5 tiles=144 density=0x2f8b7b7fb1e67258 mesh=0x4cd508cbe97344fd payload=0x2b6e96a6050458c9 topology=0x4ff6d0eda8988573
|
||||
[PipelineLODHash] lod=6 tiles=96 density=0x0114a34c8b8d6113 mesh=0xb1fec4d01ae1fa44 payload=0x3e50cfd429b8e950 topology=0x08090c96d15c1618
|
||||
[PipelineLODHash] lod=7 tiles=96 density=0x3836ed8cfce73418 mesh=0x40bc6589c5fc1aac payload=0x677349bcae16790f topology=0x36e3aa53192e6a6b
|
||||
[PipelineLODHash] lod=8 tiles=306 density=0x144f3c1fd722708b mesh=0xef77b28bf7fd9453 payload=0xe3f47b37fcd61489 topology=0x5a3c73e295494e04
|
||||
[PipelineExactQueryHash] probes=9 density=0x7b7c50ac24ccadcc unclamped=0x7b7c50ac24ccadcc detail=0xefcba20c0c70c415 collision=0xe604823a249029bf path=direct-Core-queries
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
[PipelineFullDetailHash] tiles=960 density=0x11802e529414a62a mesh=0xee7dab071f572c46 payload=0x824a7c07f3cd3f8f topology=0x14a372c4f0003a9b
|
||||
[PipelineWholeViewHash] tiles=2578 density=0x077534532d13b549 mesh=0x0932314a7475fed4 payload=0x6c2bfa3e4a72f8dc topology=0x7e6b3b76ed31bd0f
|
||||
[PipelineLODHash] lod=0 tiles=512 density=0xf8cbb499fca6f62b mesh=0xf3b8e097407eb9e1 payload=0xeef6bfe266279de5 topology=0x79c5ed3811360d1e
|
||||
[PipelineLODHash] lod=1 tiles=448 density=0x7d95c955a8433cac mesh=0xa803bb427deeba9a payload=0xf4718f1ce85d4f4f topology=0x7b770585aafd8174
|
||||
[PipelineLODHash] lod=2 tiles=320 density=0x1c9445d15cce0de3 mesh=0x4da3bcf40eb6d137 payload=0x561116e3bbf34b8e topology=0x5e0e5a961bea641e
|
||||
[PipelineLODHash] lod=3 tiles=272 density=0xe505981dea225509 mesh=0x1b13027b94137ad0 payload=0x3f93cd2fda3fef1c topology=0x8e160cd2f5ab0805
|
||||
[PipelineLODHash] lod=4 tiles=272 density=0xb743eb64967bddcd mesh=0xf6b5bd36b0ebfead payload=0xd1284c1540f50636 topology=0x4a6e197e2a1a9500
|
||||
[PipelineLODHash] lod=5 tiles=208 density=0x38706b628a74dd17 mesh=0x445b1c7b51489cbb payload=0x713efc66290768f7 topology=0x56486b919146bb1e
|
||||
[PipelineLODHash] lod=6 tiles=144 density=0xd53849b2002a1faa mesh=0xaa210abc8498c415 payload=0xd109aef8639706d1 topology=0x61a4d75fbbc35268
|
||||
[PipelineLODHash] lod=7 tiles=96 density=0xb0ea9a140275c9cc mesh=0x3ffd8365c8b0ec29 payload=0x3577afb0a2e4a420 topology=0x97530aafde15b7e0
|
||||
[PipelineLODHash] lod=8 tiles=306 density=0x8b3d1816799d67a0 mesh=0x80bf554f17700e1e payload=0xccbe22c3333a9c34 topology=0xcb11b28f6b6bcc50
|
||||
[PipelineExactQueryHash] probes=9 density=0xf2df67b38b7802df unclamped=0x48b347986345b557 detail=0xefcba20c0c70c415 collision=0x137e8f6c0b03a624 path=direct-Core-queries
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
[PipelineFullDetailHash] tiles=960 density=0xace56c8f205238ad mesh=0xa9c603a1248de6b8 payload=0xea55f1f4fcc6a894 topology=0x5ea7bc78a1b678ae
|
||||
[PipelineWholeViewHash] tiles=2370 density=0x03331b1721d89092 mesh=0x1fa61520dc6c6d7b payload=0xe5c306e087381056 topology=0xef499f11d87ca569
|
||||
[PipelineLODHash] lod=0 tiles=512 density=0xcd6ab28cfa504aca mesh=0xf03dc80a669fca31 payload=0x397aded1c3d2d297 topology=0xb4a1dc84fabc1fe3
|
||||
[PipelineLODHash] lod=1 tiles=448 density=0xce6e713828b2a20a mesh=0x1cf408c25d67d18c payload=0x8a2b5d20571c997e topology=0x51cd985fe8e7d100
|
||||
[PipelineLODHash] lod=2 tiles=320 density=0x8581c27a6966cccd mesh=0x610a6eb3ef75fe11 payload=0xdecaf47d125efd5c topology=0xa5ea883ebeb628e4
|
||||
[PipelineLODHash] lod=3 tiles=208 density=0x5d87341a6428ea0b mesh=0x662096703512f5e2 payload=0x5703acca3ad9c2c7 topology=0xc8fb411f09c46f60
|
||||
[PipelineLODHash] lod=4 tiles=240 density=0x0be8798407724eaf mesh=0x131c303cbbe51434 payload=0x2a90ecf0a2411ca0 topology=0xe3e054a371152e08
|
||||
[PipelineLODHash] lod=5 tiles=144 density=0xf20897ad272103a9 mesh=0x13d00b6253ae1f72 payload=0x0db3880693a962fa topology=0x462bd87a80f15e89
|
||||
[PipelineLODHash] lod=6 tiles=96 density=0xc040fcac457d6313 mesh=0x1ed132eeb718fb62 payload=0xcd0214e35577c6e3 topology=0x2c56c69e6fdcfd64
|
||||
[PipelineLODHash] lod=7 tiles=96 density=0xc2d419446355fdb8 mesh=0x4ea44452574fc84b payload=0xfd9779bedfc9ae0f topology=0x8948546e770c9b72
|
||||
[PipelineLODHash] lod=8 tiles=306 density=0x62db31696f2da831 mesh=0xd373f9e9481532fe payload=0x540a60526e0e3e46 topology=0xc725cb901e6dc335
|
||||
[PipelineExactQueryHash] probes=9 density=0xc949c4df2ce6f9d9 unclamped=0xc949c4df2ce6f9d9 detail=0x114c501e2d830d94 collision=0xe6011d3a248d4849 path=direct-Core-queries
|
||||
@@ -89,6 +89,9 @@ TILE_HASH_RE = re.compile(
|
||||
r"^\[PipelineTileHash\] lod=(-?\d+) x=(-?\d+) y=(-?\d+) z=(-?\d+) "
|
||||
r"density=(0x[0-9a-f]+) mesh=(0x[0-9a-f]+) "
|
||||
r"payload=(0x[0-9a-f]+) topology=(0x[0-9a-f]+)$", re.M)
|
||||
DENSITY_DISPATCH_RE = re.compile(
|
||||
r"^\[DensityDispatch\] strate=(\d+) generator=([^ ]+) recipe=([^ ]+) "
|
||||
r"version=(\d+) bound_path=([^ ]+) adapter=([^ ]+)$", re.M)
|
||||
TILE_MATERIAL_HASH_RE = re.compile(
|
||||
r"^\[PipelineTileMaterialHash\] lod=(-?\d+) x=(-?\d+) y=(-?\d+) z=(-?\d+) "
|
||||
r"material=(0x[0-9a-f]+)$", re.M)
|
||||
@@ -122,11 +125,11 @@ RECIPE_RE = re.compile(
|
||||
|
||||
def owner_hash_baseline(recipe: str, style: int) -> tuple[Path, str]:
|
||||
if recipe == "surface-world" and style == 1:
|
||||
return (BASELINES / "owner-hash/canonical/owner-hash-surface-world-style1-v225.baseline",
|
||||
"L125-v225-stamped-passage-sweep")
|
||||
return (BASELINES / "owner-hash/canonical/owner-hash-surface-world-style1-v227.baseline",
|
||||
"L130-v227-reach-units")
|
||||
if recipe == "floating-islands" and style == 2:
|
||||
return (BASELINES / "owner-hash/canonical/owner-hash-floating-islands-style2-v225.baseline",
|
||||
"L125-v225-stamped-passage-sweep")
|
||||
return (BASELINES / "owner-hash/canonical/owner-hash-floating-islands-style2-v227.baseline",
|
||||
"L130-v227-reach-units")
|
||||
raise VerificationFailure(f"no pinned owner hash baseline for {recipe} style {style}")
|
||||
|
||||
|
||||
@@ -493,6 +496,117 @@ def run_new_owner_plan_stage(runner: VerificationRunner, binary: Path) -> None:
|
||||
+ ", ".join(deferred_failures))
|
||||
|
||||
|
||||
def run_density_dispatch_report(runner: VerificationRunner, binary: Path) -> None:
|
||||
"""Report selected owner density paths and generated tile shares by path."""
|
||||
cameras = {
|
||||
0: (8.0, 16.0, -372.2626953125),
|
||||
1: (25.8369140625, 3.19921875, -737.0),
|
||||
2: (19.166015625, -14.2001953125, -753.3740234375),
|
||||
3: (-20.0625, -5.068359375, -900.353515625),
|
||||
}
|
||||
aggregate: dict[int, dict[str, int]] = {}
|
||||
bound_paths: dict[int, tuple[str, str, str, int, str]] = {}
|
||||
failures: list[str] = []
|
||||
for focus_strate, position in cameras.items():
|
||||
name = f"owner-density-dispatch-s{focus_strate}-clang"
|
||||
camera = "--camera=" + ",".join(
|
||||
f"{value:.12f}" for value in (*position, 0.0, 0.0))
|
||||
layout_path = OUT / "layouts" / f"{name}.json"
|
||||
try:
|
||||
row, output = runner.run_cpp(name, binary, OWNER_NEW, "surface-world",
|
||||
["--density-dispatch-report", "--render-distance-chunks=0", camera],
|
||||
expected_style=1, workers=8, max_level=8, clip_radius=3,
|
||||
layout_path=layout_path)
|
||||
except VerificationFailure as error:
|
||||
failures.append(f"{name}: {error}")
|
||||
continue
|
||||
|
||||
dispatch_rows = DENSITY_DISPATCH_RE.findall(output)
|
||||
dispatch = {int(index): (path, generator, recipe, int(version), adapter)
|
||||
for index, generator, recipe, version, path, adapter in dispatch_rows}
|
||||
if len(dispatch_rows) != 4 or set(dispatch) != {0, 1, 2, 3}:
|
||||
failures.append(f"{name}: expected four unique dispatch rows, got {dispatch_rows}")
|
||||
continue
|
||||
if not layout_path.is_file():
|
||||
failures.append(f"{name}: resolved layout missing at {layout_path}")
|
||||
continue
|
||||
try:
|
||||
layout = json.loads(layout_path.read_text(encoding="utf-8"))
|
||||
strata = {int(value["strate_index"]): value for value in layout.get("strates", [])}
|
||||
if set(strata) != {0, 1, 2, 3}:
|
||||
raise ValueError(f"expected four strata, got {sorted(strata)}")
|
||||
voxel_size_um = int(strata[0]["voxel_size_um"])
|
||||
if voxel_size_um <= 0:
|
||||
raise ValueError(f"invalid voxel_size_um={voxel_size_um}")
|
||||
except (OSError, json.JSONDecodeError, KeyError, TypeError, ValueError) as error:
|
||||
failures.append(f"{name}: cannot classify tiles from resolved layout: {error}")
|
||||
continue
|
||||
|
||||
tile_rows = TILE_HASH_RE.findall(output)
|
||||
camera_counts = {index: 0 for index in strata}
|
||||
for lod_text, _x, _y, z_text, *_hashes in tile_rows:
|
||||
lod, z = int(lod_text), int(z_text)
|
||||
if lod < 0 or lod > 30:
|
||||
failures.append(f"{name}: invalid tile lod={lod}")
|
||||
continue
|
||||
extent_voxels = 32 << lod
|
||||
center_um = (z * extent_voxels + extent_voxels // 2) * voxel_size_um
|
||||
matches = [index for index, stratum in strata.items()
|
||||
if int(stratum["interior_bottom_um"]) <= center_um
|
||||
< int(stratum["interior_top_um"])]
|
||||
if len(matches) == 1:
|
||||
index = matches[0]
|
||||
camera_counts[index] += 1
|
||||
aggregate.setdefault(index, {}).setdefault(dispatch[index][0], 0)
|
||||
aggregate[index][dispatch[index][0]] += 1
|
||||
if not tile_rows:
|
||||
failures.append(f"{name}: --density-dispatch-report emitted no tile hashes")
|
||||
observed = sum(camera_counts.values())
|
||||
print(f"[DensityDispatchView] focus_strate={focus_strate} tiles={len(tile_rows)} "
|
||||
f"classified_by_center={observed} status={'PASS' if observed else 'FAIL'}",
|
||||
flush=True)
|
||||
runner.require(f"{name}:dispatch-and-tile-counts",
|
||||
observed > 0 and row["status"] == "PASS",
|
||||
f"dispatch={dispatch} center_attributed_tiles={camera_counts} "
|
||||
f"hashed_tiles={len(tile_rows)}")
|
||||
for index, value in dispatch.items():
|
||||
previous = bound_paths.get(index)
|
||||
if previous is not None and previous != value:
|
||||
failures.append(f"strate {index}: bound path changed between views: "
|
||||
f"{previous} vs {value}")
|
||||
bound_paths[index] = value
|
||||
|
||||
global_path_counts: dict[str, int] = {}
|
||||
for index in range(4):
|
||||
path, generator, recipe, version, adapter = bound_paths.get(
|
||||
index, ("MISSING", "?", "?", 0, "?"))
|
||||
path_counts = aggregate.get(index, {})
|
||||
total = sum(path_counts.values())
|
||||
for path_name, count in path_counts.items():
|
||||
global_path_counts[path_name] = global_path_counts.get(path_name, 0) + count
|
||||
details = ",".join(
|
||||
f"{key}:{value}/{total} ({100.0 * value / max(1, total):.1f}%)"
|
||||
for key, value in sorted(path_counts.items())) or "no tile centers observed"
|
||||
print(f"[DensityDispatchStrate] strate={index} generator={generator} recipe={recipe} "
|
||||
f"version={version} bound_path={path} adapter={adapter} "
|
||||
f"tile_centers={total} path_shares={details}", flush=True)
|
||||
if path == "MISSING" or total == 0:
|
||||
failures.append(f"strate {index}: dispatch path or tile-center share missing")
|
||||
else:
|
||||
runner.require(f"owner-density-dispatch-strate-{index}", True,
|
||||
f"bound_path={path} tile_center_path_shares={details}")
|
||||
all_tiles = sum(global_path_counts.values())
|
||||
for path_name, count in sorted(global_path_counts.items()):
|
||||
share = 100.0 * count / max(1, all_tiles)
|
||||
print(f"[DensityDispatchPathShare] path={path_name} tiles={count}/{all_tiles} "
|
||||
f"share={share:.1f}%", flush=True)
|
||||
if not all_tiles:
|
||||
failures.append("no tile centers were attributed to any bound path")
|
||||
runner.require("owner-density-dispatch-report", not failures,
|
||||
"; ".join(failures) if failures else
|
||||
"four owner poses reported per-strate bound paths and tile-center path shares")
|
||||
|
||||
|
||||
def run_landmark_reachability(runner: VerificationRunner,
|
||||
binaries: tuple[Path, ...]) -> None:
|
||||
for binary in binaries:
|
||||
@@ -3144,6 +3258,7 @@ def main() -> int:
|
||||
except VerificationFailure as error:
|
||||
new_plan_failure = str(error)
|
||||
print(f"[{runner.tier}] new-owner-plan-stage FAIL {error}", flush=True)
|
||||
run_density_dispatch_report(runner, CLANG)
|
||||
run_landmark_reachability(runner, (CLANG,))
|
||||
run_regression_controls(runner)
|
||||
run_hash_pairs(runner, owners)
|
||||
|
||||
Reference in new issue
Block a user