Merging latest development

Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-14 19:17:10 -07:00
parent a6e7a81b79 16e60a94af
commit 3040f74c41
1528 changed files with 33581 additions and 22343 deletions
@@ -76,6 +76,7 @@ namespace Multiplayer
            ImGui::Checkbox("Networking Stats", &m_displayNetworkingStats);
            ImGui::Checkbox("Multiplayer Stats", &m_displayMultiplayerStats);
            ImGui::Checkbox("Multiplayer Entity Stats", &m_displayPerEntityStats);
+            ImGui::Checkbox("Multiplayer Hierarchy Debugger", &m_displayHierarchyDebugger);
            ImGui::EndMenu();
        }
    }
@@ -473,6 +474,29 @@ namespace Multiplayer
                }
            }
        }
+
+        if (m_displayHierarchyDebugger)
+        {
+            if (ImGui::Begin("Multiplayer Hierarchy Debugger", &m_displayHierarchyDebugger))
+            {
+                if (m_hierarchyDebugger == nullptr)
+                {
+                    m_hierarchyDebugger = AZStd::make_unique<MultiplayerDebugHierarchyReporter>();
+                }
+
+                if (m_hierarchyDebugger)
+                {
+                    m_hierarchyDebugger->OnImGuiUpdate();
+                }
+            }
+        }
+        else
+        {
+            if (m_hierarchyDebugger)
+            {
+                m_hierarchyDebugger.reset();
+            }
+        }
    }
 #endif
 }