Add support for using Q3DSViewerSettings in Q3DSEngine

Q3DSEngine has a reference to the Q3DSViewerSettings for usage in
generating the viewport for the main presentation. This is used to make
sure that the scene is rendered with the correct scale mode and matte if
requested on the main presentation.

Adds Menu items for scale modes and matte to Q3DSViewer

Change-Id: I9f468c42fe846be8170dac01fcdf6d692aae19ab
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/imports/studio3d/q3dsstudio3ditem.cpp b/src/imports/studio3d/q3dsstudio3ditem.cpp
index 1c16b89..7b4c0eb 100644
--- a/src/imports/studio3d/q3dsstudio3ditem.cpp
+++ b/src/imports/studio3d/q3dsstudio3ditem.cpp
@@ -242,10 +242,8 @@ void Q3DSStudio3DItem::componentComplete()
                 qWarning("Studio3D: Duplicate ViewerSettings");
             } else {
                 m_viewerSettings = viewerSettings;
-                connect(m_viewerSettings, &Q3DSViewerSettings::showRenderStatsChanged, m_viewerSettings, [this] {
-                    if (m_engine)
-                        m_engine->setProfileUiVisible(m_viewerSettings->isShowingRenderStats());
-                });
+                if (m_engine)
+                    m_engine->setViewerSettings(m_viewerSettings);
             }
         }
     }
@@ -346,11 +344,12 @@ void Q3DSStudio3DItem::createEngine()
             m_engine->setSurface(w);
         }
 
+        if (m_viewerSettings)
+            m_engine->setViewerSettings(m_viewerSettings);
+
         qCDebug(lcStudio3D, "created engine %p", m_engine);
 
         connect(m_engine, &Q3DSEngine::presentationLoaded, this, [this]() {
-            if (m_viewerSettings && m_viewerSettings->isShowingRenderStats())
-                m_engine->setProfileUiVisible(true);
             m_presentation->studio3DPresentationLoaded();
             if (!m_running) {
                 m_running = true;