Merge branch 'main' into carlitosan-beta-fixes

AutomatedTesting/Gem/PythonTests/AWS/CMakeLists.txt

@@ -16,16 +16,16 @@
 
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
     # Enable after installing NodeJS and CDK on jenkins Windows AMI.
-    #ly_add_pytest(
-    #    NAME AutomatedTesting::AWSTests
-    #    TEST_SUITE periodic
-    #    TEST_SERIAL
-    #    PATH ${CMAKE_CURRENT_LIST_DIR}/AWS/${PAL_PLATFORM_NAME}/
-    #    RUNTIME_DEPENDENCIES
-    #        Legacy::Editor
-    #        AZ::AssetProcessor
-    #        AutomatedTesting.Assets
-    #    COMPONENT
-    #        AWS
-    #)
+    ly_add_pytest(
+        NAME AutomatedTesting::AWSTests
+        TEST_SUITE periodic
+        TEST_SERIAL
+        PATH ${CMAKE_CURRENT_LIST_DIR}/${PAL_PLATFORM_NAME}/
+        RUNTIME_DEPENDENCIES
+            Legacy::Editor
+            AZ::AssetProcessor
+            AutomatedTesting.Assets
+        COMPONENT
+            AWS
+    )
 endif()

AutomatedTesting/Gem/PythonTests/AWS/Windows/__init__.py

@@ -0,0 +1,11 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+"""
+

AutomatedTesting/Gem/PythonTests/AWS/Windows/cdk/__init__.py

@@ -0,0 +1,11 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+"""
+

AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/__init__.py

@@ -0,0 +1,11 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+"""
+

AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/test_anonymous_credentials.py

@@ -68,6 +68,7 @@ class TestAWSClientAuthAnonymousCredentials(object):
         log_monitor = ly_test_tools.log.log_monitor.LogMonitor(launcher=launcher, log_file_path=file_to_monitor)
 
         launcher.args = ['+LoadLevel', level]
+        launcher.args.extend(['-rhi=null'])
 
         with launcher.start(launch_ap=False):
             result = log_monitor.monitor_log_for_lines(

AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/test_password_signin.py

@@ -67,6 +67,7 @@ class TestAWSClientAuthPasswordSignIn(object):
         log_monitor = ly_test_tools.log.log_monitor.LogMonitor(launcher=launcher, log_file_path=file_to_monitor)
 
         launcher.args = ['+LoadLevel', 'AWS/ClientAuthPasswordSignUp']
+        launcher.args.extend(['-rhi=null'])
 
         with launcher.start(launch_ap=False):
             result = log_monitor.monitor_log_for_lines(
@@ -87,6 +88,7 @@ class TestAWSClientAuthPasswordSignIn(object):
         )
 
         launcher.args = ['+LoadLevel', 'AWS/ClientAuthPasswordSignIn']
+        launcher.args.extend(['-rhi=null'])
 
         with launcher.start(launch_ap=False):
             result = log_monitor.monitor_log_for_lines(

AutomatedTesting/Gem/PythonTests/AWS/Windows/resource_mappings/resource_mappings.py

@@ -10,8 +10,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
 import os
+from os.path import abspath
 import pytest
 import json
+import logging
+
+logger = logging.getLogger(__name__)
 
 AWS_RESOURCE_MAPPINGS_KEY = 'AWSResourceMappings'
 AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY = 'AccountId'
@@ -57,9 +61,9 @@ class ResourceMappings:
             stacks = response.get('Stacks', [])
             assert len(stacks) == 1, f'{stack_name} is invalid.'
 
-            self.__write_resource_mappings(stacks[0].get('Outputs', []))
+            self._write_resource_mappings(stacks[0].get('Outputs', []))
 
-    def __write_resource_mappings(self, outputs, append_feature_name = True) -> None:
+    def _write_resource_mappings(self, outputs, append_feature_name = True) -> None:
         with open(self._resource_mapping_file_path) as file_content:
             resource_mappings = json.load(file_content)
 
@@ -129,8 +133,10 @@ def resource_mappings(
     :return: ResourceMappings class object.
     """
 
-    path = f'{workspace.paths.engine_root()}\\{project}\\Config\\{resource_mappings_filename}'
-    resource_mappings_obj = ResourceMappings(path, aws_utils.assume_session().region_name, feature_name,
+    path = f'{workspace.paths.engine_root()}/{project}/Config/{resource_mappings_filename}'
+    logger.info(f'Resource mapping path : {path}')
+    logger.info(f'Resource mapping resolved path : {abspath(path)}')
+    resource_mappings_obj = ResourceMappings(abspath(path), aws_utils.assume_session().region_name, feature_name,
                                              aws_utils.assume_account_id(), workspace,
                                              aws_utils.client('cloudformation'))
 

AutomatedTesting/Gem/PythonTests/AWS/common/__init__.py

@@ -0,0 +1,11 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+"""
+

AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py

@@ -74,15 +74,23 @@ def add_component(componentName, entityId):
     typeIdsList = editor.EditorComponentAPIBus(bus.Broadcast, 'FindComponentTypeIdsByEntityType', [componentName],
                                                entity.EntityType().Game)
     typeNamesList = editor.EditorComponentAPIBus(bus.Broadcast, 'FindComponentTypeNames', typeIdsList)
+
+    # If the type name comes back as empty, then it means componentName is invalid
+    if len(typeNamesList) != 1 or not typeNamesList[0]:
+        print('Unable to find component TypeId for {}'.format(componentName))
+        return None
+
     componentOutcome = editor.EditorComponentAPIBus(bus.Broadcast, 'AddComponentsOfType', entityId, typeIdsList)
+    if not componentOutcome.IsSuccess():
+        print('Failed to add {} component to entity'.format(typeNamesList[0]))
+        return None
+
     isActive = editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled', componentOutcome.GetValue()[0])
     hasComponent = editor.EditorComponentAPIBus(bus.Broadcast, 'HasComponentOfType', entityId, typeIdsList[0])
-    if componentOutcome.IsSuccess() and isActive:
+    if isActive:
         print('{} component was added to entity'.format(typeNamesList[0]))
-    elif componentOutcome.IsSuccess() and not isActive:
+    else:
         print('{} component was added to entity, but the component is disabled'.format(typeNamesList[0]))
-    elif not componentOutcome.IsSuccess():
-        print('Failed to add {} component to entity'.format(typeNamesList[0]))
     if hasComponent:
         print('Entity has a {} component'.format(typeNamesList[0]))
     return componentOutcome.GetValue()[0]
@@ -218,7 +226,8 @@ class Entity:
 
     def add_component(self, component):
         new_component = add_component(component, self.id)
-        self.components.append(new_component)
+        if new_component:
+            self.components.append(new_component)
 
     def add_component_of_type(self, componentTypeId):
         new_component = add_component_of_type(componentTypeId, self.id)

AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py

@@ -135,9 +135,7 @@ def run():
     # Delete all existing entities initially
     search_filter = azlmbr.entity.SearchFilter()
     all_entities = entity.SearchBus(azlmbr.bus.Broadcast, "SearchEntities", search_filter)
-    general.idle_wait_frames(1)
     editor.ToolsApplicationRequestBus(bus.Broadcast, "DeleteEntities", all_entities)
-    general.idle_wait_frames(1)
 
     class ComponentTests:
         """Test launcher for each component."""
@@ -149,11 +147,9 @@ def run():
         def run_component_tests(self):
             # Run common and additional tests
             entity_obj = create_entity_undo_redo_component_addition(self.component_name)
-            general.idle_wait(0.5)
 
             # Enter/Exit game mode test
             verify_enter_exit_game_mode(self.component_name)
-            general.idle_wait(0.5)
 
             # Any additional tests are executed here
             for test in self.additional_tests:
@@ -161,16 +157,13 @@ def run():
 
             # Hide/Unhide entity test
             verify_hide_unhide_entity(self.component_name, entity_obj)
-            general.idle_wait(0.5)
 
             # Deletion/Undo/Redo test
             verify_deletion_undo_redo(self.component_name, entity_obj)
-            general.idle_wait(0.5)
 
     # DepthOfField Component
     camera_entity = hydra.Entity("camera_entity")
     camera_entity.create_entity(math.Vector3(512.0, 512.0, 34.0), ["Camera"])
-    general.idle_wait(0.5)
     depth_of_field = "DepthOfField"
     ComponentTests(
         depth_of_field,

AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py

@@ -26,20 +26,23 @@ TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "atom_hydra_scripts")
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 @pytest.mark.parametrize("level", ["auto_test"])
 class TestAtomEditorComponentsMain(object):
+    """Holds tests for Atom components."""
 
-    @pytest.mark.xfail(reason="Timing out sporadically, LYN-3956")
-    @pytest.mark.test_case_id(
-        "C32078130",  # Display Mapper
-        "C32078129",  # Light
-        "C32078131",  # Radius Weight Modifier
-        "C32078127",  # PostFX Layer
-        "C32078125",  # Physical Sky
-        "C32078115",  # Global Skylight (IBL)
-        "C32078121",  # Exposure Control
-        "C32078120",  # Directional Light
-        "C32078119",  # DepthOfField
-        "C32078118")  # Decal (Atom)
     def test_AtomEditorComponents_AddedToEntity(self, request, editor, level, workspace, project, launcher_platform):
+        """
+        Please review the hydra script run by this test for more specific test info.
+        Tests the following Atom components and verifies all "expected_lines" appear in Editor.log:
+        1. Display Mapper
+        2. Light
+        3. Radius Weight Modifier
+        4. PostFX Layer
+        5. Physical Sky
+        6. Global Skylight (IBL)
+        7. Exposure Control
+        8. Directional Light
+        9. DepthOfField
+        10. Decal (Atom)
+        """
         cfg_args = [level]
 
         expected_lines = [

AutomatedTesting/Gem/PythonTests/scripting/ScriptEvent_AddRemoveMethod_UpdatesInSC.py

@@ -0,0 +1,202 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+"""
+
+
+# fmt: off
+class Tests():
+    new_event_created = ("New Script Event created",             "New Script Event not created")
+    child_1_created   = ("Initial Child Event created",          "Initial Child Event not created")
+    child_2_created   = ("Second Child Event created",           "Second Child Event not created")
+    file_saved        = ("Script event file saved",              "Script event file did not save")
+    method_added      = ("Method added to scriptevent file",     "Method not added to scriptevent file")
+    method_removed    = ("Method removed from scriptevent file", "Method not removed from scriptevent file")
+# fmt: on
+
+
+def ScriptEvent_AddRemoveMethod_UpdatesInSC():
+    """
+    Summary:
+     Method can be added/removed to an existing .scriptevents file
+
+    Expected Behavior:
+     The Method is correctly added/removed to the asset, and Script Canvas nodes are updated accordingly.
+
+    Test Steps:
+     1) Open Asset Editor and Script Canvas windows
+     2) Initially create new Script Event file with one method
+     3) Verify if file is created and saved
+     4) Add a new child element
+     5) Update MethodNames and save file
+     6) Verify if the new node exist in SC (search in node palette)
+     7) Delete one method and save
+     8) Verify if the node is removed in SC
+     9) Close Asset Editor
+
+    Note:
+     - This test file must be called from the Open 3D Engine Editor command terminal
+     - Any passed and failed tests are written to the Editor.log file.
+            Parsing the file or running a log_monitor are required to observe the test results.
+
+    :return: None
+    """
+    import os
+    from utils import TestHelper as helper
+    import pyside_utils
+
+    # Open 3D Engine imports
+    import azlmbr.legacy.general as general
+    import azlmbr.editor as editor
+    import azlmbr.bus as bus
+
+    # Pyside imports
+    from PySide2 import QtWidgets, QtTest, QtCore
+
+    GENERAL_WAIT = 1.0  # seconds
+
+    FILE_PATH = os.path.join("AutomatedTesting", "TestAssets", "test_file.scriptevents")
+    METHOD_NAME = "test_method_name"
+
+    editor_window = pyside_utils.get_editor_main_window()
+    asset_editor = asset_editor_widget = container = menu_bar = None
+    sc = node_palette = tree = search_frame = search_box = None
+
+    def initialize_asset_editor_qt_objects():
+        nonlocal asset_editor, asset_editor_widget, container, menu_bar
+        asset_editor = editor_window.findChild(QtWidgets.QDockWidget, "Asset Editor")
+        asset_editor_widget = asset_editor.findChild(QtWidgets.QWidget, "AssetEditorWindowClass")
+        container = asset_editor_widget.findChild(QtWidgets.QWidget, "ContainerForRows")
+        menu_bar = asset_editor_widget.findChild(QtWidgets.QMenuBar)
+
+    def initialize_sc_qt_objects():
+        nonlocal sc, node_palette, tree, search_frame, search_box
+        sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+        if sc.findChild(QtWidgets.QDockWidget, "NodePalette") is None:
+            action = pyside_utils.find_child_by_pattern(sc, {"text": "Node Palette", "type": QtWidgets.QAction})
+            action.trigger()
+        node_palette = sc.findChild(QtWidgets.QDockWidget, "NodePalette")
+        tree = node_palette.findChild(QtWidgets.QTreeView, "treeView")
+        search_frame = node_palette.findChild(QtWidgets.QFrame, "searchFrame")
+        search_box = search_frame.findChild(QtWidgets.QLineEdit, "searchFilter")
+
+    def save_file():
+        editor.AssetEditorWidgetRequestsBus(bus.Broadcast, "SaveAssetAs", FILE_PATH)
+        action = pyside_utils.find_child_by_pattern(menu_bar, {"type": QtWidgets.QAction, "iconText": "Save"})
+        action.trigger()
+        # wait till file is saved, to validate that check the text of QLabel at the bottom of the AssetEditor,
+        # if there are no unsaved changes we will not have any * in the text
+        label = asset_editor.findChild(QtWidgets.QLabel, "textEdit")
+        return helper.wait_for_condition(lambda: "*" not in label.text(), 3.0)
+
+    def expand_container_rows(object_name):
+        children = container.findChildren(QtWidgets.QFrame, object_name)
+        for child in children:
+            check_box = child.findChild(QtWidgets.QCheckBox)
+            if check_box and not check_box.isChecked():
+                QtTest.QTest.mouseClick(check_box, QtCore.Qt.LeftButton, QtCore.Qt.NoModifier)
+
+    def node_palette_search(node_name):
+        search_box.setText(node_name)
+        helper.wait_for_condition(lambda: search_box.text() == node_name, 1.0)
+        # Try clicking ENTER in search box multiple times
+        for _ in range(10):
+            QtTest.QTest.keyClick(search_box, QtCore.Qt.Key_Enter, QtCore.Qt.NoModifier)
+            if pyside_utils.find_child_by_pattern(tree, {"text": node_name}) is not None:
+                break
+
+    # 1) Open Asset Editor
+    general.idle_enable(True)
+    # Initially close the Asset Editor and then reopen to ensure we don't have any existing assets open
+    general.close_pane("Asset Editor")
+    general.open_pane("Asset Editor")
+    helper.wait_for_condition(lambda: general.is_pane_visible("Asset Editor"), 5.0)
+
+    # 2) Initially create new Script Event file with one method
+    initialize_asset_editor_qt_objects()
+    action = pyside_utils.find_child_by_pattern(menu_bar, {"type": QtWidgets.QAction, "text": "Script Events"})
+    action.trigger()
+    result = helper.wait_for_condition(
+        lambda: container.findChild(QtWidgets.QFrame, "Events") is not None
+        and container.findChild(QtWidgets.QFrame, "Events").findChild(QtWidgets.QToolButton, "") is not None,
+        3 * GENERAL_WAIT,
+    )
+    Report.result(Tests.new_event_created, result)
+    # Add new method
+    add_event = container.findChild(QtWidgets.QFrame, "Events").findChild(QtWidgets.QToolButton, "")
+    add_event.click()
+    result = helper.wait_for_condition(
+        lambda: asset_editor_widget.findChild(QtWidgets.QFrame, "EventName") is not None, GENERAL_WAIT
+    )
+    Report.result(Tests.child_1_created, result)
+    editor.AssetEditorWidgetRequestsBus(bus.Broadcast, "SaveAssetAs", FILE_PATH)
+
+    # 3) Verify if file is created and saved
+    result = helper.wait_for_condition(lambda: os.path.exists(FILE_PATH), 3 * GENERAL_WAIT)
+    Report.result(Tests.file_saved, result and save_file())
+
+    # 4) Add a new child element
+    add_event = container.findChild(QtWidgets.QFrame, "Events").findChild(QtWidgets.QToolButton, "")
+    add_event.click()
+    result = helper.wait_for_condition(
+        lambda: len(asset_editor_widget.findChildren(QtWidgets.QFrame, "EventName")) == 2, 2 * GENERAL_WAIT
+    )
+    Report.result(Tests.child_2_created, result)
+
+    # 5) Update MethodNames and save file, (update all Method names to make it easier to search in SC later)
+    # Expand the EventName initially
+    expand_container_rows("EventName")
+    # Expand Name fields under it
+    expand_container_rows("Name")
+    count = 0  # 2 Method names will be updated Ex: test_method_name_0, test_method_name_1
+    container = asset_editor_widget.findChild(QtWidgets.QWidget, "ContainerForRows")
+    children = container.findChildren(QtWidgets.QFrame, "Name")
+    for child in children:
+        line_edit = child.findChild(QtWidgets.QLineEdit)
+        if line_edit and line_edit.text() == "MethodName":
+            line_edit.setText(f"{METHOD_NAME}_{count}")
+            count += 1
+    save_file()
+
+    # 6) Verify if the new node exist in SC (search in node palette)
+    general.open_pane("Script Canvas")
+    helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
+    initialize_sc_qt_objects()
+    node_palette_search(f"{METHOD_NAME}_1")
+    get_node_index = lambda: pyside_utils.find_child_by_pattern(tree, {"text": f"{METHOD_NAME}_1"}) is not None
+    result = helper.wait_for_condition(get_node_index, GENERAL_WAIT)
+    Report.result(Tests.method_added, result)
+
+    # 7) Delete one method and save
+    initialize_asset_editor_qt_objects()
+    for child in container.findChildren(QtWidgets.QFrame, "EventName"):
+        if child.findChild(QtWidgets.QToolButton, ""):
+            child.findChild(QtWidgets.QToolButton, "").click()
+            break
+    save_file()
+
+    # 8) Verify if the node is removed in SC (search in node palette)
+    initialize_sc_qt_objects()
+    node_palette_search(f"{METHOD_NAME}_0")
+    get_node_index = lambda: pyside_utils.find_child_by_pattern(tree, {"text": f"{METHOD_NAME}_0"}) is None
+    result = helper.wait_for_condition(get_node_index, GENERAL_WAIT)
+    Report.result(Tests.method_removed, result)
+
+    # 9) Close Asset Editor
+    general.close_pane("Asset Editor")
+    general.close_pane("Script Canvas")
+
+
+if __name__ == "__main__":
+    import ImportPathHelper as imports
+
+    imports.init()
+    from utils import Report
+
+    Report.start_test(ScriptEvent_AddRemoveMethod_UpdatesInSC)

AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py

@@ -278,6 +278,7 @@ class TestScriptCanvasTests(object):
             },
         ],
     )
+
     def test_Pane_PropertiesChanged_RetainsOnRestart(self, request, editor, config, project, launcher_platform):
         hydra.launch_and_validate_results(
             request,
@@ -289,3 +290,31 @@ class TestScriptCanvasTests(object):
             auto_test_mode=False,
             timeout=60,
         )
+
+    def test_ScriptEvent_AddRemoveMethod_UpdatesInSC(self, request, workspace, editor, launcher_platform):
+        def teardown():
+            file_system.delete(
+                [os.path.join(workspace.paths.project(), "TestAssets", "test_file.scriptevents")], True, True
+            )
+        request.addfinalizer(teardown)
+        file_system.delete(
+            [os.path.join(workspace.paths.project(), "TestAssets", "test_file.scriptevents")], True, True
+        )
+        expected_lines = [
+            "Success: New Script Event created",
+            "Success: Initial Child Event created",
+            "Success: Second Child Event created",
+            "Success: Script event file saved",
+            "Success: Method added to scriptevent file",
+            "Success: Method removed from scriptevent file",
+        ]
+        hydra.launch_and_validate_results(
+            request,
+            TEST_DIRECTORY,
+            editor,
+            "ScriptEvent_AddRemoveMethod_UpdatesInSC.py",
+            expected_lines,
+            auto_test_mode=False,
+            timeout=60,
+        )
+        

Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h

@@ -60,6 +60,7 @@ namespace AzFramework
         virtual void DrawTrianglesIndexed(const AZStd::vector<AZ::Vector3>& vertices, const AZStd::vector<AZ::u32>& indices, const AZ::Color& color) { (void)vertices; (void)indices, (void)color; }
         virtual void DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max) { (void)min; (void)max; }
         virtual void DrawSolidBox(const AZ::Vector3& min, const AZ::Vector3& max) { (void)min; (void)max; }
+        virtual void DrawWireOBB(const AZ::Vector3& center, const AZ::Vector3& axisX, const AZ::Vector3& axisY, const AZ::Vector3& axisZ, const AZ::Vector3& halfExtents) { (void)center; (void)axisX; (void)axisY; (void)axisZ; (void)halfExtents; }
         virtual void DrawSolidOBB(const AZ::Vector3& center, const AZ::Vector3& axisX, const AZ::Vector3& axisY, const AZ::Vector3& axisZ, const AZ::Vector3& halfExtents) { (void)center; (void)axisX; (void)axisY; (void)axisZ; (void)halfExtents; }
         virtual void DrawPoint(const AZ::Vector3& p, int nSize = 1) { (void)p; (void)nSize; }
         virtual void DrawLine(const AZ::Vector3& p1, const AZ::Vector3& p2) { (void)p1; (void)p2; }
@@ -70,18 +71,15 @@ namespace AzFramework
         virtual void DrawLine2d(const AZ::Vector2& p1, const AZ::Vector2& p2, float z) { (void)p1; (void)p2; (void)z; }
         virtual void DrawLine2dGradient(const AZ::Vector2& p1, const AZ::Vector2& p2, float z, const AZ::Vector4& firstColor, const AZ::Vector4& secondColor) { (void)p1; (void)p2; (void)z; (void)firstColor; (void)secondColor; }
         virtual void DrawWireCircle2d(const AZ::Vector2& center, float radius, float z) { (void)center; (void)radius; (void)z; }
-        virtual void DrawTerrainCircle(const AZ::Vector3& worldPos, float radius, float height) { (void)worldPos; (void)radius; (void)height; }
-        virtual void DrawTerrainCircle(const AZ::Vector3& center, float radius, float angle1, float angle2, float height) { (void)center; (void)radius; (void)angle1; (void)angle2; (void)height; }
         virtual void DrawArc(const AZ::Vector3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, int referenceAxis = 2) { (void)pos; (void)radius; (void)startAngleDegrees; (void)sweepAngleDegrees; (void)angularStepDegrees; (void)referenceAxis; }
         virtual void DrawArc(const AZ::Vector3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, const AZ::Vector3& fixedAxis) { (void)pos; (void)radius; (void)startAngleDegrees; (void)sweepAngleDegrees; (void)angularStepDegrees; (void)fixedAxis; }
         virtual void DrawCircle(const AZ::Vector3& pos, float radius, int nUnchangedAxis = 2 /*z axis*/) { (void)pos; (void)radius; (void)nUnchangedAxis; }
         virtual void DrawHalfDottedCircle(const AZ::Vector3& pos, float radius, const AZ::Vector3& viewPos, int nUnchangedAxis = 2 /*z axis*/) { (void)pos; (void)radius; (void)viewPos; (void)nUnchangedAxis; }
-        virtual void DrawCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height, bool drawShaded = true) { (void)pos; (void)dir; (void)radius; (void)height; (void)drawShaded; }
+        virtual void DrawWireCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height) { (void)pos; (void)dir; (void)radius; (void)height; }
+        virtual void DrawSolidCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height, bool drawShaded = true) { (void)pos; (void)dir; (void)radius; (void)height; (void)drawShaded; }
         virtual void DrawWireCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) { (void)center; (void)axis; (void)radius; (void)height; }
         virtual void DrawSolidCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height, bool drawShaded = true) { (void)center; (void)axis; (void)radius; (void)height; (void)drawShaded; }
         virtual void DrawWireCapsule(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float heightStraightSection) { (void)center; (void)axis; (void)radius; (void)heightStraightSection; }
-        virtual void DrawTerrainRect(float x1, float y1, float x2, float y2, float height) { (void)x1; (void)y1; (void)x2; (void)y2; (void)height; }
-        virtual void DrawTerrainLine(AZ::Vector3 worldPos1, AZ::Vector3 worldPos2) { (void)worldPos1; (void)worldPos2; }
         virtual void DrawWireSphere(const AZ::Vector3& pos, float radius) { (void)pos; (void)radius; }
         virtual void DrawWireSphere(const AZ::Vector3& pos, const AZ::Vector3 radius) { (void)pos; (void)radius; }
         virtual void DrawWireDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius) { (void)pos; (void)dir; (void)radius; }
@@ -91,11 +89,8 @@ namespace AzFramework
         virtual void DrawTextLabel(const AZ::Vector3& pos, float size, const char* text, const bool bCenter = false, int srcOffsetX = 0, int srcOffsetY = 0) { (void)pos; (void)size; (void)text; (void)bCenter; (void)srcOffsetX; (void)srcOffsetY; }
         virtual void Draw2dTextLabel(float x, float y, float size, const char* text, bool bCenter = false) { (void)x; (void)y; (void)size; (void)text; (void)bCenter; }
         virtual void DrawTextOn2DBox(const AZ::Vector3& pos, const char* text, float textScale, const AZ::Vector4& TextColor, const AZ::Vector4& TextBackColor) { (void)pos; (void)text; (void)textScale; (void)TextColor; (void)TextBackColor; }
-        virtual void DrawTextureLabel(ITexture* texture, const AZ::Vector3& pos, float sizeX, float sizeY, int texIconFlags) { (void)texture; (void)pos; (void)sizeX; (void)sizeY; (void)texIconFlags; }
-        virtual void DrawTextureLabel(int textureId, const AZ::Vector3& pos, float sizeX, float sizeY, int texIconFlags) { (void)textureId; (void)pos; (void)sizeX; (void)sizeY; (void)texIconFlags; }
         virtual void SetLineWidth(float width) { (void)width; }
         virtual bool IsVisible(const AZ::Aabb& bounds) { (void)bounds; return false; }
-        virtual int SetFillMode(int nFillMode) { (void)nFillMode; return 0; }
         virtual float GetLineWidth() { return 0.0f; }
         virtual float GetAspectRatio() { return 0.0f; }
         virtual void DepthTestOff() {}

Code/Framework/AzFramework/AzFramework/Visibility/OctreeSystemComponent.cpp

@@ -123,8 +123,9 @@ namespace AzFramework
         OctreeNode* insertCheck = this;
         while (insertCheck != nullptr)
         {
-            if (AZ::ShapeIntersection::Contains(insertCheck->m_bounds, boundingVolume))
+            if (AZ::ShapeIntersection::Contains(insertCheck->m_bounds, boundingVolume) || !insertCheck->m_parent)
             {
+                // Insert here if the entry is fully contained or if we've reached the root node
                 return insertCheck->Insert(octreeScene, entry);
             }
             insertCheck = insertCheck->m_parent;

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp

@@ -81,9 +81,20 @@ namespace AzToolsFramework
 
             m_ui->m_assetBrowserTreeViewWidget->SetName("AssetBrowserTreeView_" + name);
 
+            bool selectedAsset = false;
+
             for (auto& assetId : selection.GetSelectedAssetIds())
             {
-                m_ui->m_assetBrowserTreeViewWidget->SelectProduct(assetId);
+                if (assetId.IsValid())
+                {
+                    selectedAsset = true;
+                    m_ui->m_assetBrowserTreeViewWidget->SelectProduct(assetId);
+                }
+            }
+
+            if (!selectedAsset)
+            {
+                m_ui->m_assetBrowserTreeViewWidget->SelectFolder(selection.GetDefaultDirectory());
             }
 
             setWindowTitle(tr("Pick %1").arg(m_selection.GetTitle()));

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.cpp

@@ -93,6 +93,16 @@ namespace AzToolsFramework
             m_selectedAssetIds.push_back(selectedAssetId);
         }
 
+        void AssetSelectionModel::SetDefaultDirectory(AZStd::string_view defaultDirectory)
+        {
+            m_defaultDirectory = defaultDirectory;
+        }
+
+        AZStd::string_view AssetSelectionModel::GetDefaultDirectory() const
+        {
+            return m_defaultDirectory;
+        }
+
         AZStd::vector<const AssetBrowserEntry*>& AssetSelectionModel::GetResults()
         {
             return m_results;

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.h

@@ -47,6 +47,9 @@ namespace AzToolsFramework
             const AZStd::vector<AZ::Data::AssetId>& GetSelectedAssetIds() const;
             void SetSelectedAssetIds(const AZStd::vector<AZ::Data::AssetId>& selectedAssetIds);
             void SetSelectedAssetId(const AZ::Data::AssetId& selectedAssetId);
+
+            void SetDefaultDirectory(AZStd::string_view defaultDirectory);
+            AZStd::string_view GetDefaultDirectory() const;
             
             AZStd::vector<const AssetBrowserEntry*>& GetResults();
             const AssetBrowserEntry* GetResult();
@@ -72,6 +75,7 @@ namespace AzToolsFramework
             
             AZStd::vector<AZ::Data::AssetId> m_selectedAssetIds;
             AZStd::vector<const AssetBrowserEntry*> m_results;
+            AZStd::string m_defaultDirectory;
 
             QString m_title;
         };

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp

@@ -14,6 +14,7 @@
 #include <AzCore/Asset/AssetManagerBus.h>
 #include <AzCore/Math/Crc.h>
 #include <AzCore/std/containers/vector.h>
+#include <AzCore/StringFunc/StringFunc.h>
 
 #include <AzFramework/StringFunc/StringFunc.h>
 
@@ -270,7 +271,20 @@ namespace AzToolsFramework
             return false;
         }
 
-        bool AssetBrowserTreeView::SelectEntry(const QModelIndex& idxParent, const AZStd::vector<AZStd::string>& entries, const uint32_t entryPathIndex)
+        void AssetBrowserTreeView::SelectFolder(AZStd::string_view folderPath)
+        {
+            if (folderPath.size() == 0)
+            {
+                return;
+            }
+
+            AZStd::vector<AZStd::string> entries;
+            AZ::StringFunc::Tokenize(folderPath, entries, "/");
+
+            SelectEntry(QModelIndex(), entries, 0, true);
+        }
+
+        bool AssetBrowserTreeView::SelectEntry(const QModelIndex& idxParent, const AZStd::vector<AZStd::string>& entries, const uint32_t entryPathIndex, bool useDisplayName)
         {
             if (entries.empty())
             {
@@ -285,30 +299,43 @@ namespace AzToolsFramework
                 auto rowIdx = model()->index(idx, 0, idxParent);
                 auto rowEntry = GetEntryFromIndex<AssetBrowserEntry>(rowIdx);
 
-                // Check if this entry name matches the query
-                if (rowEntry && AzFramework::StringFunc::Equal(entry.c_str(), rowEntry->GetName().c_str(), true))
+                if (rowEntry)
                 {
-                    // Final entry found - set it as the selected element
-                    if (entryPathIndex == entries.size() - 1)
-                    {
-                        selectionModel()->clear();
-                        selectionModel()->select(rowIdx, QItemSelectionModel::Select);
-                        setCurrentIndex(rowIdx);
-                        return true;
-                    }
+                    // Check if this entry name matches the query
+                    AZStd::string_view compareName = useDisplayName ? (const char*)(rowEntry->GetDisplayName().toUtf8()) : rowEntry->GetName().c_str();
 
-                    // If this isn't the final entry, it needs to be a folder for the path to be valid (otherwise, early out)
-                    if (rowEntry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Folder)
+                    if (AzFramework::StringFunc::Equal(entry.c_str(), compareName, true))
                     {
-                        // Folder found - if the final entry is found, expand this folder so the final entry is viewable in the Asset Browser (otherwise, early out)
-                        if (SelectEntry(rowIdx, entries, entryPathIndex + 1))
+                        // Final entry found - set it as the selected element
+                        if (entryPathIndex == entries.size() - 1)
                         {
-                            expand(rowIdx);
+                            if (rowEntry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Folder)
+                            {
+                                // Expand the item itself if it is a folder
+                                expand(rowIdx);
+                            }
+
+                            selectionModel()->clear();
+                            selectionModel()->select(rowIdx, QItemSelectionModel::Select);
+                            setCurrentIndex(rowIdx);
+
                             return true;
                         }
+
+                        // If this isn't the final entry, it needs to be a folder for the path to be valid (otherwise, early out)
+                        if (rowEntry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Folder)
+                        {
+                            // Folder found - if the final entry is found, expand this folder so the final entry is viewable in the Asset
+                            // Browser (otherwise, early out)
+                            if (SelectEntry(rowIdx, entries, entryPathIndex + 1, useDisplayName))
+                            {
+                                expand(rowIdx);
+                                return true;
+                            }
+                        }
+
+                        return false;
                     }
-                    
-                    return false;
                 }
             }
 

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h

@@ -60,6 +60,8 @@ namespace AzToolsFramework
 
             AZStd::vector<AssetBrowserEntry*> GetSelectedAssets() const;
 
+            void SelectFolder(AZStd::string_view folderPath);
+
             //////////////////////////////////////////////////////////////////////////
             // AssetBrowserViewRequestBus
             void SelectProduct(AZ::Data::AssetId assetID) override;
@@ -67,6 +69,7 @@ namespace AzToolsFramework
             void ClearFilter() override;
 
             void Update() override;
+
             //////////////////////////////////////////////////////////////////////////
 
             //////////////////////////////////////////////////////////////////////////
@@ -105,7 +108,7 @@ namespace AzToolsFramework
             QString m_name;
 
             bool SelectProduct(const QModelIndex& idxParent, AZ::Data::AssetId assetID);
-            bool SelectEntry(const QModelIndex& idxParent, const AZStd::vector<AZStd::string>& entryPathTokens, const uint32_t entryPathIndex = 0);
+            bool SelectEntry(const QModelIndex& idxParent, const AZStd::vector<AZStd::string>& entryPathTokens, const uint32_t entryPathIndex = 0, bool useDisplayName = false);
 
             //! Grab one entry from the source thumbnail list and update it
             void UpdateSCThumbnails();

Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp

@@ -447,17 +447,14 @@ namespace AzToolsFramework
                 m_radius * viewScale);
 
         debugDisplay.SetColor(ViewColor(manipulatorState.m_mouseOver, m_color, m_mouseOverColor).GetAsVector4());
-
-        // show wireframe if the axis has been corrected/flipped
-        //   note: please see IRenderAuxGeom.h for the definition of e_FillModeWireframe and e_FillModeSolid.
-        //   it is not possible to include IRenderAuxGeom from here and we also don't want to introduce that dependency.
-        //   these legacy enums should be wrapped so set SetFillMode can be used in a type safe way, until then,
-        //   use the values directly until the API has been updated.
-        const AZ::u32 prevFillMode = debugDisplay.SetFillMode(
-            m_shouldCorrect ? /*e_FillModeWireframe =*/ 0x1 << 26 : /*e_FillModeSolid =*/ 0);
-
-        debugDisplay.DrawCone(coneBound.m_base, coneBound.m_axis, coneBound.m_radius, coneBound.m_height, false);
-        debugDisplay.SetFillMode(prevFillMode);
+        if (m_shouldCorrect)
+        {
+            debugDisplay.DrawWireCone(coneBound.m_base, coneBound.m_axis, coneBound.m_radius, coneBound.m_height);
+        }
+        else
+        {
+            debugDisplay.DrawSolidCone(coneBound.m_base, coneBound.m_axis, coneBound.m_radius, coneBound.m_height, false);
+        }
 
         RefreshBoundInternal(managerId, manipulatorId, coneBound);
     }

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/Model/AssetCompleterModel.cpp

@@ -140,8 +140,7 @@ namespace AzToolsFramework
                 ProductAssetBrowserEntry* productEntry = static_cast<ProductAssetBrowserEntry*>(childEntry);
                 AZStd::string assetName;
                 AzFramework::StringFunc::Path::GetFileName(productEntry->GetFullPath().c_str(), assetName);
-                m_assets.push_back({
-                    assetName, productEntry->GetFullPath(), productEntry->GetAssetId()
+                m_assets.push_back({ productEntry->GetName(), productEntry->GetFullPath(), productEntry->GetAssetId()
                 });
             }
 

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp

@@ -769,6 +769,14 @@ namespace AzToolsFramework
         // Request the AssetBrowser Dialog and set a type filter
         AssetSelectionModel selection = GetAssetSelectionModel();
         selection.SetSelectedAssetId(m_selectedAssetID);
+
+        AZStd::string defaultDirectory;
+        if (m_defaultDirectoryCallback)
+        {
+            m_defaultDirectoryCallback->Invoke(m_editNotifyTarget, defaultDirectory);
+            selection.SetDefaultDirectory(defaultDirectory);
+        }
+
         AssetBrowserComponentRequestBus::Broadcast(&AssetBrowserComponentRequests::PickAssets, selection, parentWidget());
         if (selection.IsValid())
         {
@@ -1080,6 +1088,11 @@ namespace AzToolsFramework
         m_editNotifyCallback = editNotifyCallback;
     }
 
+    void PropertyAssetCtrl::SetDefaultDirectoryCallback(DefaultDirectoryCallbackType* callback)
+    {
+        m_defaultDirectoryCallback = callback;
+    }
+
     void PropertyAssetCtrl::SetClearNotifyCallback(ClearCallbackType* clearNotifyCallback)
     {
         m_clearNotifyCallback = clearNotifyCallback;
@@ -1214,6 +1227,11 @@ namespace AzToolsFramework
                 GUI->SetTitle(title.c_str());
             }
         }
+        else if (attrib == AZ_CRC_CE("DefaultStartingDirectoryCallback"))
+        {
+            // This is assumed to be an Asset Browser path to a specific folder to be used as a default by the asset picker if provided
+            GUI->SetDefaultDirectoryCallback(azdynamic_cast<PropertyAssetCtrl::DefaultDirectoryCallbackType*>(attrValue->GetAttribute()));
+        }
         else if (attrib == AZ_CRC("EditCallback", 0xb74f2ee1))
         {
             PropertyAssetCtrl::EditCallbackType* func = azdynamic_cast<PropertyAssetCtrl::EditCallbackType*>(attrValue->GetAttribute());

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx

@@ -68,6 +68,7 @@ namespace AzToolsFramework
         // This is meant to be used with the "EditCallback" Attribute
         using EditCallbackType = AZ::Edit::AttributeFunction<void(const AZ::Data::AssetId&, const AZ::Data::AssetType&)>;
         using ClearCallbackType = AZ::Edit::AttributeFunction<void()>;
+        using DefaultDirectoryCallbackType = AZ::Edit::AttributeFunction<void(AZStd::string&)>;
 
         PropertyAssetCtrl(QWidget *pParent = NULL, QString optionalValidDragDropExtensions = QString());
         virtual ~PropertyAssetCtrl();
@@ -119,6 +120,7 @@ namespace AzToolsFramework
         EditCallbackType* m_editNotifyCallback = nullptr;
         ClearCallbackType* m_clearNotifyCallback = nullptr;
         QString m_optionalValidDragDropExtensions;
+        DefaultDirectoryCallbackType* m_defaultDirectoryCallback = nullptr;
 
         //! The number of characters after which the autocompleter dropdown will be shown.
         //  Prevents showing too many options.
@@ -196,6 +198,7 @@ namespace AzToolsFramework
         void SetEditNotifyTarget(void* editNotifyTarget);
         void SetEditNotifyCallback(EditCallbackType* editNotifyCallback); // This is meant to be used with the "EditCallback" Attribute
         void SetClearNotifyCallback(ClearCallbackType* clearNotifyCallback); // This is meant to be used with the "ClearNotify" Attribute
+        void SetDefaultDirectoryCallback(DefaultDirectoryCallbackType* callback); // This is meant to be used with the "DefaultStartingDirectoryCallback" Attribute
         void SetEditButtonEnabled(bool enabled);
         void SetEditButtonVisible(bool visible);
         void SetEditButtonIcon(const QIcon& icon);

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp

@@ -233,9 +233,9 @@ namespace AzToolsFramework
                 }();
 
                 debugDisplay.SetColor(iconHighlight);
-                debugDisplay.DrawTextureLabel(
-                    iconTextureId, entityPosition, iconSize, iconSize,
-                    /*DisplayContext::ETextureIconFlags::TEXICON_ON_TOP=*/ 0x0008);
+                // debugDisplay.DrawTextureLabel(
+                //     iconTextureId, entityPosition, iconSize, iconSize,
+                //     /*DisplayContext::ETextureIconFlags::TEXICON_ON_TOP=*/ 0x0008);
             }
         }
     }

Code/Framework/Tests/OctreeTests.cpp

@@ -14,6 +14,7 @@
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Console/Console.h>
 #include <AzCore/Name/NameDictionary.h>
+#include <AzCore/Console/IConsole.h>
 #include <AzFramework/Visibility/OctreeSystemComponent.h>
 #include <random>
 
@@ -94,6 +95,20 @@ namespace UnitTest
         AZ::Console* m_console;
     };
 
+    void ValidateEntryCountEqualsExpectedCount(const IVisibilityScene* visScene, uint32_t expectedEntryCount)
+    {
+        // InsertOrUpdateEntry assumes that updating an existing entry won't change the count
+        // so it doesn't modify the counter used by GetEntryCount.
+        // If an entry is removed from the octree as an unintended side effect of updating an existing entry,
+        // GetEntryCount can't be relied upon to report the actual entry count.
+        // So manually count the entries when using the entry count for validation.
+        uint32_t manualEntryCount = 0;
+        visScene->EnumerateNoCull([&manualEntryCount](const AzFramework::IVisibilityScene::NodeData& nodeData) { manualEntryCount += nodeData.m_entries.size(); });
+
+        EXPECT_EQ(manualEntryCount, expectedEntryCount);
+        EXPECT_EQ(visScene->GetEntryCount(), expectedEntryCount);
+    }
+
     TEST_F(OctreeTests, InsertDeleteSingleEntry)
     {
         AzFramework::VisibilityEntry visEntry;
@@ -102,11 +117,11 @@ namespace UnitTest
         m_octreeScene->InsertOrUpdateEntry(visEntry);
         EXPECT_TRUE(visEntry.m_internalNode != nullptr);
         EXPECT_TRUE(visEntry.m_internalNodeIndex == 0);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 1);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 1);
 
         m_octreeScene->RemoveEntry(visEntry);
         EXPECT_TRUE(visEntry.m_internalNode == nullptr);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 0);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 0);
 
         EXPECT_TRUE(true); //TEST
     }
@@ -121,34 +136,34 @@ namespace UnitTest
         m_octreeScene->InsertOrUpdateEntry(visEntry[0]);
         EXPECT_TRUE(visEntry[0].m_internalNode != nullptr);
         EXPECT_TRUE(visEntry[0].m_internalNodeIndex == 0);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 1);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 1);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1);
 
         m_octreeScene->InsertOrUpdateEntry(visEntry[1]); // This should force a split of the root node
         EXPECT_TRUE(visEntry[1].m_internalNode != nullptr);
         EXPECT_TRUE(visEntry[1].m_internalNodeIndex == 0);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 2);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 2);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1 + m_octreeScene->GetChildNodeCount());
 
         m_octreeScene->InsertOrUpdateEntry(visEntry[2]); // This should force a split of the roots +/+/+ child node
         EXPECT_TRUE(visEntry[2].m_internalNode != nullptr);
         EXPECT_TRUE(visEntry[2].m_internalNodeIndex == 0);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 3);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 3);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1 + (2 * m_octreeScene->GetChildNodeCount()));
 
         m_octreeScene->RemoveEntry(visEntry[2]);
         EXPECT_TRUE(visEntry[2].m_internalNode == nullptr);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 2);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 2);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1 + m_octreeScene->GetChildNodeCount());
 
         m_octreeScene->RemoveEntry(visEntry[1]);
         EXPECT_TRUE(visEntry[1].m_internalNode == nullptr);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 1);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 1);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1);
 
         m_octreeScene->RemoveEntry(visEntry[0]);
         EXPECT_TRUE(visEntry[0].m_internalNode == nullptr);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 0);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 0);
     }
 
     TEST_F(OctreeTests, UpdateSingleEntry)
@@ -159,19 +174,19 @@ namespace UnitTest
         m_octreeScene->InsertOrUpdateEntry(visEntry);
         EXPECT_TRUE(visEntry.m_internalNode != nullptr);
         EXPECT_TRUE(visEntry.m_internalNodeIndex == 0);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 1);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 1);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1);
 
         visEntry.m_boundingVolume = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-0.5f), AZ::Vector3(0.5f));
         m_octreeScene->InsertOrUpdateEntry(visEntry);
         EXPECT_TRUE(visEntry.m_internalNode != nullptr);
         EXPECT_TRUE(visEntry.m_internalNodeIndex == 0);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 1);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 1);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1);
 
         m_octreeScene->RemoveEntry(visEntry);
         EXPECT_TRUE(visEntry.m_internalNode == nullptr);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 0);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 0);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1);
     }
 
@@ -185,19 +200,19 @@ namespace UnitTest
         m_octreeScene->InsertOrUpdateEntry(visEntry[0]);
         EXPECT_TRUE(visEntry[0].m_internalNode != nullptr);
         EXPECT_TRUE(visEntry[0].m_internalNodeIndex == 0);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 1);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 1);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1);
 
         m_octreeScene->InsertOrUpdateEntry(visEntry[1]); // This should force a split of the root node
         EXPECT_TRUE(visEntry[1].m_internalNode != nullptr);
         EXPECT_TRUE(visEntry[1].m_internalNodeIndex == 0);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 2);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 2);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1 + m_octreeScene->GetChildNodeCount());
 
         m_octreeScene->InsertOrUpdateEntry(visEntry[2]); // This should force a split of the roots +/+/+ child node
         EXPECT_TRUE(visEntry[2].m_internalNode != nullptr);
         EXPECT_TRUE(visEntry[2].m_internalNodeIndex == 0);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 3);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 3);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1 + (2 * m_octreeScene->GetChildNodeCount()));
 
         visEntry[1].m_boundingVolume = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-0.9f), AZ::Vector3(-0.6f));
@@ -206,22 +221,22 @@ namespace UnitTest
         m_octreeScene->InsertOrUpdateEntry(visEntry[0]);
         m_octreeScene->InsertOrUpdateEntry(visEntry[1]);
         m_octreeScene->InsertOrUpdateEntry(visEntry[2]);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 3);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 3);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1 + (2 * m_octreeScene->GetChildNodeCount()));
 
         m_octreeScene->RemoveEntry(visEntry[2]);
         EXPECT_TRUE(visEntry[2].m_internalNode == nullptr);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 2);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 2);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1 + m_octreeScene->GetChildNodeCount());
 
         m_octreeScene->RemoveEntry(visEntry[1]);
         EXPECT_TRUE(visEntry[1].m_internalNode == nullptr);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 1);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 1);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1);
 
         m_octreeScene->RemoveEntry(visEntry[0]);
         EXPECT_TRUE(visEntry[0].m_internalNode == nullptr);
-        EXPECT_TRUE(m_octreeScene->GetEntryCount() == 0);
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, 0);
         EXPECT_TRUE(m_octreeScene->GetNodeCount() == 1);
     }
 
@@ -365,4 +380,48 @@ namespace UnitTest
         AZ::Frustum bound3 = AZ::Frustum(AZ::ViewFrustumAttributes(frustumTransform, 1.0f, 2.0f * atanf(0.5f), 2.6f, 2.9f));
         EnumerateMultipleEntriesHelper(m_octreeScene, bound1, bound2, bound3);
     }
+
+    TEST_F(OctreeTests, InsertOrUpdateEntry_OverFillRootNodeWithLargeEntries_EntriesAreNotLost)
+    {
+        // Validate that the octree works if you exceed the max entry count with large entries,
+        // which will overfill the root node since they can't be distributed to child nodes
+
+        // Get the max extents and entries-per-node for the octree
+        AZ::IConsole* console = AZ::Interface<AZ::IConsole>::Get();
+        EXPECT_TRUE(console);
+
+        float maxExtents = 0.0f;
+        AZ::GetValueResult getCvarResult = console->GetCvarValue("bg_octreeMaxWorldExtents", maxExtents);
+        EXPECT_EQ(getCvarResult, AZ::GetValueResult::Success);
+
+        uint32_t maxEntriesPerNode = 0;
+        getCvarResult = console->GetCvarValue("bg_octreeNodeMaxEntries", maxEntriesPerNode);
+        EXPECT_EQ(getCvarResult, AZ::GetValueResult::Success);
+
+        // Create root entries that would exceed the size of the root node
+        AZ::Aabb exceedMaxExtents = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-maxExtents - 1.0f), AZ::Vector3(maxExtents + 1.0f));
+        uint32_t exceedMaxEntriesPerNode = maxEntriesPerNode + 1;
+
+        AzFramework::VisibilityEntry visEntry;
+        visEntry.m_boundingVolume = exceedMaxExtents;
+        AZStd::vector<AzFramework::VisibilityEntry> visEntries(exceedMaxEntriesPerNode, visEntry);
+
+        // Insert them all into the scene
+        for (AzFramework::VisibilityEntry& entry : visEntries)
+        {
+            m_octreeScene->InsertOrUpdateEntry(entry);
+        }
+
+        // Expect all the entries to be in the scene
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, visEntries.size());
+
+        // Update them, without making any actual changes
+        for (AzFramework::VisibilityEntry& entry : visEntries)
+        {
+            m_octreeScene->InsertOrUpdateEntry(entry);
+        }
+
+        // Expect all the entries to be in the scene
+        ValidateEntryCountEqualsExpectedCount(m_octreeScene, visEntries.size());
+    }
 }

Code/Sandbox/Editor/CryEditDoc.cpp

@@ -58,13 +58,11 @@
 #include "LevelFileDialog.h"
 #include "StatObjBus.h"
 
-// LmbrCentral
-#include <ModernViewportCameraController.h>
 #include <Atom/RPI.Public/ViewportContext.h>
 #include <Atom/RPI.Public/ViewportContextBus.h>
-#include <LmbrCentral/Rendering/EditorLightComponentBus.h>              // for LmbrCentral::EditorLightComponentRequestBus
-
 
+// LmbrCentral
+#include <LmbrCentral/Rendering/EditorLightComponentBus.h> // for LmbrCentral::EditorLightComponentRequestBus
 
 //#define PROFILE_LOADING_WITH_VTUNE
 

Code/Sandbox/Editor/EditorViewportWidget.cpp

@@ -53,6 +53,7 @@
 
 // AtomToolsFramework
 #include <AtomToolsFramework/Viewport/RenderViewportWidget.h>
+#include <AtomToolsFramework/Viewport/ModularViewportCameraController.h>
 
 // CryCommon
 #include <CryCommon/HMDBus.h>
@@ -75,7 +76,6 @@
 #include "EditorPreferencesPageGeneral.h"
 #include "ViewportManipulatorController.h"
 #include "LegacyViewportCameraController.h"
-#include "ModernViewportCameraController.h"
 #include "EditorViewportSettings.h"
 
 #include "ViewPane.h"
@@ -1220,7 +1220,7 @@ void EditorViewportWidget::SetViewportId(int id)
     {
         AzFramework::ReloadCameraKeyBindings();
 
-        auto controller = AZStd::make_shared<SandboxEditor::ModernViewportCameraController>();
+        auto controller = AZStd::make_shared<AtomToolsFramework::ModularViewportCameraController>();
         controller->SetCameraListBuilderCallback([](AzFramework::Cameras& cameras)
         {
             auto firstPersonRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(AzFramework::CameraFreeLookButton);

Code/Sandbox/Editor/GotoPositionDlg.cpp

@@ -34,6 +34,7 @@ CGotoPositionDlg::CGotoPositionDlg(QWidget* pParent /*=NULL*/)
 {
     m_ui->setupUi(this);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    setFixedSize(size());
     OnInitDialog();
 
     auto doubleValueChanged = static_cast<void(QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged);
@@ -98,6 +99,9 @@ void CGotoPositionDlg::OnInitDialog()
     m_ui->m_dymSegX->setVisible(false);
     m_ui->m_dymSegY->setVisible(false);
 
+    // Ensure the goto button is highlighted correctly.
+    m_ui->pushButton->setDefault(true);
+
     OnUpdateNumbers();
 }
 

Code/Sandbox/Editor/GotoPositionDlg.ui

@@ -6,189 +6,210 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>358</width>
-    <height>198</height>
+    <width>290</width>
+    <height>180</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Go to Position</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" columnstretch="0,1,0,0,1,0,0,1">
-   <item row="6" column="0" colspan="2">
-    <widget class="QPushButton" name="pushButton">
-     <property name="text">
-      <string>Go To</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="3" colspan="2">
-    <widget class="QPushButton" name="pushButton_2">
-     <property name="text">
-      <string>Cancel</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="6" colspan="2">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="2">
-    <spacer name="horizontalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>22</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="5" column="1">
-    <widget class="QDoubleSpinBox" name="m_dymZ"/>
-   </item>
-   <item row="4" column="1">
-    <widget class="QDoubleSpinBox" name="m_dymY"/>
-   </item>
-   <item row="3" column="1">
-    <widget class="QDoubleSpinBox" name="m_dymX"/>
-   </item>
-   <item row="4" column="4">
-    <widget class="QDoubleSpinBox" name="m_dymAngleY"/>
-   </item>
-   <item row="3" column="4">
-    <widget class="QDoubleSpinBox" name="m_dymAngleX"/>
-   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="label_8">
-     <property name="text">
-      <string>Z:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="3">
-    <widget class="QLabel" name="label_7">
-     <property name="text">
-      <string>Y:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="8">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Enter position here:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>X:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="8">
-    <widget class="QLineEdit" name="m_posEdit">
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Position:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="3">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>X:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="6">
-    <widget class="QLabel" name="m_labelSegX">
-     <property name="text">
-      <string>X:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="4">
-    <widget class="QDoubleSpinBox" name="m_dymAngleZ"/>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_6">
-     <property name="text">
-      <string>Y:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="6">
-    <widget class="QLabel" name="m_labelSegY">
-     <property name="text">
-      <string>Y:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="3">
-    <widget class="QLabel" name="label_9">
-     <property name="text">
-      <string>Z:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="5">
-    <spacer name="horizontalSpacer_3">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>22</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="3" colspan="2">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Angles:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="6" colspan="2">
-    <widget class="QLabel" name="m_labelSeg">
-     <property name="text">
-      <string>Segments:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="7">
-    <widget class="QSpinBox" name="m_dymSegX"/>
-   </item>
-   <item row="4" column="7">
-    <widget class="QSpinBox" name="m_dymSegY"/>
-   </item>
-  </layout>
+   <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+       <layout class="QGridLayout" name="gridLayout" columnstretch="0,1,0,0,1,0,0,1">
+         <item row="5" column="6" colspan="2">
+           <spacer name="horizontalSpacer">
+             <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+               <size>
+                 <width>40</width>
+                 <height>20</height>
+               </size>
+             </property>
+           </spacer>
+         </item>
+         <item row="3" column="2">
+           <spacer name="horizontalSpacer_2">
+             <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+               <size>
+                 <width>22</width>
+                 <height>20</height>
+               </size>
+             </property>
+           </spacer>
+         </item>
+         <item row="5" column="1">
+           <widget class="QDoubleSpinBox" name="m_dymZ"/>
+         </item>
+         <item row="4" column="1">
+           <widget class="QDoubleSpinBox" name="m_dymY"/>
+         </item>
+         <item row="3" column="1">
+           <widget class="QDoubleSpinBox" name="m_dymX"/>
+         </item>
+         <item row="4" column="4">
+           <widget class="QDoubleSpinBox" name="m_dymAngleY"/>
+         </item>
+         <item row="3" column="4">
+           <widget class="QDoubleSpinBox" name="m_dymAngleX"/>
+         </item>
+         <item row="5" column="0">
+           <widget class="QLabel" name="label_8">
+             <property name="text">
+               <string>Z:</string>
+             </property>
+           </widget>
+         </item>
+         <item row="4" column="3">
+           <widget class="QLabel" name="label_7">
+             <property name="text">
+               <string>Y:</string>
+             </property>
+           </widget>
+         </item>
+         <item row="0" column="0" colspan="8">
+           <widget class="QLabel" name="label">
+             <property name="text">
+               <string>Enter position here:</string>
+             </property>
+           </widget>
+         </item>
+         <item row="3" column="0">
+           <widget class="QLabel" name="label_4">
+             <property name="text">
+               <string>X:</string>
+             </property>
+           </widget>
+         </item>
+         <item row="1" column="0" colspan="8">
+           <widget class="QLineEdit" name="m_posEdit">
+             <property name="alignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+             </property>
+           </widget>
+         </item>
+         <item row="2" column="0" colspan="2">
+           <widget class="QLabel" name="label_2">
+             <property name="text">
+               <string>Position:</string>
+             </property>
+           </widget>
+         </item>
+         <item row="3" column="3">
+           <widget class="QLabel" name="label_5">
+             <property name="text">
+               <string>X:</string>
+             </property>
+           </widget>
+         </item>
+         <item row="3" column="6">
+           <widget class="QLabel" name="m_labelSegX">
+             <property name="text">
+               <string>X:</string>
+             </property>
+           </widget>
+         </item>
+         <item row="5" column="4">
+           <widget class="QDoubleSpinBox" name="m_dymAngleZ"/>
+         </item>
+         <item row="4" column="0">
+           <widget class="QLabel" name="label_6">
+             <property name="text">
+               <string>Y:</string>
+             </property>
+           </widget>
+         </item>
+         <item row="4" column="6">
+           <widget class="QLabel" name="m_labelSegY">
+             <property name="text">
+               <string>Y:</string>
+             </property>
+           </widget>
+         </item>
+         <item row="5" column="3">
+           <widget class="QLabel" name="label_9">
+             <property name="text">
+               <string>Z:</string>
+             </property>
+           </widget>
+         </item>
+         <item row="3" column="5">
+           <spacer name="horizontalSpacer_3">
+             <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+               <size>
+                 <width>22</width>
+                 <height>20</height>
+               </size>
+             </property>
+           </spacer>
+         </item>
+         <item row="2" column="3" colspan="2">
+           <widget class="QLabel" name="label_3">
+             <property name="text">
+               <string>Angles:</string>
+             </property>
+           </widget>
+         </item>
+         <item row="2" column="6" colspan="2">
+           <widget class="QLabel" name="m_labelSeg">
+             <property name="text">
+               <string>Segments:</string>
+             </property>
+           </widget>
+         </item>
+         <item row="3" column="7">
+           <widget class="QSpinBox" name="m_dymSegX"/>
+         </item>
+         <item row="4" column="7">
+           <widget class="QSpinBox" name="m_dymSegY"/>
+         </item>
+       </layout>
+     </item>
+     <item>
+       <layout class="QHBoxLayout" name="buttonLayout">
+         <item>
+           <spacer name="horizontalSpacer_1">
+             <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+               <size>
+                 <width>0</width>
+                 <height>0</height>
+               </size>
+             </property>
+           </spacer>
+         </item>
+         <item>
+           <widget class="QPushButton" name="pushButton">
+             <property name="text">
+               <string>Go To</string>
+             </property>
+           </widget>
+         </item>
+         <item>
+           <widget class="QPushButton" name="pushButton_2">
+             <property name="text">
+               <string>Cancel</string>
+             </property>
+           </widget>
+         </item>
+       </layout>
+     </item>
+   </layout>
  </widget>
  <tabstops>
   <tabstop>m_posEdit</tabstop>

Code/Sandbox/Editor/editor_lib_files.cmake

@@ -823,9 +823,6 @@ set(FILES
     ViewportManipulatorController.h
     LegacyViewportCameraController.cpp
     LegacyViewportCameraController.h
-    ModernViewportCameraController.cpp
-    ModernViewportCameraController.h
-    ModernViewportCameraControllerRequestBus.h
     RenderViewport.cpp
     RenderViewport.h
     TopRendererWnd.cpp

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt

@@ -38,6 +38,7 @@ ly_add_target(
             Gem::LmbrCentral
             AZ::AtomCore
             Gem::Atom_RPI.Public
+            Gem::AtomToolsFramework.Static
 )
 
 ly_add_dependencies(Editor ComponentEntityEditorPlugin)

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp

@@ -66,8 +66,8 @@
 
 #include <Atom/RPI.Public/ViewportContext.h>
 #include <Atom/RPI.Public/ViewportContextBus.h>
+#include <AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h>
 
-#include <ModernViewportCameraControllerRequestBus.h>
 
 #include "Objects/ComponentEntityObject.h"
 #include "ISourceControl.h"
@@ -382,11 +382,6 @@ void SandboxIntegrationManager::Teardown()
 {
     AzToolsFramework::Layers::EditorLayerComponentNotificationBus::Handler::BusDisconnect();
     AzFramework::DisplayContextRequestBus::Handler::BusDisconnect();
-    if( m_debugDisplayBusImplementationActive)
-    {
-        AzFramework::DebugDisplayRequestBus::Handler::BusDisconnect();
-        m_debugDisplayBusImplementationActive = false;
-    }
     AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
     AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
     AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
@@ -1741,9 +1736,9 @@ void SandboxIntegrationManager::GoToEntitiesInViewports(const AzToolsFramework::
                 const AZ::Transform nextCameraTransform =
                     AZ::Transform::CreateLookAt(aabb.GetCenter() - (forward * distanceToTarget), aabb.GetCenter());
 
-                SandboxEditor::ModernViewportCameraControllerRequestBus::Event(
-                    viewportContext->GetId(), &SandboxEditor::ModernViewportCameraControllerRequestBus::Events::InterpolateToTransform,
-                    nextCameraTransform);
+                AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
+                    viewportContext->GetId(),
+                    &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform, nextCameraTransform);
             }
         }
     }
@@ -2041,678 +2036,6 @@ void SandboxIntegrationManager::BrowseForAssets(AssetSelectionModel& selection)
     AssetBrowserComponentRequestBus::Broadcast(&AssetBrowserComponentRequests::PickAssets, selection, GetMainWindow());
 }
 
-void SandboxIntegrationManager::SetColor(float r, float g, float b, float a)
-{
-    if (m_dc)
-    {
-        m_dc->SetColor(Vec3(r, g, b), a);
-    }
-}
-
-void SandboxIntegrationManager::SetColor(const AZ::Color& color)
-{
-    if (m_dc)
-    {
-        m_dc->SetColor(AZColorToLYColorF(color));
-    }
-}
-
-void SandboxIntegrationManager::SetColor(const AZ::Vector4& color)
-{
-    if (m_dc)
-    {
-        m_dc->SetColor(AZVec3ToLYVec3(color.GetAsVector3()), color.GetW());
-    }
-}
-
-void SandboxIntegrationManager::SetAlpha(float a)
-{
-    if (m_dc)
-    {
-        m_dc->SetAlpha(a);
-    }
-}
-
-void SandboxIntegrationManager::DrawQuad(const AZ::Vector3& p1, const AZ::Vector3& p2, const AZ::Vector3& p3, const AZ::Vector3& p4)
-{
-    if (m_dc)
-    {
-        m_dc->DrawQuad(
-            AZVec3ToLYVec3(p1),
-            AZVec3ToLYVec3(p2),
-            AZVec3ToLYVec3(p3),
-            AZVec3ToLYVec3(p4));
-    }
-}
-
-void SandboxIntegrationManager::DrawQuad(float width, float height)
-{
-    if (m_dc)
-    {
-        m_dc->DrawQuad(width, height);
-    }
-}
-
-void SandboxIntegrationManager::DrawWireQuad(const AZ::Vector3& p1, const AZ::Vector3& p2, const AZ::Vector3& p3, const AZ::Vector3& p4)
-{
-    if (m_dc)
-    {
-        m_dc->DrawWireQuad(
-            AZVec3ToLYVec3(p1),
-            AZVec3ToLYVec3(p2),
-            AZVec3ToLYVec3(p3),
-            AZVec3ToLYVec3(p4));
-    }
-}
-
-void SandboxIntegrationManager::DrawWireQuad(float width, float height)
-{
-    if (m_dc)
-    {
-        m_dc->DrawWireQuad(width, height);
-    }
-}
-
-void SandboxIntegrationManager::DrawQuadGradient(const AZ::Vector3& p1, const AZ::Vector3& p2, const AZ::Vector3& p3, const AZ::Vector3& p4, const AZ::Vector4& firstColor, const AZ::Vector4& secondColor)
-{
-    if (m_dc)
-    {
-        m_dc->DrawQuadGradient(
-            AZVec3ToLYVec3(p1),
-            AZVec3ToLYVec3(p2),
-            AZVec3ToLYVec3(p3),
-            AZVec3ToLYVec3(p4),
-            ColorF(AZVec3ToLYVec3(firstColor.GetAsVector3()), firstColor.GetW()),
-            ColorF(AZVec3ToLYVec3(secondColor.GetAsVector3()), secondColor.GetW()));
-    }
-}
-
-void SandboxIntegrationManager::DrawTri(const AZ::Vector3& p1, const AZ::Vector3& p2, const AZ::Vector3& p3)
-{
-    if (m_dc)
-    {
-        m_dc->DrawTri(
-            AZVec3ToLYVec3(p1),
-            AZVec3ToLYVec3(p2),
-            AZVec3ToLYVec3(p3));
-    }
-}
-
-void SandboxIntegrationManager::DrawTriangles(const AZStd::vector<AZ::Vector3>& vertices, const AZ::Color& color)
-{
-    if (m_dc)
-    {
-        // transform to world space
-        const auto vecTransform = [this](const AZ::Vector3& vec)
-        {
-            return m_dc->GetMatrix() * AZVec3ToLYVec3(vec);
-        };
-
-        AZStd::vector<Vec3> cryVertices;
-        cryVertices.reserve(vertices.size());
-        AZStd::transform(vertices.begin(), vertices.end(), AZStd::back_inserter(cryVertices), vecTransform);
-        m_dc->DrawTriangles(
-            cryVertices,
-            AZColorToLYColorF(color));
-    }
-}
-
-void SandboxIntegrationManager::DrawTrianglesIndexed(const AZStd::vector<AZ::Vector3>& vertices, const AZStd::vector<AZ::u32>& indices, const AZ::Color& color)
-{
-    if (m_dc)
-    {
-        // transform to world space
-        const auto vecTransform = [this](const AZ::Vector3& vec)
-        {
-            return m_dc->GetMatrix() * AZVec3ToLYVec3(vec);
-        };
-
-        AZStd::vector<Vec3> cryVertices;
-        cryVertices.reserve(vertices.size());
-        AZStd::transform(vertices.begin(), vertices.end(), AZStd::back_inserter(cryVertices), vecTransform);
-        m_dc->DrawTrianglesIndexed(
-            cryVertices,
-            indices,
-            AZColorToLYColorF(color));
-    }
-}
-
-void SandboxIntegrationManager::DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max)
-{
-    if (m_dc)
-    {
-        m_dc->DrawWireBox(
-            AZVec3ToLYVec3(min),
-            AZVec3ToLYVec3(max));
-    }
-}
-
-void SandboxIntegrationManager::DrawSolidBox(const AZ::Vector3& min, const AZ::Vector3& max)
-{
-    if (m_dc)
-    {
-        m_dc->DrawSolidBox(
-            AZVec3ToLYVec3(min),
-            AZVec3ToLYVec3(max));
-    }
-}
-
-void SandboxIntegrationManager::DrawSolidOBB(const AZ::Vector3& center, const AZ::Vector3& axisX, const AZ::Vector3& axisY, const AZ::Vector3& axisZ, const AZ::Vector3& halfExtents)
-{
-    if (m_dc)
-    {
-        m_dc->DrawSolidOBB(AZVec3ToLYVec3(center), AZVec3ToLYVec3(axisX), AZVec3ToLYVec3(axisY), AZVec3ToLYVec3(axisZ), AZVec3ToLYVec3(halfExtents));
-    }
-}
-
-void SandboxIntegrationManager::DrawPoint(const AZ::Vector3& p, int nSize)
-{
-    if (m_dc)
-    {
-        m_dc->DrawPoint(AZVec3ToLYVec3(p), nSize);
-    }
-}
-
-void SandboxIntegrationManager::DrawLine(const AZ::Vector3& p1, const AZ::Vector3& p2)
-{
-    if (m_dc)
-    {
-        m_dc->DrawLine(
-            AZVec3ToLYVec3(p1),
-            AZVec3ToLYVec3(p2));
-    }
-}
-
-void SandboxIntegrationManager::DrawLine(const AZ::Vector3& p1, const AZ::Vector3& p2, const AZ::Vector4& col1, const AZ::Vector4& col2)
-{
-    if (m_dc)
-    {
-        m_dc->DrawLine(
-            AZVec3ToLYVec3(p1),
-            AZVec3ToLYVec3(p2),
-            ColorF(AZVec3ToLYVec3(col1.GetAsVector3()), col1.GetW()),
-            ColorF(AZVec3ToLYVec3(col2.GetAsVector3()), col2.GetW()));
-    }
-}
-
-void SandboxIntegrationManager::DrawLines(const AZStd::vector<AZ::Vector3>& lines, const AZ::Color& color)
-{
-    if (m_dc)
-    {
-        // transform to world space
-        const auto vecTransform = [this](const AZ::Vector3& vec)
-        {
-            return m_dc->GetMatrix() * AZVec3ToLYVec3(vec);
-        };
-
-        AZStd::vector<Vec3> cryLines;
-        cryLines.reserve(cryLines.size());
-        AZStd::transform(lines.begin(), lines.end(), AZStd::back_inserter(cryLines), vecTransform);
-        m_dc->DrawLines(cryLines, AZColorToLYColorF(color));
-    }
-}
-
-void SandboxIntegrationManager::DrawPolyLine(const AZ::Vector3* pnts, int numPoints, bool cycled)
-{
-    if (m_dc)
-    {
-        Vec3* points = new Vec3[numPoints];
-        for (int i = 0; i < numPoints; ++i)
-        {
-            points[i] = AZVec3ToLYVec3(pnts[i]);
-        }
-
-        m_dc->DrawPolyLine(points, numPoints, cycled);
-
-        delete[] points;
-    }
-}
-
-void SandboxIntegrationManager::DrawWireQuad2d(const AZ::Vector2& p1, const AZ::Vector2& p2, float z)
-{
-    if (m_dc)
-    {
-        m_dc->DrawWireQuad2d(
-            QPoint(static_cast<int>(p1.GetX()), static_cast<int>(p1.GetY())),
-            QPoint(static_cast<int>(p2.GetX()), static_cast<int>(p2.GetY())),
-            z);
-    }
-}
-
-void SandboxIntegrationManager::DrawLine2d(const AZ::Vector2& p1, const AZ::Vector2& p2, float z)
-{
-    if (m_dc)
-    {
-        m_dc->DrawLine2d(
-            QPoint(static_cast<int>(p1.GetX()), static_cast<int>(p1.GetY())),
-            QPoint(static_cast<int>(p2.GetX()), static_cast<int>(p2.GetY())),
-            z);
-    }
-}
-
-void SandboxIntegrationManager::DrawLine2dGradient(const AZ::Vector2& p1, const AZ::Vector2& p2, float z, const AZ::Vector4& firstColor, const AZ::Vector4& secondColor)
-{
-    if (m_dc)
-    {
-        m_dc->DrawLine2dGradient(
-            QPoint(static_cast<int>(p1.GetX()), static_cast<int>(p1.GetY())),
-            QPoint(static_cast<int>(p2.GetX()), static_cast<int>(p2.GetY())),
-            z,
-            ColorF(AZVec3ToLYVec3(firstColor.GetAsVector3()), firstColor.GetW()),
-            ColorF(AZVec3ToLYVec3(secondColor.GetAsVector3()), secondColor.GetW()));
-    }
-}
-
-void SandboxIntegrationManager::DrawWireCircle2d(const AZ::Vector2& center, float radius, float z)
-{
-    if (m_dc)
-    {
-        m_dc->DrawWireCircle2d(
-            QPoint(static_cast<int>(center.GetX()), static_cast<int>(center.GetY())),
-            radius, z);
-    }
-}
-
-void SandboxIntegrationManager::DrawTerrainCircle(const AZ::Vector3& worldPos, float radius, float height)
-{
-    if (m_dc)
-    {
-        m_dc->DrawTerrainCircle(
-            AZVec3ToLYVec3(worldPos), radius, height);
-    }
-}
-
-void SandboxIntegrationManager::DrawTerrainCircle(const AZ::Vector3& center, float radius, float angle1, float angle2, float height)
-{
-    if (m_dc)
-    {
-        m_dc->DrawTerrainCircle(
-            AZVec3ToLYVec3(center), radius, angle1, angle2, height);
-    }
-}
-
-void SandboxIntegrationManager::DrawArc(const AZ::Vector3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, int referenceAxis)
-{
-    if (m_dc)
-    {
-        m_dc->DrawArc(
-            AZVec3ToLYVec3(pos),
-            radius,
-            startAngleDegrees,
-            sweepAngleDegrees,
-            angularStepDegrees,
-            referenceAxis);
-    }
-}
-
-void SandboxIntegrationManager::DrawArc(const AZ::Vector3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, const AZ::Vector3& fixedAxis)
-{
-    if (m_dc)
-    {
-        m_dc->DrawArc(
-            AZVec3ToLYVec3(pos),
-            radius,
-            startAngleDegrees,
-            sweepAngleDegrees,
-            angularStepDegrees,
-            AZVec3ToLYVec3(fixedAxis));
-    }
-}
-
-void SandboxIntegrationManager::DrawCircle(const AZ::Vector3& pos, float radius, int nUnchangedAxis)
-{
-    if (m_dc)
-    {
-        m_dc->DrawCircle(
-            AZVec3ToLYVec3(pos),
-            radius,
-            nUnchangedAxis);
-    }
-}
-
-void SandboxIntegrationManager::DrawHalfDottedCircle(const AZ::Vector3& pos, float radius, const AZ::Vector3& viewPos, int nUnchangedAxis)
-{
-    if (m_dc)
-    {
-        m_dc->DrawHalfDottedCircle(
-            AZVec3ToLYVec3(pos),
-            radius,
-            AZVec3ToLYVec3(viewPos),
-            nUnchangedAxis);
-    }
-}
-
-void SandboxIntegrationManager::DrawCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height, bool drawShaded)
-{
-    if (m_dc)
-    {
-        m_dc->DrawCone(
-            AZVec3ToLYVec3(pos),
-            AZVec3ToLYVec3(dir),
-            radius,
-            height,
-            drawShaded);
-    }
-}
-
-void SandboxIntegrationManager::DrawWireCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height)
-{
-    if (m_dc)
-    {
-        m_dc->DrawWireCylinder(
-            AZVec3ToLYVec3(center),
-            AZVec3ToLYVec3(axis),
-            radius,
-            height);
-    }
-}
-
-void SandboxIntegrationManager::DrawSolidCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height, bool drawShaded)
-{
-    if (m_dc)
-    {
-        m_dc->DrawSolidCylinder(
-            AZVec3ToLYVec3(center),
-            AZVec3ToLYVec3(axis),
-            radius,
-            height,
-            drawShaded);
-    }
-}
-
-void SandboxIntegrationManager::DrawWireCapsule(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height)
-{
-    if (m_dc)
-    {
-        m_dc->DrawWireCapsule(
-            AZVec3ToLYVec3(center),
-            AZVec3ToLYVec3(axis),
-            radius,
-            height);
-    }
-}
-
-void SandboxIntegrationManager::DrawTerrainRect(float x1, float y1, float x2, float y2, float height)
-{
-    if (m_dc)
-    {
-        m_dc->DrawTerrainRect(x1, y1, x2, y2, height);
-    }
-}
-
-void SandboxIntegrationManager::DrawTerrainLine(AZ::Vector3 worldPos1, AZ::Vector3 worldPos2)
-{
-    if (m_dc)
-    {
-        m_dc->DrawTerrainLine(
-            AZVec3ToLYVec3(worldPos1),
-            AZVec3ToLYVec3(worldPos2));
-    }
-}
-
-void SandboxIntegrationManager::DrawWireSphere(const AZ::Vector3& pos, float radius)
-{
-    if (m_dc)
-    {
-        m_dc->DrawWireSphere(AZVec3ToLYVec3(pos), radius);
-    }
-}
-
-void SandboxIntegrationManager::DrawWireSphere(const AZ::Vector3& pos, const AZ::Vector3 radius)
-{
-    if (m_dc)
-    {
-        m_dc->DrawWireSphere(
-            AZVec3ToLYVec3(pos),
-            AZVec3ToLYVec3(radius));
-    }
-}
-
-void SandboxIntegrationManager::DrawWireDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius)
-{
-    if (m_dc)
-    {
-        m_dc->DrawWireDisk(
-            AZVec3ToLYVec3(pos),
-            AZVec3ToLYVec3(dir),
-            radius);
-    }
-}
-
-void SandboxIntegrationManager::DrawBall(const AZ::Vector3& pos, float radius, bool drawShaded)
-{
-    if (m_dc)
-    {
-        m_dc->DrawBall(AZVec3ToLYVec3(pos), radius, drawShaded);
-    }
-}
-
-void SandboxIntegrationManager::DrawDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius)
-{
-    if (m_dc)
-    {
-        m_dc->DrawDisk(
-            AZVec3ToLYVec3(pos),
-            AZVec3ToLYVec3(dir),
-            radius);
-    }
-}
-
-void SandboxIntegrationManager::DrawArrow(const AZ::Vector3& src, const AZ::Vector3& trg, float fHeadScale, bool b2SidedArrow)
-{
-    if (m_dc)
-    {
-        m_dc->DrawArrow(
-            AZVec3ToLYVec3(src),
-            AZVec3ToLYVec3(trg),
-            fHeadScale,
-            b2SidedArrow);
-    }
-}
-
-void SandboxIntegrationManager::DrawTextLabel(const AZ::Vector3& pos, float size, const char* text, const bool bCenter, int srcOffsetX, int srcOffsetY)
-{
-    if (m_dc)
-    {
-        m_dc->DrawTextLabel(
-            AZVec3ToLYVec3(pos),
-            size,
-            text,
-            bCenter,
-            srcOffsetX,
-            srcOffsetY);
-    }
-}
-
-void SandboxIntegrationManager::Draw2dTextLabel(float x, float y, float size, const char* text, bool bCenter)
-{
-    if (m_dc)
-    {
-        m_dc->Draw2dTextLabel(x, y, size, text, bCenter);
-    }
-}
-
-void SandboxIntegrationManager::DrawTextureLabel(ITexture* texture, const AZ::Vector3& pos, float sizeX, float sizeY, int texIconFlags)
-{
-    if (m_dc)
-    {
-        if (texture)
-        {
-            float textureWidth = aznumeric_caster(texture->GetWidth());
-            float textureHeight = aznumeric_caster(texture->GetHeight());
-
-            // resize the label in proportion to the actual texture size
-            if (textureWidth > textureHeight)
-            {
-                sizeY = sizeX * (textureHeight / textureWidth);
-            }
-            else
-            {
-                sizeX = sizeY * (textureWidth / textureHeight);
-            }
-
-            m_dc->DrawTextureLabel(AZVec3ToLYVec3(pos), sizeX, sizeY, texture->GetTextureID(), texIconFlags);
-        }
-    }
-}
-
-void SandboxIntegrationManager::DrawTextureLabel(int textureId, const AZ::Vector3& pos, float sizeX, float sizeY, int texIconFlags)
-{
-    // ToDo: With Atom?
-    AZ_UNUSED(textureId);
-    AZ_UNUSED(pos);
-    AZ_UNUSED(sizeX);
-    AZ_UNUSED(sizeY);
-    AZ_UNUSED(texIconFlags);
-}
-
-void SandboxIntegrationManager::SetLineWidth(float width)
-{
-    if (m_dc)
-    {
-        m_dc->SetLineWidth(width);
-    }
-}
-
-bool SandboxIntegrationManager::IsVisible(const AZ::Aabb& bounds)
-{
-    if (m_dc)
-    {
-        const AABB aabb(
-            AZVec3ToLYVec3(bounds.GetMin()),
-            AZVec3ToLYVec3(bounds.GetMax()));
-
-        return m_dc->IsVisible(aabb);
-    }
-
-    return 0;
-}
-
-int SandboxIntegrationManager::SetFillMode(int nFillMode)
-{
-    if (m_dc)
-    {
-        return m_dc->SetFillMode(nFillMode);
-    }
-
-    return 0;
-}
-
-float SandboxIntegrationManager::GetLineWidth()
-{
-    if (m_dc)
-    {
-        return m_dc->GetLineWidth();
-    }
-
-    return 0.f;
-}
-
-float SandboxIntegrationManager::GetAspectRatio()
-{
-    if (m_dc && m_dc->GetView())
-    {
-        return m_dc->GetView()->GetAspectRatio();
-    }
-
-    return 0.f;
-}
-
-void SandboxIntegrationManager::DepthTestOff()
-{
-    if (m_dc)
-    {
-        m_dc->DepthTestOff();
-    }
-}
-
-void SandboxIntegrationManager::DepthTestOn()
-{
-    if (m_dc)
-    {
-        m_dc->DepthTestOn();
-    }
-}
-
-void SandboxIntegrationManager::DepthWriteOff()
-{
-    if (m_dc)
-    {
-        m_dc->DepthWriteOff();
-    }
-}
-
-void SandboxIntegrationManager::DepthWriteOn()
-{
-    if (m_dc)
-    {
-        m_dc->DepthWriteOn();
-    }
-}
-
-void SandboxIntegrationManager::CullOff()
-{
-    if (m_dc)
-    {
-        m_dc->CullOff();
-    }
-}
-
-void SandboxIntegrationManager::CullOn()
-{
-    if (m_dc)
-    {
-        m_dc->CullOn();
-    }
-}
-
-bool SandboxIntegrationManager::SetDrawInFrontMode(bool bOn)
-{
-    if (m_dc)
-    {
-        return m_dc->SetDrawInFrontMode(bOn);
-    }
-
-    return 0.f;
-}
-
-AZ::u32 SandboxIntegrationManager::GetState()
-{
-    if (m_dc)
-    {
-        return m_dc->GetState();
-    }
-
-    return 0;
-}
-
-AZ::u32 SandboxIntegrationManager::SetState(AZ::u32 state)
-{
-    if (m_dc)
-    {
-        return m_dc->SetState(state);
-    }
-
-    return 0;
-}
-
-void SandboxIntegrationManager::PushMatrix(const AZ::Transform& tm)
-{
-    if (m_dc)
-    {
-        const Matrix34 m = AZTransformToLYTransform(tm);
-        m_dc->PushMatrix(m);
-    }
-}
-
-void SandboxIntegrationManager::PopMatrix()
-{
-    if (m_dc)
-    {
-        m_dc->PopMatrix();
-    }
-}
-
 bool SandboxIntegrationManager::DisplayHelpersVisible()
 {
     return GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h

@@ -100,7 +100,6 @@ class SandboxIntegrationManager
     , private AzToolsFramework::EditorEvents::Bus::Handler
     , private AzToolsFramework::EditorWindowRequests::Bus::Handler
     , private AzFramework::AssetCatalogEventBus::Handler
-    , private AzFramework::DebugDisplayRequestBus::Handler
     , private AzFramework::DisplayContextRequestBus::Handler
     , private AzToolsFramework::EditorEntityContextNotificationBus::Handler
     , private AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler
@@ -202,70 +201,6 @@ private:
         const AzFramework::SliceInstantiationTicket& ticket) override;
     //////////////////////////////////////////////////////////////////////////
 
-    // AzToolsFramework::DebugDisplayRequestBus
-    void SetColor(float r, float g, float b, float a) override;
-    void SetColor(const AZ::Color& color) override;
-    void SetColor(const AZ::Vector4& color) override;
-    void SetAlpha(float a) override;
-    void DrawQuad(const AZ::Vector3& p1, const AZ::Vector3& p2, const AZ::Vector3& p3, const AZ::Vector3& p4) override;
-    void DrawQuad(float width, float height) override;
-    void DrawWireQuad(const AZ::Vector3& p1, const AZ::Vector3& p2, const AZ::Vector3& p3, const AZ::Vector3& p4) override;
-    void DrawWireQuad(float width, float height) override;
-    void DrawQuadGradient(const AZ::Vector3& p1, const AZ::Vector3& p2, const AZ::Vector3& p3, const AZ::Vector3& p4, const AZ::Vector4& firstColor, const AZ::Vector4& secondColor) override;
-    void DrawTri(const AZ::Vector3& p1, const AZ::Vector3& p2, const AZ::Vector3& p3) override;
-    void DrawTriangles(const AZStd::vector<AZ::Vector3>& vertices, const AZ::Color& color) override;
-    void DrawTrianglesIndexed(const AZStd::vector<AZ::Vector3>& vertices, const AZStd::vector<AZ::u32>& indices, const AZ::Color& color) override;
-    void DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max) override;
-    void DrawSolidBox(const AZ::Vector3& min, const AZ::Vector3& max) override;
-    void DrawSolidOBB(const AZ::Vector3& center, const AZ::Vector3& axisX, const AZ::Vector3& axisY, const AZ::Vector3& axisZ, const AZ::Vector3& halfExtents) override;
-    void DrawPoint(const AZ::Vector3& p, int nSize) override;
-    void DrawLine(const AZ::Vector3& p1, const AZ::Vector3& p2) override;
-    void DrawLine(const AZ::Vector3& p1, const AZ::Vector3& p2, const AZ::Vector4& col1, const AZ::Vector4& col2) override;
-    void DrawLines(const AZStd::vector<AZ::Vector3>& lines, const AZ::Color& color) override;
-    void DrawPolyLine(const AZ::Vector3* pnts, int numPoints, bool cycled) override;
-    void DrawWireQuad2d(const AZ::Vector2& p1, const AZ::Vector2& p2, float z) override;
-    void DrawLine2d(const AZ::Vector2& p1, const AZ::Vector2& p2, float z) override;
-    void DrawLine2dGradient(const AZ::Vector2& p1, const AZ::Vector2& p2, float z, const AZ::Vector4& firstColor, const AZ::Vector4& secondColor) override;
-    void DrawWireCircle2d(const AZ::Vector2& center, float radius, float z) override;
-    void DrawTerrainCircle(const AZ::Vector3& worldPos, float radius, float height) override;
-    void DrawTerrainCircle(const AZ::Vector3& center, float radius, float angle1, float angle2, float height) override;
-    void DrawArc(const AZ::Vector3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, int referenceAxis) override;
-    void DrawArc(const AZ::Vector3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, const AZ::Vector3& fixedAxis) override;
-    void DrawCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height, bool drawShaded = true) override;
-    void DrawCircle(const AZ::Vector3& pos, float radius, int nUnchangedAxis) override;
-    void DrawHalfDottedCircle(const AZ::Vector3& pos, float radius, const AZ::Vector3& viewPos, int nUnchangedAxis) override;
-    void DrawWireCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) override;
-    void DrawSolidCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height, bool drawShaded = true) override;
-    void DrawWireCapsule(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) override;
-    void DrawTerrainRect(float x1, float y1, float x2, float y2, float height) override;
-    void DrawTerrainLine(AZ::Vector3 worldPos1, AZ::Vector3 worldPos2) override;
-    void DrawWireSphere(const AZ::Vector3& pos, float radius) override;
-    void DrawWireSphere(const AZ::Vector3& pos, const AZ::Vector3 radius) override;
-    void DrawWireDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius) override;
-    void DrawBall(const AZ::Vector3& pos, float radius, bool drawShaded = true) override;
-    void DrawDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius) override;
-    void DrawArrow(const AZ::Vector3& src, const AZ::Vector3& trg, float fHeadScale, bool b2SidedArrow) override;
-    void DrawTextLabel(const AZ::Vector3& pos, float size, const char* text, const bool bCenter, int srcOffsetX, int scrOffsetY) override;
-    void Draw2dTextLabel(float x, float y, float size, const char* text, bool bCenter) override;
-    void DrawTextureLabel(ITexture* texture, const AZ::Vector3& pos, float sizeX, float sizeY, int texIconFlags) override;
-    void DrawTextureLabel(int textureId, const AZ::Vector3& pos, float sizeX, float sizeY, int texIconFlags) override;
-    void SetLineWidth(float width) override;
-    bool IsVisible(const AZ::Aabb& bounds) override;
-    int SetFillMode(int nFillMode) override;
-    float GetLineWidth() override;
-    float GetAspectRatio() override;
-    void DepthTestOff() override;
-    void DepthTestOn() override;
-    void DepthWriteOff() override;
-    void DepthWriteOn() override;
-    void CullOff() override;
-    void CullOn() override;
-    bool SetDrawInFrontMode(bool bOn) override;
-    AZ::u32 GetState() override;
-    AZ::u32 SetState(AZ::u32 state) override;
-    void PushMatrix(const AZ::Transform& tm) override;
-    void PopMatrix() override;
-
     // AzFramework::DisplayContextRequestBus (and @deprecated EntityDebugDisplayRequestBus)
     // AzFramework::DisplayContextRequestBus
     void SetDC(DisplayContext* dc) override;

Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.cpp

@@ -224,7 +224,7 @@ void RCcontrollerTest_Simple::SubmitJob()
 
 // This is a regresssion test to ensure the rccontroller can handle multiple jobs for the same file being completed before
 // the APM has a chance to send OnFinishedProcesssingJob events
-TEST_F(RCcontrollerTest_Simple, SameJobIsCompletedMultipleTimes_CompletesWithoutError)
+TEST_F(RCcontrollerTest_Simple, DISABLED_SameJobIsCompletedMultipleTimes_CompletesWithoutError)
 {
     using namespace AssetProcessor;
     

Code/Tools/ProjectManager/Resources/DefaultProjectImage.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f82f22df64b93d4bec91e56b60efa3d5ce2915ce388a2dc627f1ab720678e3d5
+size 334987

Code/Tools/ProjectManager/Resources/ProjectManager.qrc

@@ -11,6 +11,9 @@
         <file>iOS.svg</file>
         <file>Linux.svg</file>
         <file>macOS.svg</file>
+        <file>DefaultProjectImage.png</file>
+        <file>ArrowDownLine.svg</file>
+        <file>ArrowUpLine.svg</file>
         <file>Backgrounds/FirstTimeBackgroundImage.jpg</file>
     </qresource>
 </RCC>

Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp

@@ -10,7 +10,7 @@
  *
  */
 
-#include <ProjectSettingsCtrl.h>
+#include <CreateProjectCtrl.h>
 #include <ScreensCtrl.h>
 #include <PythonBindingsInterface.h>
 #include <NewProjectSettingsScreen.h>
@@ -22,7 +22,7 @@
 
 namespace O3DE::ProjectManager
 {
-    ProjectSettingsCtrl::ProjectSettingsCtrl(QWidget* parent)
+    CreateProjectCtrl::CreateProjectCtrl(QWidget* parent)
         : ScreenWidget(parent)
     {
         QVBoxLayout* vLayout = new QVBoxLayout();
@@ -34,11 +34,11 @@ namespace O3DE::ProjectManager
         QDialogButtonBox* backNextButtons = new QDialogButtonBox();
         vLayout->addWidget(backNextButtons);
 
-        m_backButton = backNextButtons->addButton("Back", QDialogButtonBox::RejectRole);
-        m_nextButton = backNextButtons->addButton("Next", QDialogButtonBox::ApplyRole);
+        m_backButton = backNextButtons->addButton(tr("Back"), QDialogButtonBox::RejectRole);
+        m_nextButton = backNextButtons->addButton(tr("Next"), QDialogButtonBox::ApplyRole);
 
-        connect(m_backButton, &QPushButton::pressed, this, &ProjectSettingsCtrl::HandleBackButton);
-        connect(m_nextButton, &QPushButton::pressed, this, &ProjectSettingsCtrl::HandleNextButton);
+        connect(m_backButton, &QPushButton::pressed, this, &CreateProjectCtrl::HandleBackButton);
+        connect(m_nextButton, &QPushButton::pressed, this, &CreateProjectCtrl::HandleNextButton);
 
         m_screensOrder =
         {
@@ -47,15 +47,16 @@ namespace O3DE::ProjectManager
         };
         m_screensCtrl->BuildScreens(m_screensOrder);
         m_screensCtrl->ForceChangeToScreen(ProjectManagerScreen::NewProjectSettings, false);
+
         UpdateNextButtonText();
     }
 
-    ProjectManagerScreen ProjectSettingsCtrl::GetScreenEnum()
+    ProjectManagerScreen CreateProjectCtrl::GetScreenEnum()
     {
-        return ProjectManagerScreen::NewProjectSettingsCore;
+        return ProjectManagerScreen::CreateProject;
     }
 
-    void ProjectSettingsCtrl::HandleBackButton()
+    void CreateProjectCtrl::HandleBackButton()
     {
         if (!m_screensCtrl->GotoPreviousScreen())
         {
@@ -66,7 +67,7 @@ namespace O3DE::ProjectManager
             UpdateNextButtonText();
         }
     }
-    void ProjectSettingsCtrl::HandleNextButton()
+    void CreateProjectCtrl::HandleNextButton()
     {
         ScreenWidget* currentScreen = m_screensCtrl->GetCurrentScreen();
         ProjectManagerScreen screenEnum = currentScreen->GetScreenEnum();
@@ -116,9 +117,14 @@ namespace O3DE::ProjectManager
         }
     }
 
-    void ProjectSettingsCtrl::UpdateNextButtonText()
+    void CreateProjectCtrl::UpdateNextButtonText()
     {
-        m_nextButton->setText(m_screensCtrl->GetCurrentScreen()->GetNextButtonText());
+        QString nextButtonText = tr("Next");
+        if (m_screensCtrl->GetCurrentScreen()->GetScreenEnum() == ProjectManagerScreen::GemCatalog)
+        {
+            nextButtonText = tr("Create Project");
+        }
+        m_nextButton->setText(nextButtonText);
     }
 
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/CreateProjectCtrl.h

@@ -21,12 +21,12 @@
 
 namespace O3DE::ProjectManager
 {
-    class ProjectSettingsCtrl
+    class CreateProjectCtrl
         : public ScreenWidget
     {
     public:
-        explicit ProjectSettingsCtrl(QWidget* parent = nullptr);
-        ~ProjectSettingsCtrl() = default;
+        explicit CreateProjectCtrl(QWidget* parent = nullptr);
+        ~CreateProjectCtrl() = default;
         ProjectManagerScreen GetScreenEnum() override;
 
     protected slots:

Code/Tools/ProjectManager/Source/FirstTimeUseScreen.cpp

@@ -21,13 +21,6 @@
 
 namespace O3DE::ProjectManager
 {
-    inline constexpr static int s_contentMargins = 80;
-    inline constexpr static int s_buttonSpacing = 30;
-    inline constexpr static int s_iconSize = 24;
-    inline constexpr static int s_spacerSize = 20;
-    inline constexpr static int s_boxButtonWidth = 210;
-    inline constexpr static int s_boxButtonHeight = 280;
-
     FirstTimeUseScreen::FirstTimeUseScreen(QWidget* parent)
         : ScreenWidget(parent)
     {
@@ -79,8 +72,8 @@ namespace O3DE::ProjectManager
 
     void FirstTimeUseScreen::HandleNewProjectButton()
     {
-        emit ResetScreenRequest(ProjectManagerScreen::NewProjectSettingsCore);
-        emit ChangeScreenRequest(ProjectManagerScreen::NewProjectSettingsCore);
+        emit ResetScreenRequest(ProjectManagerScreen::CreateProject);
+        emit ChangeScreenRequest(ProjectManagerScreen::CreateProject);
     }
     void FirstTimeUseScreen::HandleAddProjectButton()
     {

Code/Tools/ProjectManager/Source/FirstTimeUseScreen.h

@@ -37,6 +37,13 @@ namespace O3DE::ProjectManager
 
         QPushButton* m_createProjectButton;
         QPushButton* m_addProjectButton;
+
+        inline constexpr static int s_contentMargins = 80;
+        inline constexpr static int s_buttonSpacing = 30;
+        inline constexpr static int s_iconSize = 24;
+        inline constexpr static int s_spacerSize = 20;
+        inline constexpr static int s_boxButtonWidth = 210;
+        inline constexpr static int s_boxButtonHeight = 280;
     };
 
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp

@@ -12,6 +12,8 @@
 
 #include <GemCatalog/GemCatalogScreen.h>
 #include <PythonBindingsInterface.h>
+#include <GemCatalog/GemSortFilterProxyModel.h>
+#include <GemCatalog/GemFilterWidget.h>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QPushButton>
@@ -25,15 +27,18 @@ namespace O3DE::ProjectManager
         : ScreenWidget(parent)
     {
         m_gemModel = new GemModel(this);
+        GemSortFilterProxyModel* proxyModel = new GemSortFilterProxyModel(m_gemModel, this);
 
         QVBoxLayout* vLayout = new QVBoxLayout();
         vLayout->setMargin(0);
+        vLayout->setSpacing(0);
         setLayout(vLayout);
 
         QHBoxLayout* hLayout = new QHBoxLayout();
+        hLayout->setMargin(0);
         vLayout->addLayout(hLayout);
 
-        m_gemListView = new GemListView(m_gemModel, this);
+        m_gemListView = new GemListView(proxyModel, proxyModel->GetSelectionModel(), this);
         m_gemInspector = new GemInspector(m_gemModel, this);
         m_gemInspector->setFixedWidth(320);
 
@@ -56,8 +61,19 @@ namespace O3DE::ProjectManager
         }
 #endif
 
-        hLayout->addWidget(m_gemListView);
+        GemFilterWidget* filterWidget = new GemFilterWidget(proxyModel);
+        filterWidget->setFixedWidth(250);
+
+        QVBoxLayout* middleVLayout = new QVBoxLayout();
+        middleVLayout->setMargin(0);
+        middleVLayout->setSpacing(0);
+        middleVLayout->addWidget(m_gemListView);
+
+        hLayout->addWidget(filterWidget);
+        hLayout->addLayout(middleVLayout);
         hLayout->addWidget(m_gemInspector);
+
+        proxyModel->InvalidateFilter();
     }
 
     QVector<GemInfo> GemCatalogScreen::GenerateTestData()
@@ -73,10 +89,12 @@ namespace O3DE::ProjectManager
         gem.m_documentationLink = "http://www.amazon.com";
         gem.m_dependingGemUuids = QStringList({"EMotionFX", "Atom"});
         gem.m_conflictingGemUuids = QStringList({"Vegetation", "Camera", "ScriptCanvas", "CloudCanvas", "Networking"});
+        gem.m_types = (GemInfo::Code | GemInfo::Asset);
         gem.m_version = "v1.01";
         gem.m_lastUpdatedDate = "24th April 2021";
         gem.m_binarySizeInKB = 40;
         gem.m_features = QStringList({"Animation", "Assets", "Physics"});
+        gem.m_gemOrigin = GemInfo::O3DEFoundation;
         result.push_back(gem);
 
         gem.m_name = "Atom";
@@ -152,9 +170,4 @@ namespace O3DE::ProjectManager
     {
         return ProjectManagerScreen::GemCatalog;
     }
-
-    QString GemCatalogScreen::GetNextButtonText()
-    {
-        return "Create Project";
-    }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h

@@ -9,6 +9,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *
  */
+
 #pragma once
 
 #if !defined(Q_MOC_RUN)
@@ -27,7 +28,6 @@ namespace O3DE::ProjectManager
         explicit GemCatalogScreen(QWidget* parent = nullptr);
         ~GemCatalogScreen() = default;
         ProjectManagerScreen GetScreenEnum() override;
-        QString GetNextButtonText() override;
 
     private:
         QVector<GemInfo> GenerateTestData();

Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp

@@ -0,0 +1,412 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <GemCatalog/GemFilterWidget.h>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QLabel>
+#include <QMap>
+#include <QLineEdit>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QPushButton>
+
+namespace O3DE::ProjectManager
+{
+    FilterCategoryWidget::FilterCategoryWidget(const QString& header,
+        const QVector<QString>& elementNames,
+        const QVector<int>& elementCounts,
+        bool showAllLessButton,
+        int defaultShowCount,
+        QWidget* parent)
+        : QWidget(parent)
+        , m_defaultShowCount(defaultShowCount)
+    {
+        AZ_Assert(elementNames.size() == elementCounts.size(), "Number of element names needs to match the counts.");
+
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        setLayout(vLayout);
+
+        // Collapse button
+        QHBoxLayout* collapseLayout = new QHBoxLayout();
+        m_collapseButton = new QPushButton();
+        m_collapseButton->setCheckable(true);
+        m_collapseButton->setFlat(true);
+        m_collapseButton->setFocusPolicy(Qt::NoFocus);
+        m_collapseButton->setFixedWidth(s_collapseButtonSize);
+        m_collapseButton->setStyleSheet("border: 0px; border-radius: 0px;");
+        connect(m_collapseButton, &QPushButton::clicked, this, [=]()
+            {
+                UpdateCollapseState();
+            });
+        collapseLayout->addWidget(m_collapseButton);
+
+        // Category title
+        QLabel* headerLabel = new QLabel(header);
+        headerLabel->setStyleSheet("font-size: 11pt;");
+        collapseLayout->addWidget(headerLabel);
+        vLayout->addLayout(collapseLayout);
+
+        vLayout->addSpacing(5);
+
+        // Everything in the main widget will be collapsed/uncollapsed
+        {
+            m_mainWidget = new QWidget();
+            vLayout->addWidget(m_mainWidget);
+
+            QVBoxLayout* mainLayout = new QVBoxLayout();
+            mainLayout->setMargin(0);
+            mainLayout->setAlignment(Qt::AlignTop);
+            m_mainWidget->setLayout(mainLayout);
+
+            // Elements
+            m_buttonGroup = new QButtonGroup();
+            m_buttonGroup->setExclusive(false);
+            for (int i = 0; i < elementNames.size(); ++i)
+            {
+                QWidget* elementWidget = new QWidget();
+                QHBoxLayout* elementLayout = new QHBoxLayout();
+                elementLayout->setMargin(0);
+                elementWidget->setLayout(elementLayout);
+
+                QCheckBox* checkbox = new QCheckBox(elementNames[i]);
+                checkbox->setStyleSheet("font-size: 11pt;");
+                m_buttonGroup->addButton(checkbox);
+                elementLayout->addWidget(checkbox);
+
+                elementLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
+
+                QLabel* countLabel = new QLabel(QString::number(elementCounts[i]));
+                countLabel->setStyleSheet("font-size: 11pt; background-color: #333333; border-radius: 3px; color: #94D2FF;");
+                elementLayout->addWidget(countLabel);
+
+                m_elementWidgets.push_back(elementWidget);
+                mainLayout->addWidget(elementWidget);
+            }
+
+            // See more / less
+            if (showAllLessButton)
+            {
+                m_seeAllLessLabel = new LinkLabel();
+                connect(m_seeAllLessLabel, &LinkLabel::clicked, this, [=]()
+                    {
+                        m_seeAll = !m_seeAll;
+                        UpdateSeeMoreLess();
+                    });
+                mainLayout->addWidget(m_seeAllLessLabel);
+            }
+            else
+            {
+                mainLayout->addSpacing(5);
+            }
+        }
+
+        // Separating line
+        QFrame* hLine = new QFrame();
+        hLine->setFrameShape(QFrame::HLine);
+        hLine->setStyleSheet("color: #666666;");
+        vLayout->addWidget(hLine);
+
+        UpdateCollapseState();
+        UpdateSeeMoreLess();
+    }
+
+    void FilterCategoryWidget::UpdateCollapseState()
+    {
+        if (m_collapseButton->isChecked())
+        {
+            m_collapseButton->setIcon(QIcon(":/Resources/ArrowDownLine.svg"));
+            m_mainWidget->hide();
+        }
+        else
+        {
+            m_collapseButton->setIcon(QIcon(":/Resources/ArrowUpLine.svg"));
+            m_mainWidget->show();
+        }
+    }
+
+    void FilterCategoryWidget::UpdateSeeMoreLess()
+    {
+        if (!m_seeAllLessLabel)
+        {
+            return;
+        }
+
+        if (m_elementWidgets.isEmpty())
+        {
+            m_seeAllLessLabel->hide();
+            return;
+        }
+        else
+        {
+            m_seeAllLessLabel->show();
+        }
+
+        if (!m_seeAll)
+        {
+            m_seeAllLessLabel->setText("See all");
+        }
+        else
+        {
+            m_seeAllLessLabel->setText("See less");
+        }
+
+        int showCount = m_seeAll ? m_elementWidgets.size() : m_defaultShowCount;
+        showCount = AZ::GetMin(showCount, m_elementWidgets.size());
+        for (int i = 0; i < showCount; ++i)
+        {
+            m_elementWidgets[i]->show();
+        }
+        for (int i = showCount; i < m_elementWidgets.size(); ++i)
+        {
+            m_elementWidgets[i]->hide();
+        }
+    }
+
+    QButtonGroup* FilterCategoryWidget::GetButtonGroup()
+    {
+        return m_buttonGroup;
+    }
+
+    GemFilterWidget::GemFilterWidget(GemSortFilterProxyModel* filterProxyModel, QWidget* parent)
+        : QScrollArea(parent)
+        , m_filterProxyModel(filterProxyModel)
+    {
+        m_gemModel = m_filterProxyModel->GetSourceModel();
+
+        setWidgetResizable(true);
+        setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+
+        QWidget* mainWidget = new QWidget();
+        setWidget(mainWidget);
+
+        m_mainLayout = new QVBoxLayout();
+        m_mainLayout->setAlignment(Qt::AlignTop);
+        mainWidget->setLayout(m_mainLayout);
+
+        QLabel* filterByLabel = new QLabel("Filter by");
+        filterByLabel->setStyleSheet("font-size: 15pt;");
+        m_mainLayout->addWidget(filterByLabel);
+
+        AddGemOriginFilter();
+        AddTypeFilter();
+        AddPlatformFilter();
+        AddFeatureFilter();
+    }
+
+    void GemFilterWidget::AddGemOriginFilter()
+    {
+        QVector<QString> elementNames;
+        QVector<int> elementCounts;
+        const int numGems = m_gemModel->rowCount();
+        for (int originIndex = 0; originIndex < GemInfo::NumGemOrigins; ++originIndex)
+        {
+            const GemInfo::GemOrigin gemOriginToBeCounted = static_cast<GemInfo::GemOrigin>(1 << originIndex);
+
+            int gemOriginCount = 0;
+            for (int gemIndex = 0; gemIndex < numGems; ++gemIndex)
+            {
+                const GemInfo::GemOrigin gemOrigin = m_gemModel->GetGemOrigin(m_gemModel->index(gemIndex, 0));
+
+                // Is the gem of the given origin?
+                if (gemOriginToBeCounted == gemOrigin)
+                {
+                    gemOriginCount++;
+                }
+            }
+
+            elementNames.push_back(GemInfo::GetGemOriginString(gemOriginToBeCounted));
+            elementCounts.push_back(gemOriginCount);
+        }
+
+        FilterCategoryWidget* filterWidget = new FilterCategoryWidget("Provider", elementNames, elementCounts, /*showAllLessButton=*/false);
+        m_mainLayout->addWidget(filterWidget);
+
+        const QList<QAbstractButton*> buttons = filterWidget->GetButtonGroup()->buttons();
+        for (int i = 0; i < buttons.size(); ++i)
+        {
+            const GemInfo::GemOrigin gemOrigin = static_cast<GemInfo::GemOrigin>(1 << i);
+            QAbstractButton* button = buttons[i];
+
+            connect(button, &QAbstractButton::toggled, this, [=](bool checked)
+                {
+                    GemInfo::GemOrigins gemOrigins = m_filterProxyModel->GetGemOrigins();
+                    if (checked)
+                    {
+                        gemOrigins |= gemOrigin;
+                    }
+                    else
+                    {
+                        gemOrigins &= ~gemOrigin;
+                    }
+                    m_filterProxyModel->SetGemOrigins(gemOrigins);
+                });
+        }
+    }
+
+    void GemFilterWidget::AddTypeFilter()
+    {
+        QVector<QString> elementNames;
+        QVector<int> elementCounts;
+        const int numGems = m_gemModel->rowCount();
+        for (int typeIndex = 0; typeIndex < GemInfo::NumTypes; ++typeIndex)
+        {
+            const GemInfo::Type type = static_cast<GemInfo::Type>(1 << typeIndex);
+
+            int typeGemCount = 0;
+            for (int gemIndex = 0; gemIndex < numGems; ++gemIndex)
+            {
+                const GemInfo::Types types = m_gemModel->GetTypes(m_gemModel->index(gemIndex, 0));
+
+                // Is type (Asset, Code, Tool) part of the gem?
+                if (types & type)
+                {
+                    typeGemCount++;
+                }
+            }
+
+            elementNames.push_back(GemInfo::GetTypeString(type));
+            elementCounts.push_back(typeGemCount);
+        }
+
+        FilterCategoryWidget* filterWidget = new FilterCategoryWidget("Type", elementNames, elementCounts, /*showAllLessButton=*/false);
+        m_mainLayout->addWidget(filterWidget);
+
+        const QList<QAbstractButton*> buttons = filterWidget->GetButtonGroup()->buttons();
+        for (int i = 0; i < buttons.size(); ++i)
+        {
+            const GemInfo::Type type = static_cast<GemInfo::Type>(1 << i);
+            QAbstractButton* button = buttons[i];
+
+            connect(button, &QAbstractButton::toggled, this, [=](bool checked)
+                {
+                    GemInfo::Types types = m_filterProxyModel->GetTypes();
+                    if (checked)
+                    {
+                        types |= type;
+                    }
+                    else
+                    {
+                        types &= ~type;
+                    }
+                    m_filterProxyModel->SetTypes(types);
+                });
+        }
+    }
+
+    void GemFilterWidget::AddPlatformFilter()
+    {
+        QVector<QString> elementNames;
+        QVector<int> elementCounts;
+        const int numGems = m_gemModel->rowCount();
+        for (int platformIndex = 0; platformIndex < GemInfo::NumPlatforms; ++platformIndex)
+        {
+            const GemInfo::Platform platform = static_cast<GemInfo::Platform>(1 << platformIndex);
+
+            int platformGemCount = 0;
+            for (int gemIndex = 0; gemIndex < numGems; ++gemIndex)
+            {
+                const GemInfo::Platforms platforms = m_gemModel->GetPlatforms(m_gemModel->index(gemIndex, 0));
+
+                // Is platform supported?
+                if (platforms & platform)
+                {
+                    platformGemCount++;
+                }
+            }
+
+            elementNames.push_back(GemInfo::GetPlatformString(platform));
+            elementCounts.push_back(platformGemCount);
+        }
+
+        FilterCategoryWidget* filterWidget = new FilterCategoryWidget("Supported Platforms", elementNames, elementCounts, /*showAllLessButton=*/false);
+        m_mainLayout->addWidget(filterWidget);
+
+        const QList<QAbstractButton*> buttons = filterWidget->GetButtonGroup()->buttons();
+        for (int i = 0; i < buttons.size(); ++i)
+        {
+            const GemInfo::Platform platform = static_cast<GemInfo::Platform>(1 << i);
+            QAbstractButton* button = buttons[i];
+
+            connect(button, &QAbstractButton::toggled, this, [=](bool checked)
+                {
+                    GemInfo::Platforms platforms = m_filterProxyModel->GetPlatforms();
+                    if (checked)
+                    {
+                        platforms |= platform;
+                    }
+                    else
+                    {
+                        platforms &= ~platform;
+                    }
+                    m_filterProxyModel->SetPlatforms(platforms);
+                });
+        }
+    }
+
+    void GemFilterWidget::AddFeatureFilter()
+    {
+        // Alphabetically sorted, unique features and their number of occurrences in the gem database.
+        QMap<QString, int> uniqueFeatureCounts;
+        const int numGems = m_gemModel->rowCount();
+        for (int gemIndex = 0; gemIndex < numGems; ++gemIndex)
+        {
+            const QStringList features = m_gemModel->GetFeatures(m_gemModel->index(gemIndex, 0));
+            for (const QString& feature : features)
+            {
+                if (!uniqueFeatureCounts.contains(feature))
+                {
+                    uniqueFeatureCounts.insert(feature, 1);
+                }
+                else
+                {
+                    int& featureeCount = uniqueFeatureCounts[feature];
+                    featureeCount++;
+                }
+            }
+        }
+
+        QVector<QString> elementNames;
+        QVector<int> elementCounts;
+        for (auto iterator = uniqueFeatureCounts.begin(); iterator != uniqueFeatureCounts.end(); iterator++)
+        {
+            elementNames.push_back(iterator.key());
+            elementCounts.push_back(iterator.value());
+        }
+
+        FilterCategoryWidget* filterWidget = new FilterCategoryWidget("Features", elementNames, elementCounts,
+            /*showAllLessButton=*/true, /*defaultShowCount=*/5);
+        m_mainLayout->addWidget(filterWidget);
+
+        const QList<QAbstractButton*> buttons = filterWidget->GetButtonGroup()->buttons();
+        for (int i = 0; i < buttons.size(); ++i)
+        {
+            const QString& feature = elementNames[i];
+            QAbstractButton* button = buttons[i];
+
+            connect(button, &QAbstractButton::toggled, this, [=](bool checked)
+                {
+                    QSet<QString> features = m_filterProxyModel->GetFeatures();
+                    if (checked)
+                    {
+                        features.insert(feature);
+                    }
+                    else
+                    {
+                        features.remove(feature);
+                    }
+                    m_filterProxyModel->SetFeatures(features);
+                });
+        }
+    }
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.h

@@ -0,0 +1,79 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <LinkWidget.h>
+#include <GemCatalog/GemSortFilterProxyModel.h>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <QCheckBox>
+#include <QVector>
+#include <QPushButton>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QButtonGroup)
+
+namespace O3DE::ProjectManager
+{
+    class FilterCategoryWidget
+        : public QWidget
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit FilterCategoryWidget(const QString& header,
+            const QVector<QString>& elementNames,
+            const QVector<int>& elementCounts,
+            bool showAllLessButton = true,
+            int defaultShowCount = 4,
+            QWidget* parent = nullptr);
+
+        QButtonGroup* GetButtonGroup();
+
+    private:
+        void UpdateCollapseState();
+        void UpdateSeeMoreLess();
+
+        inline constexpr static int s_collapseButtonSize = 16;
+        QPushButton* m_collapseButton = nullptr;
+
+        QWidget* m_mainWidget = nullptr;
+        QButtonGroup* m_buttonGroup = nullptr;
+        QVector<QWidget*> m_elementWidgets; //! Includes checkbox and the count labl.
+        LinkLabel* m_seeAllLessLabel = nullptr;
+        int m_defaultShowCount = 0;
+        bool m_seeAll = false;
+    };
+
+    class GemFilterWidget
+        : public QScrollArea
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit GemFilterWidget(GemSortFilterProxyModel* filterProxyModel, QWidget* parent = nullptr);
+        ~GemFilterWidget() = default;
+
+    private:
+        void AddGemOriginFilter();
+        void AddTypeFilter();
+        void AddPlatformFilter();
+        void AddFeatureFilter();
+
+        QVBoxLayout* m_mainLayout = nullptr;
+        GemModel* m_gemModel = nullptr;
+        GemSortFilterProxyModel* m_filterProxyModel = nullptr;
+    };
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.cpp

@@ -62,6 +62,19 @@ namespace O3DE::ProjectManager
         }
     }
 
+    QString GemInfo::GetGemOriginString(GemOrigin origin)
+    {
+        switch (origin)
+        {
+        case O3DEFoundation:
+            return "Open 3D Foundation";
+        case Local:
+            return "Local";
+        default:
+            return "<Unknown Gem Origin>";
+        }
+    }
+
     bool GemInfo::IsPlatformSupported(Platform platform) const
     {
         return (m_platforms & platform);

Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h

@@ -46,6 +46,15 @@ namespace O3DE::ProjectManager
         Q_DECLARE_FLAGS(Types, Type)
         static QString GetTypeString(Type type);
 
+        enum GemOrigin
+        {
+            O3DEFoundation = 1 << 0,
+            Local = 1 << 1,
+            NumGemOrigins = 2
+        };
+        Q_DECLARE_FLAGS(GemOrigins, GemOrigin)
+        static QString GetGemOriginString(GemOrigin origin);
+
         GemInfo() = default;
         GemInfo(const QString& name, const QString& creator, const QString& summary, Platforms platforms, bool isAdded);
         bool IsPlatformSupported(Platform platform) const;
@@ -57,6 +66,7 @@ namespace O3DE::ProjectManager
         QString m_displayName;
         AZ::Uuid m_uuid;
         QString m_creator;
+        GemOrigin m_gemOrigin = Local;
         bool m_isAdded = false; //! Is the gem currently added and enabled in the project?
         QString m_summary;
         Platforms m_platforms;
@@ -74,3 +84,4 @@ namespace O3DE::ProjectManager
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(O3DE::ProjectManager::GemInfo::Platforms)
 Q_DECLARE_OPERATORS_FOR_FLAGS(O3DE::ProjectManager::GemInfo::Types)
+Q_DECLARE_OPERATORS_FOR_FLAGS(O3DE::ProjectManager::GemInfo::GemOrigins)

Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp

@@ -70,8 +70,8 @@ namespace O3DE::ProjectManager
         m_documentationLinkLabel->SetUrl(m_model->GetDocLink(modelIndex));
 
         // Depending and conflicting gems
-        m_dependingGems->Update("Depending Gems", "The following Gems will be automatically enabled with this Gem.", m_model->GetDependingGems(modelIndex));
-        m_conflictingGems->Update("Conflicting Gems", "The following Gems will be automatically disabled with this Gem.", m_model->GetConflictingGems(modelIndex));
+        m_dependingGems->Update("Depending Gems", "The following Gems will be automatically enabled with this Gem.", m_model->GetDependingGemNames(modelIndex));
+        m_conflictingGems->Update("Conflicting Gems", "The following Gems will be automatically disabled with this Gem.", m_model->GetConflictingGemNames(modelIndex));
 
         // Additional information
         m_versionLabel->setText(QString("Gem Version: %1").arg(m_model->GetVersion(modelIndex)));

Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp

@@ -10,7 +10,7 @@
 *
 */
 
-#include "GemItemDelegate.h"
+#include <GemCatalog/GemItemDelegate.h>
 #include "GemModel.h"
 #include <QEvent>
 #include <QPainter>
@@ -18,9 +18,9 @@
 
 namespace O3DE::ProjectManager
 {
-    GemItemDelegate::GemItemDelegate(GemModel* gemModel, QObject* parent)
+    GemItemDelegate::GemItemDelegate(QAbstractItemModel* model, QObject* parent)
         : QStyledItemDelegate(parent)
-        , m_gemModel(gemModel)
+        , m_model(model)
     {
         AddPlatformIcon(GemInfo::Android, ":/Android.svg");
         AddPlatformIcon(GemInfo::iOS, ":/iOS.svg");
@@ -78,7 +78,7 @@ namespace O3DE::ProjectManager
         }
 
         // Gem name
-        const QString gemName = m_gemModel->GetName(modelIndex);
+        const QString gemName = GemModel::GetName(modelIndex);
         QFont gemNameFont(options.font);
         gemNameFont.setPixelSize(s_gemNameFontSize);
         gemNameFont.setBold(true);
@@ -90,7 +90,7 @@ namespace O3DE::ProjectManager
         painter->drawText(gemNameRect, Qt::TextSingleLine, gemName);
 
         // Gem creator
-        const QString gemCreator = m_gemModel->GetCreator(modelIndex);
+        const QString gemCreator = GemModel::GetCreator(modelIndex);
         QRect gemCreatorRect = GetTextRect(standardFont, gemCreator, s_fontSize);
         gemCreatorRect.moveTo(contentRect.left(), contentRect.top() + gemNameRect.height());
 
@@ -105,7 +105,7 @@ namespace O3DE::ProjectManager
         painter->setFont(standardFont);
         painter->setPen(m_textColor);
 
-        const QString summary = m_gemModel->GetSummary(modelIndex);
+        const QString summary = GemModel::GetSummary(modelIndex);
         painter->drawText(summaryRect, Qt::AlignLeft | Qt::TextWordWrap, summary);
 
 
@@ -158,7 +158,7 @@ namespace O3DE::ProjectManager
 
     void GemItemDelegate::DrawPlatformIcons(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const
     {
-        const GemInfo::Platforms platforms = m_gemModel->GetPlatforms(modelIndex);
+        const GemInfo::Platforms platforms = GemModel::GetPlatforms(modelIndex);
         int startX = 0;
 
         // Iterate and draw the platforms in the order they are defined in the enum.
@@ -188,7 +188,7 @@ namespace O3DE::ProjectManager
         QPoint circleCenter;
         QString buttonText;
 
-        const bool isAdded = m_gemModel->IsAdded(modelIndex);
+        const bool isAdded = GemModel::IsAdded(modelIndex);
         if (isAdded)
         {
             painter->setBrush(m_buttonEnabledColor);

Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h

@@ -15,7 +15,7 @@
 #if !defined(Q_MOC_RUN)
 #include <QStyledItemDelegate>
 #include "GemInfo.h"
-#include "GemModel.h"
+#include <QAbstractItemModel>
 #include <QHash>
 #endif
 
@@ -29,22 +29,13 @@ namespace O3DE::ProjectManager
         Q_OBJECT // AUTOMOC
 
     public:
-        explicit GemItemDelegate(GemModel* gemModel, QObject* parent = nullptr);
+        explicit GemItemDelegate(QAbstractItemModel* model, QObject* parent = nullptr);
         ~GemItemDelegate() = default;
 
         void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) const override;
         bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) override;
         QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& modelIndex) const override;
 
-    private:
-        void CalcRects(const QStyleOptionViewItem& option, const QModelIndex& modelIndex, QRect& outFullRect, QRect& outItemRect, QRect& outContentRect) const;
-        QRect GetTextRect(QFont& font, const QString& text, qreal fontSize) const;
-        QRect CalcButtonRect(const QRect& contentRect) const;
-        void DrawPlatformIcons(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const;
-        void DrawButton(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const;
-
-        GemModel* m_gemModel = nullptr;
-
         // Colors
         const QColor m_textColor = QColor("#FFFFFF");
         const QColor m_linkColor = QColor("#94D2FF");
@@ -71,6 +62,15 @@ namespace O3DE::ProjectManager
         inline constexpr static int s_buttonCircleRadius = s_buttonBorderRadius - 3;
         inline constexpr static qreal s_buttonFontSize = 12.0;
 
+    private:
+        void CalcRects(const QStyleOptionViewItem& option, const QModelIndex& modelIndex, QRect& outFullRect, QRect& outItemRect, QRect& outContentRect) const;
+        QRect GetTextRect(QFont& font, const QString& text, qreal fontSize) const;
+        QRect CalcButtonRect(const QRect& contentRect) const;
+        void DrawPlatformIcons(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const;
+        void DrawButton(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const;
+
+        QAbstractItemModel* m_model = nullptr;
+
         // Platform icons
         void AddPlatformIcon(GemInfo::Platform platform, const QString& iconPath);
         inline constexpr static int s_platformIconSize = 16;

Code/Tools/ProjectManager/Source/GemCatalog/GemListView.cpp

@@ -18,17 +18,15 @@
 
 namespace O3DE::ProjectManager
 {
-    GemListView::GemListView(GemModel* model, QWidget *parent) :
-        QListView(parent)
+    GemListView::GemListView(QAbstractItemModel* model, QItemSelectionModel* selectionModel, QWidget* parent)
+        : QListView(parent)
     {
         setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
 
-        QPalette palette;
-        palette.setColor(QPalette::Window, QColor("#333333"));
-        setPalette(palette);
+        setStyleSheet("background-color: #333333;");
 
         setModel(model);
-        setSelectionModel(model->GetSelectionModel());
+        setSelectionModel(selectionModel);
         setItemDelegate(new GemItemDelegate(model, this));
     }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemListView.h

@@ -14,7 +14,8 @@
 
 #if !defined(Q_MOC_RUN)
 #include "GemInfo.h"
-#include "GemModel.h"
+#include <QAbstractItemModel>
+#include <QItemSelectionModel>
 #include <QListView>
 #endif
 
@@ -24,8 +25,9 @@ namespace O3DE::ProjectManager
         : public QListView
     {
         Q_OBJECT // AUTOMOC
+
     public:
-        explicit GemListView(GemModel* model, QWidget *parent = nullptr);
+        explicit GemListView(QAbstractItemModel* model, QItemSelectionModel* selectionModel, QWidget* parent = nullptr);
         ~GemListView() = default;
     };
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp

@@ -36,11 +36,11 @@ namespace O3DE::ProjectManager
         const QString uuidString = gemInfo.m_uuid.ToString<AZStd::string>().c_str();
         item->setData(uuidString, RoleUuid);
         item->setData(gemInfo.m_creator, RoleCreator);
+        item->setData(gemInfo.m_gemOrigin, RoleGemOrigin);
         item->setData(aznumeric_cast<int>(gemInfo.m_platforms), RolePlatforms);
         item->setData(aznumeric_cast<int>(gemInfo.m_types), RoleTypes);
         item->setData(gemInfo.m_summary, RoleSummary);
         item->setData(gemInfo.m_isAdded, RoleIsAdded);
-
         item->setData(gemInfo.m_directoryLink, RoleDirectoryLink);
         item->setData(gemInfo.m_documentationLink, RoleDocLink);
         item->setData(gemInfo.m_dependingGemUuids, RoleDependingGems);
@@ -48,12 +48,12 @@ namespace O3DE::ProjectManager
         item->setData(gemInfo.m_version, RoleVersion);
         item->setData(gemInfo.m_lastUpdatedDate, RoleLastUpdated);
         item->setData(gemInfo.m_binarySizeInKB, RoleBinarySize);
-
         item->setData(gemInfo.m_features, RoleFeatures);
 
         appendRow(item);
 
-        m_uuidToNameMap[uuidString] = gemInfo.m_displayName;
+        const QModelIndex modelIndex = index(rowCount()-1, 0);
+        m_uuidToIndexMap[uuidString] = modelIndex;
     }
 
     void GemModel::Clear()
@@ -71,6 +71,11 @@ namespace O3DE::ProjectManager
         return modelIndex.data(RoleCreator).toString();
     }
 
+    GemInfo::GemOrigin GemModel::GetGemOrigin(const QModelIndex& modelIndex)
+    {
+        return static_cast<GemInfo::GemOrigin>(modelIndex.data(RoleGemOrigin).toInt());
+    }
+
     QString GemModel::GetUuidString(const QModelIndex& modelIndex)
     {
         return modelIndex.data(RoleUuid).toString();
@@ -106,42 +111,63 @@ namespace O3DE::ProjectManager
         return modelIndex.data(RoleDocLink).toString();
     }
 
-    AZ::Outcome<QString> GemModel::FindGemNameByUuidString(const QString& uuidString) const
+    QModelIndex GemModel::FindIndexByUuidString(const QString& uuidString) const
     {
-        const auto iterator = m_uuidToNameMap.find(uuidString);
-        if (iterator != m_uuidToNameMap.end())
+        const auto iterator = m_uuidToIndexMap.find(uuidString);
+        if (iterator != m_uuidToIndexMap.end())
         {
-            return AZ::Success(iterator.value());
+            return iterator.value();
         }
 
-        return AZ::Failure();
+        return {};
     }
 
-    QStringList GemModel::GetDependingGems(const QModelIndex& modelIndex)
+    void GemModel::FindGemNamesByUuidStrings(QStringList& inOutGemNames)
     {
-        QStringList result = modelIndex.data(RoleDependingGems).toStringList();
+        for (QString& dependingGemString : inOutGemNames)
+        {
+            QModelIndex modelIndex = FindIndexByUuidString(dependingGemString);
+            if (modelIndex.isValid())
+            {
+                dependingGemString = GetName(modelIndex);
+            }
+        }
+    }
+
+    QStringList GemModel::GetDependingGemUuids(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RoleDependingGems).toStringList();
+    }
+
+    QStringList GemModel::GetDependingGemNames(const QModelIndex& modelIndex)
+    {
+        QStringList result = GetDependingGemUuids(modelIndex);
         if (result.isEmpty())
         {
             return {};
         }
 
-        for (QString& dependingGemString : result)
-        {
-            AZ::Outcome<QString> gemNameOutcome = FindGemNameByUuidString(dependingGemString);
-            if (gemNameOutcome.IsSuccess())
-            {
-                dependingGemString = gemNameOutcome.GetValue();
-            }
-        }
-
+        FindGemNamesByUuidStrings(result);
         return result;
     }
 
-    QStringList GemModel::GetConflictingGems(const QModelIndex& modelIndex)
+    QStringList GemModel::GetConflictingGemUuids(const QModelIndex& modelIndex)
     {
         return modelIndex.data(RoleConflictingGems).toStringList();
     }
 
+    QStringList GemModel::GetConflictingGemNames(const QModelIndex& modelIndex)
+    {
+        QStringList result = GetConflictingGemUuids(modelIndex);
+        if (result.isEmpty())
+        {
+            return {};
+        }
+
+        FindGemNamesByUuidStrings(result);
+        return result;
+    }
+
     QString GemModel::GetVersion(const QModelIndex& modelIndex)
     {
         return modelIndex.data(RoleVersion).toString();

Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h

@@ -13,7 +13,6 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include <AzCore/Outcome/Outcome.h>
 #include <GemCatalog/GemInfo.h>
 #include <QAbstractItemModel>
 #include <QStandardItemModel>
@@ -34,11 +33,16 @@ namespace O3DE::ProjectManager
         void AddGem(const GemInfo& gemInfo);
         void Clear();
 
-        AZ::Outcome<QString> FindGemNameByUuidString(const QString& uuidString) const;
-        QStringList GetDependingGems(const QModelIndex& modelIndex);
+        QModelIndex FindIndexByUuidString(const QString& uuidString) const;
+        void FindGemNamesByUuidStrings(QStringList& inOutGemNames);
+        QStringList GetDependingGemUuids(const QModelIndex& modelIndex);
+        QStringList GetDependingGemNames(const QModelIndex& modelIndex);
+        QStringList GetConflictingGemUuids(const QModelIndex& modelIndex);
+        QStringList GetConflictingGemNames(const QModelIndex& modelIndex);
 
         static QString GetName(const QModelIndex& modelIndex);
         static QString GetCreator(const QModelIndex& modelIndex);
+        static GemInfo::GemOrigin GetGemOrigin(const QModelIndex& modelIndex);
         static QString GetUuidString(const QModelIndex& modelIndex);
         static GemInfo::Platforms GetPlatforms(const QModelIndex& modelIndex);
         static GemInfo::Types GetTypes(const QModelIndex& modelIndex);
@@ -46,7 +50,6 @@ namespace O3DE::ProjectManager
         static bool IsAdded(const QModelIndex& modelIndex);
         static QString GetDirectoryLink(const QModelIndex& modelIndex);
         static QString GetDocLink(const QModelIndex& modelIndex);
-        static QStringList GetConflictingGems(const QModelIndex& modelIndex);
         static QString GetVersion(const QModelIndex& modelIndex);
         static QString GetLastUpdated(const QModelIndex& modelIndex);
         static int GetBinarySizeInKB(const QModelIndex& modelIndex);
@@ -58,6 +61,7 @@ namespace O3DE::ProjectManager
             RoleName = Qt::UserRole,
             RoleUuid,
             RoleCreator,
+            RoleGemOrigin,
             RolePlatforms,
             RoleSummary,
             RoleIsAdded,
@@ -72,7 +76,7 @@ namespace O3DE::ProjectManager
             RoleTypes
         };
 
-        QHash<QString, QString> m_uuidToNameMap;
+        QHash<QString, QModelIndex> m_uuidToIndexMap;
         QItemSelectionModel* m_selectionModel = nullptr;
     };
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.cpp

@@ -0,0 +1,133 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <GemCatalog/GemSortFilterProxyModel.h>
+#include <QItemSelectionModel>
+
+namespace O3DE::ProjectManager
+{
+    GemSortFilterProxyModel::GemSortFilterProxyModel(GemModel* sourceModel, QObject* parent)
+        : QSortFilterProxyModel(parent)
+        , m_sourceModel(sourceModel)
+    {
+        setSourceModel(sourceModel);
+        m_selectionProxyModel = new AzQtComponents::SelectionProxyModel(sourceModel->GetSelectionModel(), this, parent);
+    }
+
+    bool GemSortFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
+    {
+        // Do not use sourceParent->child because an invalid parent does not produce valid children (which our index function does)
+        QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent);
+        if (!sourceIndex.isValid())
+        {
+            return false;
+        }
+
+        if (!m_sourceModel->GetName(sourceIndex).contains(m_searchString, Qt::CaseInsensitive))
+        {
+            return false;
+        }
+
+        // Gem origins
+        if (m_gemOriginFilter)
+        {
+            bool supportsAnyFilteredGemOrigin = false;
+            for (int i = 0; i < GemInfo::NumGemOrigins; ++i)
+            {
+                const GemInfo::GemOrigin filteredGemOrigin = static_cast<GemInfo::GemOrigin>(1 << i);
+                if (m_gemOriginFilter & filteredGemOrigin)
+                {
+                    if ((GemModel::GetGemOrigin(sourceIndex) == filteredGemOrigin))
+                    {
+                        supportsAnyFilteredGemOrigin = true;
+                        break;
+                    }
+                }
+            }
+            if (!supportsAnyFilteredGemOrigin)
+            {
+                return false;
+            }
+        }
+
+        // Platform
+        if (m_platformFilter)
+        {
+            bool supportsAnyFilteredPlatform = false;
+            for (int i = 0; i < GemInfo::NumPlatforms; ++i)
+            {
+                const GemInfo::Platform filteredPlatform = static_cast<GemInfo::Platform>(1 << i);
+                if (m_platformFilter & filteredPlatform)
+                {
+                    if ((GemModel::GetPlatforms(sourceIndex) & filteredPlatform))
+                    {
+                        supportsAnyFilteredPlatform = true;
+                        break;
+                    }
+                }
+            }
+            if (!supportsAnyFilteredPlatform)
+            {
+                return false;
+            }
+        }
+
+        // Types (Asset, Code, Tool)
+        if (m_typeFilter)
+        {
+            bool supportsAnyFilteredType = false;
+            for (int i = 0; i < GemInfo::NumTypes; ++i)
+            {
+                const GemInfo::Type filteredType = static_cast<GemInfo::Type>(1 << i);
+                if (m_typeFilter & filteredType)
+                {
+                    if ((GemModel::GetTypes(sourceIndex) & filteredType))
+                    {
+                        supportsAnyFilteredType = true;
+                        break;
+                    }
+                }
+            }
+            if (!supportsAnyFilteredType)
+            {
+                return false;
+            }
+        }
+
+        // Features
+        if (!m_featureFilter.isEmpty())
+        {
+            bool containsFilterFeature = false;
+            const QStringList features = m_sourceModel->GetFeatures(sourceIndex);
+            for (const QString& feature : features)
+            {
+                if (m_featureFilter.contains(feature))
+                {
+                    containsFilterFeature = true;
+                    break;
+                }
+            }
+            if (!containsFilterFeature)
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    void GemSortFilterProxyModel::InvalidateFilter()
+    {
+        invalidate();
+        emit OnInvalidated();
+    }
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.h

@@ -0,0 +1,68 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzQtComponents/Utilities/SelectionProxyModel.h>
+#include <GemCatalog/GemModel.h>
+#include <QtCore/QSortFilterProxyModel>
+#include <QSet>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QItemSelectionModel)
+
+namespace O3DE::ProjectManager
+{
+    class GemSortFilterProxyModel
+        : public QSortFilterProxyModel
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        GemSortFilterProxyModel(GemModel* sourceModel, QObject* parent = nullptr);
+
+        bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
+
+        GemModel* GetSourceModel() const { return m_sourceModel; } 
+        AzQtComponents::SelectionProxyModel* GetSelectionModel() const { return m_selectionProxyModel; }
+
+        void SetSearchString(const QString& searchString) { m_searchString = searchString; InvalidateFilter(); }
+
+        GemInfo::GemOrigins GetGemOrigins() const { return m_gemOriginFilter; }
+        void SetGemOrigins(const GemInfo::GemOrigins& gemOrigins) { m_gemOriginFilter = gemOrigins; InvalidateFilter(); }
+
+        GemInfo::Platforms GetPlatforms() const { return m_platformFilter; }
+        void SetPlatforms(const GemInfo::Platforms& platforms) { m_platformFilter = platforms; InvalidateFilter(); }
+
+        GemInfo::Types GetTypes() const { return m_typeFilter; }
+        void SetTypes(const GemInfo::Types& types) { m_typeFilter = types; InvalidateFilter(); }
+
+        const QSet<QString>& GetFeatures() const { return m_featureFilter; }
+        void SetFeatures(const QSet<QString>& features) { m_featureFilter = features; InvalidateFilter(); }
+
+        void InvalidateFilter();
+
+    signals:
+        void OnInvalidated();
+
+    private:
+        GemModel* m_sourceModel = nullptr;
+        AzQtComponents::SelectionProxyModel* m_selectionProxyModel = nullptr;
+
+        QString m_searchString;
+        GemInfo::GemOrigins m_gemOriginFilter = {};
+        GemInfo::Platforms m_platformFilter = {};
+        GemInfo::Types m_typeFilter = {};
+        QSet<QString> m_featureFilter;
+    };
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp

@@ -96,11 +96,6 @@ namespace O3DE::ProjectManager
         return ProjectManagerScreen::NewProjectSettings;
     }
 
-    QString NewProjectSettingsScreen::GetNextButtonText()
-    {
-        return tr("Next");
-    }
-
     void NewProjectSettingsScreen::HandleBrowseButton()
     {
         QString defaultPath = m_projectPathLineEdit->text();

Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.h

@@ -28,7 +28,6 @@ namespace O3DE::ProjectManager
         explicit NewProjectSettingsScreen(QWidget* parent = nullptr);
         ~NewProjectSettingsScreen() = default;
         ProjectManagerScreen GetScreenEnum() override;
-        QString GetNextButtonText() override;
 
         ProjectInfo GetProjectInfo();
         QString GetProjectTemplatePath();

Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp

@@ -0,0 +1,102 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <ProjectButtonWidget.h>
+
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QResizeEvent>
+#include <QLabel>
+#include <QPushButton>
+#include <QPixmap>
+#include <QMenu>
+#include <QSpacerItem>
+
+//#define SHOW_ALL_PROJECT_ACTIONS
+
+namespace O3DE::ProjectManager
+{
+    inline constexpr static int s_projectImageWidth = 210;
+    inline constexpr static int s_projectImageHeight = 280;
+
+    LabelButton::LabelButton(QWidget* parent)
+        : QLabel(parent)
+    {
+    }
+
+    void LabelButton::mousePressEvent([[maybe_unused]] QMouseEvent* event)
+    {
+        emit triggered();
+    }
+
+    ProjectButton::ProjectButton(const QString& projectName, QWidget* parent)
+        : QFrame(parent)
+        , m_projectName(projectName)
+        , m_projectImagePath(":/Resources/DefaultProjectImage.png")
+    {
+        Setup();
+    }
+
+    ProjectButton::ProjectButton(const QString& projectName, const QString& projectImage, QWidget* parent)
+        : QFrame(parent)
+        , m_projectName(projectName)
+        , m_projectImagePath(projectImage)
+    {
+        Setup();
+    }
+
+    void ProjectButton::Setup()
+    {
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        vLayout->setSpacing(0);
+        vLayout->setContentsMargins(0, 0, 0, 0);
+        setLayout(vLayout);
+
+        m_projectImageLabel = new LabelButton(this);
+        m_projectImageLabel->setFixedSize(s_projectImageWidth, s_projectImageHeight);
+        vLayout->addWidget(m_projectImageLabel);
+
+        m_projectImageLabel->setPixmap(QPixmap(m_projectImagePath).scaled(m_projectImageLabel->size(), Qt::KeepAspectRatioByExpanding));
+
+        QMenu* newProjectMenu = new QMenu(this);
+        m_editProjectAction = newProjectMenu->addAction(tr("Edit Project Settings..."));
+
+#ifdef SHOW_ALL_PROJECT_ACTIONS
+        m_editProjectGemsAction = newProjectMenu->addAction(tr("Cutomize Gems..."));
+        newProjectMenu->addSeparator();
+        m_copyProjectAction = newProjectMenu->addAction(tr("Duplicate"));
+        newProjectMenu->addSeparator();
+        m_removeProjectAction = newProjectMenu->addAction(tr("Remove from O3DE"));
+        m_deleteProjectAction = newProjectMenu->addAction(tr("Delete the Project"));
+#endif
+
+        m_projectSettingsMenuButton = new QPushButton(this);
+        m_projectSettingsMenuButton->setText(m_projectName);
+        m_projectSettingsMenuButton->setMenu(newProjectMenu);
+        m_projectSettingsMenuButton->setFocusPolicy(Qt::FocusPolicy::NoFocus);
+        m_projectSettingsMenuButton->setStyleSheet("font-size: 14px; text-align:left;");
+        vLayout->addWidget(m_projectSettingsMenuButton);
+
+        setFixedSize(s_projectImageWidth, s_projectImageHeight + m_projectSettingsMenuButton->height());
+
+        connect(m_projectImageLabel, &LabelButton::triggered, [this]() { emit OpenProject(m_projectName); });
+        connect(m_editProjectAction, &QAction::triggered, [this]() { emit EditProject(m_projectName); });
+
+#ifdef SHOW_ALL_PROJECT_ACTIONS
+        connect(m_editProjectGemsAction, &QAction::triggered, [this]() { emit EditProjectGems(m_projectName); });
+        connect(m_copyProjectAction, &QAction::triggered, [this]() { emit CopyProject(m_projectName); });
+        connect(m_removeProjectAction, &QAction::triggered, [this]() { emit RemoveProject(m_projectName); });
+        connect(m_deleteProjectAction, &QAction::triggered, [this]() { emit DeleteProject(m_projectName); });
+#endif
+    }
+
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectButtonWidget.h

@@ -0,0 +1,73 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QFrame>
+#include <QLabel>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QPixmap)
+QT_FORWARD_DECLARE_CLASS(QPushButton)
+QT_FORWARD_DECLARE_CLASS(QAction)
+
+namespace O3DE::ProjectManager
+{
+    class LabelButton
+        : public QLabel
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit LabelButton(QWidget* parent = nullptr);
+        ~LabelButton() = default;
+
+    signals:
+        void triggered();
+
+    public slots:
+        void mousePressEvent(QMouseEvent* event) override;
+    };
+
+    class ProjectButton
+        : public QFrame
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit ProjectButton(const QString& projectName, QWidget* parent = nullptr);
+        explicit ProjectButton(const QString& projectName, const QString& projectImage, QWidget* parent = nullptr);
+        ~ProjectButton() = default;
+
+    signals:
+        void OpenProject(const QString& projectName);
+        void EditProject(const QString& projectName);
+        void EditProjectGems(const QString& projectName);
+        void CopyProject(const QString& projectName);
+        void RemoveProject(const QString& projectName);
+        void DeleteProject(const QString& projectName);
+
+    private:
+        void Setup();
+
+        QString m_projectName;
+        QString m_projectImagePath;
+        LabelButton* m_projectImageLabel;
+        QPushButton* m_projectSettingsMenuButton;
+        QAction* m_editProjectAction;
+        QAction* m_editProjectGemsAction;
+        QAction* m_copyProjectAction;
+        QAction* m_removeProjectAction;
+        QAction* m_deleteProjectAction;
+    };
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp

@@ -32,8 +32,6 @@ namespace O3DE::ProjectManager
         layout->setSpacing(0);
         layout->setContentsMargins(0, 0, 0, 0);
 
-        setFixedSize(this->geometry().width(), this->geometry().height());
-
         m_pythonBindings = AZStd::make_unique<PythonBindings>(engineRootPath);
 
         m_screensCtrl = new ScreensCtrl();
@@ -52,9 +50,9 @@ namespace O3DE::ProjectManager
         QVector<ProjectManagerScreen> screenEnums =
         {
             ProjectManagerScreen::FirstTimeUse,
-            ProjectManagerScreen::NewProjectSettingsCore,
+            ProjectManagerScreen::CreateProject,
             ProjectManagerScreen::ProjectsHome,
-            ProjectManagerScreen::ProjectSettings,
+            ProjectManagerScreen::UpdateProject,
             ProjectManagerScreen::EngineSettings
         };
         m_screensCtrl->BuildScreens(screenEnums);

Code/Tools/ProjectManager/Source/ProjectManagerWindow.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>

Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp

@@ -30,6 +30,23 @@ namespace O3DE::ProjectManager
         return ProjectManagerScreen::ProjectSettings;
     }
 
+    ProjectInfo ProjectSettingsScreen::GetProjectInfo()
+    {
+        // Impl pending next PR
+        return ProjectInfo();
+    }
+
+    void ProjectSettingsScreen::SetProjectInfo()
+    {
+        // Impl pending next PR
+    }
+
+    bool ProjectSettingsScreen::Validate()
+    {
+        // Impl pending next PR
+        return true;
+    }
+
     void ProjectSettingsScreen::HandleGemsButton()
     {
         emit ChangeScreenRequest(ProjectManagerScreen::GemCatalog);

Code/Tools/ProjectManager/Source/ProjectSettingsScreen.h

@@ -13,6 +13,7 @@
 
 #if !defined(Q_MOC_RUN)
 #include <ScreenWidget.h>
+#include <ProjectInfo.h>
 #endif
 
 namespace Ui
@@ -30,6 +31,11 @@ namespace O3DE::ProjectManager
         ~ProjectSettingsScreen() = default;
         ProjectManagerScreen GetScreenEnum() override;
 
+        ProjectInfo GetProjectInfo();
+        void SetProjectInfo();
+
+        bool Validate();
+
     protected slots:
         void HandleGemsButton();
 

Code/Tools/ProjectManager/Source/ProjectsHomeScreen.cpp

@@ -12,21 +12,103 @@
 
 #include <ProjectsHomeScreen.h>
 
-#include <Source/ui_ProjectsHomeScreen.h>
-
+#include <ProjectButtonWidget.h>
 #include <PythonBindingsInterface.h>
 
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QMenu>
+#include <QListView>
+#include <QSpacerItem>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QFileInfo>
+#include <QScrollArea>
+
 namespace O3DE::ProjectManager
 {
     ProjectsHomeScreen::ProjectsHomeScreen(QWidget* parent)
         : ScreenWidget(parent)
-        , m_ui(new Ui::ProjectsHomeClass())
     {
-        m_ui->setupUi(this);
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        setLayout(vLayout);
+        vLayout->setContentsMargins(s_contentMargins, s_contentMargins, s_contentMargins, s_contentMargins);
 
-        connect(m_ui->newProjectButton, &QPushButton::pressed, this, &ProjectsHomeScreen::HandleNewProjectButton);
-        connect(m_ui->addProjectButton, &QPushButton::pressed, this, &ProjectsHomeScreen::HandleAddProjectButton);
-        connect(m_ui->editProjectButton, &QPushButton::pressed, this, &ProjectsHomeScreen::HandleEditProjectButton);
+        QHBoxLayout* topLayout = new QHBoxLayout();
+
+        QLabel* titleLabel = new QLabel(this);
+        titleLabel->setText("My Projects");
+        titleLabel->setStyleSheet("font-size: 24px");
+        topLayout->addWidget(titleLabel);
+
+        QSpacerItem* topSpacer = new QSpacerItem(s_spacerSize, s_spacerSize, QSizePolicy::Expanding, QSizePolicy::Minimum);
+        topLayout->addItem(topSpacer);
+
+        QMenu* newProjectMenu = new QMenu(this);
+        m_createNewProjectAction = newProjectMenu->addAction("Create New Project");
+        m_addExistingProjectAction = newProjectMenu->addAction("Add Existing Project");
+
+        QPushButton* newProjectMenuButton = new QPushButton(this);
+        newProjectMenuButton->setText("New Project...");
+        newProjectMenuButton->setMenu(newProjectMenu);
+        newProjectMenuButton->setFixedWidth(s_newProjectButtonWidth);
+        newProjectMenuButton->setStyleSheet("font-size: 14px;");
+        topLayout->addWidget(newProjectMenuButton);
+
+        vLayout->addLayout(topLayout);
+
+        // Get all projects and create a horizontal scrolling list of them
+        auto projectsResult = PythonBindingsInterface::Get()->GetProjects();
+        if (projectsResult.IsSuccess() && !projectsResult.GetValue().isEmpty())
+        {
+            QScrollArea* projectsScrollArea = new QScrollArea(this);
+            QWidget* scrollWidget = new QWidget();
+            QGridLayout* projectGridLayout = new QGridLayout();
+            scrollWidget->setLayout(projectGridLayout);
+            projectsScrollArea->setWidget(scrollWidget);
+            projectsScrollArea->setWidgetResizable(true);
+
+            int gridIndex = 0;
+            for (auto project : projectsResult.GetValue())
+            {
+                ProjectButton* projectButton;
+                QString projectPreviewPath = project.m_path + m_projectPreviewImagePath;
+                QFileInfo doesPreviewExist(projectPreviewPath);
+                if (doesPreviewExist.exists() && doesPreviewExist.isFile())
+                {
+                    projectButton = new ProjectButton(project.m_projectName, projectPreviewPath, this);
+                }
+                else
+                {
+                    projectButton = new ProjectButton(project.m_projectName, this);
+                }
+
+                // Create rows of projects buttons s_projectButtonRowCount buttons wide
+                projectGridLayout->addWidget(projectButton, gridIndex / s_projectButtonRowCount, gridIndex % s_projectButtonRowCount);
+
+                connect(projectButton, &ProjectButton::OpenProject, this, &ProjectsHomeScreen::HandleOpenProject);
+                connect(projectButton, &ProjectButton::EditProject, this, &ProjectsHomeScreen::HandleEditProject);
+
+#ifdef SHOW_ALL_PROJECT_ACTIONS
+                connect(projectButton, &ProjectButton::EditProjectGems, this, &ProjectsHomeScreen::HandleEditProjectGems);
+                connect(projectButton, &ProjectButton::CopyProject, this, &ProjectsHomeScreen::HandleCopyProject);
+                connect(projectButton, &ProjectButton::RemoveProject, this, &ProjectsHomeScreen::HandleRemoveProject);
+                connect(projectButton, &ProjectButton::DeleteProject, this, &ProjectsHomeScreen::HandleDeleteProject);
+#endif
+                ++gridIndex;
+            }
+
+            vLayout->addWidget(projectsScrollArea);
+        }
+
+        // Using border-image allows for scaling options background-image does not support
+        setStyleSheet("O3DE--ProjectManager--ScreenWidget { border-image: url(:/Backgrounds/FirstTimeBackgroundImage.jpg) repeat repeat; }");
+
+        connect(m_createNewProjectAction, &QAction::triggered, this, &ProjectsHomeScreen::HandleNewProjectButton);
+        connect(m_addExistingProjectAction, &QAction::triggered, this, &ProjectsHomeScreen::HandleAddProjectButton);
     }
 
     ProjectManagerScreen ProjectsHomeScreen::GetScreenEnum()
@@ -36,16 +118,41 @@ namespace O3DE::ProjectManager
 
     void ProjectsHomeScreen::HandleNewProjectButton()
     {
-        emit ResetScreenRequest(ProjectManagerScreen::NewProjectSettingsCore);
-        emit ChangeScreenRequest(ProjectManagerScreen::NewProjectSettingsCore);
+        emit ResetScreenRequest(ProjectManagerScreen::CreateProject);
+        emit ChangeScreenRequest(ProjectManagerScreen::CreateProject);
     }
     void ProjectsHomeScreen::HandleAddProjectButton()
     {
         // Do nothing for now
     }
-    void ProjectsHomeScreen::HandleEditProjectButton()
+    void ProjectsHomeScreen::HandleOpenProject(const QString& projectPath)
     {
-        emit ChangeScreenRequest(ProjectManagerScreen::ProjectSettings);
+        // Open the editor with this project open
+        emit NotifyCurrentProject(projectPath);
+    }
+    void ProjectsHomeScreen::HandleEditProject(const QString& projectPath)
+    {
+        emit NotifyCurrentProject(projectPath);
+        emit ResetScreenRequest(ProjectManagerScreen::UpdateProject);
+        emit ChangeScreenRequest(ProjectManagerScreen::UpdateProject);
+    }
+    void ProjectsHomeScreen::HandleEditProjectGems(const QString& projectPath)
+    {
+        emit NotifyCurrentProject(projectPath);
+        emit ChangeScreenRequest(ProjectManagerScreen::GemCatalog);
+    }
+    void ProjectsHomeScreen::HandleCopyProject([[maybe_unused]] const QString& projectPath)
+    {
+        // Open file dialog and choose location for copied project then register copy with O3DE
+    }
+    void ProjectsHomeScreen::HandleRemoveProject([[maybe_unused]] const QString& projectPath)
+    {
+        // Unregister Project from O3DE 
+    }
+    void ProjectsHomeScreen::HandleDeleteProject([[maybe_unused]] const QString& projectPath)
+    {
+        // Remove project from 03DE and delete from disk
+        ProjectsHomeScreen::HandleRemoveProject(projectPath);
     }
 
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectsHomeScreen.h

@@ -15,11 +15,6 @@
 #include <ScreenWidget.h>
 #endif
 
-namespace Ui
-{
-    class ProjectsHomeClass;
-}
-
 namespace O3DE::ProjectManager
 {
     class ProjectsHomeScreen
@@ -34,10 +29,23 @@ namespace O3DE::ProjectManager
     protected slots:
         void HandleNewProjectButton();
         void HandleAddProjectButton();
-        void HandleEditProjectButton();
+        void HandleOpenProject(const QString& projectPath);
+        void HandleEditProject(const QString& projectPath);
+        void HandleEditProjectGems(const QString& projectPath);
+        void HandleCopyProject(const QString& projectPath);
+        void HandleRemoveProject(const QString& projectPath);
+        void HandleDeleteProject(const QString& projectPath);
 
     private:
-        QScopedPointer<Ui::ProjectsHomeClass> m_ui;
+        QAction* m_createNewProjectAction;
+        QAction* m_addExistingProjectAction;
+
+        const QString m_projectPreviewImagePath = "/preview.png";
+        inline constexpr static int s_contentMargins = 80;
+        inline constexpr static int s_spacerSize = 20;
+        inline constexpr static int s_projectButtonRowCount = 4;
+        inline constexpr static int s_newProjectButtonWidth = 156;
+
     };
 
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectsHomeScreen.ui

@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProjectsHomeClass</class>
- <widget class="QWidget" name="ProjectsHomeClass">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>826</width>
-    <height>585</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>My Projects</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="currentProjectButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="newProjectButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../Resources/ProjectManager.qrc">
-         <normaloff>:/Add.svg</normaloff>:/Add.svg</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="addProjectButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../Resources/ProjectManager.qrc">
-         <normaloff>:/Select_Folder.svg</normaloff>:/Select_Folder.svg</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QToolButton" name="editProjectButton">
-     <property name="text">
-      <string>Edit Project</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Open a Project</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../Resources/ProjectManager.qrc"/>
- </resources>
- <connections/>
-</ui>

Code/Tools/ProjectManager/Source/PythonBindings.cpp

@@ -540,7 +540,8 @@ namespace O3DE::ProjectManager
     ProjectInfo PythonBindings::ProjectInfoFromPath(pybind11::handle path)
     {
         ProjectInfo projectInfo;
-        projectInfo.m_path = Py_To_String(path); 
+        projectInfo.m_path = Py_To_String(path);
+        projectInfo.m_isNew = false;
 
         auto projectData = m_registration.attr("get_project_data")(pybind11::none(), path);
         if (pybind11::isinstance<pybind11::dict>(projectData))

Code/Tools/ProjectManager/Source/ScreenDefs.h

@@ -18,10 +18,11 @@ namespace O3DE::ProjectManager
         Invalid = -1,
         Empty,
         FirstTimeUse,
-        NewProjectSettingsCore,
+        CreateProject,
         NewProjectSettings,
         GemCatalog,
         ProjectsHome,
+        UpdateProject,
         ProjectSettings,
         EngineSettings
     };

Code/Tools/ProjectManager/Source/ScreenFactory.cpp

@@ -12,7 +12,8 @@
 #include <ScreenFactory.h>
 
 #include <FirstTimeUseScreen.h>
-#include <ProjectSettingsCtrl.h>
+#include <CreateProjectCtrl.h>
+#include <UpdateProjectCtrl.h>
 #include <NewProjectSettingsScreen.h>
 #include <GemCatalog/GemCatalogScreen.h>
 #include <ProjectsHomeScreen.h>
@@ -30,8 +31,8 @@ namespace O3DE::ProjectManager
         case (ProjectManagerScreen::FirstTimeUse):
             newScreen = new FirstTimeUseScreen(parent);
             break;
-        case (ProjectManagerScreen::NewProjectSettingsCore):
-            newScreen = new ProjectSettingsCtrl(parent);
+        case (ProjectManagerScreen::CreateProject):
+            newScreen = new CreateProjectCtrl(parent);
             break;
         case (ProjectManagerScreen::NewProjectSettings):
             newScreen = new NewProjectSettingsScreen(parent);
@@ -42,6 +43,9 @@ namespace O3DE::ProjectManager
         case (ProjectManagerScreen::ProjectsHome):
             newScreen = new ProjectsHomeScreen(parent);
             break;
+        case (ProjectManagerScreen::UpdateProject):
+            newScreen = new UpdateProjectCtrl(parent);
+            break;
         case (ProjectManagerScreen::ProjectSettings):
             newScreen = new ProjectSettingsScreen(parent);
             break;

Code/Tools/ProjectManager/Source/ScreenWidget.h

@@ -41,15 +41,12 @@ namespace O3DE::ProjectManager
         {
             return true;
         }
-        virtual QString GetNextButtonText()
-        {
-            return "Next";
-        }
 
     signals:
         void ChangeScreenRequest(ProjectManagerScreen screen);
         void GotoPreviousScreenRequest();
         void ResetScreenRequest(ProjectManagerScreen screen);
+        void NotifyCurrentProject(const QString& projectPath);
     };
 
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ScreensCtrl.cpp

@@ -117,6 +117,7 @@ namespace O3DE::ProjectManager
         connect(newScreen, &ScreenWidget::ChangeScreenRequest, this, &ScreensCtrl::ChangeToScreen);
         connect(newScreen, &ScreenWidget::GotoPreviousScreenRequest, this, &ScreensCtrl::GotoPreviousScreen);
         connect(newScreen, &ScreenWidget::ResetScreenRequest, this, &ScreensCtrl::ResetScreen);
+        connect(newScreen, &ScreenWidget::NotifyCurrentProject, this, &ScreensCtrl::NotifyCurrentProject);
     }
 
     void ScreensCtrl::ResetAllScreens()

Code/Tools/ProjectManager/Source/ScreensCtrl.h

@@ -35,6 +35,9 @@ namespace O3DE::ProjectManager
         ScreenWidget* FindScreen(ProjectManagerScreen screen);
         ScreenWidget* GetCurrentScreen();
 
+    signals:
+        void NotifyCurrentProject(const QString& projectPath);
+
     public slots:
         bool ChangeToScreen(ProjectManagerScreen screen);
         bool ForceChangeToScreen(ProjectManagerScreen screen, bool addVisit = true);

Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp

@@ -0,0 +1,139 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <UpdateProjectCtrl.h>
+#include <ScreensCtrl.h>
+#include <PythonBindingsInterface.h>
+#include <ProjectSettingsScreen.h>
+
+#include <QDialogButtonBox>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QMessageBox>
+
+namespace O3DE::ProjectManager
+{
+    UpdateProjectCtrl::UpdateProjectCtrl(QWidget* parent)
+        : ScreenWidget(parent)
+    {
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        setLayout(vLayout);
+
+        m_screensCtrl = new ScreensCtrl();
+        vLayout->addWidget(m_screensCtrl);
+
+        QDialogButtonBox* backNextButtons = new QDialogButtonBox();
+        vLayout->addWidget(backNextButtons);
+
+        m_backButton = backNextButtons->addButton(tr("Back"), QDialogButtonBox::RejectRole);
+        m_nextButton = backNextButtons->addButton(tr("Next"), QDialogButtonBox::ApplyRole);
+
+        connect(m_backButton, &QPushButton::pressed, this, &UpdateProjectCtrl::HandleBackButton);
+        connect(m_nextButton, &QPushButton::pressed, this, &UpdateProjectCtrl::HandleNextButton);
+        connect(reinterpret_cast<ScreensCtrl*>(parent), &ScreensCtrl::NotifyCurrentProject, this, &UpdateProjectCtrl::UpdateCurrentProject);
+
+        m_screensOrder =
+        {
+            ProjectManagerScreen::ProjectSettings,
+            ProjectManagerScreen::GemCatalog
+        };
+        m_screensCtrl->BuildScreens(m_screensOrder);
+        m_screensCtrl->ForceChangeToScreen(ProjectManagerScreen::ProjectSettings, false);
+
+        UpdateNextButtonText();
+
+    }
+
+    ProjectManagerScreen UpdateProjectCtrl::GetScreenEnum()
+    {
+        return ProjectManagerScreen::UpdateProject;
+    }
+
+    void UpdateProjectCtrl::HandleBackButton()
+    {
+        if (!m_screensCtrl->GotoPreviousScreen())
+        {
+            emit GotoPreviousScreenRequest();
+        }
+        else
+        {
+            UpdateNextButtonText();
+        }
+    }
+    void UpdateProjectCtrl::HandleNextButton()
+    {
+        ScreenWidget* currentScreen = m_screensCtrl->GetCurrentScreen();
+        ProjectManagerScreen screenEnum = currentScreen->GetScreenEnum();
+        auto screenOrderIter = m_screensOrder.begin();
+        for (; screenOrderIter != m_screensOrder.end(); ++screenOrderIter)
+        {
+            if (*screenOrderIter == screenEnum)
+            {
+                ++screenOrderIter;
+                break;
+            }
+        }
+
+        if (screenEnum == ProjectManagerScreen::ProjectSettings)
+        {
+            auto projectScreen = reinterpret_cast<ProjectSettingsScreen*>(currentScreen);
+            if (projectScreen)
+            {
+                if (!projectScreen->Validate())
+                {
+                    QMessageBox::critical(this, tr("Invalid project settings"), tr("Invalid project settings"));
+                    return;
+                }
+
+                m_projectInfo = projectScreen->GetProjectInfo();
+            }
+        }
+
+        if (screenOrderIter != m_screensOrder.end())
+        {
+            m_screensCtrl->ChangeToScreen(*screenOrderIter);
+            UpdateNextButtonText();
+        }
+        else
+        {
+            auto result = PythonBindingsInterface::Get()->UpdateProject(m_projectInfo);
+            if (result)
+            {
+                emit ChangeScreenRequest(ProjectManagerScreen::ProjectsHome);
+            }
+            else
+            {
+                QMessageBox::critical(this, tr("Project update failed"), tr("Failed to update project."));
+            }
+        }
+    }
+
+    void UpdateProjectCtrl::UpdateCurrentProject(const QString& projectPath)
+    {
+        auto projectResult = PythonBindingsInterface::Get()->GetProject(projectPath);
+        if (projectResult.IsSuccess())
+        {
+            m_projectInfo = projectResult.GetValue();
+        }
+    }
+
+    void UpdateProjectCtrl::UpdateNextButtonText()
+    {
+        QString nextButtonText = tr("Continue");
+        if (m_screensCtrl->GetCurrentScreen()->GetScreenEnum() == ProjectManagerScreen::GemCatalog)
+        {
+            nextButtonText = tr("Update Project");
+        }
+        m_nextButton->setText(nextButtonText);
+    }
+
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h

@@ -0,0 +1,51 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "ProjectInfo.h"
+#include <ScreenWidget.h>
+#include <ScreensCtrl.h>
+#include <QPushButton>
+#endif
+
+
+namespace O3DE::ProjectManager
+{
+    class UpdateProjectCtrl
+        : public ScreenWidget
+    {
+    public:
+        explicit UpdateProjectCtrl(QWidget* parent = nullptr);
+        ~UpdateProjectCtrl() = default;
+        ProjectManagerScreen GetScreenEnum() override;
+
+
+    protected slots:
+        void HandleBackButton();
+        void HandleNextButton();
+        void UpdateCurrentProject(const QString& projectPath);
+
+    private:
+        void UpdateNextButtonText();
+
+        ScreensCtrl* m_screensCtrl;
+        QPushButton* m_backButton;
+        QPushButton* m_nextButton;
+        QVector<ProjectManagerScreen> m_screensOrder;
+
+        ProjectInfo m_projectInfo;
+
+        ProjectManagerScreen m_screenEnum;
+    };
+
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/project_manager_files.cmake

@@ -41,22 +41,27 @@ set(FILES
     Source/ProjectInfo.cpp
     Source/NewProjectSettingsScreen.h
     Source/NewProjectSettingsScreen.cpp
-    Source/ProjectSettingsCtrl.h
-    Source/ProjectSettingsCtrl.cpp
+    Source/CreateProjectCtrl.h
+    Source/CreateProjectCtrl.cpp
+    Source/UpdateProjectCtrl.h
+    Source/UpdateProjectCtrl.cpp
     Source/ProjectsHomeScreen.h
     Source/ProjectsHomeScreen.cpp
-    Source/ProjectsHomeScreen.ui
     Source/ProjectSettingsScreen.h
     Source/ProjectSettingsScreen.cpp
     Source/ProjectSettingsScreen.ui
     Source/EngineSettingsScreen.h
     Source/EngineSettingsScreen.cpp
+    Source/ProjectButtonWidget.h
+    Source/ProjectButtonWidget.cpp
     Source/LinkWidget.h
     Source/LinkWidget.cpp
     Source/TagWidget.h
     Source/TagWidget.cpp
     Source/GemCatalog/GemCatalogScreen.h
     Source/GemCatalog/GemCatalogScreen.cpp
+    Source/GemCatalog/GemFilterWidget.h
+    Source/GemCatalog/GemFilterWidget.cpp
     Source/GemCatalog/GemInfo.h
     Source/GemCatalog/GemInfo.cpp
     Source/GemCatalog/GemInspector.h
@@ -67,4 +72,6 @@ set(FILES
     Source/GemCatalog/GemListView.cpp
     Source/GemCatalog/GemModel.h
     Source/GemCatalog/GemModel.cpp
+    Source/GemCatalog/GemSortFilterProxyModel.h
+    Source/GemCatalog/GemSortFilterProxyModel.cpp
 )

Code/Tools/SceneAPI/FbxSceneBuilder/DllMain.cpp

@@ -41,6 +41,18 @@ namespace AZ
             static AZ::SceneAPI::FbxSceneImporter::FbxImportRequestHandler* g_fbxImporter = nullptr;
             static AZStd::vector<AZ::ComponentDescriptor*> g_componentDescriptors;
 
+            void Initialize()
+            {
+                // Currently it's still needed to explicitly create an instance of this instead of letting
+                //      it be a normal component. This is because ResourceCompilerScene needs to return
+                //      the list of available extensions before it can start the application.
+                if (!g_fbxImporter)
+                {
+                    g_fbxImporter = aznew AZ::SceneAPI::FbxSceneImporter::FbxImportRequestHandler();
+                    g_fbxImporter->Activate();
+                }
+            }
+
             void Reflect(AZ::SerializeContext* /*context*/)
             {
                 // Descriptor registration is done in Reflect instead of Initialize because the ResourceCompilerScene initializes the libraries before
@@ -52,7 +64,6 @@ namespace AZ
                 {
                     // Global importer and behavior
                     g_componentDescriptors.push_back(FbxSceneBuilder::FbxImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(FbxSceneImporter::FbxImportRequestHandler::CreateDescriptor());
 
                     // Node and attribute importers
                     g_componentDescriptors.push_back(AssImpBitangentStreamImporter::CreateDescriptor());
@@ -114,6 +125,7 @@ namespace AZ
 extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env)
 {
     AZ::Environment::Attach(static_cast<AZ::EnvironmentInstance>(env));
+    AZ::SceneAPI::FbxSceneBuilder::Initialize();
 }
 extern "C" AZ_DLL_EXPORT void Reflect(AZ::SerializeContext* context)
 {

Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.cpp

@@ -10,16 +10,12 @@
 *
 */
 
-#include <AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h>
-#include <AzCore/Serialization/EditContextConstants.inl>
 #include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/Json/JsonSerialization.h>
-#include <AzCore/Settings/SettingsRegistry.h>
-#include <AzCore/StringFunc/StringFunc.h>
-#include <SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h>
+#include <AzFramework/StringFunc/StringFunc.h>
 #include <SceneAPI/SceneCore/Containers/Scene.h>
 #include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
 #include <SceneAPI/SceneCore/Events/ImportEventContext.h>
+#include <SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h>
 
 namespace AZ
 {
@@ -27,25 +23,10 @@ namespace AZ
     {
         namespace FbxSceneImporter
         {
-            void SceneImporterSettings::Reflect(AZ::ReflectContext* context)
-            {
-                if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext)
-                {
-                    serializeContext->Class<SceneImporterSettings>()
-                                    ->Version(1)
-                                    ->Field("SupportedFileTypeExtensions", &SceneImporterSettings::m_supportedFileTypeExtensions);
-                }
-            }
+            const char* FbxImportRequestHandler::s_extension = ".fbx";
 
             void FbxImportRequestHandler::Activate()
             {
-                auto settingsRegistry = AZ::SettingsRegistry::Get();
-                
-                if (settingsRegistry)
-                {
-                    settingsRegistry->GetObject(m_settings, "/O3DE/SceneAPI/AssetImporter");
-                }
-
                 BusConnect();
             }
 
@@ -56,29 +37,21 @@ namespace AZ
 
             void FbxImportRequestHandler::Reflect(ReflectContext* context)
             {
-                SceneImporterSettings::Reflect(context);
-
                 SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
                 if (serializeContext)
                 {
-                    serializeContext->Class<FbxImportRequestHandler, AZ::Component>()->Version(1)->Attribute(
-                        AZ::Edit::Attributes::SystemComponentTags,
-                        AZStd::vector<AZ::Crc32>({AssetBuilderSDK::ComponentTags::AssetBuilder}));
-                    
+                    serializeContext->Class<FbxImportRequestHandler, SceneCore::BehaviorComponent>()->Version(1);
                 }
             }
 
             void FbxImportRequestHandler::GetSupportedFileExtensions(AZStd::unordered_set<AZStd::string>& extensions)
             {
-                extensions.insert(m_settings.m_supportedFileTypeExtensions.begin(), m_settings.m_supportedFileTypeExtensions.end());
+                extensions.insert(s_extension);
             }
 
             Events::LoadingResult FbxImportRequestHandler::LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid, [[maybe_unused]] RequestingApplication requester)
             {
-                AZStd::string extension;
-                StringFunc::Path::GetExtension(path.c_str(), extension);
-                
-                if (!m_settings.m_supportedFileTypeExtensions.contains(extension))
+                if (!AzFramework::StringFunc::Path::IsExtension(path.c_str(), s_extension))
                 {
                     return Events::LoadingResult::Ignored;
                 }
@@ -100,11 +73,6 @@ namespace AZ
                     return Events::LoadingResult::AssetFailure;
                 }
             }
-
-            void FbxImportRequestHandler::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)
-            {
-                provided.emplace_back(AZ_CRC_CE("AssetImportRequestHandler"));
-            }
         } // namespace Import
     } // namespace SceneAPI
 } // namespace AZ

Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h

@@ -21,21 +21,12 @@ namespace AZ
     {
         namespace FbxSceneImporter
         {
-            struct SceneImporterSettings
-            {
-                AZ_TYPE_INFO(SceneImporterSettings, "{8BB6C7AD-BF99-44DC-9DA1-E7AD3F03DC10}");
-                
-                static void Reflect(AZ::ReflectContext* context);
-
-                AZStd::unordered_set<AZStd::string> m_supportedFileTypeExtensions;
-            };
-
             class FbxImportRequestHandler
-                : public AZ::Component
+                : public SceneCore::BehaviorComponent
                 , public Events::AssetImportRequestBus::Handler
             {
             public:
-                AZ_COMPONENT(FbxImportRequestHandler, "{9F4B189C-0A96-4F44-A5F0-E087FF1561F8}");
+                AZ_COMPONENT(FbxImportRequestHandler, "{9F4B189C-0A96-4F44-A5F0-E087FF1561F8}", SceneCore::BehaviorComponent);
 
                 ~FbxImportRequestHandler() override = default;
 
@@ -47,13 +38,8 @@ namespace AZ
                 Events::LoadingResult LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid,
                     RequestingApplication requester) override;
 
-                static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided);
-
             private:
-
-                SceneImporterSettings m_settings;
-
-                static constexpr const char* SettingsFilename = "AssetImporterSettings.json";
+                static const char* s_extension;
             };
         } // namespace FbxSceneImporter
     } // namespace SceneAPI

Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.cpp

@@ -151,7 +151,7 @@ namespace AZ
                 SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
                 if (serializeContext)
                 {
-                    serializeContext->Class<AssImpAnimationImporter, SceneCore::LoadingComponent>()->Version(3); // [LYN-3349] Rolling back rotation change
+                    serializeContext->Class<AssImpAnimationImporter, SceneCore::LoadingComponent>()->Version(4); // [LYN-3971] Bone pruning crash fix in AssImp SDK
                 }
             }
 

Code/Tools/SerializeContextTools/Application.cpp

@@ -97,6 +97,11 @@ namespace AZ
             return m_configFilePath.c_str();
         }
 
+        void Application::QueryApplicationType(AZ::ApplicationTypeQuery& appType) const
+        {
+            appType.m_maskValue = AZ::ApplicationTypeQuery::Masks::Tool;
+        }
+ 
         void Application::SetSettingsRegistrySpecializations(AZ::SettingsRegistryInterface::Specializations& specializations)
         {
             AZ::ComponentApplication::SetSettingsRegistrySpecializations(specializations);

Code/Tools/SerializeContextTools/Application.h

@@ -28,6 +28,7 @@ namespace AZ
             
             const char* GetConfigFilePath() const;
             AZ::ComponentTypeList GetRequiredSystemComponents() const override;
+            void QueryApplicationType(AZ::ApplicationTypeQuery& appType) const override;
 
         protected:
             void SetSettingsRegistrySpecializations(AZ::SettingsRegistryInterface::Specializations& specializations) override;

Code/Tools/SerializeContextTools/SliceConverter.cpp

@@ -25,8 +25,11 @@
 #include <AzCore/std/containers/unordered_set.h>
 #include <AzCore/Utils/Utils.h>
 #include <AzFramework/Archive/IArchive.h>
+#include <AzFramework/Asset/AssetSystemBus.h>
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 #include <AzToolsFramework/Prefab/PrefabDomUtils.h>
 #include <AzToolsFramework/Prefab/EditorPrefabComponent.h>
+#include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
 #include <AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h>
 #include <AzToolsFramework/ToolsComponents/TransformComponent.h>
@@ -36,7 +39,6 @@
 
 // SliceConverter reads in a slice file (saved in an ObjectStream format), instantiates it, creates a prefab out of the data,
 // and saves the prefab in a JSON format.  This can be used for one-time migrations of slices or slice-based levels to prefabs.
-// This converter is still in an early state.  It can convert trivial slices, but it cannot handle nested slices yet.
 // 
 // If the slice contains legacy data, it will print out warnings / errors about the data that couldn't be serialized.
 // The prefab will be generated without that data.
@@ -70,6 +72,20 @@ namespace AZ
                 AZ_Error("Convert-Slice", false, "No json registration context found.");
                 return false;
             }
+
+            // Connect to the Asset Processor so that we can get the correct source path to any nested slice references.
+            if (!ConnectToAssetProcessor())
+            {
+                AZ_Error("Convert-Slice", false, "  Failed to connect to the Asset Processor.\n");
+                return false;
+            }
+
+            // Load the asset catalog so that we can find any nested assets successfully.  We also need to tick the tick bus
+            // so that the OnCatalogLoaded event gets processed now, instead of during application shutdown.
+            AZ::Data::AssetCatalogRequestBus::Broadcast(
+                &AZ::Data::AssetCatalogRequestBus::Events::LoadCatalog, "@assets@/assetcatalog.xml");
+            application.Tick();
+
             AZStd::string logggingScratchBuffer;
             SetupLogging(logggingScratchBuffer, convertSettings.m_reporting, *commandLine);
 
@@ -80,83 +96,90 @@ namespace AZ
             verifySettings.m_serializeContext = application.GetSerializeContext();
             SetupLogging(logggingScratchBuffer, verifySettings.m_reporting, *commandLine);
 
-            auto archiveInterface = AZ::Interface<AZ::IO::IArchive>::Get();
-
-            // Find the Prefab System Component for use in creating and saving the prefab
-            AZ::Entity* systemEntity = application.FindEntity(AZ::SystemEntityId);
-            AZ_Assert(systemEntity != nullptr, "System entity doesn't exist.");
-            auto prefabSystemComponent = systemEntity->FindComponent<AzToolsFramework::Prefab::PrefabSystemComponent>();
-            AZ_Assert(prefabSystemComponent != nullptr, "Prefab System component doesn't exist");
-
             bool result = true;
             rapidjson::StringBuffer scratchBuffer;
 
+            // Loop through the list of requested files and convert them.
             AZStd::vector<AZStd::string> fileList = Utilities::ReadFileListFromCommandLine(application, "files");
             for (AZStd::string& filePath : fileList)
             {
-                bool packOpened = false;
-
-                AZ::IO::Path outputPath = filePath;
-                outputPath.ReplaceExtension("prefab");
-
-                AZ_Printf("Convert-Slice", "------------------------------------------------------------------------------------------\n");
-                AZ_Printf("Convert-Slice", "Converting '%s' to '%s'\n", filePath.c_str(), outputPath.c_str());
-
-                AZ::IO::Path inputPath = filePath;
-                auto fileExtension = inputPath.Extension();
-                if (fileExtension == ".ly")
-                {
-                    // Special case:  for level files, we need to open the .ly zip file and convert the levelentities.editor_xml file
-                    // inside of it.  All the other files can be ignored as they are deprecated legacy system files that are no longer
-                    // loaded with prefab-based levels.
-                    packOpened = archiveInterface->OpenPack(filePath);
-                    inputPath.ReplaceFilename("levelentities.editor_xml");
-                    AZ_Warning("Convert-Slice", packOpened, "  '%s' could not be opened as a pack file.\n", filePath.c_str());
-                }
-                else
-                {
-                    AZ_Warning(
-                        "Convert-Slice", (fileExtension == ".slice"),
-                        "  Warning: Only .ly and .slice files are supported, conversion of '%.*s' may not work.\n",
-                        AZ_STRING_ARG(fileExtension.Native()));
-                }
-
-                auto callback = [prefabSystemComponent, &outputPath, isDryRun]
-                    (void* classPtr, const Uuid& classId, [[maybe_unused]] SerializeContext* context)
-                {
-                    if (classId != azrtti_typeid<AZ::Entity>())
-                    {
-                        AZ_Printf("Convert-Slice", "  File not converted: Slice root is not an entity.\n");
-                        return false;
-                    }
-
-                    AZ::Entity* rootEntity = reinterpret_cast<AZ::Entity*>(classPtr);
-                    return ConvertSliceFile(prefabSystemComponent, outputPath, isDryRun, rootEntity);
-                };
-
-                if (!Utilities::InspectSerializedFile(inputPath.c_str(), convertSettings.m_serializeContext, callback))
-                {
-                    AZ_Warning("Convert-Slice", false, "Failed to load '%s'. File may not contain an object stream.", inputPath.c_str());
-                    result = false;
-                }
-
-                if (packOpened)
-                {
-                    [[maybe_unused]] bool closeResult = archiveInterface->ClosePack(filePath);
-                    AZ_Warning("Convert-Slice", closeResult, "Failed to close '%s'.", filePath.c_str());
-                }
-
-                AZ_Printf("Convert-Slice", "Finished converting '%s' to '%s'\n", filePath.c_str(), outputPath.c_str());
-                AZ_Printf("Convert-Slice", "------------------------------------------------------------------------------------------\n");
+                bool convertResult = ConvertSliceFile(convertSettings.m_serializeContext, filePath, isDryRun);
+                result = result && convertResult;
             }
 
+            DisconnectFromAssetProcessor();
             return result;
         }
 
         bool SliceConverter::ConvertSliceFile(
-            AzToolsFramework::Prefab::PrefabSystemComponent* prefabSystemComponent, AZ::IO::PathView outputPath, bool isDryRun,
-            AZ::Entity* rootEntity)
+            AZ::SerializeContext* serializeContext, const AZStd::string& slicePath, bool isDryRun)
         {
+            bool result = true;
+            bool packOpened = false;
+
+            auto archiveInterface = AZ::Interface<AZ::IO::IArchive>::Get();
+
+            AZ::IO::Path outputPath = slicePath;
+            outputPath.ReplaceExtension("prefab");
+
+            AZ_Printf("Convert-Slice", "------------------------------------------------------------------------------------------\n");
+            AZ_Printf("Convert-Slice", "Converting '%s' to '%s'\n", slicePath.c_str(), outputPath.c_str());
+
+            AZ::IO::Path inputPath = slicePath;
+            auto fileExtension = inputPath.Extension();
+            if (fileExtension == ".ly")
+            {
+                // Special case:  for level files, we need to open the .ly zip file and convert the levelentities.editor_xml file
+                // inside of it.  All the other files can be ignored as they are deprecated legacy system files that are no longer
+                // loaded with prefab-based levels.
+                packOpened = archiveInterface->OpenPack(slicePath);
+                inputPath.ReplaceFilename("levelentities.editor_xml");
+                AZ_Warning("Convert-Slice", packOpened, "  '%s' could not be opened as a pack file.\n", slicePath.c_str());
+            }
+            else
+            {
+                AZ_Warning(
+                    "Convert-Slice", (fileExtension == ".slice"),
+                    "  Warning: Only .ly and .slice files are supported, conversion of '%.*s' may not work.\n",
+                    AZ_STRING_ARG(fileExtension.Native()));
+            }
+
+            auto callback = [&outputPath, isDryRun](void* classPtr, const Uuid& classId, SerializeContext* context)
+            {
+                if (classId != azrtti_typeid<AZ::Entity>())
+                {
+                    AZ_Printf("Convert-Slice", "  File not converted: Slice root is not an entity.\n");
+                    return false;
+                }
+
+                AZ::Entity* rootEntity = reinterpret_cast<AZ::Entity*>(classPtr);
+                return ConvertSliceToPrefab(context, outputPath, isDryRun, rootEntity);
+            };
+
+            // Read in the slice file and call the callback on completion to convert the read-in slice to a prefab.
+            if (!Utilities::InspectSerializedFile(inputPath.c_str(), serializeContext, callback))
+            {
+                AZ_Warning("Convert-Slice", false, "Failed to load '%s'. File may not contain an object stream.", inputPath.c_str());
+                result = false;
+            }
+
+            if (packOpened)
+            {
+                [[maybe_unused]] bool closeResult = archiveInterface->ClosePack(slicePath);
+                AZ_Warning("Convert-Slice", closeResult, "Failed to close '%s'.", slicePath.c_str());
+            }
+
+            AZ_Printf("Convert-Slice", "Finished converting '%s' to '%s'\n", slicePath.c_str(), outputPath.c_str());
+            AZ_Printf("Convert-Slice", "------------------------------------------------------------------------------------------\n");
+
+            return result;
+        }
+
+        bool SliceConverter::ConvertSliceToPrefab(
+            AZ::SerializeContext* serializeContext, AZ::IO::PathView outputPath, bool isDryRun, AZ::Entity* rootEntity)
+        {
+            auto prefabSystemComponentInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabSystemComponentInterface>::Get();
+
             // Find the slice from the root entity.
             SliceComponent* sliceComponent = AZ::EntityUtils::FindFirstDerivedComponent<SliceComponent>(rootEntity);
             if (sliceComponent == nullptr)
@@ -167,44 +190,21 @@ namespace AZ
 
             // Get all of the entities from the slice.
             SliceComponent::EntityList sliceEntities = sliceComponent->GetNewEntities();
-            if (sliceEntities.empty())
-            {
-                AZ_Printf("Convert-Slice", "  File not converted: Slice entities could not be retrieved.\n");
-                return false;
-            }
-
-            AZ_Warning("Convert-Slice", sliceComponent->GetSlices().empty(), "  Slice depends on other slices, this conversion will lose data.\n");
+            AZ_Printf("Convert-Slice", "  Slice contains %zu entities.\n", sliceEntities.size());
 
             // Create the Prefab with the entities from the slice
             AZStd::unique_ptr<AzToolsFramework::Prefab::Instance> sourceInstance(
-                prefabSystemComponent->CreatePrefab(sliceEntities, {}, outputPath));
+                prefabSystemComponentInterface->CreatePrefab(sliceEntities, {}, outputPath));
 
             // Dispatch events here, because prefab creation might trigger asset loads in rare circumstances.
             AZ::Data::AssetManager::Instance().DispatchEvents();
 
-            // Set up the Prefab container entity to be a proper Editor entity.  (This logic is normally triggered
-            // via an EditorRequests EBus in CreatePrefab, but the subsystem that listens for it isn't present in this tool.)
+            // Fix up the container entity to have the proper components and fix up the slice entities to have the proper hierarchy
+            // with the container as the top-most parent.
             AzToolsFramework::Prefab::EntityOptionalReference container = sourceInstance->GetContainerEntity();
-            AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
-                &AzToolsFramework::EditorEntityContextRequestBus::Events::AddRequiredComponents, container->get());
-            container->get().AddComponent(aznew AzToolsFramework::Prefab::EditorPrefabComponent());
-
-            // Reparent any root-level slice entities to the container entity.
-            for (auto entity : sliceEntities)
-            {
-                AzToolsFramework::Components::TransformComponent* transformComponent =
-                    entity->FindComponent<AzToolsFramework::Components::TransformComponent>();
-                if (transformComponent)
-                {
-                    if (!transformComponent->GetParentId().IsValid())
-                    {
-                        transformComponent->SetParent(container->get().GetId());
-                    }
-                }
-            }
+            FixPrefabEntities(container->get(), sliceEntities);
 
             auto templateId = sourceInstance->GetTemplateId();
-
             if (templateId == AzToolsFramework::Prefab::InvalidTemplateId)
             {
                 AZ_Printf("Convert-Slice", "  Path error. Path could be invalid, or the prefab may not be loaded in this level.\n");
@@ -219,14 +219,27 @@ namespace AZ
                 AZ_Printf("Convert-Slice", "  Failed to convert prefab instance data to a PrefabDom.\n");
                 return false;
             }
-            prefabSystemComponent->UpdatePrefabTemplate(templateId, prefabDom);
+            prefabSystemComponentInterface->UpdatePrefabTemplate(templateId, prefabDom);
 
             // Dispatch events here, because prefab serialization might trigger asset loads in rare circumstances.
             AZ::Data::AssetManager::Instance().DispatchEvents();
 
+            // If this slice has nested slices, we need to loop through those, convert them to prefabs as well, and
+            // set up the new nesting relationships correctly.
+            const SliceComponent::SliceList& sliceList = sliceComponent->GetSlices();
+            AZ_Printf("Convert-Slice", "  Slice contains %zu nested slices.\n", sliceList.size());
+            if (!sliceList.empty())
+            {
+                bool nestedSliceResult = ConvertNestedSlices(sliceComponent, sourceInstance.get(), serializeContext, isDryRun);
+                if (!nestedSliceResult)
+                {
+                    return false;
+                }
+            }
+
             if (isDryRun)
             {
-                PrintPrefab(prefabDom, sourceInstance->GetTemplateSourcePath());
+                PrintPrefab(templateId);
                 return true;
             }
             else
@@ -235,8 +248,187 @@ namespace AZ
             }
         }
 
-        void SliceConverter::PrintPrefab(const AzToolsFramework::Prefab::PrefabDom& prefabDom, const AZ::IO::Path& templatePath)
+        void SliceConverter::FixPrefabEntities(AZ::Entity& containerEntity, SliceComponent::EntityList& sliceEntities)
         {
+            // Set up the Prefab container entity to be a proper Editor entity.  (This logic is normally triggered
+            // via an EditorRequests EBus in CreatePrefab, but the subsystem that listens for it isn't present in this tool.)
+            AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
+                &AzToolsFramework::EditorEntityContextRequestBus::Events::AddRequiredComponents, containerEntity);
+            containerEntity.AddComponent(aznew AzToolsFramework::Prefab::EditorPrefabComponent());
+
+            // Reparent any root-level slice entities to the container entity.
+            for (auto entity : sliceEntities)
+            {
+                AzToolsFramework::Components::TransformComponent* transformComponent =
+                    entity->FindComponent<AzToolsFramework::Components::TransformComponent>();
+                if (transformComponent)
+                {
+                    if (!transformComponent->GetParentId().IsValid())
+                    {
+                        transformComponent->SetParent(containerEntity.GetId());
+                        transformComponent->UpdateCachedWorldTransform();
+                    }
+                }
+            }
+        }
+
+        bool SliceConverter::ConvertNestedSlices(
+            SliceComponent* sliceComponent, AzToolsFramework::Prefab::Instance* sourceInstance,
+            AZ::SerializeContext* serializeContext, bool isDryRun)
+        {
+            const SliceComponent::SliceList& sliceList = sliceComponent->GetSlices();
+            auto prefabSystemComponentInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabSystemComponentInterface>::Get();
+
+            for (auto& slice : sliceList)
+            {
+                // Get the nested slice asset
+                auto sliceAsset = slice.GetSliceAsset();
+                sliceAsset.QueueLoad();
+                sliceAsset.BlockUntilLoadComplete();
+
+                // The slice list gives us asset IDs, and we need to get to the source path.  So first we get the asset path from the ID,
+                // then we get the source path from the asset path.
+
+                AZStd::string processedAssetPath;
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                    processedAssetPath, &AZ::Data::AssetCatalogRequests::GetAssetPathById, sliceAsset.GetId());
+
+                AZStd::string assetPath;
+                AzToolsFramework::AssetSystemRequestBus::Broadcast(
+                    &AzToolsFramework::AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath,
+                    processedAssetPath, assetPath);
+                if (assetPath.empty())
+                {
+                    AZ_Warning("Convert-Slice", false,
+                        "  Source path for nested slice '%s' could not be found, slice not converted.", processedAssetPath.c_str());
+                    return false;
+                }
+
+                // Now, convert the nested slice to a prefab.
+                bool nestedSliceResult = ConvertSliceFile(serializeContext, assetPath, isDryRun);
+                if (!nestedSliceResult)
+                {
+                    AZ_Warning("Convert-Slice", nestedSliceResult, "  Nested slice '%s' could not be converted.", assetPath.c_str());
+                    return false;
+                }
+
+                // Load the prefab template for the newly-created nested prefab.
+                // To get the template, we need to take our absolute slice path and turn it into a project-relative prefab path.
+                AZ::IO::Path nestedPrefabPath = assetPath;
+                nestedPrefabPath.ReplaceExtension("prefab");
+
+                auto prefabLoaderInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabLoaderInterface>::Get();
+                nestedPrefabPath = prefabLoaderInterface->GetRelativePathToProject(nestedPrefabPath);
+
+                AzToolsFramework::Prefab::TemplateId nestedTemplateId =
+                    prefabSystemComponentInterface->GetTemplateIdFromFilePath(nestedPrefabPath);
+                AzToolsFramework::Prefab::TemplateReference nestedTemplate =
+                    prefabSystemComponentInterface->FindTemplate(nestedTemplateId);
+
+                // For each slice instance of the nested slice, convert it to a nested prefab instance instead.
+
+                auto instances = slice.GetInstances();
+                AZ_Printf(
+                    "Convert-Slice", "  Attaching %zu instances of nested slice '%s'.\n", instances.size(),
+                    nestedPrefabPath.Native().c_str());
+
+                for (auto& instance : instances)
+                {
+                    bool instanceConvertResult = ConvertSliceInstance(instance, sliceAsset, nestedTemplate, sourceInstance);
+                    if (!instanceConvertResult)
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        bool SliceConverter::ConvertSliceInstance(
+            [[maybe_unused]] AZ::SliceComponent::SliceInstance& instance,
+            [[maybe_unused]] AZ::Data::Asset<AZ::SliceAsset>& sliceAsset,
+            AzToolsFramework::Prefab::TemplateReference nestedTemplate,
+            AzToolsFramework::Prefab::Instance* topLevelInstance)
+        {
+            auto instanceToTemplateInterface = AZ::Interface<AzToolsFramework::Prefab::InstanceToTemplateInterface>::Get();
+            auto prefabSystemComponentInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabSystemComponentInterface>::Get();
+
+            // Create a new unmodified prefab Instance for the nested slice instance.
+            auto nestedInstance = AZStd::make_unique<AzToolsFramework::Prefab::Instance>();
+            AzToolsFramework::Prefab::Instance::EntityList newEntities;
+            if (!AzToolsFramework::Prefab::PrefabDomUtils::LoadInstanceFromPrefabDom(
+                    *nestedInstance, newEntities, nestedTemplate->get().GetPrefabDom()))
+            {
+                AZ_Error(
+                    "Convert-Slice", false, "  Failed to load and instantiate nested Prefab Template '%s'.",
+                    nestedTemplate->get().GetFilePath().c_str());
+                return false;
+            }
+
+            // Get the DOM for the unmodified nested instance.  This will be used later below for generating the correct patch
+            // to the top-level template DOM.
+            AzToolsFramework::Prefab::PrefabDom unmodifiedNestedInstanceDom;
+            instanceToTemplateInterface->GenerateDomForInstance(unmodifiedNestedInstanceDom, *(nestedInstance.get()));
+
+            // Currently, DataPatch conversions for nested slices aren't implemented, so all nested slice overrides will
+            // be lost.
+            AZ_Warning(
+                "Convert-Slice", false, "  Nested slice instances will lose all of their override data during conversion.",
+                nestedTemplate->get().GetFilePath().c_str());
+
+            // Set the container entity of the nested prefab to have the top-level prefab as the parent.
+            // Once DataPatch conversions are supported, this will need to change to nest the prefab under the appropriate entity
+            // within the level.
+            auto containerEntity = nestedInstance->GetContainerEntity();
+            AzToolsFramework::Components::TransformComponent* transformComponent =
+                containerEntity->get().FindComponent<AzToolsFramework::Components::TransformComponent>();
+            if (transformComponent)
+            {
+                transformComponent->SetParent(topLevelInstance->GetContainerEntityId());
+                transformComponent->UpdateCachedWorldTransform();
+            }
+
+            // Add the nested instance itself to the top-level prefab.  To do this, we need to add it to our top-level instance,
+            // create a patch out of it, and patch the top-level prefab template.
+
+            AzToolsFramework::Prefab::PrefabDom topLevelInstanceDomBefore;
+            instanceToTemplateInterface->GenerateDomForInstance(topLevelInstanceDomBefore, *topLevelInstance);
+
+            AzToolsFramework::Prefab::Instance& addedInstance = topLevelInstance->AddInstance(AZStd::move(nestedInstance));
+
+            AzToolsFramework::Prefab::PrefabDom topLevelInstanceDomAfter;
+            instanceToTemplateInterface->GenerateDomForInstance(topLevelInstanceDomAfter, *topLevelInstance);
+
+            AzToolsFramework::Prefab::PrefabDom addedInstancePatch;
+            instanceToTemplateInterface->GeneratePatch(addedInstancePatch, topLevelInstanceDomBefore, topLevelInstanceDomAfter);
+            instanceToTemplateInterface->PatchTemplate(addedInstancePatch, topLevelInstance->GetTemplateId());
+
+            // Get the DOM for the modified nested instance.  Now that the data has been fixed up, and the instance has been added
+            // to the top-level instance, we've got all the changes we need to generate the correct patch.
+
+            AzToolsFramework::Prefab::PrefabDom modifiedNestedInstanceDom;
+            instanceToTemplateInterface->GenerateDomForInstance(modifiedNestedInstanceDom, addedInstance);
+
+            AzToolsFramework::Prefab::PrefabDom linkPatch;
+            instanceToTemplateInterface->GeneratePatch(linkPatch, unmodifiedNestedInstanceDom, modifiedNestedInstanceDom);
+
+            prefabSystemComponentInterface->CreateLink(
+                topLevelInstance->GetTemplateId(), addedInstance.GetTemplateId(), addedInstance.GetInstanceAlias(), linkPatch,
+                AzToolsFramework::Prefab::InvalidLinkId);
+            prefabSystemComponentInterface->PropagateTemplateChanges(topLevelInstance->GetTemplateId());
+
+            return true;
+        }
+
+        void SliceConverter::PrintPrefab(AzToolsFramework::Prefab::TemplateId templateId)
+        {
+            auto prefabSystemComponentInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabSystemComponentInterface>::Get();
+
+            auto prefabTemplate = prefabSystemComponentInterface->FindTemplate(templateId);
+            auto& prefabDom = prefabTemplate->get().GetPrefabDom();
+            const AZ::IO::Path& templatePath = prefabTemplate->get().GetFilePath();
+
             rapidjson::StringBuffer prefabBuffer;
             rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(prefabBuffer);
             prefabDom.Accept(writer);
@@ -260,5 +452,41 @@ namespace AZ
             return true;
         }
 
+        bool SliceConverter::ConnectToAssetProcessor()
+        {
+            AzFramework::AssetSystem::ConnectionSettings connectionSettings;
+            AzFramework::AssetSystem::ReadConnectionSettingsFromSettingsRegistry(connectionSettings);
+
+            connectionSettings.m_launchAssetProcessorOnFailedConnection = true;
+            connectionSettings.m_connectionDirection =
+                AzFramework::AssetSystem::ConnectionSettings::ConnectionDirection::ConnectToAssetProcessor;
+            connectionSettings.m_connectionIdentifier = AzFramework::AssetSystem::ConnectionIdentifiers::Editor;
+            connectionSettings.m_loggingCallback = [](AZStd::string_view logData)
+            {
+                AZ_Printf("Convert-Slice", "%.*s\n", AZ_STRING_ARG(logData));
+            };
+
+            bool connectedToAssetProcessor = false;
+
+            AzFramework::AssetSystemRequestBus::BroadcastResult(
+                connectedToAssetProcessor, &AzFramework::AssetSystemRequestBus::Events::EstablishAssetProcessorConnection,
+                connectionSettings);
+
+            return connectedToAssetProcessor;
+        }
+
+        void SliceConverter::DisconnectFromAssetProcessor()
+        {
+            AzFramework::AssetSystemRequestBus::Broadcast(
+                &AzFramework::AssetSystem::AssetSystemRequests::StartDisconnectingAssetProcessor);
+
+            // Wait for the disconnect to finish.
+            bool disconnected = false;
+            AzFramework::AssetSystemRequestBus::BroadcastResult(disconnected, 
+                &AzFramework::AssetSystem::AssetSystemRequests::WaitUntilAssetProcessorDisconnected, AZStd::chrono::seconds(30));
+
+            AZ_Error("Convert-Slice", disconnected, "Asset Processor failed to disconnect successfully.");
+        }
+
     } // namespace SerializeContextTools
 } // namespace AZ

Code/Tools/SerializeContextTools/SliceConverter.h

@@ -42,11 +42,20 @@ namespace AZ
             static bool ConvertSliceFiles(Application& application);
 
         private:
+            static bool ConnectToAssetProcessor();
+            static void DisconnectFromAssetProcessor();
 
-            static bool ConvertSliceFile(AzToolsFramework::Prefab::PrefabSystemComponent* prefabSystemComponent,
-                AZ::IO::PathView outputPath, bool isDryRun, AZ::Entity* rootEntity);
-
-            static void PrintPrefab(const AzToolsFramework::Prefab::PrefabDom& prefabDom, const AZ::IO::Path& templatePath);
+            static bool ConvertSliceFile(AZ::SerializeContext* serializeContext, const AZStd::string& slicePath, bool isDryRun);
+            static bool ConvertSliceToPrefab(
+                AZ::SerializeContext* serializeContext,  AZ::IO::PathView outputPath, bool isDryRun, AZ::Entity* rootEntity);
+            static void FixPrefabEntities(AZ::Entity& containerEntity, SliceComponent::EntityList& sliceEntities);
+            static bool ConvertNestedSlices(
+                SliceComponent* sliceComponent, AzToolsFramework::Prefab::Instance* sourceInstance,
+                AZ::SerializeContext* serializeContext, bool isDryRun);
+            static bool SliceConverter::ConvertSliceInstance(
+                AZ::SliceComponent::SliceInstance& instance, AZ::Data::Asset<AZ::SliceAsset>& sliceAsset,
+                AzToolsFramework::Prefab::TemplateReference nestedTemplate, AzToolsFramework::Prefab::Instance* topLevelInstance);
+            static void PrintPrefab(AzToolsFramework::Prefab::TemplateId templateId);
             static bool SavePrefab(AzToolsFramework::Prefab::TemplateId templateId);
         };
     } // namespace SerializeContextTools

Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Viewport.h

@@ -51,6 +51,25 @@ namespace AZ
             float m_maxY = 0.0f;
             float m_minZ = 0.0f;
             float m_maxZ = 1.0f;
+
+            float GetWidth() const;
+            float GetHeight() const;
+            float GetDepth() const;
         };
     } // namespace RHI
 } // namespace AZ
+
+inline float AZ::RHI::Viewport::GetWidth() const
+{
+    return m_maxX - m_minX;
+}
+
+inline float AZ::RHI::Viewport::GetHeight() const
+{
+    return m_maxY - m_minY;
+}
+
+inline float AZ::RHI::Viewport::GetDepth() const
+{
+    return m_maxZ - m_minZ;
+}

Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h

@@ -12,17 +12,16 @@
 
 #pragma once
 
-#include <ModernViewportCameraControllerRequestBus.h>
-
 #include <Atom/RPI.Public/ViewportContext.h>
+#include <AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h>
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
 #include <AzFramework/Viewport/CameraInput.h>
 #include <AzFramework/Viewport/MultiViewportController.h>
 
-namespace SandboxEditor
+namespace AtomToolsFramework
 {
     class ModernViewportCameraControllerInstance;
-    class ModernViewportCameraController
+    class ModularViewportCameraController
         : public AzFramework::MultiViewportController<
               ModernViewportCameraControllerInstance, AzFramework::ViewportControllerPriority::DispatchToAllPriorities>
     {
@@ -39,19 +38,19 @@ namespace SandboxEditor
     };
 
     class ModernViewportCameraControllerInstance final
-        : public AzFramework::MultiViewportControllerInstanceInterface<ModernViewportCameraController>,
-          public ModernViewportCameraControllerRequestBus::Handler,
+        : public AzFramework::MultiViewportControllerInstanceInterface<ModularViewportCameraController>,
+          public ModularViewportCameraControllerRequestBus::Handler,
           private AzFramework::ViewportDebugDisplayEventBus::Handler
     {
     public:
-        explicit ModernViewportCameraControllerInstance(AzFramework::ViewportId viewportId, ModernViewportCameraController* controller);
+        explicit ModernViewportCameraControllerInstance(AzFramework::ViewportId viewportId, ModularViewportCameraController* controller);
         ~ModernViewportCameraControllerInstance() override;
 
         // MultiViewportControllerInstanceInterface overrides ...
         bool HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event) override;
         void UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) override;
 
-        // ModernViewportCameraControllerRequestBus overrides ...
+        // ModularViewportCameraControllerRequestBus overrides ...
         void InterpolateToTransform(const AZ::Transform& worldFromLocal) override;
 
     private:
@@ -76,4 +75,4 @@ namespace SandboxEditor
 
         AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraViewMatrixChangeHandler;
     };
-} // namespace SandboxEditor
+} // namespace AtomToolsFramework

Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h

@@ -20,11 +20,11 @@ namespace AZ
     class Transform;
 }
 
-namespace SandboxEditor
+namespace AtomToolsFramework
 {
     //! Provides an interface to control the modern viewport camera controller from the Editor.
     //! @note The bus is addressed by viewport id.
-    class ModernViewportCameraControllerRequests : public AZ::EBusTraits
+    class ModularViewportCameraControllerRequests : public AZ::EBusTraits
     {
     public:
         using BusIdType = AzFramework::ViewportId;
@@ -35,8 +35,8 @@ namespace SandboxEditor
         virtual void InterpolateToTransform(const AZ::Transform& worldFromLocal) = 0;
 
     protected:
-        ~ModernViewportCameraControllerRequests() = default;
+        ~ModularViewportCameraControllerRequests() = default;
     };
 
-    using ModernViewportCameraControllerRequestBus = AZ::EBus<ModernViewportCameraControllerRequests>;
-} // namespace SandboxEditor
+    using ModularViewportCameraControllerRequestBus = AZ::EBus<ModularViewportCameraControllerRequests>;
+} // namespace AtomToolsFramework

Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp

@@ -10,10 +10,9 @@
  *
  */
 
-#include "ModernViewportCameraController.h"
-
 #include <Atom/RPI.Public/ViewportContext.h>
 #include <Atom/RPI.Public/ViewportContextBus.h>
+#include <AtomToolsFramework/Viewport/ModularViewportCameraController.h>
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
@@ -23,7 +22,7 @@
 #include <AzFramework/Windowing/WindowBus.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 
-namespace SandboxEditor
+namespace AtomToolsFramework
 {
     // debug
     void DrawPreviewAxis(AzFramework::DebugDisplayRequests& display, const AZ::Transform& transform, const float axisLength)
@@ -53,12 +52,12 @@ namespace SandboxEditor
         return viewportContext;
     }
 
-    void ModernViewportCameraController::SetCameraListBuilderCallback(const CameraListBuilder& builder)
+    void ModularViewportCameraController::SetCameraListBuilderCallback(const CameraListBuilder& builder)
     {
         m_cameraListBuilder = builder;
     }
 
-    void ModernViewportCameraController::SetupCameras(AzFramework::Cameras& cameras)
+    void ModularViewportCameraController::SetupCameras(AzFramework::Cameras& cameras)
     {
         if (m_cameraListBuilder)
         {
@@ -67,8 +66,8 @@ namespace SandboxEditor
     }
 
     ModernViewportCameraControllerInstance::ModernViewportCameraControllerInstance(
-        const AzFramework::ViewportId viewportId, ModernViewportCameraController* controller)
-        : MultiViewportControllerInstanceInterface<ModernViewportCameraController>(viewportId, controller)
+        const AzFramework::ViewportId viewportId, ModularViewportCameraController* controller)
+        : MultiViewportControllerInstanceInterface<ModularViewportCameraController>(viewportId, controller)
     {
         controller->SetupCameras(m_cameraSystem.m_cameras);
 
@@ -88,12 +87,12 @@ namespace SandboxEditor
         }
 
         AzFramework::ViewportDebugDisplayEventBus::Handler::BusConnect(AzToolsFramework::GetEntityContextId());
-        ModernViewportCameraControllerRequestBus::Handler::BusConnect(viewportId);
+        ModularViewportCameraControllerRequestBus::Handler::BusConnect(viewportId);
     }
 
     ModernViewportCameraControllerInstance::~ModernViewportCameraControllerInstance()
     {
-        ModernViewportCameraControllerRequestBus::Handler::BusDisconnect();
+        ModularViewportCameraControllerRequestBus::Handler::BusDisconnect();
         AzFramework::ViewportDebugDisplayEventBus::Handler::BusDisconnect();
     }
 
@@ -182,4 +181,4 @@ namespace SandboxEditor
         m_transformStart = m_camera.Transform();
         m_transformEnd = worldFromLocal;
     }
-} // namespace SandboxEditor
+} // namespace AtomToolsFramework

Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake

@@ -24,6 +24,8 @@ set(FILES
     Include/AtomToolsFramework/Util/MaterialPropertyUtil.h
     Include/AtomToolsFramework/Util/Util.h
     Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
+    Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h
+    Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h
     Source/Communication/LocalServer.cpp
     Source/Communication/LocalSocket.cpp
     Source/Debug/TraceRecorder.cpp
@@ -38,4 +40,5 @@ set(FILES
     Source/Util/MaterialPropertyUtil.cpp
     Source/Util/Util.cpp
     Source/Viewport/RenderViewportWidget.cpp
+    Source/Viewport/ModularViewportCameraController.cpp
 )

Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/InputController/MaterialEditorViewportInputControllerBus.h

@@ -47,6 +47,9 @@ namespace MaterialEditor
         //! @param distanceMax furthest camera can be from the target
         virtual void GetExtents(float& distanceMin, float& distanceMax) const = 0;
 
+        //! Get bounding sphere radius of the active model
+        virtual float GetRadius() const = 0;
+
         //! Reset camera to default position and rotation 
         virtual void Reset() = 0;
 

Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp

@@ -798,7 +798,8 @@ namespace MaterialEditor
                 propertyConfig.m_showThumbnail = true;
                 propertyConfig.m_originalValue = AtomToolsFramework::ConvertToEditableType(m_materialAsset->GetPropertyValues()[propertyIndex.GetIndex()]);
                 propertyConfig.m_parentValue = AtomToolsFramework::ConvertToEditableType(parentPropertyValues[propertyIndex.GetIndex()]);
-                propertyConfig.m_groupName = m_materialTypeSourceData.FindGroup(groupNameId)->m_displayName;
+                auto groupDefinition = m_materialTypeSourceData.FindGroup(groupNameId);
+                propertyConfig.m_groupName = groupDefinition ? groupDefinition->m_displayName : groupNameId;
                 m_properties[propertyConfig.m_id] = AtomToolsFramework::DynamicProperty(propertyConfig);
             }
             return true;

Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp

@@ -44,6 +44,8 @@ namespace MaterialEditor
         MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
             m_targetPosition,
             &MaterialEditorViewportInputControllerRequestBus::Handler::GetTargetPosition);
+        MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
+            m_radius, &MaterialEditorViewportInputControllerRequestBus::Handler::GetRadius);
     }
 
     void Behavior::End()
@@ -119,7 +121,8 @@ namespace MaterialEditor
 
     float Behavior::GetSensitivityZ()
     {
-        return 0.001f;
+        // adjust zooming sensitivity by model size, so that large models zoom at the same speed as smaller ones
+        return 0.001f * AZ::GetMax(0.5f, m_radius);
     }
 
     AZ::Quaternion Behavior::LookRotation(AZ::Vector3 forward)

Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.h

@@ -54,6 +54,8 @@ namespace MaterialEditor
         float m_y = 0;
         //! delta scroll wheel accumulated during current frame
         float m_z = 0;
+        //! Model radius
+        float m_radius = 1.0f;
 
         AZ::EntityId m_cameraEntityId;
         AZ::Vector3 m_targetPosition = AZ::Vector3::CreateZero();

Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp

@@ -114,6 +114,11 @@ namespace MaterialEditor
         distanceMax = m_distanceMax;
     }
 
+    float MaterialEditorViewportInputController::GetRadius() const
+    {
+        return m_radius;
+    }
+
     void MaterialEditorViewportInputController::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event)
     {
         if (m_keysChanged)
@@ -306,11 +311,10 @@ namespace MaterialEditor
             if (modelAsset.IsReady())
             {
                 const AZ::Aabb& aabb = modelAsset->GetAabb();
-                float radius;
-                aabb.GetAsSphere(m_modelCenter, radius);
+                aabb.GetAsSphere(m_modelCenter, m_radius);
 
                 m_distanceMin = 0.5f * AZ::GetMin(AZ::GetMin(aabb.GetExtents().GetX(), aabb.GetExtents().GetY()), aabb.GetExtents().GetZ()) + DepthNear;
-                m_distanceMax = radius * MaxDistanceMultiplier;
+                m_distanceMax = m_radius * MaxDistanceMultiplier;
             }
         }
     }

Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h

@@ -43,6 +43,7 @@ namespace MaterialEditor
         void SetTargetPosition(const AZ::Vector3& targetPosition) override;
         float GetDistanceToTarget() const override;
         void GetExtents(float& distanceMin, float& distanceMax) const override;
+        float GetRadius() const override;
         void Reset() override;
         void SetFieldOfView(float value) override;
         bool IsCameraCentered() const override;
@@ -96,6 +97,8 @@ namespace MaterialEditor
         float m_distanceMin = 1.0f;
         //! Maximum distance from camera to target
         float m_distanceMax = 10.0f;
+        //! Model radius
+        float m_radius = 1.0f;
         //! True if camera is centered on a model
         bool m_isCameraCentered = true;
 

Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp

@@ -24,6 +24,7 @@ AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnin
 #include <QIcon>
 #include <QMenu>
 #include <QToolButton>
+#include <QAbstractItemView>
 AZ_POP_DISABLE_WARNING
 
 namespace MaterialEditor
@@ -86,11 +87,13 @@ namespace MaterialEditor
         // Add model combo box
         auto modelPresetComboBox = new ModelPresetComboBox(this);
         modelPresetComboBox->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
+        modelPresetComboBox->view()->setMinimumWidth(200);
         addWidget(modelPresetComboBox);
 
         // Add lighting preset combo box
         auto lightingPresetComboBox = new LightingPresetComboBox(this);
         lightingPresetComboBox->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
+        lightingPresetComboBox->view()->setMinimumWidth(200);
         addWidget(lightingPresetComboBox);
 
         MaterialViewportNotificationBus::Handler::BusConnect();

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

@@ -576,6 +576,29 @@ namespace AZ::AtomBridge
         }
     }
 
+    void AtomDebugDisplayViewportInterface::DrawWireOBB(
+        const AZ::Vector3& center, 
+        const AZ::Vector3& axisX, 
+        const AZ::Vector3& axisY, 
+        const AZ::Vector3& axisZ, 
+        const AZ::Vector3& halfExtents)
+    {
+        if (m_auxGeomPtr)
+        {
+            AZ::Quaternion rotation = AZ::Quaternion::CreateFromMatrix3x3(AZ::Matrix3x3::CreateFromColumns(axisX, axisY, axisZ));
+            AZ::Obb obb = AZ::Obb::CreateFromPositionRotationAndHalfLengths(center, rotation, halfExtents);
+            m_auxGeomPtr->DrawObb(
+                obb,
+                AZ::Vector3::CreateZero(), 
+                m_rendState.m_color, 
+                AZ::RPI::AuxGeomDraw::DrawStyle::Line,
+                m_rendState.m_depthTest,
+                m_rendState.m_depthWrite,
+                m_rendState.m_faceCullMode,
+                m_rendState.m_viewProjOverrideIndex);
+        }
+    }
+
     void AtomDebugDisplayViewportInterface::DrawSolidOBB(
         const AZ::Vector3& center, 
         const AZ::Vector3& axisX, 
@@ -906,7 +929,28 @@ namespace AZ::AtomBridge
         }
     }
 
-    void AtomDebugDisplayViewportInterface::DrawCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height, bool drawShaded)
+    void AtomDebugDisplayViewportInterface::DrawWireCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height)
+    {
+        if (m_auxGeomPtr)
+        {
+            const AZ::Vector3 worldPos = ToWorldSpacePosition(pos);
+            const AZ::Vector3 worldDir = ToWorldSpaceVector(dir);
+            m_auxGeomPtr->DrawCone(
+                worldPos, 
+                worldDir, 
+                radius, 
+                height, 
+                m_rendState.m_color, 
+                AZ::RPI::AuxGeomDraw::DrawStyle::Line,
+                m_rendState.m_depthTest,
+                m_rendState.m_depthWrite,
+                m_rendState.m_faceCullMode,
+                m_rendState.m_viewProjOverrideIndex
+            );
+        }
+    }
+
+    void AtomDebugDisplayViewportInterface::DrawSolidCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height, bool drawShaded)
     {
         if (m_auxGeomPtr)
         {
@@ -1336,8 +1380,6 @@ namespace AZ::AtomBridge
     {
         AZ_Assert(false, "Unexpected use of legacy api, please file a feature request with the rendering team to get this implemented!");
     }
-    // unhandledled on Atom - virtual void DrawTextureLabel(ITexture* texture, const AZ::Vector3& pos, float sizeX, float sizeY, int texIconFlags) override;
-    // void AtomDebugDisplayViewportInterface::DrawTextureLabel(int textureId, const AZ::Vector3& pos, float sizeX, float sizeY, int texIconFlags) override;
 
     void AtomDebugDisplayViewportInterface::SetLineWidth(float width)
     {

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

@@ -153,6 +153,7 @@ namespace AZ::AtomBridge
         void DrawTrianglesIndexed(const AZStd::vector<AZ::Vector3>& vertices, const AZStd::vector<AZ::u32>& indices, const AZ::Color& color) override;
         void DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max) override;
         void DrawSolidBox(const AZ::Vector3& min, const AZ::Vector3& max) override;
+        void DrawWireOBB(const AZ::Vector3& center, const AZ::Vector3& axisX, const AZ::Vector3& axisY, const AZ::Vector3& axisZ, const AZ::Vector3& halfExtents) override;
         void DrawSolidOBB(const AZ::Vector3& center, const AZ::Vector3& axisX, const AZ::Vector3& axisY, const AZ::Vector3& axisZ, const AZ::Vector3& halfExtents) override;
         void DrawPoint(const AZ::Vector3& p, int nSize = 1) override;
         void DrawLine(const AZ::Vector3& p1, const AZ::Vector3& p2) override;
@@ -167,7 +168,8 @@ namespace AZ::AtomBridge
         void DrawArc(const AZ::Vector3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, const AZ::Vector3& fixedAxis) override;
         void DrawCircle(const AZ::Vector3& pos, float radius, int nUnchangedAxis = 2 /*z axis*/) override;
         void DrawHalfDottedCircle(const AZ::Vector3& pos, float radius, const AZ::Vector3& viewPos, int nUnchangedAxis = 2 /*z axis*/) override;
-        void DrawCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height, bool drawShaded) override;
+        void DrawWireCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height) override;
+        void DrawSolidCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height, bool drawShaded) override;
         void DrawWireCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) override;
         void DrawSolidCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height, bool drawShaded) override;
         void DrawWireCapsule(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float heightStraightSection) override;
@@ -180,11 +182,8 @@ namespace AZ::AtomBridge
         void DrawTextLabel(const AZ::Vector3& pos, float size, const char* text, const bool bCenter = false, int srcOffsetX = 0, int srcOffsetY = 0) override;
         void Draw2dTextLabel(float x, float y, float size, const char* text, bool bCenter = false) override;
         void DrawTextOn2DBox(const AZ::Vector3& pos, const char* text, float textScale, const AZ::Vector4& TextColor, const AZ::Vector4& TextBackColor) override;
-        // unhandled on Atom - virtual void DrawTextureLabel(ITexture* texture, const AZ::Vector3& pos, float sizeX, float sizeY, int texIconFlags) override;
-        // void DrawTextureLabel(int textureId, const AZ::Vector3& pos, float sizeX, float sizeY, int texIconFlags) override;
         void SetLineWidth(float width) override;
         bool IsVisible(const AZ::Aabb& bounds) override;
-        // int SetFillMode(int nFillMode) override;
         float GetLineWidth() override;
         float GetAspectRatio() override;
         void DepthTestOff() override;

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

@@ -1786,18 +1786,17 @@ void AZ::FFont::DrawScreenAlignedText3d(
     }
     AZ::Vector3 positionNDC = AzFramework::WorldToScreenNDC(
         params.m_position,
-        currentView->GetViewToWorldMatrix(),
+        currentView->GetWorldToViewMatrix(),
         currentView->GetViewToClipMatrix()
     );
-    AzFramework::TextDrawParameters param2d = params;
-    param2d.m_position = positionNDC;
+    internalParams.m_ctx.m_sizeIn800x600 = false;
 
     DrawStringUInternal(
         *internalParams.m_viewport, 
         internalParams.m_viewportContext, 
-        internalParams.m_position.GetX(), 
-        internalParams.m_position.GetY(), 
-        params.m_position.GetZ(), // Z
+        positionNDC.GetX() * internalParams.m_viewport->GetWidth(), 
+        (1.0f - positionNDC.GetY()) * internalParams.m_viewport->GetHeight(), 
+        positionNDC.GetZ(), // Z
         text.data(),
         params.m_multiline,
         internalParams.m_ctx

Gems/DebugDraw/Code/CMakeLists.txt

@@ -21,6 +21,9 @@ ly_add_target(
             Include
     BUILD_DEPENDENCIES
         PUBLIC
+            AZ::AtomCore
+            Gem::Atom_RPI.Public
+            Gem::Atom_Bootstrap.Headers
             Legacy::CryCommon
 )
 
@@ -51,6 +54,9 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
                 Source
             PUBLIC
                 Include
+        COMPILE_DEFINITIONS
+            PRIVATE
+                DEBUGDRAW_GEM_EDITOR=1
         BUILD_DEPENDENCIES
             PRIVATE
                 Gem::DebugDraw.Static