diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2019-06-27 09:47:07 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2019-06-28 09:31:22 +0300 |
| commit | 9677851febf223cb3e74aa0d11edf95d0c08b919 (patch) | |
| tree | cce42160d48e178e01fe7194da2e2f77b6219250 /src/api/studio3dqml/q3dsrenderer.cpp | |
| parent | 3a014b324f1948192cb973c62c40150464ce5aa2 (diff) | |
Fix simpleqml example
- Reset source when window changes because it will cause new renderer to be
created and it would not have proper source without it.
- Update the example codes and resources
- Change how the init timer is initialized to get proper result each time
the presentation gets reloaded.
Task-number: QT3DS-3681
Change-Id: I64d4f6980b87b6efcbb906bb4ad241956ce0a7bc
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/api/studio3dqml/q3dsrenderer.cpp')
| -rw-r--r-- | src/api/studio3dqml/q3dsrenderer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/api/studio3dqml/q3dsrenderer.cpp b/src/api/studio3dqml/q3dsrenderer.cpp index 33c7b98..e3fce5c 100644 --- a/src/api/studio3dqml/q3dsrenderer.cpp +++ b/src/api/studio3dqml/q3dsrenderer.cpp @@ -48,7 +48,8 @@ using namespace Q3DSViewer; QT_BEGIN_NAMESPACE -Q3DSRenderer::Q3DSRenderer(bool visibleFlag, qt3ds::Qt3DSAssetVisitor *assetVisitor) +Q3DSRenderer::Q3DSRenderer(bool visibleFlag, qt3ds::Qt3DSAssetVisitor *assetVisitor, + QElapsedTimer *startupTimer) : m_visibleFlag(visibleFlag) , m_initElements(false) , m_runtime(0) @@ -58,8 +59,9 @@ Q3DSRenderer::Q3DSRenderer(bool visibleFlag, qt3ds::Qt3DSAssetVisitor *assetVisi , m_visitor(assetVisitor) , m_settings(new Q3DSViewerSettings(this)) , m_presentation(new Q3DSPresentation(this)) + , m_startupTimer(startupTimer) { - m_startupTimer.start(); + } Q3DSRenderer::~Q3DSRenderer() @@ -170,7 +172,7 @@ void Q3DSRenderer::draw() bool Q3DSRenderer::initializeRuntime(QOpenGLFramebufferObject *inFbo) { - m_runtime = &Q3DSViewerApp::Create(nullptr, new Qt3DSAudioPlayerImpl(), &m_startupTimer); + m_runtime = &Q3DSViewerApp::Create(nullptr, new Qt3DSAudioPlayerImpl(), m_startupTimer); Q_ASSERT(m_runtime); // Connect presentation ready signal before initializing the app |