summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Render/StudioRenderer.cpp
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2018-10-19 15:08:50 +0300
committerMahmoud Badri <mahmoud.badri@qt.io>2018-10-22 10:47:15 +0000
commit66eec09db38d076b6c23f6d1ef43ea57e54d6060 (patch)
tree0c86a209734d360d7ac32446228461bb92f0c8e8 /src/Authoring/Studio/Render/StudioRenderer.cpp
parent871bfa4458efde3b73b76c4e44080163973e53bb (diff)
Improve Custom material assets loading
Some tweaks that focus on minimizing presentation loading time: - Prevent adding duplicate search directory. - A fix in matchCaseInsensitiveFile() method to use a cleanPath for comparison (I think this method should be removed altogether). - Other minor tweaks. Task-number: QT3DS-2535 Change-Id: Ieecbf67d37ef86e444d9b0b1de5e5361f26a3eae Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Render/StudioRenderer.cpp')
-rw-r--r--src/Authoring/Studio/Render/StudioRenderer.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Authoring/Studio/Render/StudioRenderer.cpp b/src/Authoring/Studio/Render/StudioRenderer.cpp
index 8b08a6fe..2ac39e8e 100644
--- a/src/Authoring/Studio/Render/StudioRenderer.cpp
+++ b/src/Authoring/Studio/Render/StudioRenderer.cpp
@@ -165,7 +165,7 @@ struct SRendererImpl : public IStudioRenderer,
IOffscreenRenderManager &offscreenMgr(m_Context->GetOffscreenRenderManager());
const QString projectPath = m_Doc.GetCore()->getProjectFile().getProjectPath();
// setPath expects full path, but strips the filename
- m_proxy->setPath(projectPath + "/dummy.uip");
+ m_proxy->setPath(projectPath + QLatin1Char('/'));
QVector<SubPresentationRecord> toUnregister;
QVector<SubPresentationRecord> toRegister;
const auto keys = m_subpresentations.keys();
@@ -221,7 +221,6 @@ struct SRendererImpl : public IStudioRenderer,
// then get the desired environment to initialize the qml renderer.
QCoreApplication::processEvents();
for (int i = 0; i < toRegister.size(); ++i) {
- QByteArray data = toRegister[i].m_id.toLocal8Bit();
if (toRegister[i].m_type == QLatin1String("presentation-qml"))
m_subpresentations[toRegister[i].m_id].renderer
->GetDesiredEnvironment(QT3DSVec2(1.0f, 1.0f));