mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-11 02:02:22 +00:00
8ab5c31e75
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>
185 lines
8.1 KiB
C++
185 lines
8.1 KiB
C++
/********************************************************************************
|
|
* *
|
|
* This file is part of IfcOpenShell. *
|
|
* *
|
|
* IfcOpenShell is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the Lesser GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3.0 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* IfcOpenShell is distributed in the hope that it will be useful, *
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
|
* Lesser GNU General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the Lesser GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
* *
|
|
********************************************************************************/
|
|
|
|
#ifndef SCENELOADER_H
|
|
#define SCENELOADER_H
|
|
|
|
#include <QObject>
|
|
#include <QString>
|
|
#include <QStringList>
|
|
#include <QTimer>
|
|
#include <QElapsedTimer>
|
|
|
|
#include <cstdint>
|
|
#include <deque>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <string>
|
|
#include <thread>
|
|
#include <vector>
|
|
|
|
#include "Federation.h"
|
|
#include "../ifcviewer/ViewportWindow.h"
|
|
#include "../ifcviewer/StreamingLoader.h"
|
|
#include "GeometryStreamer.h"
|
|
#include "SidecarBuilder.h"
|
|
#include "SidecarCache.h"
|
|
|
|
// Drives IFC file loading into a ViewportWindow. Owns the per-model
|
|
// GeometryStreamer, the load queue, the sidecar read thread, and the
|
|
// next-free object_id counter used to rebase cached models onto the
|
|
// current session's ID space.
|
|
//
|
|
// Consumers (MainWindow, MinimalWindow) observe progress through signals
|
|
// and never touch the streamer, sidecar thread, or queue directly.
|
|
// Sidecar *writes* happen automatically as a side effect of stream loads —
|
|
// the SidecarBuilder accumulates from the streamer chunks alongside the
|
|
// viewport upload, and SceneLoader finalizes + writes the result when the
|
|
// stream finishes. No GPU readback involved.
|
|
class SceneLoader : public QObject {
|
|
Q_OBJECT
|
|
public:
|
|
explicit SceneLoader(ViewportWindow* viewport, QObject* parent = nullptr);
|
|
~SceneLoader();
|
|
|
|
// Sidecar cache use is opt-in per direction. Embedders that don't care
|
|
// about .ifcview can leave both off (default) and SceneLoader will never
|
|
// probe for or produce one. Toggles only affect *subsequent* loads;
|
|
// a load already in flight finishes with whatever was set when it
|
|
// started. Opening a `.ifcview` file directly always reads it,
|
|
// regardless of these flags.
|
|
void setShouldReadSidecar(bool enabled);
|
|
void setShouldWriteSidecar(bool enabled);
|
|
bool shouldReadSidecar() const { return should_read_sidecar_; }
|
|
bool shouldWriteSidecar() const { return should_write_sidecar_; }
|
|
|
|
// Returns the model_ids assigned to the enqueued paths, in order.
|
|
// Callers can use these to set up per-model UI state (tree roots, etc.)
|
|
// before any load signal fires.
|
|
std::vector<uint32_t> addFiles(const QStringList& paths);
|
|
void cancelCurrentLoad();
|
|
bool isLoading() const { return loading_model_id_ != 0 || !load_queue_.empty(); }
|
|
bool isLoadingModel(uint32_t mid) const { return loading_model_id_ == mid; }
|
|
size_t modelCount() const { return models_.size(); }
|
|
|
|
// Drop the loader's tracking for `mid` — its streamer, file path, georef
|
|
// cache, and queue slot if still pending. Caller is responsible for the
|
|
// viewport / UI cleanup; this only releases the loader's own state.
|
|
// Refuses while the model is the active load (use cancelCurrentLoad first).
|
|
void removeModel(uint32_t mid);
|
|
|
|
QString filePath(uint32_t mid) const;
|
|
QString displayName(uint32_t mid) const;
|
|
ifcopenshell::file* ifcFile(uint32_t mid) const;
|
|
|
|
// Lazily computes the model's georef matrix + unit scales the first
|
|
// time it's asked for, caches the result, and returns a pointer into the
|
|
// cache. Returns nullptr when the IFC file isn't available yet (e.g.
|
|
// sidecar-hit path before the data-source thread populates the streamer).
|
|
const ModelGeoref* modelGeoref(uint32_t mid);
|
|
|
|
signals:
|
|
void progressChanged(int percent);
|
|
void loadStarted(uint32_t mid, QString display_name);
|
|
|
|
// Fired once per sidecar hit, before loadedFromSidecar, with the full
|
|
// packed element set. Consumer is responsible for decoding + tree/
|
|
// property-map population. Moved arguments — avoid unnecessary copies.
|
|
void sidecarElementsReady(uint32_t mid,
|
|
std::vector<PackedElementInfo> elements,
|
|
std::string string_table);
|
|
void loadedFromSidecar(uint32_t mid, qint64 elapsed_ms);
|
|
|
|
// Fired after a sidecar-hit model has its .rdb/.ifc opened as a
|
|
// property data source in the background. Consumers can refresh
|
|
// any UI that queries ifcFile(mid) for attributes/properties.
|
|
void dataSourceReady(uint32_t mid);
|
|
|
|
// Fired repeatedly while streaming, as the worker thread produces
|
|
// elements. Each batch contains whatever accumulated since the last
|
|
// poll tick.
|
|
void streamedElementsReady(uint32_t mid, std::vector<ElementInfo> elements);
|
|
|
|
// Fired once after the streamer finishes and the viewport has been
|
|
// finalized. Consumer may synchronously perform work that needs all
|
|
// elements to be known (e.g. sidecar write) — SceneLoader will only
|
|
// start the next queued load after all slots return.
|
|
void loadedFromStream(uint32_t mid, qint64 elapsed_ms);
|
|
void loadCancelled(uint32_t mid);
|
|
|
|
void loadError(uint32_t mid, QString message);
|
|
void allLoadsFinished();
|
|
|
|
private slots:
|
|
void onStreamerProgressChanged(int percent);
|
|
void onStreamerMeshReady(MeshChunk chunk);
|
|
void onStreamerInstanceReady(InstanceChunk chunk);
|
|
void onStreamerFinished();
|
|
void onStreamerCancelled();
|
|
void onStreamerError(const QString& msg);
|
|
void onElementPollTick();
|
|
|
|
private:
|
|
struct Model {
|
|
uint32_t id = 0;
|
|
QString file_path;
|
|
QString display_name;
|
|
GeometryStreamer* streamer = nullptr;
|
|
QElapsedTimer load_timer;
|
|
|
|
// Cached on first SceneLoader::modelGeoref(mid) call once the
|
|
// streamer has its IFC file loaded.
|
|
ModelGeoref georef;
|
|
bool has_georef = false;
|
|
|
|
// Live-load sidecar accumulator. Constructed at the start of a
|
|
// stream load when shouldWriteSidecar is on; null otherwise.
|
|
std::unique_ptr<SidecarBuilder> sidecar_builder;
|
|
// Element batches accumulated as the streamer yields, mirrored from
|
|
// what's emitted via streamedElementsReady so finalize() has the
|
|
// full set without re-draining.
|
|
std::vector<ElementInfo> streamed_elements;
|
|
};
|
|
|
|
void startNextLoad();
|
|
void startStreamLoadFor(uint32_t mid);
|
|
void connectStreamer(GeometryStreamer* streamer);
|
|
void joinSidecarThread();
|
|
void joinDataSourceThreads();
|
|
void applySidecarData(uint32_t mid, StreamingSidecar metadata);
|
|
void startDataSourceLoad(uint32_t mid);
|
|
|
|
ViewportWindow* viewport_ = nullptr;
|
|
bool should_read_sidecar_ = false;
|
|
bool should_write_sidecar_ = false;
|
|
std::map<uint32_t, Model> models_;
|
|
std::deque<uint32_t> load_queue_;
|
|
uint32_t next_model_id_ = 1;
|
|
uint32_t next_object_id_ = 1;
|
|
uint32_t loading_model_id_ = 0;
|
|
std::thread sidecar_read_thread_;
|
|
// One thread per sidecar-hit model while its .rdb/.ifc opens in the
|
|
// background. Joined only at destruction so a slow SPF parse on model
|
|
// A never blocks the sidecar-hit path of model B.
|
|
std::vector<std::thread> data_source_threads_;
|
|
QTimer element_poll_timer_;
|
|
};
|
|
|
|
#endif // SCENELOADER_H
|