mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-12 18:43:26 +00:00
Dion Moult
b62e14a06a
Take QString out of ViewportWindow's outward-facing surface so it can
eventually move into a Qt-free ViewportCore:
void queueLoadSidecar(const QString&) → (const std::string&)
uint32_t loadSidecar(const QString&) → (const std::string&)
QString cameraString() const → std::string …
void captureNextFrameToPng(const QString&, bool)
→ (const std::string&, bool)
void setHudText(const QString&) → (const std::string&)
Internal members also moved off QString:
std::deque<QString> pending_sidecars_ → std::deque<std::string>
QString pending_screenshot_path_ → std::string
Implementation strategy: convert at the boundary where ViewportWindow
still leans on Qt internals — `loadSidecar` bridges to QString once
for QFile/QDir/QFileInfo path handling; the screenshot save path
constructs a QString locally for QImage::save; the OverlayRenderer's
HUD setter still takes QString so setHudText converts before calling
through. Each of those bridges goes away when ViewportCore lands and
OverlayRenderer / SceneLoader / SidecarBuilder get their own de-Qt
sweeps. cameraString now produces its CSV via snprintf — no QString
ever instantiated.
Bonsai-side updates (compile-only):
ifcviewer-minimal/main.cpp — queueLoadSidecar / captureNextFrameToPng
callers add .toStdString() on the QString
parser result
modules/viewport/View.cpp — setHudText callers add .toStdString() to
their `QString::arg(...)` formatter chains;
two `QString()` empty sentinels become
`std::string()`
Measurement.cpp — same pattern, two setHudText sites
ifcviewer/LengthMeasurement.cpp — same, three sites
The cameraString string-streaming fix-up in ViewportWindow.cpp drops
the temporary .toUtf8().constData() bridge from #82 — Log::Stream's
std::string overload now handles it directly.
Builds: desktop / bonsai / web all green. Tests 100/100. Closes #80.
109 lines
4.8 KiB
C++
109 lines
4.8 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/>. *
|
|
* *
|
|
********************************************************************************/
|
|
|
|
#include <QApplication>
|
|
#include <QCommandLineParser>
|
|
#include <QMainWindow>
|
|
#include <QWidget>
|
|
#include <QVBoxLayout>
|
|
|
|
#include "Log.h"
|
|
#include "LogQt.h"
|
|
#include "ViewportWindow.h"
|
|
|
|
// Stage-1 driver: opens a single window with the wgpu viewport embedded,
|
|
// clears to background colour, and exits on close. The shape mirrors
|
|
// ifcviewer-minimal so subsequent stages can grow this into a full
|
|
// benchmark-comparable binary.
|
|
int main(int argc, char* argv[]) {
|
|
QApplication app(argc, argv);
|
|
app.setApplicationName("IfcViewerMinimal");
|
|
app.setOrganizationName("IfcOpenShell");
|
|
|
|
QCommandLineParser parser;
|
|
parser.setApplicationDescription(
|
|
"IfcOpenShell minimal wgpu IFC viewer");
|
|
parser.addHelpOption();
|
|
parser.addPositionalArgument("files",
|
|
"Sidecar (.ifcview) files to load. Stem-based: foo.ifc resolves to foo.ifcview.",
|
|
"[files...]");
|
|
parser.addOption({{"s", "screenshot"},
|
|
"Render one frame, save to PATH as PNG, exit.", "path"});
|
|
parser.addOption({{"b", "benchmark"},
|
|
"Render N frames (yaw-sweeping the camera), print stats, exit.", "frames"});
|
|
parser.addOption({{"c", "camera"},
|
|
"Set camera as tx,ty,tz,dist,yaw,pitch (same format as IfcViewerMinimal).",
|
|
"params"});
|
|
parser.addOption({"no-hiz",
|
|
"Disable HiZ occlusion culling for perf diagnostics."});
|
|
parser.addOption({"web-limits",
|
|
"Request the WebGPU mandatory floor limits (128MB max storage binding) "
|
|
"instead of the adapter's actual max. Use to verify scenes fit through "
|
|
"browser constraints."});
|
|
parser.process(app);
|
|
|
|
auto* viewport = new ViewportWindow;
|
|
viewport->resize(1280, 800);
|
|
if (parser.isSet("no-hiz")) viewport->hiz_enabled_ = false;
|
|
if (parser.isSet("web-limits")) viewport->web_limits_ = true;
|
|
|
|
QWidget* container = QWidget::createWindowContainer(viewport);
|
|
container->setMinimumSize(320, 240);
|
|
|
|
QMainWindow main_window;
|
|
main_window.setWindowTitle("IfcViewer (wgpu) — stage 2");
|
|
main_window.setCentralWidget(container);
|
|
main_window.resize(1280, 800);
|
|
main_window.show();
|
|
|
|
// Queue sidecars; they're loaded after wgpu init completes in
|
|
// exposeEvent. Ordering matches the command line.
|
|
for (const QString& path : parser.positionalArguments()) {
|
|
viewport->queueLoadSidecar(path.toStdString());
|
|
}
|
|
|
|
if (parser.isSet("camera")) {
|
|
const QStringList parts = parser.value("camera").split(',');
|
|
if (parts.size() == 6) {
|
|
bool ok = true;
|
|
float v[6];
|
|
for (int i = 0; i < 6 && ok; ++i) v[i] = parts[i].toFloat(&ok);
|
|
if (ok) {
|
|
viewport->setCamera(v[0], v[1], v[2], v[3], v[4], v[5]);
|
|
} else {
|
|
Log::warn() << "--camera: failed to parse "
|
|
<< parser.value("camera");
|
|
}
|
|
} else {
|
|
Log::warn() << "--camera: expected 6 comma-separated floats, got "
|
|
<< parts.size();
|
|
}
|
|
}
|
|
|
|
if (parser.isSet("screenshot")) {
|
|
viewport->captureNextFrameToPng(parser.value("screenshot").toStdString(),
|
|
/*quit_after=*/true);
|
|
}
|
|
if (parser.isSet("benchmark")) {
|
|
viewport->setBenchmarkFrames(parser.value("benchmark").toInt());
|
|
}
|
|
|
|
return app.exec();
|
|
}
|