summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2019-04-01 15:12:07 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2019-04-02 06:00:12 +0000
commiteab20916a3c753d5cb14df07f03f5c6d0ba45432 (patch)
tree3ff7b2d662d16ca6e7e84f03cb8c21a28b9fffd6 /src/Authoring/Studio
parentd341649e1d5741046c3030bb368a5bec0b42085b (diff)
Fix visual aid widget camera frustrum when presentation size changes
Change-Id: Ifc0457be9e8af9963b24085ce03dc895c02ad441 Fixes: QT3DS-3252 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/Authoring/Studio')
-rw-r--r--src/Authoring/Studio/Render/StudioRendererTranslation.cpp13
-rw-r--r--src/Authoring/Studio/Render/StudioRendererTranslation.h2
2 files changed, 14 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
index 752a84d7..94d77a59 100644
--- a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
+++ b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
@@ -2914,6 +2914,19 @@ void STranslation::drawPivot(SGraphObjectTranslator &inTranslator)
}
}
+void STranslation::SetViewport(qt3ds::QT3DSF32 inWidth, qt3ds::QT3DSF32 inHeight)
+{
+ m_Viewport = QT3DSVec2(inWidth, inHeight);
+ if (m_EditCameraEnabled) {
+ // Update inner rect as it is used to calculate camera frustrum for visual aid widget
+ QSize theSize = g_StudioApp.GetCore()->GetStudioProjectSettings()->getPresentationSize();
+ m_InnerRect.m_Top = 0;
+ m_InnerRect.m_Bottom = theSize.height();
+ m_InnerRect.m_Left = 0;
+ m_InnerRect.m_Right = theSize.width();
+ }
+}
+
Option<QT3DSU32> STranslation::PickWidget(CPt inMouseCoords, TranslationSelectMode::Enum,
qt3ds::widgets::IStudioWidgetBase &inWidget)
{
diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.h b/src/Authoring/Studio/Render/StudioRendererTranslation.h
index 45e86871..2d3e965a 100644
--- a/src/Authoring/Studio/Render/StudioRendererTranslation.h
+++ b/src/Authoring/Studio/Render/StudioRendererTranslation.h
@@ -494,7 +494,7 @@ namespace studio {
void drawPivot(SGraphObjectTranslator &inTranslator);
- void SetViewport(QT3DSF32 inWidth, QT3DSF32 inHeight) { m_Viewport = QT3DSVec2(inWidth, inHeight); }
+ void SetViewport(QT3DSF32 inWidth, QT3DSF32 inHeight);
QT3DSVec2 GetViewportDimensions() const { return m_Viewport; }
QT3DSVec2 GetPreviewViewportDimensions() const;