diff options
author | Määttä Antti <antti.maatta@qt.io> | 2017-10-13 12:07:20 +0300 |
---|---|---|
committer | Antti Määttä <antti.maatta@qt.io> | 2017-10-24 13:23:19 +0000 |
commit | 09e9cdc430d9ae4b44bd157cc3d19943df66b8d4 (patch) | |
tree | 408c5a3029f1b85bef2917c5ff676e0d4f47099a /src/Authoring/Studio/Render/StudioRenderer.cpp | |
parent | a0ee8e091ee53ec1c52ab71fbf7334657182a336 (diff) |
Replace UICDM namespace with qt3dsdm namespace
Task-number: QT3DS-18
Change-Id: I8a76c6be45eee7285a21cdf87ac28b88c4522102
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 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Authoring/Studio/Render/StudioRenderer.cpp b/src/Authoring/Studio/Render/StudioRenderer.cpp index a87918f1..f9962c6f 100644 --- a/src/Authoring/Studio/Render/StudioRenderer.cpp +++ b/src/Authoring/Studio/Render/StudioRenderer.cpp @@ -92,7 +92,7 @@ struct SRendererImpl : public IStudioRenderer, bool m_RenderRequested; int m_LastToolMode; bool m_GuidesEnabled; - UICDM::TSignalConnectionPtr m_SelectionSignal; + qt3dsdm::TSignalConnectionPtr m_SelectionSignal; SRendererImpl() : m_Dispatch(*g_StudioApp.GetCore()->GetDispatch()) @@ -125,7 +125,7 @@ struct SRendererImpl : public IStudioRenderer, } // IDocSceneGraph - QT3DSVec3 GetIntendedPosition(UICDM::CUICDMInstanceHandle inHandle, CPt inPoint) override + QT3DSVec3 GetIntendedPosition(qt3dsdm::CUICDMInstanceHandle inHandle, CPt inPoint) override { if (m_Translation) return m_Translation->GetIntendedPosition(inHandle, inPoint); @@ -339,7 +339,7 @@ struct SRendererImpl : public IStudioRenderer, void EditCameraZoomToFit() override { - UICDM::CUICDMInstanceHandle theInstance = m_Doc.GetSelectedInstance(); + qt3dsdm::CUICDMInstanceHandle theInstance = m_Doc.GetSelectedInstance(); if (!m_Translation || m_Translation->m_EditCameraEnabled == false) return; // If we aren't pointed at a node then bounce up the asset graph till we are. @@ -420,7 +420,7 @@ struct SRendererImpl : public IStudioRenderer, // Fired during 3d drag or mouse move events (or keyframe drag) or likewise // events so that views that need to update based on the new data can. - void OnImmediateRefreshInstanceSingle(UICDM::CUICDMInstanceHandle inInstance) override + void OnImmediateRefreshInstanceSingle(qt3dsdm::CUICDMInstanceHandle inInstance) override { if (m_Translation) { m_Translation->MarkDirty(inInstance); @@ -429,7 +429,7 @@ struct SRendererImpl : public IStudioRenderer, } } // Same thing, but fired when more than one instance is being refreshed. - void OnImmediateRefreshInstanceMultiple(UICDM::CUICDMInstanceHandle *inInstance, + void OnImmediateRefreshInstanceMultiple(qt3dsdm::CUICDMInstanceHandle *inInstance, long inInstanceCount) override { // Pass to translation system @@ -441,7 +441,7 @@ struct SRendererImpl : public IStudioRenderer, Render(); } - void OnReloadEffectInstance(UICDM::CUICDMInstanceHandle inInstance) override + void OnReloadEffectInstance(qt3dsdm::CUICDMInstanceHandle inInstance) override { if (m_Translation) m_Translation->ReleaseEffect(inInstance); @@ -544,7 +544,7 @@ struct SRendererImpl : public IStudioRenderer, void OnSelectionChange() { RequestRender(); } - UICDM::CUICDMInstanceHandle GetAnchorPointFromPick(SPathPick &inPick) + qt3dsdm::CUICDMInstanceHandle GetAnchorPointFromPick(SPathPick &inPick) { return m_Translation->GetAnchorPoint(inPick); } @@ -580,15 +580,15 @@ struct SRendererImpl : public IStudioRenderer, m_RenderContext->EndRender(); // If we definitely did not pick a widget. if (m_PickResult.getType() == StudioPickValueTypes::Instance) { - UICDM::CUICDMInstanceHandle theHandle(m_PickResult.getData<CUICDMInstanceHandle>()); + qt3dsdm::CUICDMInstanceHandle theHandle(m_PickResult.getData<CUICDMInstanceHandle>()); if (theHandle != m_Doc.GetSelectedInstance()) m_Doc.SelectUICDMObject(theHandle); } else if (m_PickResult.getType() == StudioPickValueTypes::Guide) - m_Doc.NotifySelectionChanged(m_PickResult.getData<UICDM::CUICDMGuideHandle>()); + m_Doc.NotifySelectionChanged(m_PickResult.getData<qt3dsdm::CUICDMGuideHandle>()); else if (m_PickResult.getType() == StudioPickValueTypes::Path) { SPathPick thePick = m_PickResult.getData<SPathPick>(); - UICDM::CUICDMInstanceHandle theAnchorHandle = + qt3dsdm::CUICDMInstanceHandle theAnchorHandle = m_Translation->GetAnchorPoint(thePick); if (theAnchorHandle.Valid() && theAnchorHandle != m_Doc.GetSelectedInstance()) { m_Doc.SelectUICDMObject(theAnchorHandle); @@ -596,7 +596,7 @@ struct SRendererImpl : public IStudioRenderer, } RequestRender(); } else { - qt3ds::foundation::Option<UICDM::SGuideInfo> pickResult = + qt3ds::foundation::Option<qt3dsdm::SGuideInfo> pickResult = m_Translation->PickRulers(inPoint); if (pickResult.hasValue() == false) m_Translation->PrepareForDrag(); @@ -839,7 +839,7 @@ struct SRendererImpl : public IStudioRenderer, m_Doc.SelectAndNavigateToUICDMObject(theResult.getData<CUICDMInstanceHandle>()); else if (theResult.getType() == StudioPickValueTypes::Path) { SPathPick thePickValue = theResult.getData<SPathPick>(); - UICDM::CUICDMInstanceHandle theAnchorHandle = + qt3dsdm::CUICDMInstanceHandle theAnchorHandle = m_Translation->GetAnchorPoint(thePickValue); if (theAnchorHandle.Valid() && theAnchorHandle != m_Doc.GetSelectedInstance()) { m_Doc.SelectUICDMObject(theAnchorHandle); |