Change name of export actions

Author: Vertexwahn

devertexwahn/MODULE.bazel

@@ -324,11 +324,3 @@ include("//bazel/module/cpp:Cpp.MODULE.bazel")
 include("//bazel/module/python:Python.MODULE.bazel")
 
 include("//bazel/module/oci:Oci.MODULE.bazel")
-
-#-------------------------------------------------------------------------------------
-# Doxygen
-
-doxygen_extension = use_extension("@rules_doxygen//:extensions.bzl", "doxygen_extension")
-use_repo(doxygen_extension, "doxygen")
-
-#-------------------------------------------------------------------------------------

devertexwahn/bazel/module/tools/Tools.MODULE.bazel

@@ -7,11 +7,11 @@
 bazel_dep(name = "bazel_clang_tidy", dev_dependency = True)
 bazel_dep(name = "bazel_iwyu", version = "0.0.1", dev_dependency = True)
 bazel_dep(name = "bazel_sonarqube", version = "1.0.5", dev_dependency = True)
-bazel_dep(name = "buildifier_prebuilt", version = "8.2.1.2", dev_dependency = True)
+bazel_dep(name = "buildifier_prebuilt", version = "8.5.1", dev_dependency = True)
 bazel_dep(name = "buildozer", version = "8.5.1", dev_dependency = True)
 bazel_dep(name = "cpplint", version = "2.0.2", dev_dependency = True)
 bazel_dep(name = "depend_on_what_you_use", version = "0.13.0", dev_dependency = True)
-bazel_dep(name = "rules_doxygen", version = "2.6.1", dev_dependency = True)
+bazel_dep(name = "rules_doxygen", version = "2.6.2", dev_dependency = True)
 bazel_dep(name = "rules_license", version = "1.0.0", dev_dependency = True)
 
 local_path_override(
@@ -20,9 +20,16 @@ local_path_override(
 )
 
 # In bazel_sonarqube version 1.0.5 the "BUILD.sonar_scanner" uses native java_import/java_binary which are removed in Bazel 9.
-# Those imports are needed to make "bazel cquery" working. 
+# Those imports are needed to make "bazel cquery" working.
 # This override contains a bit new version the contains those changes.
 local_path_override(
     module_name = "bazel_sonarqube",
     path = "../third_party/bazel-sonarqube",
 )
+
+#-------------------------------------------------------------------------------------
+# Doxygen
+#-------------------------------------------------------------------------------------
+
+doxygen_extension = use_extension("@rules_doxygen//:extensions.bzl", "doxygen_extension")
+use_repo(doxygen_extension, "doxygen")

devertexwahn/okapi/command_line_arguments.cpp

@@ -20,10 +20,10 @@ CommandLineArguments::CommandLineArguments() {
         ("render_mode", value<std::string>()->default_value("progressive"), "Defines which render mode should be used.")
         ("samples_per_pixel", value<int>()->default_value(0), "Samples per pixel")
         ("scene_filename", value<std::string>()->default_value(""), "Okapi scene filename use as input for rendering")
+        ("show_maximized", value<bool>()->default_value(false), "Specify if render windows should be shown maximaized" )
         ("store_benchmark_json_data", value<bool>()->default_value(false), "Determines if benchmark data such as render time should be uploaded.")
         ("thread_count", value<int>()->default_value(0), "Number of thread that should be used for rendering")
         ("upload_benchmark_data", value<bool>()->default_value(false), "Determines if benchmark data such as render time should be uploaded.")
-        ("show_maximized", value<bool>()->default_value(false), "Specify if render windows should be shown maximaized" )
         ("version,v", "print version string");
 }
 
@@ -137,4 +137,5 @@ std::string CommandLineArguments::filename() const {
     return vm["scene_filename"].as<std::string>();
 }
 
+
 DE_VERTEXWAHN_END_NAMESPACE

devertexwahn/okapi/command_line_arguments.hpp

@@ -47,6 +47,7 @@ class CommandLineArguments {
 
     RenderMode render_mode() const;
 
+
     std::string filename() const;
 
 public:

devertexwahn/okapi/ui/main.cpp

@@ -40,6 +40,7 @@ int main(int argc, char ** argv) {
 
     LOG_INFO_WITH_LOCATION("Running on {} CPU", cpuinfo_get_package(0)->name);
 
+
     QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
     QApplication application(argc, argv);
     QApplication::setWindowIcon(QIcon(":/okapi.ui.ico"));

devertexwahn/okapi/ui/main_window.cpp

@@ -1,10 +1,16 @@
 /*
- *  SPDX-FileCopyrightText: Copyright 2022-2023 Julian Amann <dev@vertexwahn.de>
+ *  SPDX-FileCopyrightText: Copyright 2022-2026 Julian Amann <dev@vertexwahn.de>
  *  SPDX-License-Identifier: Apache-2.0
  */
 
 #include "okapi/ui/main_window.hpp"
 
+#include "okapi/rendering/scene/load_scene.hpp"
+#include "okapi/rendering/sensor/sensor.hpp"
+
+#include "core/stl/filesystem.hpp"
+#include "core/stl/string.hpp"
+
 #include "QtCore/QEvent"
 #include "QtCore/QSettings"
 #include "QtCore/QThread"
@@ -13,160 +19,211 @@
 #include "QtGui/QKeyEvent"
 #include "QtWidgets/QApplication"
 #include "QtWidgets/QFileDialog"
+#include "QtGui/QSurfaceFormat"
 
-MainWindow::MainWindow(CommandLineArguments* cla, QWidget *parent /*= nullptr*/)
-: ui_(new Ui::MainWindow), cla_(cla) {
+MainWindow::MainWindow(CommandLineArguments *cla, QWidget *parent /*= nullptr*/)
+    : ui_(new Ui::MainWindow)
+    , cla_(cla) {
     ui_->setupUi(this);
 
     QHBoxLayout *layout = new QHBoxLayout();
     ui_->scrollAreaWidgetContents->setLayout(layout);
 
-    rw_ = new Viewport(*cla);
-    layout->addWidget(rw_);
+    {
+        rw_ = new Viewport(*cla);
+        layout->addWidget(rw_);
 
-    connect(&rw_->render_scene_thread_, SIGNAL(update(const QString&)), this, SLOT(update(const QString&)));
+        connect(&rw_->render_scene_thread_, SIGNAL(update(const QString&)), this, SLOT(update(const QString&)));
 
-    rw_->render_scene_thread_.start();
-    rw_->render_preview_thread_.start();
+        rw_->render_scene_thread_.start();
+        rw_->render_preview_thread_.start();
+    }
 
     installEventFilter(this);
 
     if (cla_->show_maximized()) {
         this->showMaximized();
         LOG_INFO_WITH_LOCATION("Show maximized");
     }
+
+    update_scene_explorer();
+}
+
+void MainWindow::update_scene_explorer() {
+    if (!rw_) { return; }
 }
 
 bool MainWindow::eventFilter(QObject *target, QEvent *event) {
-    if (event->type() == QEvent::KeyPress)
-    {
-        QKeyEvent *key_event = static_cast<QKeyEvent*>(event);
+    if (event->type() == QEvent::KeyPress) {
+        QKeyEvent *key_event = static_cast<QKeyEvent *>(event);
 
-        if (key_event->key() == Qt::Key_Escape)
-        {
+        if (key_event->key() == Qt::Key_Escape) {
             this->close();
-            return QMainWindow::eventFilter(target,event);
+            return QMainWindow::eventFilter(target, event);
         }
     }
-    return QMainWindow::eventFilter(target,event);
+    return QMainWindow::eventFilter(target, event);
 }
 
 void MainWindow::write_position_settings() {
-    QSettings settings( "devertexwahn", "okapi" );
+    QSettings settings("devertexwahn", "okapi");
 
-    settings.beginGroup( "mainwindow" );
+    settings.beginGroup("mainwindow");
 
-    settings.setValue( "geometry", saveGeometry() );
-    settings.setValue( "savestate", saveState() );
-    settings.setValue( "maximized", isMaximized() );
-    if ( !isMaximized() ) {
-        settings.setValue( "pos", pos() );
-        settings.setValue( "size", size() );
+    settings.setValue("geometry", saveGeometry());
+    settings.setValue("savestate", saveState());
+    settings.setValue("maximized", isMaximized());
+    if (!isMaximized()) {
+        settings.setValue("pos", pos());
+        settings.setValue("size", size());
     }
 
     settings.endGroup();
 }
 
 void MainWindow::read_position_settings() {
-    QSettings settings( "devertexwahn", "okapi" );
+    QSettings settings("devertexwahn", "okapi");
 
-    settings.beginGroup( "mainwindow" );
+    settings.beginGroup("mainwindow");
 
-    restoreGeometry(settings.value( "geometry", saveGeometry() ).toByteArray());
-    restoreState(settings.value( "savestate", saveState() ).toByteArray());
-    move(settings.value( "pos", pos() ).toPoint());
-    resize(settings.value( "size", size() ).toSize());
-    if ( settings.value( "maximized", isMaximized() ).toBool() )
+    restoreGeometry(settings.value("geometry", saveGeometry()).toByteArray());
+    restoreState(settings.value("savestate", saveState()).toByteArray());
+    move(settings.value("pos", pos()).toPoint());
+    resize(settings.value("size", size()).toSize());
+    if (settings.value("maximized", isMaximized()).toBool())
         showMaximized();
 
     settings.endGroup();
 }
 
-void MainWindow::moveEvent( QMoveEvent* ) {
+void MainWindow::moveEvent(QMoveEvent *) {
     write_position_settings();
 }
 
-void MainWindow::resizeEvent( QResizeEvent* ) {
+void MainWindow::resizeEvent(QResizeEvent *) {
     write_position_settings();
 }
 
-void MainWindow::closeEvent( QCloseEvent* ) {
-    LOG_INFO_WITH_LOCATION("Shutting down preview thread");
-    rw_->render_preview_thread_.stop_update_ = true;
-    rw_->render_preview_thread_.wait();
+void MainWindow::closeEvent(QCloseEvent *) {
+    if (rw_) {
+        LOG_INFO_WITH_LOCATION("Shutting down preview thread");
+        rw_->render_preview_thread_.stop_update_ = true;
+        rw_->render_preview_thread_.wait();
 
-    rw_->render_scene_thread_.render_desc_.abort = true;
-    LOG_INFO_WITH_LOCATION("Waiting for render thread");
-    rw_->render_scene_thread_.wait();
-    LOG_INFO_WITH_LOCATION("Render thread finished");
+        rw_->render_scene_thread_.render_desc_.abort = true;
+        LOG_INFO_WITH_LOCATION("Waiting for render thread");
+        rw_->render_scene_thread_.wait();
+        LOG_INFO_WITH_LOCATION("Render thread finished");
+    }
 
     write_position_settings();
 }
 
+void MainWindow::on_actionScene_Explorer_triggered() {
+    read_position_settings();
+
+    if (!ui_->dockWidgetSceneExplorer->isVisible()) {
+        ui_->dockWidgetSceneExplorer->show();
+    }
+}
+
 void MainWindow::on_actionExit_triggered() {
     QApplication::quit();
 };
 
 void MainWindow::on_actionAbout_triggered() {
-    if(!about_dialog_)
+    if (!about_dialog_)
         about_dialog_ = new AboutDialog(this);
 
     about_dialog_->show();
 }
 
 void MainWindow::on_actionSettings_triggered() {
-    if(!settings_dialog_)
+    if (!settings_dialog_)
         settings_dialog_ = new SettingsDialog(cla_, this);
 
     settings_dialog_->show();
 }
 
 void MainWindow::on_actionFit_render_output_to_window_triggered() {
-    ui_->scrollArea->setFixedSize(rw_->render_preview_thread_.image_->size().x()+18, rw_->render_preview_thread_.image_->size().y()+18);
+    if (!rw_) { return; }
+    ui_->scrollArea->setFixedSize(rw_->render_preview_thread_.image_->size().x() + 18,
+                                  rw_->render_preview_thread_.image_->size().y() + 18);
     this->adjustSize();
 }
 
-void MainWindow::on_actionPortable_Pixel_Map_triggered() {
-    QString filename = QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(), tr("Portable Pixel Map (*.ppm)"));
+void MainWindow::on_actionExportPortablePixelMap_triggered() {
+    if (!rw_) { return; }
+    QString filename = QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(),
+                                                    tr("Portable Pixel Map (*.ppm)"));
 
     if (!filename.isNull()) {
         rw_->save_as_ppm(filename);
     }
 }
 
 void MainWindow::on_actionExportPFM_triggered() {
-    QString filename = QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(), tr("Portable FloatMap Image Format (*.pfm)"));
+    if (!rw_) { return; }
+    QString filename = QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(),
+                                                    tr("Portable FloatMap Image Format (*.pfm)"));
 
     if (!filename.isNull()) {
         rw_->save_as_pfm(filename);
     }
 }
 
 void MainWindow::on_actionExportPNG_triggered() {
-    QString filename = QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(), tr("Portable Network Graphics (*.png)"));
+    if (!rw_) { return; }
+    QString filename = QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(),
+                                                    tr("Portable Network Graphics (*.png)"));
 
     if (!filename.isNull()) {
         rw_->save_as_png(filename);
-	}
+    }
+}
+
+void MainWindow::on_actionExportTIFF_triggered() {
+    if (!rw_) { return; }
+    QString filename = QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(),
+                                                    tr("Tagged Image File Format (*.tiff)"));
+
+    if (!filename.isNull()) {
+        rw_->save_as_tiff(filename);
+    }
 }
 
 void MainWindow::on_actionExportWebP_triggered() {
-    QString filename = QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(), tr("WebP (*.webp)"));
+    if (!rw_) { return; }
+    QString filename =
+        QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(), tr("WebP (*.webp)"));
 
     if (!filename.isNull()) {
         rw_->save_as_webp(filename);
     }
 }
 
-void MainWindow::on_actionOpenEXR_exr_triggered() {
-    QString filename = QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(), tr("OpenEXR (*.exr)"));
+void MainWindow::on_actionExportGIF_triggered() {
+    if (!rw_) { return; }
+    QString filename =
+        QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(), tr("GIF (*.gif)"));
+
+    if (!filename.isNull()) {
+        rw_->save_as_gif(filename);
+    }
+}
+
+void MainWindow::on_actionExportOpenEXR_triggered() {
+    if (!rw_) { return; }
+    QString filename = QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(),
+                                                    tr("OpenEXR (*.exr)"));
 
     if (!filename.isNull()) {
         rw_->save_as_open_exr(filename);
-	}
+    }
 }
 
-void MainWindow::on_actionJPEG_triggered() {
+void MainWindow::on_actionExportJPEG_triggered() {
+    if (!rw_) { return; }
     QString filename = QFileDialog::getSaveFileName(this, tr("Save Document"), QDir::currentPath(), tr("JPEG (*.jpg)"));
 
     if (!filename.isNull()) {
@@ -175,20 +232,30 @@ void MainWindow::on_actionJPEG_triggered() {
 }
 
 void MainWindow::on_actionCopy_triggered() {
+    if (!rw_) { return; }
     QGuiApplication::clipboard()->setImage(*rw_->render_preview_thread_.qimage_);
 }
 
 void MainWindow::on_checkBoxDenoise_toggled(bool checked) {
-   rw_->render_preview_thread_.denoise_image_ = checked;
+    if (!rw_) { return; }
+    rw_->render_preview_thread_.denoise_image_ = checked;
 }
 
 void MainWindow::on_horizontalSliderExposureValue_valueChanged(int position) {
+    if (!rw_) { return; }
     float value = position / 100.f;
     float scale = std::pow(2.f, (value - 0.5f) * 20);
 
     rw_->render_preview_thread_.scale_ = scale;
 }
 
-void MainWindow::update(const QString& message) {
+void MainWindow::update(const QString &message) {
+    static bool first_time = true;
+    if (first_time && message.startsWith("Progress")) {
+        first_time = false;
+
+        update_scene_explorer();
+    }
+
     ui_->statusbar->showMessage(message);
 }