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

Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements

Browse Source 
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
This commit is contained in:
Yuriy Toporovskyy
2021-08-06 10:32:38 -04:00
parent 6e59b1f519 053c4af66d
commit fd616fdcfb
425 changed files with 2145 additions and 1758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Viewport.h
+5 -5
View File
@@ -113,7 +113,7 @@ public:
virtual void AddPostRenderer(IPostRenderer* pPostRenderer) = 0;
virtual bool RemovePostRenderer(IPostRenderer* pPostRenderer) = 0;
virtual BOOL DestroyWindow() { return FALSE; }
virtual bool DestroyWindow() { return false; }
/** Get type of this viewport.
*/
@@ -260,7 +260,7 @@ public:
virtual void SetCursorString(const QString& str) = 0;
virtual void SetFocus() = 0;
virtual void Invalidate(BOOL bErase = 1) = 0;
virtual void Invalidate(bool bErase = 1) = 0;
// Is overridden by RenderViewport
virtual void SetFOV([[maybe_unused]] float fov) {}
@@ -274,8 +274,8 @@ 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.
//widget rendering. Needed by the RenderViewport to handle raycasts
//from screen-space to world-space.
virtual void PreWidgetRendering() {}
virtual void PostWidgetRendering() {}
@@ -352,7 +352,7 @@ public:
QString GetName() const;
virtual void SetFocus() { setFocus(); }
virtual void Invalidate([[maybe_unused]] BOOL bErase = 1) { update(); }
virtual void Invalidate([[maybe_unused]] bool bErase = 1) { update(); }
// Is overridden by RenderViewport
virtual void SetFOV([[maybe_unused]] float fov) {}