mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-16 10:34:31 +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>
68 lines
3.9 KiB
C++
68 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_PROJECT_COMMANDS_H
|
|
#define IFCINTERFACE_MODULES_PROJECT_COMMANDS_H
|
|
|
|
#include <QString>
|
|
|
|
class QWidget;
|
|
class ViewportWindow;
|
|
namespace bonsaiviewer { class SessionState; }
|
|
|
|
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, 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, 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, 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, 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
|
|
// (push_ifcfed). No user prompt for destination. Caller is responsible for
|
|
// gating this on Federation::hasManifest.
|
|
bool saveCloudProject(SessionState& s, QWidget& host);
|
|
// Pick a connector and push the current federation to a fresh cloud target
|
|
// (push_ifcfed_interactive). The connector returns a new path + manifest;
|
|
// Federation repoints to that location.
|
|
bool saveAsCloudProject(SessionState& s, QWidget& host);
|
|
// Show the four-way Save dialog (Local / Save As Local / To Cloud / Save
|
|
// As To Cloud) and dispatch to one of the above. This is what the "Save
|
|
// Project" ribbon button is wired to.
|
|
bool saveProjectDialog(SessionState& s, QWidget& host);
|
|
|
|
} // namespace bonsaiviewer::modules::project::commands
|
|
|
|
#endif
|