mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-14 03:14:23 +00:00
Dion Moult
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>
90 lines
4.6 KiB
C++
90 lines
4.6 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 ViewportWindow;
|
|
namespace bonsaiviewer { class SessionState; }
|
|
|
|
namespace bonsaiviewer::modules::models {
|
|
|
|
// Arm/consume pair for "the next model load should auto-guess the
|
|
// federation's false origin." Add-model commands arm this when they're
|
|
// about to add into an empty session; ViewportView consumes it on the
|
|
// next modelGeometryReady. The flag has consume-on-read semantics so
|
|
// the API is functions, not a raw bool (a peek-without-clear would
|
|
// silently break the one-shot guarantee).
|
|
//
|
|
// Module-scoped (not on SessionState) because it's add-command intent —
|
|
// SessionState shouldn't grow a field for every module's per-command
|
|
// state. Lives next to the commands that arm it.
|
|
void armFederatedFalseOriginGuess();
|
|
bool consumeFederatedFalseOriginGuess();
|
|
|
|
} // namespace bonsaiviewer::modules::models
|
|
|
|
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, 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
|
|
// 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
|