m_pViewportSampleNumber (#2105)

Author: zhouhang95

ui/zenoedit/dialog/zpreferencesdlg.cpp

@@ -7,6 +7,8 @@
 #include "startup/zstartup.h"
 #include "zshortcutsettingdlg.h"
 #include <zenoui/comctrl/zlabel.h>
+#include "viewport/displaywidget.h"
+#include <zenovis/DrawOptions.h>
 
 //Language Pane
 ZLanguagePane::ZLanguagePane(QWidget* parent)
@@ -133,6 +135,23 @@ ZenoCachePane::ZenoCachePane(QWidget* parent) : QWidget(parent)
         m_pAutoCleanCache->setEnabled(state && !m_pTempCacheDir->isChecked());
     });
 
+    m_pViewportSampleNumber = new QSpinBox;
+    m_pViewportSampleNumber->setRange(1, 10000);
+    m_pViewportSampleNumber->setValue(1);
+    {
+        auto main = zenoApp->getMainWindow();
+        ZASSERT_EXIT(main);
+        for (auto displaywid : main->viewports()) {
+            if (displaywid && !displaywid->isGLViewport()) {
+                if (auto vis = displaywid->getZenoVis()) {
+                    if (auto scene = vis->getSession()->get_scene()) {
+                        m_pViewportSampleNumber->setValue(scene->drawOptions->num_samples);
+                    }
+                }
+            }
+        }
+    }
+
     QGridLayout* pLayout = new QGridLayout(this);
     pLayout->addWidget(new QLabel(tr("Enable cache")), 0, 0);
     pLayout->addWidget(m_pEnableCheckbox, 0, 1);
@@ -148,6 +167,8 @@ ZenoCachePane::ZenoCachePane(QWidget* parent) : QWidget(parent)
     pLayout->addWidget(m_pEnableShiftChangeFOV, 5, 1);
     pLayout->addWidget(new QLabel(tr("Viewport Point Size scale")), 6, 0);
     pLayout->addWidget(m_pViewportPointSizeScaleSpinBox, 6, 1);
+    pLayout->addWidget(new QLabel(tr("Viewport Sample Number")), 7, 0);
+    pLayout->addWidget(m_pViewportSampleNumber, 7, 1);
     QSpacerItem* pSpacerItem = new QSpacerItem(10, 10, QSizePolicy::Expanding);
     pLayout->addItem(pSpacerItem, 0, 2, 5);
     pLayout->setAlignment(Qt::AlignLeft | Qt::AlignTop);
@@ -163,6 +184,13 @@ void ZenoCachePane::saveValue()
     inst.setValue(zsCacheAutoClean, m_pAutoCleanCache->checkState() == Qt::Checked);
     inst.setValue(zsEnableShiftChangeFOV, m_pEnableShiftChangeFOV->checkState() == Qt::Checked);
     inst.setValue(zsViewportPointSizeScale, m_pViewportPointSizeScaleSpinBox->value());
+    auto main = zenoApp->getMainWindow();
+    ZASSERT_EXIT(main);
+    for (auto displaywid : main->viewports()) {
+        if (displaywid) {
+            displaywid->setSampleNumber(m_pViewportSampleNumber->value());
+        }
+    }
 }
 
 //layout pane

ui/zenoedit/dialog/zpreferencesdlg.h

@@ -35,6 +35,7 @@ class ZenoCachePane : public QWidget
     QDoubleSpinBox* m_pViewportPointSizeScaleSpinBox;
 
     QCheckBox* m_pEnableShiftChangeFOV;
+    QSpinBox* m_pViewportSampleNumber;
 };
 
 //NASLOCPane

ui/zenoedit/viewport/displaywidget.cpp

@@ -779,6 +779,13 @@ void DisplayWidget::onSetBackground(bool bShowBackground)
     }
 }
 
+void DisplayWidget::setSampleNumber(int sample_number)
+{
+    if (!m_bGLView) {
+        m_optixView->setSampleNumber(sample_number);
+    }
+}
+
 zenovis::ZOptixCameraSettingInfo DisplayWidget::getCamera() const
 {
     if (!m_bGLView) {

ui/zenoedit/viewport/displaywidget.h

@@ -81,6 +81,7 @@ public slots:
     void onDockViewAction(bool triggered);
     void onSetCamera(zenovis::ZOptixCameraSettingInfo value);
     void onSetBackground(bool bShowBackground);
+    void setSampleNumber(int sample_number);
     zenovis::ZOptixCameraSettingInfo getCamera() const;
 
 signals:

ui/zenoedit/viewport/optixviewport.cpp

@@ -351,6 +351,16 @@ void OptixWorker::onSetBackground(bool bShowBg)
     updateFrame();
 }
 
+void OptixWorker::onSetSampleNumber(int sample_number) {
+    ZASSERT_EXIT(m_zenoVis);
+    auto session = m_zenoVis->getSession();
+    ZASSERT_EXIT(session);
+    auto scene = session->get_scene();
+    ZASSERT_EXIT(scene);
+    scene->drawOptions->num_samples = sample_number;
+    updateFrame();
+}
+
 void OptixWorker::onSetData(
     float aperture,
     float shutter_speed,
@@ -440,6 +450,7 @@ ZOptixViewport::ZOptixViewport(QWidget* parent)
     connect(this, &ZOptixViewport::sig_cleanUpScene, m_worker, &OptixWorker::onCleanUpScene);
     connect(this, &ZOptixViewport::sig_cleanUpView, m_worker, &OptixWorker::onCleanUpView);
     connect(this, &ZOptixViewport::sig_setBackground, m_worker, &OptixWorker::onSetBackground);
+    connect(this, &ZOptixViewport::sig_setSampleNumber, m_worker, &OptixWorker::onSetSampleNumber);
     connect(this, &ZOptixViewport::sig_setdata_on_optix_thread, m_worker, &OptixWorker::onSetData);
 
     setRenderSeparately(false, false);
@@ -599,6 +610,11 @@ void ZOptixViewport::showBackground(bool bShow)
     emit sig_setBackground(bShow);
 }
 
+void ZOptixViewport::setSampleNumber(int sample_number)
+{
+    emit sig_setSampleNumber(sample_number);
+}
+
 void ZOptixViewport::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);

ui/zenoedit/viewport/optixviewport.h

@@ -44,6 +44,7 @@ public slots:
     void onCleanUpScene();
     void onCleanUpView();
     void onSetBackground(bool bShowBg);
+    void onSetSampleNumber(int sample_number);
 
     void onSetData(float, float, float, bool, bool, bool, bool, float);
 
@@ -73,6 +74,7 @@ class ZOptixViewport : public QWidget
     void setSafeFrames(bool bLock, int nx, int ny);
     void setNumSamples(int samples);
     void showBackground(bool bShow);
+    void setSampleNumber(int sample_number);
     Zenovis* getZenoVis() const;
     bool isCameraMoving() const;
     void updateCamera();
@@ -111,6 +113,7 @@ class ZOptixViewport : public QWidget
     void sig_cleanUpScene();
     void sig_cleanUpView();
     void sig_setBackground(bool bShowBg);
+    void sig_setSampleNumber(int sample_number);
     void sig_setdata_on_optix_thread(float, float, float, bool, bool, bool, bool, float);
 
 public slots: