diff options
Diffstat (limited to 'src/Authoring/Studio/Render')
4 files changed, 9 insertions, 7 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( diff --git a/src/Authoring/Studio/Render/StudioRotationWidget.cpp b/src/Authoring/Studio/Render/StudioRotationWidget.cpp index 547039a0..f3e06cd6 100644 --- a/src/Authoring/Studio/Render/StudioRotationWidget.cpp +++ b/src/Authoring/Studio/Render/StudioRotationWidget.cpp @@ -250,7 +250,7 @@ struct SRotationWidget : public SStudioWidgetImpl<StudioWidgetTypes::Rotation> qt3ds::render::NVRenderBlendEquationArgument( NVRenderBlendEquation::Add, NVRenderBlendEquation::Add)); - float pixelRatio = float(devicePixelRatio()); + float pixelRatio = float(StudioUtils::devicePixelRatio()); QT3DSF32 theRingRadius = 2 * CStudioPreferences::getSelectorLineLength() * pixelRatio; QT3DSF32 theRingWidth = CStudioPreferences::getSelectorLineWidth() * pixelRatio; QT3DSF32 theRingInner = theRingRadius; diff --git a/src/Authoring/Studio/Render/StudioScaleWidget.cpp b/src/Authoring/Studio/Render/StudioScaleWidget.cpp index 37fe20ec..9b5eec1f 100644 --- a/src/Authoring/Studio/Render/StudioScaleWidget.cpp +++ b/src/Authoring/Studio/Render/StudioScaleWidget.cpp @@ -149,7 +149,7 @@ struct SScaleWidget : public SStudioWidgetImpl<StudioWidgetTypes::Scale> inRenderContext.SetDepthWriteEnabled(true); inRenderContext.SetDepthTestEnabled(true); inRenderContext.Clear(qt3ds::render::NVRenderClearValues::Depth); - float pixelRatio = float(devicePixelRatio()); + float pixelRatio = float(StudioUtils::devicePixelRatio()); QT3DSF32 axisWidth = pixelRatio; QT3DSF32 triWidth = 3 * CStudioPreferences::getSelectorLineWidth() * pixelRatio; QT3DSF32 axisStart = CStudioPreferences::getSelectorLineLength() / 3.0f * pixelRatio; diff --git a/src/Authoring/Studio/Render/StudioTranslationWidget.cpp b/src/Authoring/Studio/Render/StudioTranslationWidget.cpp index 2be81181..0897a866 100644 --- a/src/Authoring/Studio/Render/StudioTranslationWidget.cpp +++ b/src/Authoring/Studio/Render/StudioTranslationWidget.cpp @@ -76,7 +76,7 @@ struct STranslationWidget : public SStudioWidgetImpl<StudioWidgetTypes::Translat inRenderContext.SetDepthTestEnabled(true); if (m_XAxis == nullptr) { TBase::SetupRender(inWidgetContext, inRenderContext); - float pixelRatio = float(devicePixelRatio()); + float pixelRatio = float(StudioUtils::devicePixelRatio()); QT3DSF32 axisWidth = pixelRatio; QT3DSF32 triWidth = 4 * CStudioPreferences::getSelectorLineWidth() * pixelRatio; QT3DSF32 axisStart = CStudioPreferences::getSelectorLineLength() / 3.0f * pixelRatio; |