Fixes for using the DebugDisplayRequestBus in game mode

Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp

@@ -244,9 +244,6 @@ namespace AZ::AtomBridge
     }
     ////////////////////////////////////////////////////////////////////////
 
-    // Partial implementation of the DebugDisplayRequestBus on Atom. 
-    // Commented out function prototypes are waiting to be implemented.
-    // work tracked in [ATOM-3459]
     AtomDebugDisplayViewportInterface::AtomDebugDisplayViewportInterface(AZ::RPI::ViewportContextPtr viewportContextPtr)
     {
         ResetRenderState();
@@ -272,9 +269,8 @@ namespace AZ::AtomBridge
         InitInternal(scene, nullptr);
     }
 
-    void AtomDebugDisplayViewportInterface::InitInternal(RPI::Scene* scene, AZ::RPI::ViewportContextPtr viewportContextPtr)
+    void AtomDebugDisplayViewportInterface::UpdateAuxGeom(RPI::Scene* scene, AZ::RPI::View* view)
     {
-        AzFramework::DebugDisplayRequestBus::Handler::BusDisconnect(m_viewportId);
         if (!scene)
         {
             m_auxGeomPtr = nullptr;
@@ -286,20 +282,48 @@ namespace AZ::AtomBridge
             m_auxGeomPtr = nullptr;
             return;
         }
-        if (m_defaultInstance)
+        if (m_defaultInstance || !view)
         {
             m_auxGeomPtr = auxGeomFP->GetDrawQueue();
         }
         else
         {
-            m_auxGeomPtr = auxGeomFP->GetOrCreateDrawQueueForView(viewportContextPtr->GetDefaultView().get());
+            m_auxGeomPtr = auxGeomFP->GetOrCreateDrawQueueForView(view);
         }
+    }
+
+    void AtomDebugDisplayViewportInterface::InitInternal(RPI::Scene* scene, AZ::RPI::ViewportContextPtr viewportContextPtr)
+    {
+        AzFramework::DebugDisplayRequestBus::Handler::BusDisconnect(m_viewportId);
+        UpdateAuxGeom(scene, viewportContextPtr ? viewportContextPtr->GetDefaultView().get() : nullptr);
         AzFramework::DebugDisplayRequestBus::Handler::BusConnect(m_viewportId);
+        if (!m_defaultInstance)
+        {
+            AZ::RPI::ViewportContextIdNotificationBus::Handler::BusConnect(viewportContextPtr->GetId());
+        }
+    }
+
+
+    void AtomDebugDisplayViewportInterface::OnViewportDefaultViewChanged(AZ::RPI::ViewPtr view)
+    {
+        ResetRenderState();
+        if (m_defaultInstance)
+        {
+            RPI::Scene* scene = RPI::RPISystemInterface::Get()->GetDefaultScene().get();
+            UpdateAuxGeom(scene, nullptr);
+        }
+        else
+        {
+            auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
+            AZ::RPI::ViewportContextPtr viewportContextPtr = viewportContextManager->GetViewportContextById(m_viewportId);
+            UpdateAuxGeom(viewportContextPtr->GetRenderScene().get(), viewportContextPtr->GetDefaultView().get());
+        }
     }
 
     AtomDebugDisplayViewportInterface::~AtomDebugDisplayViewportInterface()
     {
         AzFramework::DebugDisplayRequestBus::Handler::BusDisconnect(m_viewportId);
+        AZ::RPI::ViewportContextIdNotificationBus::Handler::BusDisconnect();
         m_viewportId = AzFramework::InvalidViewportId;
         m_auxGeomPtr = nullptr;
     }

Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h

@@ -25,6 +25,7 @@
 #include <Atom/RPI.Public/RPISystemInterface.h>
 #include <Atom/RPI.Public/AuxGeom/AuxGeomDraw.h>
 #include <Atom/RPI.Public/ViewportContext.h>
+#include <Atom/RPI.Public/ViewportContextBus.h>
 
 namespace AZ::AtomBridge
 {
@@ -121,6 +122,7 @@ namespace AZ::AtomBridge
 
     class AtomDebugDisplayViewportInterface final
         : public AzFramework::DebugDisplayRequestBus::Handler
+        , public AZ::RPI::ViewportContextIdNotificationBus::Handler
     {
     public:
         AZ_RTTI(AtomDebugDisplayViewportInterface, "{09AF6A46-0100-4FBF-8F94-E6B221322D14}", AzFramework::DebugDisplayRequestBus::Handler);
@@ -198,6 +200,12 @@ namespace AZ::AtomBridge
         void PopMatrix() override;
 
     private:
+
+        // ViewportContextIdNotificationBus handlers
+        void OnViewportDefaultViewChanged(AZ::RPI::ViewPtr view) override;
+
+
+        // internal helper functions
         using LineSegmentFilterFunc = AZStd::function<bool(const AZ::Vector3& lineStart, const AZ::Vector3& lineEnd, int segmentIndex)>;
         enum CircleAxis
         {
@@ -245,6 +253,7 @@ namespace AZ::AtomBridge
         
         const AZ::Matrix3x4& GetCurrentTransform() const;
 
+        void UpdateAuxGeom(RPI::Scene* scene, AZ::RPI::View* view);
         void InitInternal(RPI::Scene* scene, AZ::RPI::ViewportContextPtr viewportContextPtr);
 
         AZ::RPI::ViewportContextPtr GetViewportContext() const;

Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h

@@ -226,7 +226,7 @@ namespace AZ
 
     private:
         virtual ~FFont();
-        bool InitFont();
+        bool InitFont(AZ::RPI::Scene* renderScene);
         bool InitTexture();
         bool InitCache();
 

Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp

@@ -99,7 +99,7 @@ AZ::RPI::WindowContextSharedPtr AZ::FFont::GetDefaultWindowContext() const
     return {};
 }
 
-bool AZ::FFont::InitFont()
+bool AZ::FFont::InitFont(AZ::RPI::Scene* renderScene)
 {
     auto initializationState = InitializationState::Uninitialized;
     // Do an atomic transition to Initializing if we're in the Uninitialized state.
@@ -111,8 +111,13 @@ bool AZ::FFont::InitFont()
         return initializationState == InitializationState::Initialized;
     }
 
+    if (!renderScene)
+    {
+        return false;
+    }
+
     // Create and initialize DynamicDrawContext for font draw
-    AZ::RPI::Ptr<AZ::RPI::DynamicDrawContext> dynamicDraw = m_atomFont->GetOrCreateDynamicDrawForScene(GetDefaultViewportContext()->GetRenderScene().get());
+    AZ::RPI::Ptr<AZ::RPI::DynamicDrawContext> dynamicDraw = m_atomFont->GetOrCreateDynamicDrawForScene(renderScene);
 
     // Save draw srg input indices for later use
     Data::Instance<RPI::ShaderResourceGroup> drawSrg = dynamicDraw->NewDrawSrg();
@@ -299,7 +304,7 @@ void AZ::FFont::DrawStringUInternal(
     const TextDrawContext& ctx)
 {
     // Lazily ensure we're initialized before attempting to render.
-    if (!InitFont())
+    if (!viewportContext || !InitFont(viewportContext->GetRenderScene().get()))
     {
         return;
     }
@@ -1623,7 +1628,7 @@ void AZ::FFont::ScaleCoord(const RHI::Viewport& viewport, float& x, float& y) co
 
 void AZ::FFont::OnBootstrapSceneReady([[maybe_unused]] AZ::RPI::Scene* bootstrapScene)
 {
-    InitFont();
+    InitFont(bootstrapScene);
 }
 
 static void SetCommonContextFlags(AZ::TextDrawContext& ctx, const AzFramework::TextDrawParameters& params)

Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp

@@ -336,6 +336,7 @@ namespace AZ
             bool needsFullRefresh = HandleLightTypeChange();
 
             LmbrCentral::EditorShapeComponentRequestsBus::Event(GetEntityId(), &LmbrCentral::EditorShapeComponentRequests::SetShapeColor, m_controller.m_configuration.m_color);
+            LmbrCentral::EditorShapeComponentRequestsBus::Event(GetEntityId(), &LmbrCentral::EditorShapeComponentRequests::SetShapeWireframeColor, m_controller.m_configuration.m_color);
 
             // If photometric unit changes, convert the intensities so the actual intensity doesn't change.
             m_controller.ConvertToIntensityMode(m_controller.m_configuration.m_intensityMode);