mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-10 17:58:20 +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>
106 lines
4.1 KiB
C++
106 lines
4.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 WGPUSELECTIONSTATE_H
|
|
#define WGPUSELECTIONSTATE_H
|
|
|
|
#include <cstdint>
|
|
#include <unordered_set>
|
|
#include <vector>
|
|
|
|
// CPU-side selection tracking. Mirrors src/ifcviewer/Selection.h shape but
|
|
// without Qt deps (kept pure stdlib so it can move into ifcviewer-core
|
|
// later without dragging Qt along).
|
|
//
|
|
// Two flavours of "selected":
|
|
// - the multi-set (ids()): every object the user has Shift-added.
|
|
// - active (activeId()): the *last* single-clicked object. UIs typically
|
|
// use this to drive the properties panel; the renderer tints it
|
|
// slightly more strongly than the rest of the multi-set.
|
|
//
|
|
// The GPU consumes a flat u32 array indexed by object_id: bit 0 = selected,
|
|
// bit 1 = active. Sized to (max_object_id + 1) by the caller.
|
|
class SelectionState {
|
|
public:
|
|
void clear() {
|
|
if (ids_.empty() && active_ == 0) return;
|
|
ids_.clear();
|
|
active_ = 0;
|
|
dirty_ = true;
|
|
}
|
|
|
|
// Replace the selection with a single object. id == 0 clears.
|
|
void replace(uint32_t id) {
|
|
ids_.clear();
|
|
if (id != 0) ids_.insert(id);
|
|
active_ = id;
|
|
dirty_ = true;
|
|
}
|
|
|
|
void add(uint32_t id) {
|
|
if (id == 0) return;
|
|
ids_.insert(id);
|
|
active_ = id;
|
|
dirty_ = true;
|
|
}
|
|
|
|
void remove(uint32_t id) {
|
|
if (id == 0) return;
|
|
if (ids_.erase(id) == 0) return;
|
|
if (active_ == id) {
|
|
active_ = ids_.empty() ? 0 : *ids_.begin();
|
|
}
|
|
dirty_ = true;
|
|
}
|
|
|
|
void toggle(uint32_t id) {
|
|
if (id == 0) return;
|
|
if (ids_.count(id)) remove(id);
|
|
else add(id);
|
|
}
|
|
|
|
bool contains(uint32_t id) const { return ids_.count(id) > 0; }
|
|
uint32_t activeId() const { return active_; }
|
|
// Named selectionIds() rather than ids() so bonsai's
|
|
// `viewport_->selection().selectionIds()` compiles unchanged.
|
|
const std::unordered_set<uint32_t>& selectionIds() const { return ids_; }
|
|
size_t count() const { return ids_.size(); }
|
|
|
|
bool dirty() const { return dirty_; }
|
|
void markClean() { dirty_ = false; }
|
|
|
|
// Fill `out` (sized to entries u32s) with bit-packed flags:
|
|
// bit 0 = selected (in ids_), bit 1 = active. out[0] is always 0
|
|
// because object_id 0 is the "miss" sentinel.
|
|
void fillFlagsArray(std::vector<uint32_t>& out, uint32_t entries) const {
|
|
out.assign(entries, 0);
|
|
for (uint32_t id : ids_) {
|
|
if (id < entries) out[id] |= 1u;
|
|
}
|
|
if (active_ != 0 && active_ < entries) out[active_] |= 2u;
|
|
}
|
|
|
|
private:
|
|
std::unordered_set<uint32_t> ids_;
|
|
uint32_t active_ = 0;
|
|
bool dirty_ = false;
|
|
};
|
|
|
|
#endif // WGPUSELECTIONSTATE_H
|