mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-11 14:22:33 +00:00
Dion Moult
2981500b3b
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>
73 lines
3.9 KiB
C++
73 lines
3.9 KiB
C++
// This file was generated with the assistance of an AI coding tool.
|
|
/********************************************************************************
|
|
* *
|
|
* 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 IFCINTERFACE_MODULES_MODELS_COMMANDS_H
|
|
#define IFCINTERFACE_MODULES_MODELS_COMMANDS_H
|
|
|
|
#include "Types.h"
|
|
|
|
#include <QString>
|
|
#include <QStringList>
|
|
#include <cstdint>
|
|
|
|
class QWidget;
|
|
class WgpuViewportWindow;
|
|
namespace bonsaiviewer { class SessionState; }
|
|
|
|
namespace bonsaiviewer::modules::models::commands {
|
|
|
|
// User-facing commands. Each one is responsible for emitting any notify()
|
|
// signals exactly once, at the end of its execution.
|
|
void toggleVisibility(SessionState& s, ItemKind kind, const QString& id);
|
|
void addGroup(SessionState& s, QWidget& host, const QString& parent_group_id);
|
|
void renameGroup(SessionState& s, QWidget& host, const QString& group_id);
|
|
void moveGroup(SessionState& s, const QString& id, const QString& parent_group_id);
|
|
void moveModels(SessionState& s, const QStringList& ids, const QString& parent_group_id);
|
|
void removeGroup(SessionState& s, QWidget& host, const QString& group_id);
|
|
void removeModel(SessionState& s, WgpuViewportWindow& vp, QWidget& host, const QString& fed_id);
|
|
void addModel(SessionState& s, QWidget& host);
|
|
// Connector picker → pull_models_interactive → addCloudModel + load.
|
|
// Reachable from AddModelDialog's CloudModel button; the underlying call
|
|
// is async, so addModelFromCloud returns immediately after kicking it off.
|
|
void addModelFromCloud(SessionState& s, QWidget& host);
|
|
// push_model: push a cloud-sourced model back to its existing target.
|
|
// Only valid when model.source_connector != "local". Async.
|
|
void saveModelToCloud(SessionState& s, QWidget& host, const QString& fed_id);
|
|
// push_model_interactive: pick a connector and push to a fresh cloud
|
|
// target. Valid for any model (local or already cloud-sourced). Async.
|
|
void saveModelAsToCloud(SessionState& s, QWidget& host, const QString& fed_id);
|
|
void convertIfcToDatabase(SessionState& s, QWidget& host);
|
|
void exportGeometryDatabase(SessionState& s, QWidget& host);
|
|
void openSettings(SessionState& s, QWidget& host);
|
|
|
|
// Internal building blocks shared by commands here and by ProjectController.
|
|
// These NEVER call notify*() — the caller is responsible for emitting once
|
|
// at the end of its execution.
|
|
namespace detail {
|
|
|
|
// Queues already-federated models on the loader and maps their fed-ids to mids.
|
|
void loadModels(SessionState& s, const QStringList& paths, const QStringList& fed_ids);
|
|
|
|
} // namespace detail
|
|
|
|
} // namespace bonsaiviewer::modules::models::commands
|
|
|
|
#endif
|