mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-14 11:24:19 +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>
119 lines
4.0 KiB
C++
119 lines
4.0 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/>. *
|
|
* *
|
|
********************************************************************************/
|
|
|
|
// Tier-1 coverage of VisibilityState — the per-element hidden-id set
|
|
// consulted in cull. The class is pure stdlib; this test exercises its
|
|
// primitives directly. Bulk hide/isolate/show-all semantics live in
|
|
// ViewportWindow (which composes VisibilityState + the model
|
|
// instance lists) and would need an integration test, not a Tier-1 unit.
|
|
|
|
#include "VisibilityState.h"
|
|
|
|
#include <catch2/catch_test_macros.hpp>
|
|
|
|
TEST_CASE("VisibilityState starts empty", "[wgpu-visibility]") {
|
|
VisibilityState vis;
|
|
REQUIRE(vis.hiddenCount() == 0);
|
|
REQUIRE_FALSE(vis.isHidden(0)); // 0 is the "no object" sentinel
|
|
REQUIRE_FALSE(vis.isHidden(1));
|
|
REQUIRE_FALSE(vis.isHidden(1u << 20));
|
|
}
|
|
|
|
TEST_CASE("hide(id) records the id; isHidden reflects it",
|
|
"[wgpu-visibility]") {
|
|
VisibilityState vis;
|
|
|
|
vis.hide(1);
|
|
vis.hide(2);
|
|
vis.hide(3);
|
|
|
|
REQUIRE(vis.hiddenCount() == 3);
|
|
REQUIRE(vis.isHidden(1));
|
|
REQUIRE(vis.isHidden(2));
|
|
REQUIRE(vis.isHidden(3));
|
|
REQUIRE_FALSE(vis.isHidden(4));
|
|
}
|
|
|
|
TEST_CASE("hide is idempotent", "[wgpu-visibility]") {
|
|
VisibilityState vis;
|
|
|
|
vis.hide(5);
|
|
vis.hide(5);
|
|
vis.hide(5);
|
|
|
|
REQUIRE(vis.hiddenCount() == 1);
|
|
REQUIRE(vis.isHidden(5));
|
|
}
|
|
|
|
TEST_CASE("hide(0) is ignored", "[wgpu-visibility]") {
|
|
VisibilityState vis;
|
|
|
|
vis.hide(0);
|
|
REQUIRE(vis.hiddenCount() == 0);
|
|
REQUIRE_FALSE(vis.isHidden(0));
|
|
}
|
|
|
|
TEST_CASE("show(id) removes a previously hidden id",
|
|
"[wgpu-visibility]") {
|
|
VisibilityState vis;
|
|
vis.hide(1);
|
|
vis.hide(2);
|
|
|
|
vis.show(1);
|
|
REQUIRE(vis.hiddenCount() == 1);
|
|
REQUIRE_FALSE(vis.isHidden(1));
|
|
REQUIRE(vis.isHidden(2));
|
|
}
|
|
|
|
TEST_CASE("show(non-hidden) is a no-op", "[wgpu-visibility]") {
|
|
VisibilityState vis;
|
|
vis.hide(1);
|
|
|
|
vis.show(99); // never hidden
|
|
REQUIRE(vis.hiddenCount() == 1);
|
|
REQUIRE(vis.isHidden(1));
|
|
}
|
|
|
|
TEST_CASE("clear() drops every hidden id", "[wgpu-visibility]") {
|
|
VisibilityState vis;
|
|
vis.hide(1);
|
|
vis.hide(2);
|
|
vis.hide(3);
|
|
|
|
vis.clear();
|
|
REQUIRE(vis.hiddenCount() == 0);
|
|
REQUIRE_FALSE(vis.isHidden(1));
|
|
REQUIRE_FALSE(vis.isHidden(2));
|
|
REQUIRE_FALSE(vis.isHidden(3));
|
|
}
|
|
|
|
TEST_CASE("hiddenIds returns the live set", "[wgpu-visibility]") {
|
|
VisibilityState vis;
|
|
vis.hide(10);
|
|
vis.hide(20);
|
|
vis.hide(30);
|
|
|
|
const auto& ids = vis.hiddenIds();
|
|
REQUIRE(ids.size() == 3);
|
|
REQUIRE(ids.count(10) == 1);
|
|
REQUIRE(ids.count(20) == 1);
|
|
REQUIRE(ids.count(30) == 1);
|
|
REQUIRE(ids.count(40) == 0);
|
|
}
|