Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-18 22:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: merge ifcviewer-wgpu into ifcviewer, drop Wgpu prefix

Browse Source 
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>
This commit is contained in:
Dion Moult
2026-06-04 11:11:14 +10:00
parent 7f87408b78
commit 8ab5c31e75
48 changed files with 705 additions and 815 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsaiviewer/modules/models/Commands.cpp
+2 -2
View File
@@ -31,7 +31,7 @@
#include "../../../ifcviewer/Federation.h"
#include "../../../ifcviewer/SceneLoader.h"
#include "../../../ifcviewer/SidecarBuilder.h"
#include "../../../ifcviewer-wgpu/WgpuViewportWindow.h"
#include "../../../ifcviewer/ViewportWindow.h"
#include "../../../ifcgeom/Serializer.h"
#include "../../../serializers/document_serializer_plugin.h"
@@ -166,7 +166,7 @@ void removeGroup(SessionState& s, QWidget& host, const QString& group_id) {
s.setStatusMessage("Models", "Group removed");
}
void removeModel(SessionState& s, WgpuViewportWindow& vp, QWidget& host, const QString& fed_id) {
void removeModel(SessionState& s, ViewportWindow& vp, QWidget& host, const QString& fed_id) {
const Federation::Model* model = s.federation()->findById(fed_id);
const QString label = model ? model->display_name : fed_id;
const auto choice = QMessageBox::question(
src/bonsaiviewer/modules/models/Commands.h
+2 -2
View File
@@ -28,7 +28,7 @@
#include <cstdint>
class QWidget;
class WgpuViewportWindow;
class ViewportWindow;
namespace bonsaiviewer { class SessionState; }
namespace bonsaiviewer::modules::models {
@@ -58,7 +58,7 @@ 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 removeModel(SessionState& s, ViewportWindow& 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
src/bonsaiviewer/modules/models/Panel.cpp
+1 -1
View File
@@ -220,7 +220,7 @@ private:
} // namespace
ModelsPanel::ModelsPanel(bonsaiviewer::SessionState* session_state,
WgpuViewportWindow* viewport,
ViewportWindow* viewport,
QWidget* parent)
: components::Panel("Models", nullptr, parent, true)
, session_state_(session_state)
src/bonsaiviewer/modules/models/Panel.h
+3 -3
View File
@@ -26,7 +26,7 @@
#include "../../components/Panel.h"
class QTreeView;
class WgpuViewportWindow;
class ViewportWindow;
namespace bonsaiviewer { class SessionState; }
namespace bonsaiviewer::modules::models {
@@ -41,7 +41,7 @@ class ModelsPanel : public components::Panel {
Q_OBJECT
public:
explicit ModelsPanel(bonsaiviewer::SessionState* session_state,
WgpuViewportWindow* viewport,
ViewportWindow* viewport,
QWidget* parent = nullptr);
// Owned externally (the View constructs and owns the model). The panel
@@ -52,7 +52,7 @@ private:
void applyColumnLayout();
bonsaiviewer::SessionState* session_state_ = nullptr;
WgpuViewportWindow* viewport_ = nullptr;
ViewportWindow* viewport_ = nullptr;
QTreeView* tree_ = nullptr;
FederationItemModel* model_ = nullptr;
};
src/bonsaiviewer/modules/project/Commands.cpp
+12 -12
View File
@@ -30,7 +30,7 @@
#include "../models/Commands.h"
#include "../../../ifcviewer/Federation.h"
#include "../../../ifcviewer/SceneLoader.h"
#include "../../../ifcviewer-wgpu/WgpuViewportWindow.h"
#include "../../../ifcviewer/ViewportWindow.h"
#include <QDebug>
#include <QDir>
@@ -53,7 +53,7 @@ namespace {
// Pure helper — clears the loaded scene without emitting any signals. The
// caller (newProject / openProject) emits projectReset / projectOpened once
// the whole flow finishes.
void clearScene(SessionState& s, WgpuViewportWindow& vp) {
void clearScene(SessionState& s, ViewportWindow& vp) {
vp.setSelectedObjectId(0);
s.setSelectedObjectId(0);
for (uint32_t mid : s.modelIds()) {
@@ -88,7 +88,7 @@ bool confirmDiscardIfDirty(SessionState& s, QWidget& host) {
// - if no scene entry exists yet (initial open), queue a load.
// Per spec, connector errors are not surfaced to the user; the connector
// has already shown its own UI.
void resolveCloudModels(SessionState& s, WgpuViewportWindow& vp) {
void resolveCloudModels(SessionState& s, ViewportWindow& vp) {
auto* fed = s.federation();
QHash<QString, QStringList> connector_to_fed_ids;
for (const auto& m : fed->models()) {
@@ -99,7 +99,7 @@ void resolveCloudModels(SessionState& s, WgpuViewportWindow& vp) {
auto* registry = s.connectorRegistry();
QPointer<SessionState> sguard(&s);
QPointer<WgpuViewportWindow> vguard(&vp);
QPointer<ViewportWindow> vguard(&vp);
for (auto it = connector_to_fed_ids.constBegin();
it != connector_to_fed_ids.constEnd(); ++it) {
@@ -203,7 +203,7 @@ bool isIfcfedUnchanged(const QString& current_path, const QString& candidate_pat
return a.readAll() == b.readAll();
}
bool openProjectAt(SessionState& s, QWidget& host, WgpuViewportWindow& vp, const QString& path) {
bool openProjectAt(SessionState& s, QWidget& host, ViewportWindow& vp, const QString& path) {
SceneLoader* loader = s.loader();
if (loader && loader->isLoading()) {
QMessageBox::information(
@@ -268,7 +268,7 @@ bool saveProjectTo(SessionState& s, QWidget& host, const QString& path) {
} // namespace
bool newProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp) {
bool newProject(SessionState& s, QWidget& host, ViewportWindow& vp) {
SceneLoader* loader = s.loader();
if (loader && loader->isLoading()) {
QMessageBox::information(
@@ -285,7 +285,7 @@ bool newProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp) {
return true;
}
bool openProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp) {
bool openProject(SessionState& s, QWidget& host, ViewportWindow& vp) {
QFileDialog file_dialog(&host, "Open Project");
file_dialog.setFileMode(QFileDialog::ExistingFile);
file_dialog.setNameFilter("IFC Federation (*.ifcfed);;All Files (*)");
@@ -297,12 +297,12 @@ bool openProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp) {
return openProjectAt(s, host, vp, path);
}
bool openProjectPath(SessionState& s, QWidget& host, WgpuViewportWindow& vp, const QString& path) {
bool openProjectPath(SessionState& s, QWidget& host, ViewportWindow& vp, const QString& path) {
if (path.isEmpty()) return false;
return openProjectAt(s, host, vp, path);
}
bool openCloudProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp) {
bool openCloudProject(SessionState& s, QWidget& host, ViewportWindow& vp) {
SceneLoader* loader = s.loader();
if (loader && loader->isLoading()) {
QMessageBox::information(
@@ -341,7 +341,7 @@ bool openCloudProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp) {
QPointer<SessionState> sguard(&s);
QPointer<QWidget> hguard(&host);
QPointer<WgpuViewportWindow> vguard(&vp);
QPointer<ViewportWindow> vguard(&vp);
proc->call("pull_ifcfed_interactive", QJsonValue(),
[sguard, hguard, vguard, connector_id](const QJsonValue& result) {
@@ -371,7 +371,7 @@ bool openCloudProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp) {
return true;
}
bool syncCloudProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp) {
bool syncCloudProject(SessionState& s, QWidget& host, ViewportWindow& vp) {
auto* fed = s.federation();
// Per spec, sync has two independent phases — refreshing the .ifcfed
@@ -429,7 +429,7 @@ bool syncCloudProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp) {
QPointer<SessionState> sguard(&s);
QPointer<QWidget> hguard(&host);
QPointer<WgpuViewportWindow> vguard(&vp);
QPointer<ViewportWindow> vguard(&vp);
const QString current_path = fed->filePath();
proc->call("pull_ifcfed", fed->manifest(),
src/bonsaiviewer/modules/project/Commands.h
+6 -6
View File
@@ -24,7 +24,7 @@
#include <QString>
class QWidget;
class WgpuViewportWindow;
class ViewportWindow;
namespace bonsaiviewer { class SessionState; }
namespace bonsaiviewer::modules::project::commands {
@@ -32,21 +32,21 @@ namespace bonsaiviewer::modules::project::commands {
// User-facing commands. Each owns its own dialogs and confirmations; each
// emits exactly one notify() at the end (projectReset / projectOpened /
// projectSaved) so views refresh once per command.
bool newProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp);
bool openProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp);
bool newProject(SessionState& s, QWidget& host, ViewportWindow& vp);
bool openProject(SessionState& s, QWidget& host, ViewportWindow& vp);
// Open a specific .ifcfed by path, bypassing the file dialog. Used by the
// "Open Recent" menu. Same dirty-check / load / cloud-resolve flow as
// openProject; returns false if the load failed or was cancelled.
bool openProjectPath(SessionState& s, QWidget& host, WgpuViewportWindow& vp, const QString& path);
bool openProjectPath(SessionState& s, QWidget& host, ViewportWindow& vp, const QString& path);
// Pick a connector, then call pull_ifcfed_interactive and open the resulting
// .ifcfed as a fresh project. Non-local models in the loaded federation are
// resolved asynchronously via pull_models.
bool openCloudProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp);
bool openCloudProject(SessionState& s, QWidget& host, ViewportWindow& vp);
// pull_ifcfed using the current project's .ifcfed.manifest. Re-downloads
// the .ifcfed from the same cloud target it came from (typically without
// user interaction), then opens it like a fresh project — discarding any
// local edits after the usual dirty-check prompt.
bool syncCloudProject(SessionState& s, QWidget& host, WgpuViewportWindow& vp);
bool syncCloudProject(SessionState& s, QWidget& host, ViewportWindow& vp);
bool saveProject(SessionState& s, QWidget& host);
bool saveProjectAs(SessionState& s, QWidget& host);
// Push the current federation to the cloud target named in its manifest
src/bonsaiviewer/modules/viewport/Commands.cpp
+14 -14
View File
@@ -22,11 +22,11 @@
#include "../../SessionState.h"
#include "../../../ifcviewer/Federation.h"
#include "../../../ifcviewer-wgpu/WgpuViewportWindow.h"
#include "../../../ifcviewer/ViewportWindow.h"
namespace bonsaiviewer::modules::viewport::commands {
void setHome(SessionState& session, WgpuViewportWindow& vp) {
void setHome(SessionState& session, ViewportWindow& vp) {
auto camera = vp.cameraState();
Federation::HomeView home_view;
home_view.target = camera.target;
@@ -37,7 +37,7 @@ void setHome(SessionState& session, WgpuViewportWindow& vp) {
session.setStatusMessage("Camera", "Home view updated");
}
void goHome(SessionState& session, WgpuViewportWindow& vp) {
void goHome(SessionState& session, ViewportWindow& vp) {
Federation* federation = session.federation();
if (!federation->hasHomeView()) {
session.setStatusMessage("Camera", "No home view set for this project");
@@ -50,52 +50,52 @@ void goHome(SessionState& session, WgpuViewportWindow& vp) {
session.setStatusMessage("Camera", "Home view restored");
}
void viewSelected(WgpuViewportWindow& vp) {
void viewSelected(ViewportWindow& vp) {
vp.focusOnSelectedObject();
}
void fly(SessionState& session, WgpuViewportWindow& vp) {
void fly(SessionState& session, ViewportWindow& vp) {
vp.requestActivate();
vp.enterFpsMode();
session.setStatusMessage("Mode", "Fly mode active");
}
void toggleSection(SessionState& session, WgpuViewportWindow& vp) {
void toggleSection(SessionState& session, ViewportWindow& vp) {
vp.toggleSectionTool();
session.setStatusMessage("Section",
vp.sectionToolActive() ? "Section tool active" : "Section tool off");
}
void clearSection(SessionState& session, WgpuViewportWindow& vp) {
void clearSection(SessionState& session, ViewportWindow& vp) {
vp.clearSectionPlanes();
session.setStatusMessage("Section", "Section planes cleared");
}
void toggleDistance(WgpuViewportWindow& vp) {
void toggleDistance(ViewportWindow& vp) {
vp.toggleLengthTool();
}
void toggleArea(WgpuViewportWindow& vp) {
void toggleArea(ViewportWindow& vp) {
vp.toggleAreaTool();
}
void toggleVolume(WgpuViewportWindow& vp) {
void toggleVolume(ViewportWindow& vp) {
vp.toggleVolumeTool();
}
void hideSelected(WgpuViewportWindow& vp) {
void hideSelected(ViewportWindow& vp) {
vp.hideSelectedElements();
}
void isolateSelected(WgpuViewportWindow& vp) {
void isolateSelected(ViewportWindow& vp) {
vp.isolateSelectedElements();
}
void showAll(WgpuViewportWindow& vp) {
void showAll(ViewportWindow& vp) {
vp.showAllElements();
}
void invertVisibility(WgpuViewportWindow& vp) {
void invertVisibility(ViewportWindow& vp) {
vp.invertElementVisibility();
}
src/bonsaiviewer/modules/viewport/Commands.h
+14 -14
View File
@@ -21,27 +21,27 @@
#ifndef IFCINTERFACE_MODULES_VIEWPORT_COMMANDS_H
#define IFCINTERFACE_MODULES_VIEWPORT_COMMANDS_H
class WgpuViewportWindow;
class ViewportWindow;
namespace bonsaiviewer { class SessionState; }
namespace bonsaiviewer::modules::viewport::commands {
void setHome(SessionState& session, WgpuViewportWindow& vp);
void goHome(SessionState& session, WgpuViewportWindow& vp);
void viewSelected(WgpuViewportWindow& vp);
void setHome(SessionState& session, ViewportWindow& vp);
void goHome(SessionState& session, ViewportWindow& vp);
void viewSelected(ViewportWindow& vp);
void fly(SessionState& session, WgpuViewportWindow& vp);
void toggleSection(SessionState& session, WgpuViewportWindow& vp);
void clearSection(SessionState& session, WgpuViewportWindow& vp);
void fly(SessionState& session, ViewportWindow& vp);
void toggleSection(SessionState& session, ViewportWindow& vp);
void clearSection(SessionState& session, ViewportWindow& vp);
void toggleDistance(WgpuViewportWindow& vp);
void toggleArea(WgpuViewportWindow& vp);
void toggleVolume(WgpuViewportWindow& vp);
void toggleDistance(ViewportWindow& vp);
void toggleArea(ViewportWindow& vp);
void toggleVolume(ViewportWindow& vp);
void hideSelected(WgpuViewportWindow& vp);
void isolateSelected(WgpuViewportWindow& vp);
void showAll(WgpuViewportWindow& vp);
void invertVisibility(WgpuViewportWindow& vp);
void hideSelected(ViewportWindow& vp);
void isolateSelected(ViewportWindow& vp);
void showAll(ViewportWindow& vp);
void invertVisibility(ViewportWindow& vp);
} // namespace bonsaiviewer::modules::viewport::commands
src/bonsaiviewer/modules/viewport/Panel.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "Panel.h"
#include "../../../ifcviewer-wgpu/WgpuViewportWindow.h"
#include "../../../ifcviewer/ViewportWindow.h"
#include <QFrame>
#include <QVBoxLayout>
@@ -47,7 +47,7 @@ ViewportPanel::ViewportPanel(QWidget* parent)
frame_layout->setContentsMargins(0, 0, 0, 0);
frame_layout->setSpacing(0);
viewport_ = new WgpuViewportWindow();
viewport_ = new ViewportWindow();
viewport_container_ = QWidget::createWindowContainer(viewport_, frame);
viewport_container_->setMinimumSize(400, 300);
viewport_container_->setFocusPolicy(Qt::StrongFocus);
src/bonsaiviewer/modules/viewport/Panel.h
+3 -3
View File
@@ -23,7 +23,7 @@
#include <QWidget>
class WgpuViewportWindow;
class ViewportWindow;
namespace bonsaiviewer::modules::viewport {
@@ -33,10 +33,10 @@ class ViewportPanel : public QWidget {
public:
explicit ViewportPanel(QWidget* parent = nullptr);
WgpuViewportWindow* viewport() const { return viewport_; }
ViewportWindow* viewport() const { return viewport_; }
private:
WgpuViewportWindow* viewport_ = nullptr;
ViewportWindow* viewport_ = nullptr;
QWidget* viewport_container_ = nullptr;
};
src/bonsaiviewer/modules/viewport/View.cpp
+20 -20
View File
@@ -25,8 +25,8 @@
#include "../models/Commands.h"
#include "../../../ifcviewer/Federation.h"
#include "../../../ifcviewer/SceneLoader.h"
#include "../../../ifcviewer-wgpu/WgpuViewportWindow.h"
#include "../../../ifcviewer-wgpu/WgpuOverlayRenderer.h"
#include "../../../ifcviewer/ViewportWindow.h"
#include "../../../ifcviewer/OverlayRenderer.h"
#include "../../Measurement.h"
#include <Eigen/Dense>
@@ -37,7 +37,7 @@
namespace bonsaiviewer::modules::viewport {
ViewportView::ViewportView(bonsaiviewer::SessionState* session_state,
WgpuViewportWindow* viewport,
ViewportWindow* viewport,
QObject* parent)
: QObject(parent)
, session_state_(session_state)
@@ -73,54 +73,54 @@ ViewportView::ViewportView(bonsaiviewer::SessionState* session_state,
});
// Measurement tools — input-driven, share the View's lifetime.
connect(viewport_, &WgpuViewportWindow::surfacePickedInTool, this,
connect(viewport_, &ViewportWindow::surfacePickedInTool, this,
[this](int x, int y, int modifiers) {
const bool alt = (modifiers & Qt::AltModifier) != 0;
switch (viewport_->toolMode()) {
case WgpuViewportWindow::ToolMode::Area:
case ViewportWindow::ToolMode::Area:
area_measurement_->onPick(*viewport_, x, y, alt);
viewport_->setHudText(QString("Area: %1 m² (%2 tris)")
.arg(area_measurement_->totalArea(), 0, 'f', 4)
.arg(area_measurement_->triangleCount()));
break;
case WgpuViewportWindow::ToolMode::Length:
case ViewportWindow::ToolMode::Length:
length_measurement_->onPick(*viewport_, x, y, alt);
break;
case WgpuViewportWindow::ToolMode::NoTool:
case WgpuViewportWindow::ToolMode::Volume:
case ViewportWindow::ToolMode::NoTool:
case ViewportWindow::ToolMode::Volume:
break;
}
});
connect(viewport_, &WgpuViewportWindow::toolModeChanged, this,
[this](WgpuViewportWindow::ToolMode mode) {
connect(viewport_, &ViewportWindow::toolModeChanged, this,
[this](ViewportWindow::ToolMode mode) {
area_measurement_->clear(*viewport_);
length_measurement_->clear(*viewport_);
switch (mode) {
case WgpuViewportWindow::ToolMode::NoTool:
case ViewportWindow::ToolMode::NoTool:
viewport_->setHudText(QString());
viewport_->setOverlayLabels({});
session_state_->setStatusMessage("Measure", "Measurement tool off");
break;
case WgpuViewportWindow::ToolMode::Length:
case ViewportWindow::ToolMode::Length:
viewport_->setHudText("Length tool: click first point");
session_state_->setStatusMessage("Measure", "Length tool: LMB add point, Backspace remove last, Esc exits");
break;
case WgpuViewportWindow::ToolMode::Area:
case ViewportWindow::ToolMode::Area:
viewport_->setHudText("Area: 0.0000 m² (0 tris)");
session_state_->setStatusMessage("Measure", "Area tool: LMB add, Alt+LMB single tri, click again to remove, Esc exits");
break;
case WgpuViewportWindow::ToolMode::Volume:
case ViewportWindow::ToolMode::Volume:
session_state_->setStatusMessage("Measure", "Volume tool: click / box-select objects, Esc exits");
updateVolumeReadout();
break;
}
});
connect(viewport_, &WgpuViewportWindow::toolBackspacePressed, this, [this]() {
if (viewport_->toolMode() == WgpuViewportWindow::ToolMode::Length) {
connect(viewport_, &ViewportWindow::toolBackspacePressed, this, [this]() {
if (viewport_->toolMode() == ViewportWindow::ToolMode::Length) {
length_measurement_->removeLastPoint(*viewport_);
}
});
connect(viewport_, &WgpuViewportWindow::objectPicked, this, [this](uint32_t) {
connect(viewport_, &ViewportWindow::objectPicked, this, [this](uint32_t) {
updateVolumeReadout();
});
@@ -238,7 +238,7 @@ void ViewportView::guessFederatedFalseOriginFromFirstModel(uint32_t mid) {
}
void ViewportView::updateVolumeReadout() {
if (viewport_->toolMode() != WgpuViewportWindow::ToolMode::Volume) return;
if (viewport_->toolMode() != ViewportWindow::ToolMode::Volume) return;
const auto& sel = viewport_->selection().selectionIds();
if (sel.empty()) {
@@ -251,13 +251,13 @@ void ViewportView::updateVolumeReadout() {
const auto per_obj = volumesPerObject(*viewport_, ids);
double total = 0.0;
std::vector<WgpuOverlayRenderer::Label> labels;
std::vector<OverlayRenderer::Label> labels;
labels.reserve(per_obj.size());
for (const auto& [oid, v] : per_obj) {
total += v;
QVector3D mn, mx;
if (!viewport_->computeObjectAabb(oid, mn, mx)) continue;
WgpuOverlayRenderer::Label lbl;
OverlayRenderer::Label lbl;
const QVector3D c = (mn + mx) * 0.5f;
lbl.world_pos[0] = c.x();
lbl.world_pos[1] = c.y();
src/bonsaiviewer/modules/viewport/View.h
+3 -3
View File
@@ -25,7 +25,7 @@
#include <memory>
namespace bonsaiviewer { class SessionState; }
class WgpuViewportWindow;
class ViewportWindow;
class AreaMeasurement;
class LengthMeasurement;
@@ -44,7 +44,7 @@ class ViewportView : public QObject {
public:
explicit ViewportView(bonsaiviewer::SessionState* session_state,
WgpuViewportWindow* viewport,
ViewportWindow* viewport,
QObject* parent = nullptr);
~ViewportView() override;
@@ -57,7 +57,7 @@ private:
void updateVolumeReadout();
bonsaiviewer::SessionState* session_state_ = nullptr;
WgpuViewportWindow* viewport_ = nullptr;
ViewportWindow* viewport_ = nullptr;
std::unique_ptr<AreaMeasurement> area_measurement_;
std::unique_ptr<LengthMeasurement> length_measurement_;
};