From c716d812bcff50000b971e58b8aca342503aa4c1 Mon Sep 17 00:00:00 2001
From: rgba16f <82187279+rgba16f@users.noreply.github.com>
Date: Wed, 26 May 2021 10:25:30 -0500
Subject: [PATCH] Fix crash when using DebugDraw gem

Remove AtomBridgeSystemComponent requirement that the default window context exists before creating the default scene draw interface.

DebugDraw gem was crashing because the default scene DebugDisplayRequestBus implementation was not created.
---
 .../Code/Source/AtomBridgeSystemComponent.cpp | 43 +------------------
 .../Code/Source/DebugDrawSystemComponent.cpp  | 15 ++++---
 2 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
index 9148cdba6f..4a19c08174 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
@@ -158,47 +158,8 @@ namespace AZ
 
         void AtomBridgeSystemComponent::OnBootstrapSceneReady(AZ::RPI::Scene* bootstrapScene)
         {
-            AZStd::shared_ptr<AZ::RPI::WindowContext> windowContext;
-            AZ::Render::Bootstrap::DefaultWindowBus::BroadcastResult(windowContext, &AZ::Render::Bootstrap::DefaultWindowInterface::GetDefaultWindowContext);
-
-            if (!windowContext)
-            {
-                AZ_Warning("Atom", false, "Cannot initialize Atom because no window context is available");
-                return;
-            }
-
-            AZ::RPI::RenderPipelinePtr renderPipeline = bootstrapScene->GetDefaultRenderPipeline();
-
-            // If RenderPipeline doesn't have a default view, create a view and make it the default view.
-            // These settings will be overridden by the editor or game camera.
-            if (renderPipeline->GetDefaultView() == nullptr)
-            {
-                auto viewContextManager = AZ::Interface<RPI::ViewportContextRequestsInterface>::Get();
-                m_view = AZ::RPI::View::CreateView(AZ::Name("AtomSystem Default View"), RPI::View::UsageCamera);
-                viewContextManager->PushView(viewContextManager->GetDefaultViewportContextName(), m_view);
-                const auto& viewport = windowContext->GetViewport();
-                const float aspectRatio = viewport.m_maxX / viewport.m_maxY;
-
-                // Note: This is projection assumes a setup for reversed depth
-                AZ::Matrix4x4 viewToClipMatrix;
-                AZ::MakePerspectiveFovMatrixRH(viewToClipMatrix, AZ::Constants::HalfPi, aspectRatio, 0.1f, 100.f, true);
-
-                m_view->SetViewToClipMatrix(viewToClipMatrix);
-
-                renderPipeline = bootstrapScene->GetDefaultRenderPipeline();
-                renderPipeline->SetDefaultView(m_view);
-            }
-            else
-            {
-                m_view = renderPipeline->GetDefaultView();
-            }
-            auto auxGeomFP = bootstrapScene->GetFeatureProcessor<RPI::AuxGeomFeatureProcessorInterface>();
-            if (auxGeomFP)
-            {
-                auxGeomFP->GetOrCreateDrawQueueForView(m_view.get());
-            }
-
-            // Make default AtomDebugDisplayViewportInterface for the scene
+            AZ_UNUSED(bootstrapScene);
+            // Make default AtomDebugDisplayViewportInterface
             AZStd::shared_ptr<AtomDebugDisplayViewportInterface> mainEntityDebugDisplay = AZStd::make_shared<AtomDebugDisplayViewportInterface>(AzFramework::g_defaultSceneEntityDebugDisplayId);
             m_activeViewportsList[AzFramework::g_defaultSceneEntityDebugDisplayId] = mainEntityDebugDisplay;
         }
diff --git a/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp
index 1f677d7b6f..1304c7b392 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp
@@ -274,12 +274,15 @@ namespace DebugDraw
         AzFramework::DebugDisplayRequests* debugDisplay =
             AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
 
-        OnTickAabbs(*debugDisplay);
-        OnTickLines(*debugDisplay);
-        OnTickObbs(*debugDisplay);
-        OnTickRays(*debugDisplay);
-        OnTickSpheres(*debugDisplay);
-        OnTickText(*debugDisplay);
+        if (debugDisplay)
+        {
+            OnTickAabbs(*debugDisplay);
+            OnTickLines(*debugDisplay);
+            OnTickObbs(*debugDisplay);
+            OnTickRays(*debugDisplay);
+            OnTickSpheres(*debugDisplay);
+            OnTickText(*debugDisplay);
+        }
     }
 
     template <typename F>