5 Commits

Author	SHA1	Message	Date
Dion Moult	8dfe00cdf8	Improve viewer variable names ... Rename short local variables and parameters in the viewer loading, sidecar, and BonsaiViewer command paths to make their responsibilities clearer.\n\nGenerated with the assistance of an AI coding tool.	2026-07-03 19:20:50 +10:00
Dion Moult	8ab5c31e75	refactor: merge ifcviewer-wgpu into ifcviewer, drop Wgpu prefix ... The GL backend is gone (task #53). The wgpu/non-wgpu folder split and the Wgpu* class prefix were both disambiguation artefacts from the overlap period — now pure dead weight. ## Folder + library merge * `src/ifcviewer-wgpu/` → folded into `src/ifcviewer/` (git mv tracks every file as a rename so blame/log history survives). * `src/ifcviewer-wgpu-minimal/` → `src/ifcviewer-minimal/` (the exe was already named `IfcViewerMinimal`; this just brings the folder + CMake target name into line). * `src/ifcviewer-wgpu/tests/test_wgpu_{selection,visibility}.cpp` → `src/ifcviewer/tests/test_{selection,visibility}.cpp`, folded into the existing `add_ifcviewer_unit_test(...)` helper. * The `IfcViewerWgpu` static library is dissolved — its sources become part of the unified `IfcViewer` static library, which now bundles scene/loader + renderer in one target. The pre-merge circular dependency (IfcViewer linking IfcViewerWgpu just to get the ViewportWindow.h include path that SceneLoader.h needs) goes away. * The wgpu-native FetchContent block, the Cocoa/QuartzCore link on Apple, the OBJCXX-enabled `.mm` source, and the wgpu-native runtime install all move into `src/ifcviewer/CMakeLists.txt` unchanged. ## Type renames (Wgpu prefix dropped from every Wgpu* identifier) WgpuAreaMeasurement → AreaMeasurement WgpuBufferPool → BufferPool WgpuLengthMeasurement → LengthMeasurement WgpuMetalSurface → MetalSurface WgpuModelGpuData → ModelGpuData WgpuOverlayFrame → OverlayFrame WgpuOverlayRenderer → OverlayRenderer WgpuSectionPlane → SectionPlane WgpuSelectionState → SelectionState WgpuStreamingLoader → StreamingLoader WgpuStreamingThread → StreamingThread WgpuViewportWindow → ViewportWindow WgpuVisibilityState → VisibilityState CMake target IfcViewerWgpuMinimal → IfcViewerMinimal (exe name was already this since wgpu shipped as default). Deliberately kept: `onWgpuLog` (wgpu-native log callback — names a binding to an external API, not one of *our* types), and the WGPU* enum/struct prefixes from wgpu-native's own headers. `WgpuMemProbe` lives in the separate `src/wgpu-mem-probe/` standalone diagnostic project and isn't touched. ## Include-path updates Every `#include "../ifcviewer-wgpu/Wgpu<X>.h"` → `"../ifcviewer/<X>.h"`, every in-directory `#include "Wgpu<X>.h"` → `"<X>.h"`. Includes from sibling subdirectories (modules/, etc.) are updated to point at `../../../ifcviewer/` instead of `../../../ifcviewer-wgpu/`. ## cmake/CMakeLists.txt simplification The redundant `add_subdirectory(ifcviewer-wgpu)` blocks (one inside the BUILD_BONSAIVIEWER fan-in, one in the BONSAIVIEWER-less standalone block) collapse into a single unconditional `add_subdirectory(../src/ifcviewer ifcviewer)`. The standalone block keeps only `wgpu-mem-probe` (the diagnostic tool, unrelated to the viewer lib). ## Verification * Full build green: `IfcViewer` static lib, `IfcViewerMinimal` exe, `BonsaiViewer` exe, all four pre-existing ifcviewer unit tests, and the two new-location tests (`test_selection`, `test_visibility`). * No stray `Wgpu<X>` identifier remains across `src/ifcviewer/`, `src/bonsaiviewer/`, `src/ifcviewer-minimal/` (verified by grep). * Renames tracked by git as `R` entries — `git log --follow` on ViewportWindow.cpp etc. continues to show history through the move. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-06-04 11:11:14 +10:00
Dion Moult	7f87408b78	bonsaiviewer: rework add-models false-origin guess + drop fly-mode input lag ... Two independent threads that landed on this branch. ## 1. Federation false-origin guess: arm-on-add + frame-on-origin The cc54237f5 fix moved the guess off the refresh() fan-in (terminating the stack-overflow recursion on Holter Tower), but the gating was still `modelIds().size() == 1` — broken for batch-add-into-empty-session because the session registry is populated synchronously by all addModel calls before any modelGeometryReady lands. Result: load 3 files at once → none of the per-model geometry-ready events ever finds `size() == 1` → guess never fires → camera + federation origin stay at surveyor coords. Rework: * **Arm/consume at the command boundary.** modules/models/Commands exposes `armFederatedFalseOriginGuess` / `consumeFederatedFalseOrigin Guess` (function pair — arming is a one-shot, raw-bool would let a peek-without-clear silently break the contract). `addModel` and the cloud-callback in `addModelFromCloud` arm if `modelIds().isEmpty()` at the moment they're about to register federation entries. The first geometry-ready then consumes the arm and runs the guess — batch add or single, works the same way. * **Lazy first geometry point from mesh AABB centre.** Drop SceneLoader's `firstPlacement(mid)` / `first_placement` / `has_first_placement` and the two capture sites entirely. The viewport keeps CPU-side MeshInfo + InstanceCpu for picking / measurement; compute the anchor on demand via new const accessor `WgpuViewportWindow::firstGeometryPointWorldM(mid, out)` = instance0.placement × meshes[instance0.mesh_id].aabb_centre. This is more representative than the placement translation (placements often live far from the actual geometry due to long ObjectPlacement chains / intermediate local frames), and lighter storage-wise (lazy, vs. 128 B per model held just-in-case). * **`guessFederatedFalseOrigin` math signature: Matrix4d → Vector3d.** The function only ever consumed `.block<3,1>(0,3)`; the Matrix4d API surface was a strictly-larger-than-necessary contract. Vector3d matches what the function actually needs. * **`WgpuViewportWindow::frameOnFederatedOrigin(mid, max_distance_m)`** replaces the post-shift use of viewAll() that the ViewportView almost reached for. The federated false origin sits at (0,0,0) in post-shift space by construction, so the camera targets there directly; distance fits the model's post-shift AABB diagonal with viewAll's padding math, clamped to `max_distance_m` so a model with one crazy-coord outlier vertex can't pull the camera back so far the real geometry becomes a pixel. Called with 100 m cap from the guess. Unlike viewAll() this only iterates the one model the guess fired for — the "load 10 models, viewAll shows nothing" failure mode is structurally avoided. * **ViewportView::tryGuessFirstModelFalseOrigin** renamed to `guessFederatedFalseOriginFromFirstModel` and the body restructured to consume the arm, look up the anchor via the viewport, mutate the federation origin (which propagates through SessionState's federatedFalseOriginChanged relay → refresh() → recompose all instance world AABBs), then `frameOnFederatedOrigin(mid, 100)`. * **Internal guards preserved.** filePath skip (project files own the origin), current==defaults skip (don't clobber a user who set the origin manually then removed the model), placement / georef availability checks — defense-in-depth around the arm, not the primary gate. The arm-only flow means re-arming on add-into- empty-session is naturally re-firable: add → remove → add will retry if the previous guess returned defaults. ## 2. wgpu present-mode: prefer Immediate above FifoRelaxed On Linux Vulkan stacks where the driver / compositor doesn't advertise Mailbox (confirmed on the user's setup — capability log added in this patch reports just `fifo, fifo_relaxed, immediate`), Fifo's 2–3 frame queue doubles input-to-photon latency the moment WASD activates (~16 ms render-body fully consumes the budget, so the queue is held deep). On a 60 Hz display this reads as "less smooth than the 100 fps HUD suggests" during fly-mode mouse-look-while-moving — confirmed by WGPU_FLY_DEBUG dt traces (rock-solid 16-17 ms cadence, so it's not frame pacing — it's latency). Promote Immediate above FifoRelaxed in the preference order so that when Mailbox is unavailable we pick the no-queue option (can tear under fast motion, but tearing on architectural geometry is usually invisible while the latency win is immediately felt). Also log the full advertised capability list on first configure so future "why isn't Mailbox available?" diagnostics don't need a code patch. Mailbox remains first preference; Fifo remains the spec-guaranteed final fallback. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-06-04 10:02:53 +10:00
Dion Moult	2981500b3b	Route bonsai through wgpu; delete the GL backend ... Bonsai now drives the wgpu viewport for both sidecar and direct-IFC loads. The GL viewer and its supporting state classes are gone. SceneLoader rewire: - Takes WgpuViewportWindow* instead of ViewportWindow*. - Sidecar path reads metadata only (readSidecarMetadataOnly) and hands the StreamingSidecar off to the new applyCachedModel. Field accesses inside applySidecarData go through .meta. - Direct-IFC path uses the wgpu A-path (upload{Mesh,Instance}Chunk + finalizeModel). The applyLodExtension call is dropped — wgpu has no live LOD1 splice; LOD1 still lands in the on-disk sidecar for the next open. Bonsai migration: - ViewportWindow → WgpuViewportWindow across MainWindow, Measurement, SessionState, and every modules/*/{Commands,Panel,View}.{h,cpp} — 116 sites total. Same s/OverlayRenderer::/WgpuOverlayRenderer::/ rename, 12 sites. - Includes flipped from ../ifcviewer/ViewportWindow.h to ../ifcviewer-wgpu/WgpuViewportWindow.h. OverlayRenderer.h include dropped (transitively reached via the viewport header). - BonsaiViewer links IfcViewerWgpu in addition to IfcViewer for the duration of the migration; the GL-side IfcViewer also publicly links IfcViewerWgpu so SceneLoader can resolve WgpuViewportWindow. GL backend deletion: - src/ifcviewer/ViewportWindow.{cpp,h}, BvhAccel.*, OverlayRenderer.*, Selection.*, Visibility.* all gone. - src/ifcviewer-minimal/ removed entirely (MinimalWindow drove the GL viewport). - src/ifcviewer/tests: test_bvh_accel, test_selection, test_visibility removed. The first has no replacement (wgpu doesn't use a per-instance BVH); the latter two are ported separately. test_lod_builder, test_sidecar_cache, test_instanced_geometry, test_federation remain (backend-agnostic). - IfcViewer's CMakeLists drops OpenGL, Qt::OpenGL, Qt::Widgets — none of the surviving translation units reach for them. Build flag plumbing: - BUILD_BONSAIVIEWER now auto-enables BUILD_BONSAIVIEWER_WGPU since SceneLoader requires the wgpu lib for its WgpuViewportWindow* arg. - The wgpu subprojects add_subdirectory ahead of the GL one so IfcViewerWgpu exists when IfcViewer's link evaluates. - src/ifcviewer-minimal subdir reference removed from cmake/CMakeLists. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-06-01 17:38:33 +10:00
Dion Moult	59e5b2b1b8	Rename IfcViewerFull to Bonsai Viewer ... Directory src/ifcviewer-full -> src/bonsaiviewer, CMake target IfcViewerFull -> BonsaiViewer, namespace ifcviewerfull -> bonsaiviewer, QApplication / window titles / connector path now use the new brand. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-25 16:34:19 +10:00