Merge main

2021-04-27 11:05:22 -07:00
parent fdcb19f45a 6aa5b5698f
commit 5f33337fec
4521 changed files with 45204 additions and 58318 deletions
@@ -43,9 +43,16 @@ namespace AtomToolsFramework
        //! Creates a RenderViewportWidget.
        //! Requires the Atom RPI to be initialized in order
        //! to internally construct an RPI::ViewportContext.
-        explicit RenderViewportWidget(AzFramework::ViewportId id = AzFramework::InvalidViewportId, QWidget* parent = nullptr);
+        //! If initializeViewportContext is set to false, nothing will be displayed on-screen until InitiliazeViewportContext is called.
+        explicit RenderViewportWidget(QWidget* parent = nullptr, bool shouldInitializeViewportContext = true);
        ~RenderViewportWidget();

+        //! Initializes the underlying ViewportContext, if it hasn't already been.
+        //! If id is specified, the target ViewportContext will be overridden.
+        //! NOTE: ViewportContext IDs must be unique.
+        //! Returns true if the ViewportContext is available
+        //! (i.e. GetViewportContext will return a valid pointer).
+        bool InitializeViewportContext(AzFramework::ViewportId id = AzFramework::InvalidViewportId);
        //! Gets the name associated with this viewport's ViewportContext.
        //! This context name can be used to adjust the current Camera
        //! independently of the underlying viewport.