birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant API calls from EditorViewportWidget and use new WorldToScreen call (#4022)

Browse Source 
* remove redundant API calls from EditorViewportWidget and use new WorldToScreen call

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove additional pre/post widget render calls that are no longer required

Signed-off-by: hultonha <hultonha@amazon.co.uk>
This commit is contained in:
hultonha
2021-09-13 09:36:34 +01:00
committed by GitHub
parent 51ce59e240
commit 28d45891f2
12 changed files with 42 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Viewport.h
+2 -14
View File
@@ -274,12 +274,6 @@ public:
void SetViewPane(CLayoutViewPane* viewPane) { m_viewPane = viewPane; }
//Child classes can override these to provide extra logic that wraps
//widget rendering. Needed by the RenderViewport to handle raycasts
//from screen-space to world-space.
virtual void PreWidgetRendering() {}
virtual void PostWidgetRendering() {}
virtual CViewport *asCViewport() { return this; }
protected:
@@ -289,7 +283,7 @@ protected:
// Screen Matrix
Matrix34 m_screenTM;
int m_nCurViewportID;
// Final game view matrix before drpping back to editor
// Final game view matrix before dropping back to editor
Matrix34 m_gameTM;
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
@@ -427,7 +421,7 @@ public:
QRect GetSelectionRectangle() const override { return m_selectedRect; };
//! Called when dragging selection rectangle.
void OnDragSelectRectangle(const QRect& rect, bool bNormalizeRect = false) override;
//! Get selection procision tolerance.
//! Get selection precision tolerance.
float GetSelectionTolerance() const { return m_selectionTolerance; }
//! Center viewport on selection.
void CenterOnSelection() override {}
@@ -572,12 +566,6 @@ protected:
void dragLeaveEvent(QDragLeaveEvent* event) override;
void dropEvent(QDropEvent* event) override;
//Child classes can override these to provide extra logic that wraps
//widget rendering. Needed by the RenderViewport to handle raycasts
//from screen-space to world-space.
virtual void PreWidgetRendering() {}
virtual void PostWidgetRendering() {}
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
AzToolsFramework::ViewportUi::ViewportUiManager m_viewportUi;
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING