mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-09 05:46:51 +00:00
ifcviewer: split into shared library and two app executables
Turn src/ifcviewer into libIfcViewer.so holding the rendering engine + geometry pipeline (ViewportWindow, GeometryStreamer, BvhAccel, InstancedGeometry, SidecarCache, LodBuilder, AppSettings). Move the existing UI shell (MainWindow, SettingsWindow, main.cpp) into src/ifcviewer-full as the IfcViewerFull executable. Add a new src/ifcviewer-minimal target with a MinimalWindow that hosts only the viewport and reuses the sidecar fast-path for benchmark/debug runs. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Dion Moult
@@ -20,9 +20,9 @@
|
||||
message("Running CMakeLists.txt in /src/ifcviewer")
|
||||
|
||||
set(QT_VERSION 6 CACHE STRING "Qt version")
|
||||
# IfcViewer always needs OpenGL in addition to Core/Gui/Widgets. We don't use
|
||||
# the CACHE'd QT_COMPONENTS here because it may have been set by another target
|
||||
# (e.g. qtviewer) without the OpenGL component.
|
||||
# IfcViewerLib always needs OpenGL in addition to Core/Gui/Widgets. We don't
|
||||
# use the CACHE'd QT_COMPONENTS here because it may have been set by another
|
||||
# target (e.g. qtviewer) without the OpenGL component.
|
||||
find_package(Qt${QT_VERSION} COMPONENTS Core Gui Widgets OpenGL REQUIRED PATHS ${QT_DIR})
|
||||
|
||||
find_package(OpenGL REQUIRED)
|
||||
@@ -32,17 +32,21 @@ file(GLOB IFCVIEWER_CPP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
|
||||
file(GLOB IFCVIEWER_H_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
|
||||
set(IFCVIEWER_FILES ${IFCVIEWER_CPP_FILES} ${IFCVIEWER_H_FILES})
|
||||
|
||||
add_executable(IfcViewer ${IFCVIEWER_FILES})
|
||||
add_library(IfcViewer ${IFCVIEWER_FILES})
|
||||
|
||||
set_target_properties(IfcViewer PROPERTIES
|
||||
AUTOMOC ON
|
||||
WIN32_EXECUTABLE ON
|
||||
MACOSX_BUNDLE ON
|
||||
VERSION "${PROJECT_VERSION}"
|
||||
SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
|
||||
)
|
||||
|
||||
# Consumers include headers as `#include "ViewportWindow.h"`, so expose this
|
||||
# directory on the public interface.
|
||||
target_include_directories(IfcViewer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
add_dependencies(IfcViewer ${kernel_libraries} ${mapping_libraries})
|
||||
|
||||
target_link_libraries(IfcViewer PRIVATE
|
||||
target_link_libraries(IfcViewer PUBLIC
|
||||
IfcGeom
|
||||
IfcParse
|
||||
${OpenCASCADE_LIBRARIES}
|
||||
@@ -58,7 +62,11 @@ target_link_libraries(IfcViewer PRIVATE
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
find_package(Threads REQUIRED)
|
||||
target_link_libraries(IfcViewer PRIVATE Threads::Threads)
|
||||
target_link_libraries(IfcViewer PUBLIC Threads::Threads)
|
||||
endif()
|
||||
|
||||
install(TARGETS IfcViewer EXPORT ${IFCOPENSHELL_EXPORT_TARGETS})
|
||||
|
||||
install(FILES ${IFCVIEWER_H_FILES}
|
||||
DESTINATION ${INCLUDEDIR}/ifcviewer
|
||||
)
|
||||
|
||||
@@ -1,588 +0,0 @@
|
||||
/********************************************************************************
|
||||
* *
|
||||
* 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 "MainWindow.h"
|
||||
#include "AppSettings.h"
|
||||
#include "SettingsWindow.h"
|
||||
#include "LodBuilder.h"
|
||||
#include "SidecarCache.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QMenuBar>
|
||||
#include <QFileDialog>
|
||||
#include <QFileInfo>
|
||||
#include <QMessageBox>
|
||||
#include <QStatusBar>
|
||||
#include <QHeaderView>
|
||||
#include <QVBoxLayout>
|
||||
#include <QDockWidget>
|
||||
|
||||
MainWindow::MainWindow(QWidget* parent)
|
||||
: QMainWindow(parent)
|
||||
{
|
||||
setupUi();
|
||||
setupMenus();
|
||||
|
||||
connect(viewport_, &ViewportWindow::frameStatsUpdated, this, [this](const ViewportWindow::FrameStats& s) {
|
||||
if (!stats_label_->isVisible()) return;
|
||||
stats_label_->setText(
|
||||
QString("%1 fps | %2 ms | %3/%4 obj | %5/%6 tri | %7 gl_draws (%8 sub)")
|
||||
.arg(s.fps, 0, 'f', 1)
|
||||
.arg(s.frame_time_ms, 0, 'f', 1)
|
||||
.arg(s.visible_objects)
|
||||
.arg(s.total_objects)
|
||||
.arg(s.visible_triangles)
|
||||
.arg(s.total_triangles)
|
||||
.arg(s.gl_draw_calls)
|
||||
.arg(s.indirect_sub_draws));
|
||||
});
|
||||
|
||||
connect(&AppSettings::instance(), &AppSettings::showStatsChanged, this, [this](bool show) {
|
||||
stats_label_->setVisible(show);
|
||||
if (!show) stats_label_->clear();
|
||||
});
|
||||
|
||||
connect(&element_poll_timer_, &QTimer::timeout, this, &MainWindow::pollNewElements);
|
||||
element_poll_timer_.setInterval(100);
|
||||
|
||||
setWindowTitle("IfcViewer");
|
||||
resize(1400, 900);
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow() {
|
||||
joinSidecarThread();
|
||||
}
|
||||
|
||||
void MainWindow::joinSidecarThread() {
|
||||
if (sidecar_read_thread_.joinable())
|
||||
sidecar_read_thread_.join();
|
||||
}
|
||||
|
||||
void MainWindow::setupUi() {
|
||||
// 3D Viewport as central widget
|
||||
viewport_ = new ViewportWindow();
|
||||
viewport_container_ = QWidget::createWindowContainer(viewport_, this);
|
||||
viewport_container_->setMinimumSize(400, 300);
|
||||
viewport_container_->setFocusPolicy(Qt::StrongFocus);
|
||||
setCentralWidget(viewport_container_);
|
||||
|
||||
connect(viewport_, &ViewportWindow::objectPicked, this, &MainWindow::onObjectPicked);
|
||||
|
||||
// Element tree dock
|
||||
auto* tree_dock = new QDockWidget("Elements", this);
|
||||
tree_dock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
|
||||
element_tree_ = new QTreeWidget();
|
||||
element_tree_->setHeaderLabels({"Name", "Type", "GUID"});
|
||||
element_tree_->setColumnWidth(0, 200);
|
||||
element_tree_->setColumnWidth(1, 120);
|
||||
element_tree_->setSelectionMode(QAbstractItemView::SingleSelection);
|
||||
connect(element_tree_, &QTreeWidget::itemSelectionChanged, this, &MainWindow::onTreeSelectionChanged);
|
||||
tree_dock->setWidget(element_tree_);
|
||||
addDockWidget(Qt::LeftDockWidgetArea, tree_dock);
|
||||
|
||||
// Properties dock
|
||||
auto* prop_dock = new QDockWidget("Properties", this);
|
||||
prop_dock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
|
||||
property_table_ = new QTableWidget();
|
||||
property_table_->setColumnCount(2);
|
||||
property_table_->setHorizontalHeaderLabels({"Property", "Value"});
|
||||
property_table_->horizontalHeader()->setStretchLastSection(true);
|
||||
property_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);
|
||||
property_table_->setSelectionBehavior(QAbstractItemView::SelectRows);
|
||||
prop_dock->setWidget(property_table_);
|
||||
addDockWidget(Qt::RightDockWidgetArea, prop_dock);
|
||||
|
||||
// Status bar with progress
|
||||
progress_bar_ = new QProgressBar();
|
||||
progress_bar_->setMaximumWidth(200);
|
||||
progress_bar_->setVisible(false);
|
||||
status_label_ = new QLabel("Ready");
|
||||
stats_label_ = new QLabel();
|
||||
stats_label_->setVisible(AppSettings::instance().showStats());
|
||||
statusBar()->addWidget(status_label_, 1);
|
||||
statusBar()->addPermanentWidget(stats_label_);
|
||||
statusBar()->addPermanentWidget(progress_bar_);
|
||||
}
|
||||
|
||||
void MainWindow::setupMenus() {
|
||||
auto* file_menu = menuBar()->addMenu("&File");
|
||||
auto* open_action = file_menu->addAction("&Add Files...", this, &MainWindow::onFileOpen);
|
||||
open_action->setShortcut(QKeySequence::Open);
|
||||
file_menu->addAction("&Settings...", this, &MainWindow::onFileSettings);
|
||||
file_menu->addSeparator();
|
||||
file_menu->addAction("&Quit", QKeySequence::Quit, qApp, &QApplication::quit);
|
||||
}
|
||||
|
||||
void MainWindow::onFileOpen() {
|
||||
QStringList paths = QFileDialog::getOpenFileNames(
|
||||
this, "Add IFC Files", QString(),
|
||||
"IFC Files (*.ifc *.ifcxml *.ifczip);;All Files (*)");
|
||||
if (!paths.isEmpty()) {
|
||||
addFiles(paths);
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::onFileSettings() {
|
||||
if (settings_ == nullptr) {
|
||||
settings_ = new SettingsWindow(this);
|
||||
}
|
||||
settings_->open();
|
||||
settings_->activateWindow();
|
||||
settings_->raise();
|
||||
}
|
||||
|
||||
void MainWindow::addFiles(const QStringList& paths) {
|
||||
for (const auto& path : paths) {
|
||||
ModelId id = next_model_id_++;
|
||||
|
||||
ModelHandle handle;
|
||||
handle.id = id;
|
||||
handle.file_path = path;
|
||||
handle.display_name = QFileInfo(path).fileName();
|
||||
handle.streamer = new GeometryStreamer(this);
|
||||
|
||||
// Create top-level tree item for this model
|
||||
auto* root = new QTreeWidgetItem(element_tree_);
|
||||
root->setText(0, handle.display_name);
|
||||
root->setText(1, "IFC Model");
|
||||
root->setData(0, Qt::UserRole, static_cast<uint32_t>(0)); // 0 = not a pickable object
|
||||
handle.tree_root = root;
|
||||
|
||||
models_[id] = handle;
|
||||
load_queue_.push_back(id);
|
||||
}
|
||||
|
||||
if (loading_model_id_ == 0) {
|
||||
QTimer::singleShot(0, this, &MainWindow::startNextLoad);
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::connectStreamer(GeometryStreamer* streamer) {
|
||||
connect(streamer, &GeometryStreamer::progressChanged,
|
||||
this, &MainWindow::onProgressChanged, Qt::QueuedConnection);
|
||||
connect(streamer, &GeometryStreamer::meshReady,
|
||||
this, &MainWindow::onMeshReady, Qt::QueuedConnection);
|
||||
connect(streamer, &GeometryStreamer::instanceReady,
|
||||
this, &MainWindow::onInstanceReady, Qt::QueuedConnection);
|
||||
connect(streamer, &GeometryStreamer::finished,
|
||||
this, &MainWindow::onStreamingFinished, Qt::QueuedConnection);
|
||||
connect(streamer, &GeometryStreamer::errorOccurred, this, [this](const QString& msg) {
|
||||
QMessageBox::warning(this, "Error", msg);
|
||||
}, Qt::QueuedConnection);
|
||||
}
|
||||
|
||||
void MainWindow::startNextLoad() {
|
||||
if (load_queue_.empty()) {
|
||||
loading_model_id_ = 0;
|
||||
applyPendingBenchmark();
|
||||
return;
|
||||
}
|
||||
|
||||
loading_model_id_ = load_queue_.front();
|
||||
load_queue_.pop_front();
|
||||
|
||||
auto& model = models_[loading_model_id_];
|
||||
|
||||
load_timer_.restart();
|
||||
status_label_->setText("Loading: " + model.display_name);
|
||||
|
||||
// Try sidecar on a background thread so the UI stays responsive.
|
||||
std::string ifc_path = model.file_path.toStdString();
|
||||
uint64_t file_size = static_cast<uint64_t>(QFileInfo(model.file_path).size());
|
||||
ModelId mid = loading_model_id_;
|
||||
|
||||
joinSidecarThread();
|
||||
sidecar_read_thread_ = std::thread([this, ifc_path, file_size, mid]() {
|
||||
QElapsedTimer rt; rt.start();
|
||||
auto cached = readSidecar(ifc_path, file_size);
|
||||
qDebug(" Sidecar read: %lld ms (%s)", rt.elapsed(), ifc_path.c_str());
|
||||
auto result = std::make_shared<std::optional<SidecarData>>(std::move(cached));
|
||||
QMetaObject::invokeMethod(this, [this, mid, result]() {
|
||||
if (*result && !(*result)->instances.empty()) {
|
||||
applySidecarData(mid, std::move(**result));
|
||||
} else {
|
||||
// No sidecar — fall back to streaming from IFC.
|
||||
auto it = models_.find(mid);
|
||||
if (it == models_.end()) return;
|
||||
auto& m = it->second;
|
||||
connectStreamer(m.streamer);
|
||||
progress_bar_->setValue(0);
|
||||
progress_bar_->setVisible(true);
|
||||
status_label_->setText("Loading: " + m.display_name);
|
||||
element_poll_timer_.start();
|
||||
m.streamer->loadFile(
|
||||
m.file_path.toStdString(), next_object_id_, loading_model_id_);
|
||||
}
|
||||
}, Qt::QueuedConnection);
|
||||
});
|
||||
}
|
||||
|
||||
void MainWindow::applySidecarData(ModelId mid, SidecarData data) {
|
||||
auto it = models_.find(mid);
|
||||
if (it == models_.end()) return;
|
||||
auto& model = it->second;
|
||||
|
||||
qDebug("Sidecar hit: %s (%zu verts, %zu indices, %zu meshes, %zu instances, %zu elements)",
|
||||
model.file_path.toStdString().c_str(),
|
||||
data.vertices.size() / INSTANCED_VERTEX_STRIDE_BYTES,
|
||||
data.indices.size(),
|
||||
data.meshes.size(),
|
||||
data.instances.size(),
|
||||
data.elements.size());
|
||||
|
||||
QElapsedTimer t;
|
||||
t.start();
|
||||
|
||||
// Sidecars store raw object_ids and model_ids from the session that wrote
|
||||
// them. On load we must rebase both onto the current session's ID space,
|
||||
// or two cached models collide (both starting at object_id=1, both
|
||||
// claiming the original model_id). Offset by (next_object_id_ - min_id)
|
||||
// so the first cached object takes the next free slot.
|
||||
uint32_t min_oid = UINT32_MAX;
|
||||
for (const auto& pe : data.elements) {
|
||||
if (pe.object_id < min_oid) min_oid = pe.object_id;
|
||||
}
|
||||
uint32_t oid_offset = 0;
|
||||
if (!data.elements.empty() && min_oid < UINT32_MAX) {
|
||||
oid_offset = next_object_id_ - min_oid;
|
||||
}
|
||||
for (auto& pe : data.elements) {
|
||||
pe.object_id += oid_offset;
|
||||
pe.model_id = mid;
|
||||
if (pe.object_id >= next_object_id_)
|
||||
next_object_id_ = pe.object_id + 1;
|
||||
}
|
||||
for (auto& inst : data.instances) {
|
||||
inst.object_id += oid_offset;
|
||||
inst.model_id = mid;
|
||||
}
|
||||
|
||||
// Hand off geometry to GPU in a single call.
|
||||
std::vector<PackedElementInfo> elements = std::move(data.elements);
|
||||
std::string stbl = std::move(data.string_table);
|
||||
viewport_->applyCachedModel(mid, std::move(data));
|
||||
qDebug(" GL upload: %lld ms", t.elapsed());
|
||||
|
||||
t.restart();
|
||||
element_tree_->setUpdatesEnabled(false);
|
||||
populateTreeFromSidecar(model, elements, stbl);
|
||||
element_tree_->setUpdatesEnabled(true);
|
||||
qDebug(" Tree build: %lld ms (%zu elements)", t.elapsed(), elements.size());
|
||||
|
||||
progress_bar_->setVisible(false);
|
||||
|
||||
qint64 ms = load_timer_.elapsed();
|
||||
QString elapsed = (ms >= 1000)
|
||||
? QString::number(ms / 1000.0, 'f', 2) + " s"
|
||||
: QString::number(ms) + " ms";
|
||||
status_label_->setText(QString("%1 elements across %2 model(s) — loaded from cache in %3")
|
||||
.arg(element_map_.size())
|
||||
.arg(models_.size())
|
||||
.arg(elapsed));
|
||||
|
||||
loading_model_id_ = 0;
|
||||
QTimer::singleShot(0, this, &MainWindow::startNextLoad);
|
||||
}
|
||||
|
||||
void MainWindow::populateTreeFromSidecar(ModelHandle& model,
|
||||
const std::vector<PackedElementInfo>& elements,
|
||||
const std::string& stbl) {
|
||||
auto str = [&](uint32_t offset, uint32_t length) -> std::string {
|
||||
if (length == 0 || offset + length > stbl.size()) return {};
|
||||
return stbl.substr(offset, length);
|
||||
};
|
||||
|
||||
for (const auto& pe : elements) {
|
||||
ElementInfo info;
|
||||
info.object_id = pe.object_id;
|
||||
info.model_id = pe.model_id;
|
||||
info.ifc_id = pe.ifc_id;
|
||||
info.parent_id = pe.parent_id;
|
||||
info.guid = str(pe.guid_offset, pe.guid_length);
|
||||
info.name = str(pe.name_offset, pe.name_length);
|
||||
info.type = str(pe.type_offset, pe.type_length);
|
||||
|
||||
element_map_[info.object_id] = info;
|
||||
scoped_ifc_id_to_object_id_[scopedKey(info.model_id, info.ifc_id)] = info.object_id;
|
||||
|
||||
// Find parent tree item.
|
||||
QTreeWidgetItem* parent_item = model.tree_root;
|
||||
auto parent_obj_it = scoped_ifc_id_to_object_id_.find(
|
||||
scopedKey(info.model_id, info.parent_id));
|
||||
if (parent_obj_it != scoped_ifc_id_to_object_id_.end()) {
|
||||
auto tree_it = tree_items_.find(parent_obj_it->second);
|
||||
if (tree_it != tree_items_.end()) {
|
||||
parent_item = tree_it->second;
|
||||
}
|
||||
}
|
||||
|
||||
QString display_name = QString::fromStdString(info.name);
|
||||
if (display_name.isEmpty()) {
|
||||
display_name = QString::fromStdString(info.type) + " #" + QString::number(info.ifc_id);
|
||||
}
|
||||
|
||||
auto* item = new QTreeWidgetItem(parent_item);
|
||||
item->setText(0, display_name);
|
||||
item->setText(1, QString::fromStdString(info.type));
|
||||
item->setText(2, QString::fromStdString(info.guid));
|
||||
item->setData(0, Qt::UserRole, info.object_id);
|
||||
|
||||
tree_items_[info.object_id] = item;
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::onProgressChanged(int percent) {
|
||||
progress_bar_->setValue(percent);
|
||||
}
|
||||
|
||||
void MainWindow::onMeshReady(MeshChunk chunk) {
|
||||
viewport_->uploadMeshChunk(chunk);
|
||||
}
|
||||
|
||||
void MainWindow::onInstanceReady(InstanceChunk chunk) {
|
||||
viewport_->uploadInstanceChunk(chunk);
|
||||
}
|
||||
|
||||
void MainWindow::onStreamingFinished() {
|
||||
element_poll_timer_.stop();
|
||||
pollNewElements(); // drain remaining
|
||||
|
||||
// Update next_object_id_ from the streamer that just finished.
|
||||
if (loading_model_id_ != 0) {
|
||||
auto it = models_.find(loading_model_id_);
|
||||
if (it != models_.end()) {
|
||||
next_object_id_ = it->second.streamer->lastObjectId();
|
||||
}
|
||||
}
|
||||
|
||||
progress_bar_->setVisible(false);
|
||||
|
||||
qint64 ms = load_timer_.elapsed();
|
||||
QString elapsed = (ms >= 1000)
|
||||
? QString::number(ms / 1000.0, 'f', 2) + " s"
|
||||
: QString::number(ms) + " ms";
|
||||
|
||||
size_t total_elements = element_map_.size();
|
||||
size_t num_models = models_.size();
|
||||
status_label_->setText(QString("%1 elements across %2 model(s) — last loaded in %3")
|
||||
.arg(total_elements)
|
||||
.arg(num_models)
|
||||
.arg(elapsed));
|
||||
|
||||
// Sort instances by mesh, upload the per-model instance SSBO, and
|
||||
// persist a v4 sidecar for next load.
|
||||
if (loading_model_id_ != 0) {
|
||||
viewport_->finalizeModel(loading_model_id_);
|
||||
|
||||
auto it = models_.find(loading_model_id_);
|
||||
if (it != models_.end()) {
|
||||
SidecarData sd;
|
||||
if (viewport_->snapshotModel(loading_model_id_, sd)) {
|
||||
// Pack this model's element metadata + string table.
|
||||
for (const auto& [oid, info] : element_map_) {
|
||||
if (info.model_id != loading_model_id_) continue;
|
||||
PackedElementInfo pe;
|
||||
pe.object_id = info.object_id;
|
||||
pe.model_id = info.model_id;
|
||||
pe.ifc_id = info.ifc_id;
|
||||
pe.parent_id = info.parent_id;
|
||||
pe.guid_offset = static_cast<uint32_t>(sd.string_table.size());
|
||||
pe.guid_length = static_cast<uint32_t>(info.guid.size());
|
||||
sd.string_table += info.guid;
|
||||
pe.name_offset = static_cast<uint32_t>(sd.string_table.size());
|
||||
pe.name_length = static_cast<uint32_t>(info.name.size());
|
||||
sd.string_table += info.name;
|
||||
pe.type_offset = static_cast<uint32_t>(sd.string_table.size());
|
||||
pe.type_length = static_cast<uint32_t>(info.type.size());
|
||||
sd.string_table += info.type;
|
||||
sd.elements.push_back(pe);
|
||||
}
|
||||
|
||||
// Build LOD1 for eligible meshes (extends sd.indices and
|
||||
// populates MeshInfo::lod1_*), push the extension onto the
|
||||
// live GPU state so this session benefits too, then cache.
|
||||
QElapsedTimer t_lod; t_lod.start();
|
||||
buildLods(sd);
|
||||
LodStats ls = summariseLods(sd);
|
||||
qDebug(" LOD build: %lld ms — %u/%u meshes got LOD1 "
|
||||
"(%u tris → %u tris for those meshes)",
|
||||
t_lod.elapsed(),
|
||||
ls.meshes_with_lod1, ls.meshes_total,
|
||||
ls.tris_lod0_for_lod1, ls.tris_lod1);
|
||||
viewport_->applyLodExtension(loading_model_id_, sd);
|
||||
|
||||
std::string ifc_path = it->second.file_path.toStdString();
|
||||
uint64_t file_size = static_cast<uint64_t>(
|
||||
QFileInfo(it->second.file_path).size());
|
||||
QElapsedTimer t; t.start();
|
||||
bool ok = writeSidecar(ifc_path, sd, file_size);
|
||||
qDebug(" Sidecar write: %lld ms (%s)",
|
||||
t.elapsed(), ok ? "ok" : "FAILED");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Start next model if queued.
|
||||
startNextLoad();
|
||||
}
|
||||
|
||||
void MainWindow::onObjectPicked(uint32_t object_id) {
|
||||
viewport_->setSelectedObjectId(object_id);
|
||||
|
||||
// Select in tree
|
||||
auto it = tree_items_.find(object_id);
|
||||
if (it != tree_items_.end()) {
|
||||
element_tree_->blockSignals(true);
|
||||
element_tree_->setCurrentItem(it->second);
|
||||
element_tree_->blockSignals(false);
|
||||
}
|
||||
|
||||
populateProperties(object_id);
|
||||
}
|
||||
|
||||
void MainWindow::onTreeSelectionChanged() {
|
||||
auto items = element_tree_->selectedItems();
|
||||
if (items.isEmpty()) return;
|
||||
|
||||
uint32_t object_id = items.first()->data(0, Qt::UserRole).toUInt();
|
||||
viewport_->setSelectedObjectId(object_id);
|
||||
populateProperties(object_id);
|
||||
}
|
||||
|
||||
void MainWindow::pollNewElements() {
|
||||
if (loading_model_id_ == 0) return;
|
||||
|
||||
auto it = models_.find(loading_model_id_);
|
||||
if (it == models_.end()) return;
|
||||
|
||||
auto& model = it->second;
|
||||
auto elements = model.streamer->drainElements();
|
||||
|
||||
for (auto& info : elements) {
|
||||
element_map_[info.object_id] = info;
|
||||
scoped_ifc_id_to_object_id_[scopedKey(info.model_id, info.ifc_id)] = info.object_id;
|
||||
|
||||
// Find parent tree item (scoped to this model)
|
||||
QTreeWidgetItem* parent_item = model.tree_root;
|
||||
auto parent_obj_it = scoped_ifc_id_to_object_id_.find(
|
||||
scopedKey(info.model_id, info.parent_id));
|
||||
if (parent_obj_it != scoped_ifc_id_to_object_id_.end()) {
|
||||
auto tree_it = tree_items_.find(parent_obj_it->second);
|
||||
if (tree_it != tree_items_.end()) {
|
||||
parent_item = tree_it->second;
|
||||
}
|
||||
}
|
||||
|
||||
QString display_name = QString::fromStdString(info.name);
|
||||
if (display_name.isEmpty()) {
|
||||
display_name = QString::fromStdString(info.type) + " #" + QString::number(info.ifc_id);
|
||||
}
|
||||
|
||||
auto* item = new QTreeWidgetItem(parent_item);
|
||||
item->setText(0, display_name);
|
||||
item->setText(1, QString::fromStdString(info.type));
|
||||
item->setText(2, QString::fromStdString(info.guid));
|
||||
item->setData(0, Qt::UserRole, info.object_id);
|
||||
|
||||
tree_items_[info.object_id] = item;
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::populateProperties(uint32_t object_id) {
|
||||
property_table_->setRowCount(0);
|
||||
if (object_id == 0) return;
|
||||
|
||||
auto it = element_map_.find(object_id);
|
||||
if (it == element_map_.end()) return;
|
||||
|
||||
const auto& info = it->second;
|
||||
|
||||
auto addRow = [this](const QString& key, const QString& value) {
|
||||
int row = property_table_->rowCount();
|
||||
property_table_->insertRow(row);
|
||||
property_table_->setItem(row, 0, new QTableWidgetItem(key));
|
||||
property_table_->setItem(row, 1, new QTableWidgetItem(value));
|
||||
};
|
||||
|
||||
addRow("IFC ID", QString::number(info.ifc_id));
|
||||
addRow("GUID", QString::fromStdString(info.guid));
|
||||
addRow("Name", QString::fromStdString(info.name));
|
||||
addRow("Type", QString::fromStdString(info.type));
|
||||
|
||||
// Find the correct model's file for property lookup
|
||||
auto model_it = models_.find(info.model_id);
|
||||
if (model_it == models_.end()) return;
|
||||
|
||||
auto* file = model_it->second.streamer->ifcFile();
|
||||
if (!file) return;
|
||||
|
||||
auto product = file->instance_by_id(info.ifc_id);
|
||||
if (!product) return;
|
||||
|
||||
// Show all direct attributes
|
||||
auto& decl = product.declaration();
|
||||
if (auto* entity = decl.as_entity()) {
|
||||
for (size_t i = 0; i < entity->attribute_count(); ++i) {
|
||||
auto* attr = entity->attribute_by_index(i);
|
||||
try {
|
||||
auto val = product.get_attribute_value(i);
|
||||
if (!val.isNull()) {
|
||||
std::string str_val;
|
||||
try {
|
||||
str_val = static_cast<std::string>(val);
|
||||
} catch (...) {
|
||||
str_val = "<" + std::string(ifcopenshell::argument_type_to_string(val.type())) + ">";
|
||||
}
|
||||
addRow(QString::fromStdString(attr->name()), QString::fromStdString(str_val));
|
||||
}
|
||||
} catch (...) {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::setPendingCamera(const QString& params) {
|
||||
pending_camera_ = params;
|
||||
}
|
||||
|
||||
void MainWindow::setPendingBenchmark(int frames) {
|
||||
pending_benchmark_ = frames;
|
||||
}
|
||||
|
||||
void MainWindow::applyPendingBenchmark() {
|
||||
if (pending_camera_.isEmpty() && pending_benchmark_ <= 0) return;
|
||||
|
||||
if (!pending_camera_.isEmpty()) {
|
||||
QStringList parts = pending_camera_.split(',');
|
||||
if (parts.size() == 6) {
|
||||
viewport_->setCamera(
|
||||
parts[0].toFloat(), parts[1].toFloat(), parts[2].toFloat(),
|
||||
parts[3].toFloat(), parts[4].toFloat(), parts[5].toFloat());
|
||||
qDebug("Camera set: %s", qPrintable(pending_camera_));
|
||||
} else {
|
||||
qWarning("--camera expects 6 comma-separated values: tx,ty,tz,dist,yaw,pitch");
|
||||
}
|
||||
pending_camera_.clear();
|
||||
}
|
||||
|
||||
if (pending_benchmark_ > 0) {
|
||||
qDebug("Starting benchmark: %d frames", pending_benchmark_);
|
||||
viewport_->setBenchmarkFrames(pending_benchmark_);
|
||||
pending_benchmark_ = 0;
|
||||
}
|
||||
}
|
||||
@@ -1,121 +0,0 @@
|
||||
/********************************************************************************
|
||||
* *
|
||||
* 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 MAINWINDOW_H
|
||||
#define MAINWINDOW_H
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QTreeWidget>
|
||||
#include <QTableWidget>
|
||||
#include <QProgressBar>
|
||||
#include <QLabel>
|
||||
#include <QSplitter>
|
||||
#include <QTimer>
|
||||
#include <QElapsedTimer>
|
||||
|
||||
#include <map>
|
||||
#include <deque>
|
||||
#include <thread>
|
||||
#include <unordered_map>
|
||||
|
||||
#include "ViewportWindow.h"
|
||||
#include "GeometryStreamer.h"
|
||||
|
||||
class SettingsWindow;
|
||||
|
||||
using ModelId = uint32_t;
|
||||
|
||||
struct ModelHandle {
|
||||
ModelId id = 0;
|
||||
QString file_path;
|
||||
QString display_name;
|
||||
GeometryStreamer* streamer = nullptr;
|
||||
QTreeWidgetItem* tree_root = nullptr;
|
||||
bool visible = true;
|
||||
};
|
||||
|
||||
class MainWindow : public QMainWindow {
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit MainWindow(QWidget* parent = nullptr);
|
||||
~MainWindow();
|
||||
|
||||
void addFiles(const QStringList& paths);
|
||||
void setPendingCamera(const QString& params);
|
||||
void setPendingBenchmark(int frames);
|
||||
|
||||
private slots:
|
||||
void onFileOpen();
|
||||
void onFileSettings();
|
||||
void onProgressChanged(int percent);
|
||||
void onMeshReady(MeshChunk chunk);
|
||||
void onInstanceReady(InstanceChunk chunk);
|
||||
void onStreamingFinished();
|
||||
void onObjectPicked(uint32_t object_id);
|
||||
void onTreeSelectionChanged();
|
||||
void pollNewElements();
|
||||
|
||||
private:
|
||||
void setupUi();
|
||||
void setupMenus();
|
||||
void populateProperties(uint32_t object_id);
|
||||
void startNextLoad();
|
||||
void applySidecarData(ModelId mid, SidecarData data);
|
||||
void joinSidecarThread();
|
||||
void populateTreeFromSidecar(ModelHandle& model,
|
||||
const std::vector<PackedElementInfo>& elements,
|
||||
const std::string& string_table);
|
||||
void connectStreamer(GeometryStreamer* streamer);
|
||||
|
||||
ViewportWindow* viewport_ = nullptr;
|
||||
SettingsWindow* settings_ = nullptr;
|
||||
QWidget* viewport_container_ = nullptr;
|
||||
QTreeWidget* element_tree_ = nullptr;
|
||||
QTableWidget* property_table_ = nullptr;
|
||||
QProgressBar* progress_bar_ = nullptr;
|
||||
QLabel* status_label_ = nullptr;
|
||||
QLabel* stats_label_ = nullptr;
|
||||
QTimer element_poll_timer_;
|
||||
QElapsedTimer load_timer_;
|
||||
|
||||
// Multi-model state
|
||||
std::map<ModelId, ModelHandle> models_;
|
||||
ModelId next_model_id_ = 1;
|
||||
uint32_t next_object_id_ = 1; // monotonically increasing across all models
|
||||
std::deque<ModelId> load_queue_;
|
||||
ModelId loading_model_id_ = 0;
|
||||
std::thread sidecar_read_thread_;
|
||||
|
||||
// Map object_id -> tree item and element info
|
||||
std::unordered_map<uint32_t, ElementInfo> element_map_;
|
||||
std::unordered_map<uint32_t, QTreeWidgetItem*> tree_items_;
|
||||
// Scoped (model_id, ifc_id) -> object_id
|
||||
std::unordered_map<uint64_t, uint32_t> scoped_ifc_id_to_object_id_;
|
||||
|
||||
static uint64_t scopedKey(uint32_t model_id, int ifc_id) {
|
||||
return (static_cast<uint64_t>(model_id) << 32) | static_cast<uint32_t>(ifc_id);
|
||||
}
|
||||
|
||||
QString pending_camera_;
|
||||
int pending_benchmark_ = 0;
|
||||
|
||||
void applyPendingBenchmark();
|
||||
};
|
||||
|
||||
#endif // MAINWINDOW_H
|
||||
@@ -1,82 +0,0 @@
|
||||
/********************************************************************************
|
||||
* *
|
||||
* 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 "SettingsWindow.h"
|
||||
#include "AppSettings.h"
|
||||
|
||||
#include <QCheckBox>
|
||||
#include <QDialogButtonBox>
|
||||
#include <QFormLayout>
|
||||
#include <QLineEdit>
|
||||
#include <QShowEvent>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
SettingsWindow::SettingsWindow(QWidget *parent)
|
||||
: QDialog(parent)
|
||||
{
|
||||
setWindowTitle("Settings");
|
||||
setupUi();
|
||||
}
|
||||
|
||||
void SettingsWindow::setupUi() {
|
||||
auto* form = new QFormLayout();
|
||||
|
||||
geometry_library_edit_ = new QLineEdit(this);
|
||||
geometry_library_edit_->setMinimumWidth(280);
|
||||
form->addRow("Geometry Library", geometry_library_edit_);
|
||||
|
||||
show_stats_check_ = new QCheckBox(this);
|
||||
form->addRow("Show Performance Stats", show_stats_check_);
|
||||
|
||||
backface_culling_check_ = new QCheckBox(this);
|
||||
backface_culling_check_->setToolTip(
|
||||
"Skip triangles facing away from the camera. Big FPS win on "
|
||||
"closed solids; disable if you see holes in open geometry.");
|
||||
form->addRow("Backface Culling", backface_culling_check_);
|
||||
|
||||
auto* button_box = new QDialogButtonBox(
|
||||
QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
|
||||
|
||||
auto* root = new QVBoxLayout(this);
|
||||
root->addLayout(form);
|
||||
root->addWidget(button_box);
|
||||
|
||||
connect(button_box, &QDialogButtonBox::accepted, this, &SettingsWindow::onAccepted);
|
||||
connect(button_box, &QDialogButtonBox::rejected, this, &SettingsWindow::reject);
|
||||
}
|
||||
|
||||
void SettingsWindow::showEvent(QShowEvent* event) {
|
||||
// Re-sync widgets from the persisted settings every time the dialog is
|
||||
// shown, so a previous Cancel doesn't leave stale text in the field.
|
||||
syncFromSettings();
|
||||
QDialog::showEvent(event);
|
||||
}
|
||||
|
||||
void SettingsWindow::syncFromSettings() {
|
||||
geometry_library_edit_->setText(AppSettings::instance().geometryLibrary());
|
||||
show_stats_check_->setChecked(AppSettings::instance().showStats());
|
||||
backface_culling_check_->setChecked(AppSettings::instance().backfaceCulling());
|
||||
}
|
||||
|
||||
void SettingsWindow::onAccepted() {
|
||||
AppSettings::instance().setGeometryLibrary(geometry_library_edit_->text());
|
||||
AppSettings::instance().setShowStats(show_stats_check_->isChecked());
|
||||
AppSettings::instance().setBackfaceCulling(backface_culling_check_->isChecked());
|
||||
accept();
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
/********************************************************************************
|
||||
* *
|
||||
* 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 SETTINGSWINDOW_H
|
||||
#define SETTINGSWINDOW_H
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
class QCheckBox;
|
||||
class QLineEdit;
|
||||
class QShowEvent;
|
||||
|
||||
class SettingsWindow : public QDialog {
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit SettingsWindow(QWidget *parent = nullptr);
|
||||
|
||||
protected:
|
||||
void showEvent(QShowEvent* event) override;
|
||||
|
||||
private slots:
|
||||
void onAccepted();
|
||||
|
||||
private:
|
||||
void setupUi();
|
||||
void syncFromSettings();
|
||||
|
||||
QLineEdit* geometry_library_edit_ = nullptr;
|
||||
QCheckBox* show_stats_check_ = nullptr;
|
||||
QCheckBox* backface_culling_check_ = nullptr;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -1,66 +0,0 @@
|
||||
/********************************************************************************
|
||||
* *
|
||||
* 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 <QSurfaceFormat>
|
||||
#include <QCommandLineParser>
|
||||
|
||||
#include "MainWindow.h"
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
QApplication app(argc, argv);
|
||||
app.setApplicationName("IfcViewer");
|
||||
app.setOrganizationName("IfcOpenShell");
|
||||
|
||||
// Request OpenGL 4.5 Core globally
|
||||
QSurfaceFormat fmt;
|
||||
fmt.setVersion(4, 5);
|
||||
fmt.setProfile(QSurfaceFormat::CoreProfile);
|
||||
fmt.setDepthBufferSize(24);
|
||||
fmt.setSwapBehavior(QSurfaceFormat::DoubleBuffer);
|
||||
fmt.setSamples(4);
|
||||
QSurfaceFormat::setDefaultFormat(fmt);
|
||||
|
||||
QCommandLineParser parser;
|
||||
parser.setApplicationDescription("IfcOpenShell IFC Viewer");
|
||||
parser.addHelpOption();
|
||||
parser.addPositionalArgument("files", "IFC file(s) to open", "[files...]");
|
||||
parser.addOption({{"c", "camera"},
|
||||
"Set camera: tx,ty,tz,dist,yaw,pitch", "params"});
|
||||
parser.addOption({{"b", "benchmark"},
|
||||
"Run N frames then print stats and exit", "frames"});
|
||||
parser.process(app);
|
||||
|
||||
MainWindow window;
|
||||
window.show();
|
||||
|
||||
auto args = parser.positionalArguments();
|
||||
if (!args.isEmpty()) {
|
||||
window.addFiles(args);
|
||||
}
|
||||
|
||||
if (parser.isSet("camera")) {
|
||||
window.setPendingCamera(parser.value("camera"));
|
||||
}
|
||||
if (parser.isSet("benchmark")) {
|
||||
window.setPendingBenchmark(parser.value("benchmark").toInt());
|
||||
}
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
Reference in New Issue
Block a user