diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-10-17 11:04:01 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-10-18 08:58:42 +0000 |
| commit | 510029c1d1974d3e0d417e87da30261357fec510 (patch) | |
| tree | 9c89094f221c33d46a9a3ff13242a3995459bbed /src/Authoring/Studio/Render/StudioRenderer.cpp | |
| parent | 4430b2eb13f2b37068b4af65d0ec038d30ff0233 (diff) | |
Clean up StudioUtils
Made StudioUtils a class of static functions instead of global
functions. Also cleaned up the code a bit where changes happened
because of this change.
Change-Id: Ic583dd25bf228c7e344be6664b6651958d84906e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@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.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Authoring/Studio/Render/StudioRenderer.cpp b/src/Authoring/Studio/Render/StudioRenderer.cpp index 61af4114..8b08a6fe 100644 --- a/src/Authoring/Studio/Render/StudioRenderer.cpp +++ b/src/Authoring/Studio/Render/StudioRenderer.cpp @@ -303,7 +303,8 @@ struct SRendererImpl : public IStudioRenderer, try { m_RenderContext = std::make_shared<CWGLRenderContext>(inWindow); - Q3DStudio::CString theResourcePath = Q3DStudio::CString::fromQString(resourcePath()); + Q3DStudio::CString theResourcePath = Q3DStudio::CString::fromQString( + StudioUtils::resourcePath()); NVScopedRefCounted<qt3ds::render::IQt3DSRenderContextCore> theCore = qt3ds::render::IQt3DSRenderContextCore::Create( m_RenderContext->GetRenderContext().GetFoundation(), @@ -353,7 +354,7 @@ struct SRendererImpl : public IStudioRenderer, m_Rect = inRect; if (IsInitialized()) { - m_pixelRatio = devicePixelRatio(); + m_pixelRatio = StudioUtils::devicePixelRatio(); m_RenderContext->BeginRender(); NVRenderContext &theContext = m_RenderContext->GetRenderContext(); theContext.SetViewport(qt3ds::render::NVRenderRect(0, 0, inRect.width(), @@ -675,8 +676,9 @@ struct SRendererImpl : public IStudioRenderer, QString projectPath = g_StudioApp.GetCore()->getProjectFile().getProjectPath(); if (!projectPath.isEmpty()) { // Add the installed font folders from the res dir. - Q3DStudio::CString thePath(Q3DStudio::CString::fromQString( - resourcePath() + QStringLiteral("/Font"))); + Q3DStudio::CString thePath( + Q3DStudio::CString::fromQString( + StudioUtils::resourcePath() + QStringLiteral("/Font"))); m_Context->GetTextRenderer()->AddSystemFontDirectory( m_Context->GetStringTable().RegisterStr(thePath.c_str())); m_Context->GetTextRenderer()->AddProjectFontDirectory( |