Merge branch 'development' into cmake/remove_align_macros

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py

@@ -342,7 +342,7 @@ def bundler_batch_setup_fixture(request, workspace, asset_processor, timeout) ->
     # Run a full scan to ENSURE that both caches (pc and osx) are COMPLETELY POPULATED
     # Needed for asset bundling
     # fmt:off
-    assert asset_processor.batch_process(fastscan=False, timeout=timeout * len(platforms), platforms=platforms_list), \
+    assert asset_processor.batch_process(fastscan=True, timeout=timeout * len(platforms), platforms=platforms_list), \
         "AP Batch failed to process in bundler_batch_fixture"
     # fmt:on
 

AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt

@@ -92,25 +92,12 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
             AZ::AssetProcessor
     )
 
-    # Issue #3017
-    #ly_add_pytest(
-    #    NAME AssetPipelineTests.AssetBundler
-    #    PATH ${CMAKE_CURRENT_LIST_DIR}/asset_bundler_batch_tests.py
-    #    EXCLUDE_TEST_RUN_TARGET_FROM_IDE
-    #    TEST_SERIAL 
-    #    TEST_SUITE periodic
-    #    RUNTIME_DEPENDENCIES
-    #        AZ::AssetProcessor
-    #        AZ::AssetBundlerBatch
-    #)
-
     ly_add_pytest(
-        NAME AssetPipelineTests.AssetBundler_SandBox
-        TEST_SUITE sandbox
+        NAME AssetPipelineTests.AssetBundler
         PATH ${CMAKE_CURRENT_LIST_DIR}/asset_bundler_batch_tests.py
-        PYTEST_MARKS "SUITE_sandbox" # run only sandbox tests in this file
         EXCLUDE_TEST_RUN_TARGET_FROM_IDE
         TEST_SERIAL 
+        TEST_SUITE periodic
         RUNTIME_DEPENDENCIES
             AZ::AssetProcessor
             AZ::AssetBundlerBatch

AutomatedTesting/Registry/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

AutomatedTesting/Registry/C18977601_Material_FrictionCombinePriority.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

AutomatedTesting/Registry/C18981526_Material_RestitutionCombinePriority.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

AutomatedTesting/Registry/C3510644_Collider_CollisionGroups.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

AutomatedTesting/Registry/C4044456_Material_FrictionCombine.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

AutomatedTesting/Registry/C4044457_Material_RestitutionCombine.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

AutomatedTesting/Registry/C4044459_Material_DynamicFriction.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

AutomatedTesting/Registry/C4044461_Material_Restitution.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

AutomatedTesting/Registry/C4044697_Material_PerfaceMaterialValidation.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

AutomatedTesting/Registry/C4976227_Collider_NewGroup.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

AutomatedTesting/Registry/C4976244_Collider_SameGroupSameLayerCollision.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

AutomatedTesting/Registry/C4976245_PhysXCollider_CollisionLayerTest.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

AutomatedTesting/Registry/C4982593_PhysXCollider_CollisionLayer.setreg_override

@@ -69,7 +69,7 @@
                                 {},
                                 {},
                                 {},
-                                "TouchBend"
+                                {}
                             ]
                         },
                         "Groups": {

Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp

@@ -19,6 +19,66 @@ namespace UnitTest
 
     using AzToolsFramework::ViewportInteraction::MouseInteractionEvent;
 
+    class ViewportMouseCursorRequestImpl : public AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler
+    {
+    public:
+        void Connect(const AzFramework::ViewportId viewportId, AzToolsFramework::QtEventToAzInputMapper* inputChannelMapper)
+        {
+            AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler::BusConnect(viewportId);
+            m_inputChannelMapper = inputChannelMapper;
+        }
+
+        void Disconnect()
+        {
+            AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler::BusDisconnect();
+        }
+
+        // ViewportMouseCursorRequestBus overrides ...
+        void BeginCursorCapture() override;
+        void EndCursorCapture() override;
+        bool IsMouseOver() const override;
+
+    private:
+        AzToolsFramework::QtEventToAzInputMapper* m_inputChannelMapper = nullptr;
+    };
+
+    void ViewportMouseCursorRequestImpl::BeginCursorCapture()
+    {
+        m_inputChannelMapper->SetCursorCaptureEnabled(true);
+    }
+
+    void ViewportMouseCursorRequestImpl::EndCursorCapture()
+    {
+        m_inputChannelMapper->SetCursorCaptureEnabled(false);
+    }
+
+    bool ViewportMouseCursorRequestImpl::IsMouseOver() const
+    {
+        return true;
+    }
+
+    class TestModularCameraViewportContextImpl : public AtomToolsFramework::ModularCameraViewportContext
+    {
+    public:
+        AZ::Transform GetCameraTransform() const override
+        {
+            return m_cameraTransform;
+        }
+
+        void SetCameraTransform(const AZ::Transform& transform) override
+        {
+            m_cameraTransform = transform;
+        }
+
+        void ConnectViewMatrixChangedHandler(AZ::RPI::ViewportContext::MatrixChangedEvent::Handler&) override
+        {
+            // noop
+        }
+
+    private:
+        AZ::Transform m_cameraTransform = AZ::Transform::CreateIdentity();
+    };
+
     class ModularViewportCameraControllerFixture : public AllocatorsTestFixture
     {
     public:
@@ -48,123 +108,159 @@ namespace UnitTest
             AllocatorsTestFixture::TearDown();
         }
 
+        void PrepareCollaborators()
+        {
+            AzFramework::NativeWindowHandle nativeWindowHandle = nullptr;
+
+            // listen for events signaled from QtEventToAzInputMapper and forward to the controller list
+            QObject::connect(
+                m_inputChannelMapper.get(), &AzToolsFramework::QtEventToAzInputMapper::InputChannelUpdated, m_rootWidget.get(),
+                [this, nativeWindowHandle](const AzFramework::InputChannel* inputChannel, [[maybe_unused]] QEvent* event)
+                {
+                    m_controllerList->HandleInputChannelEvent(
+                        AzFramework::ViewportControllerInputEvent{ TestViewportId, nativeWindowHandle, *inputChannel });
+                });
+
+            m_mockWindowRequests.Connect(nativeWindowHandle);
+
+            using ::testing::Return;
+            // note: WindowRequests is used internally by ModularViewportCameraController, this ensures it returns the viewport size we want
+            ON_CALL(m_mockWindowRequests, GetClientAreaSize())
+                .WillByDefault(Return(AzFramework::WindowSize(WidgetSize.width(), WidgetSize.height())));
+
+            // respond to begin/end cursor capture events
+            m_viewportMouseCursorRequests.Connect(TestViewportId, m_inputChannelMapper.get());
+
+            // create editor modular camera
+            auto controller = CreateModularViewportCameraController(TestViewportId);
+
+            // set some overrides for the test
+            controller->SetCameraViewportContextBuilderCallback(
+                [this](AZStd::unique_ptr<AtomToolsFramework::ModularCameraViewportContext>& cameraViewportContext)
+                {
+                    cameraViewportContext = AZStd::make_unique<TestModularCameraViewportContextImpl>();
+                    m_cameraViewportContextView = cameraViewportContext.get();
+                });
+
+            // disable smoothing in the test
+            controller->SetCameraPropsBuilderCallback(
+                [](AzFramework::CameraProps& cameraProps)
+                {
+                    cameraProps.m_rotateSmoothingEnabledFn = []
+                    {
+                        return false;
+                    };
+
+                    cameraProps.m_translateSmoothingEnabledFn = []
+                    {
+                        return false;
+                    };
+                });
+
+            m_controllerList->Add(controller);
+        }
+
+        void HaltCollaborators()
+        {
+            m_mockWindowRequests.Disconnect();
+            m_viewportMouseCursorRequests.Disconnect();
+            m_cameraViewportContextView = nullptr;
+        }
+
+        void RepeatDiagonalMouseMovements(const AZStd::function<float()>& deltaTimeFn)
+        {
+            // move to the center of the screen
+            auto start = QPoint(WidgetSize.width() / 2, WidgetSize.height() / 2);
+            MouseMove(m_rootWidget.get(), start, QPoint(0, 0));
+            m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(deltaTimeFn()), AZ::ScriptTimePoint() });
+
+            // move mouse diagonally to top right, then to bottom left and back repeatedly
+            auto current = start;
+            auto halfDelta = QPoint(200, -200);
+            const int iterationsPerDiagonal = 50;
+            for (int diagonals = 0; diagonals < 80; ++diagonals)
+            {
+                for (int i = 0; i < iterationsPerDiagonal; ++i)
+                {
+                    MousePressAndMove(m_rootWidget.get(), current, halfDelta / iterationsPerDiagonal, Qt::MouseButton::RightButton);
+                    m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(deltaTimeFn()), AZ::ScriptTimePoint() });
+                    current += halfDelta / iterationsPerDiagonal;
+                }
+
+                if (diagonals % 2 == 0)
+                {
+                    halfDelta.setX(halfDelta.x() * -1);
+                    halfDelta.setY(halfDelta.y() * -1);
+                }
+            }
+
+            QTest::mouseRelease(m_rootWidget.get(), Qt::MouseButton::RightButton, Qt::KeyboardModifier::NoModifier, current);
+            m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(deltaTimeFn()), AZ::ScriptTimePoint() });
+        }
+
         AZStd::unique_ptr<QWidget> m_rootWidget;
         AzFramework::ViewportControllerListPtr m_controllerList;
         AZStd::unique_ptr<AzToolsFramework::QtEventToAzInputMapper> m_inputChannelMapper;
+        ::testing::NiceMock<MockWindowRequests> m_mockWindowRequests;
+        ViewportMouseCursorRequestImpl m_viewportMouseCursorRequests;
+        AtomToolsFramework::ModularCameraViewportContext* m_cameraViewportContextView = nullptr;
     };
 
     const AzFramework::ViewportId ModularViewportCameraControllerFixture::TestViewportId = AzFramework::ViewportId(0);
 
-    class TestModularCameraViewportContextImpl : public AtomToolsFramework::ModularCameraViewportContext
+    TEST_F(ModularViewportCameraControllerFixture, MouseMovementDoesNotAccumulateExcessiveDriftInModularViewportCameraWithVaryingDeltaTime)
     {
-    public:
-        AZ::Transform GetCameraTransform() const override
-        {
-            return m_cameraTransform;
-        }
-
-        void SetCameraTransform(const AZ::Transform& transform) override
-        {
-            m_cameraTransform = transform;
-        }
-
-        void ConnectViewMatrixChangedHandler(AZ::RPI::ViewportContext::MatrixChangedEvent::Handler&) override
-        {
-            // noop
-        }
-
-    private:
-        AZ::Transform m_cameraTransform = AZ::Transform::CreateIdentity();
-    };
-
-    TEST_F(ModularViewportCameraControllerFixture, Mouse_movement_does_not_accumulate_excessive_drift_in_modular_viewport_camera)
-    {
-        AzFramework::NativeWindowHandle nativeWindowHandle = nullptr;
-
-        const float deltaTime = 1.0f / 60.0f; // mimic 60fps
-
         // Given
-        // listen for events signaled from QtEventToAzInputMapper and forward to the controller list
-        QObject::connect(
-            m_inputChannelMapper.get(), &AzToolsFramework::QtEventToAzInputMapper::InputChannelUpdated, m_rootWidget.get(),
-            [this, nativeWindowHandle](const AzFramework::InputChannel* inputChannel, [[maybe_unused]] QEvent* event)
-            {
-                m_controllerList->HandleInputChannelEvent(
-                    AzFramework::ViewportControllerInputEvent{ TestViewportId, nativeWindowHandle, *inputChannel });
-            });
-
-        using ::testing::NiceMock;
-        using ::testing::Return;
-
-        NiceMock<MockWindowRequests> mockWindowRequests;
-        mockWindowRequests.Connect(nativeWindowHandle);
-
-        // note: WindowRequests is used internally by ModularViewportCameraController, this ensures it returns the viewport size we want
-        ON_CALL(mockWindowRequests, GetClientAreaSize())
-            .WillByDefault(Return(AzFramework::WindowSize(WidgetSize.width(), WidgetSize.height())));
-
-        // create editor modular camera
-        auto controller = CreateModularViewportCameraController(TestViewportId);
-
-        // set some overrides for the test
-        AtomToolsFramework::ModularCameraViewportContext* cameraViewportContextView = nullptr;
-        controller->SetCameraViewportContextBuilderCallback(
-            [&cameraViewportContextView](AZStd::unique_ptr<AtomToolsFramework::ModularCameraViewportContext>& cameraViewportContext)
-            {
-                cameraViewportContext = AZStd::make_unique<TestModularCameraViewportContextImpl>();
-                cameraViewportContextView = cameraViewportContext.get();
-            });
-
-        controller->SetCameraPropsBuilderCallback(
-            [](AzFramework::CameraProps& cameraProps)
-            {
-                cameraProps.m_rotateSmoothingEnabledFn = []
-                {
-                    return false;
-                };
-
-                cameraProps.m_translateSmoothingEnabledFn = []
-                {
-                    return false;
-                };
-            });
-
-        m_controllerList->Add(controller);
-
-        // move to the center of the screen
-        auto start = QPoint(WidgetSize.width() / 2, WidgetSize.height() / 2);
-        MouseMove(m_rootWidget.get(), start, QPoint(0, 0));
-        m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(deltaTime), AZ::ScriptTimePoint() });
+        PrepareCollaborators();
 
         // When
-        // move mouse diagonally to top right, then to bottom left and back repeatedly
-        auto current = start;
-        auto halfDelta = QPoint(200, -200);
-        const int iterationsPerDiagonal = 50;
-        for (int diagonals = 0; diagonals < 80; ++diagonals)
-        {
-            for (int i = 0; i < iterationsPerDiagonal; ++i)
+        RepeatDiagonalMouseMovements(
+            [t = 0.0f]() mutable
             {
-                MousePressAndMove(m_rootWidget.get(), current, halfDelta / iterationsPerDiagonal, Qt::MouseButton::RightButton);
-                m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(deltaTime), AZ::ScriptTimePoint() });
-                current += halfDelta / iterationsPerDiagonal;
-            }
-
-            if (diagonals % 2 == 0)
-            {
-                halfDelta.setX(halfDelta.x() * -1);
-                halfDelta.setY(halfDelta.y() * -1);
-            }
-        }
-
-        QTest::mouseRelease(m_rootWidget.get(), Qt::MouseButton::RightButton, Qt::KeyboardModifier::NoModifier, current);
-        m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(deltaTime), AZ::ScriptTimePoint() });
+                // vary between 30 and 50 fps (40 +/- 10)
+                const float fps = 40.0f + (10.0f * AZStd::sin(t));
+                t += AZ::DegToRad(5.0f);
+                return 1.0f / fps;
+            });
 
         // Then
         // ensure the camera rotation is the identity (no significant drift has occurred as we moved the mouse)
-        const AZ::Transform cameraRotation = cameraViewportContextView->GetCameraTransform();
+        const AZ::Transform cameraRotation = m_cameraViewportContextView->GetCameraTransform();
         EXPECT_THAT(cameraRotation.GetRotation(), IsClose(AZ::Quaternion::CreateIdentity()));
 
-        mockWindowRequests.Disconnect();
+        // Clean-up
+        HaltCollaborators();
     }
+
+    class ModularViewportCameraControllerDeltaTimeParamFixture
+        : public ModularViewportCameraControllerFixture
+        , public ::testing::WithParamInterface<float> // delta time
+    {
+    };
+
+    TEST_P(
+        ModularViewportCameraControllerDeltaTimeParamFixture,
+        MouseMovementDoesNotAccumulateExcessiveDriftInModularViewportCameraWithFixedDeltaTime)
+    {
+        // Given
+        PrepareCollaborators();
+
+        // When
+        RepeatDiagonalMouseMovements(
+            [this]
+            {
+                return GetParam();
+            });
+
+        // Then
+        // ensure the camera rotation is the identity (no significant drift has occurred as we moved the mouse)
+        const AZ::Transform cameraRotation = m_cameraViewportContextView->GetCameraTransform();
+        EXPECT_THAT(cameraRotation.GetRotation(), IsClose(AZ::Quaternion::CreateIdentity()));
+
+        // Clean-up
+        HaltCollaborators();
+    }
+
+    INSTANTIATE_TEST_CASE_P(
+        All, ModularViewportCameraControllerDeltaTimeParamFixture, testing::Values(1.0f / 60.0f, 1.0f / 50.0f, 1.0f / 30.0f));
 } // namespace UnitTest

Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventListener.h

@@ -35,6 +35,7 @@ namespace AzFramework
         //! Predefined input event listener priority, used to sort handlers from highest to lowest
         inline static AZ::s32 GetPriorityFirst()    { return std::numeric_limits<AZ::s32>::max(); }
         inline static AZ::s32 GetPriorityDebug()    { return (GetPriorityFirst() / 4) * 3;        }
+        inline static AZ::s32 GetPriorityDebugUI()  { return (GetPriorityFirst() / 8) * 5;        }
         inline static AZ::s32 GetPriorityUI()       { return GetPriorityFirst() / 2;              }
         inline static AZ::s32 GetPriorityDefault()  { return 0;                                   }
         inline static AZ::s32 GetPriorityLast()     { return std::numeric_limits<AZ::s32>::min(); }

Code/Framework/AzFramework/AzFramework/Input/Events/InputTextEventListener.h

@@ -28,6 +28,7 @@ namespace AzFramework
         //! Predefined text event listener priority, used to sort handlers from highest to lowest
         inline static AZ::s32 GetPriorityFirst()    { return std::numeric_limits<AZ::s32>::max(); }
         inline static AZ::s32 GetPriorityDebug()    { return (GetPriorityFirst() / 4) * 3;        }
+        inline static AZ::s32 GetPriorityDebugUI()  { return (GetPriorityFirst() / 8) * 5;        }
         inline static AZ::s32 GetPriorityUI()       { return GetPriorityFirst() / 2;              }
         inline static AZ::s32 GetPriorityDefault()  { return 0;                                   }
         inline static AZ::s32 GetPriorityLast()     { return std::numeric_limits<AZ::s32>::min(); }

Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionGroups.cpp

@@ -13,14 +13,6 @@
 
 #include <AzFramework/Physics/CollisionBus.h>
 
-//This bit is defined in the TouchBending Gem wscript.
-//Make sure the bit has a valid value.
-#ifdef TOUCHBENDING_LAYER_BIT
-#if (TOUCHBENDING_LAYER_BIT < 1) || (TOUCHBENDING_LAYER_BIT > 63)
-#error Invalid Bit Definition For the TouchBending Layer Bit
-#endif
-#endif //#ifdef TOUCHBENDING_LAYER_BIT
-
 namespace AzPhysics
 {
     AZ_CLASS_ALLOCATOR_IMPL(CollisionGroup, AZ::SystemAllocator, 0);
@@ -31,10 +23,6 @@ namespace AzPhysics
     const CollisionGroup CollisionGroup::None = 0x0000000000000000ULL;
     const CollisionGroup CollisionGroup::All = 0xFFFFFFFFFFFFFFFFULL;
 
-#ifdef TOUCHBENDING_LAYER_BIT
-    const CollisionGroup CollisionGroup::All_NoTouchBend = CollisionGroup::All.GetMask() & ~CollisionLayer::TouchBend.GetMask();
-#endif
-
     void CollisionGroupScriptConstructor(CollisionGroup* thisPtr, AZ::ScriptDataContext& scriptDataContext)
     {
         if (int numArgs = scriptDataContext.GetNumArguments();

Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionLayers.cpp

@@ -14,14 +14,6 @@
 
 #include <AzFramework/Physics/CollisionBus.h>
 
-//This bit is defined in the TouchBending Gem wscript.
-//Make sure the bit has a valid value.
-#ifdef TOUCHBENDING_LAYER_BIT
-#if (TOUCHBENDING_LAYER_BIT < 1) || (TOUCHBENDING_LAYER_BIT > 63)
-#error Invalid Bit Definition For the TouchBending Layer Bit
-#endif
-#endif //#ifdef TOUCHBENDING_LAYER_BIT
-
 namespace AzPhysics
 {
     AZ_CLASS_ALLOCATOR_IMPL(CollisionLayer, AZ::SystemAllocator, 0);
@@ -29,10 +21,6 @@ namespace AzPhysics
 
     const CollisionLayer CollisionLayer::Default = 0;
 
-#ifdef TOUCHBENDING_LAYER_BIT
-    const CollisionLayer CollisionLayer::TouchBend = TOUCHBENDING_LAYER_BIT;
-#endif
-
     void CollisionLayer::Reflect(AZ::ReflectContext* context)
     {
         if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))

Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/StaticRigidBody.h

@@ -32,12 +32,20 @@ namespace AzPhysics
     {
     public:
         AZ_CLASS_ALLOCATOR_DECL;
-        AZ_RTTI(StaticRigidBody, "{13A677BB-7085-4EDB-BCC8-306548238692}", SimulatedBody);
+        AZ_RTTI(AzPhysics::StaticRigidBody, "{13A677BB-7085-4EDB-BCC8-306548238692}", AzPhysics::SimulatedBody);
         static void Reflect(AZ::ReflectContext* context);
 
-        //Legacy API - may change with LYN-438
+        //! Add a shape to the static rigid body.
+        //! @param shape A shared pointer of the shape to add.
         virtual void AddShape(const AZStd::shared_ptr<Physics::Shape>& shape) = 0;
+
+        //! Returns the number of shapes that make up this static rigid body.
+        //! @return Returns the number of shapes as a AZ::u32.
         virtual AZ::u32 GetShapeCount() { return 0; }
+
+        //! Returns a shared pointer to the requested shape index.
+        //! @param index The index of the shapes to return. Expected to be between 0 and GetShapeCount().
+        //! @return Returns a shared pointer of the shape requested or nullptr if index is out of bounds.
         virtual AZStd::shared_ptr<Physics::Shape> GetShape([[maybe_unused]]AZ::u32 index) { return nullptr; }
     };
 }

Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp

@@ -802,7 +802,6 @@ namespace AzFramework
             {
                 return VerticalMotionEvent{ aznumeric_cast<int>(inputChannel.GetValue()) };
             }
-
             else if (inputChannelId == InputDeviceMouse::Movement::Z)
             {
                 return ScrollEvent{ inputChannel.GetValue() };

Code/Framework/AzFramework/CMakeLists.txt

@@ -10,8 +10,6 @@
 ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
 ly_get_list_relative_pal_filename(common_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/Common)
 
-set(LY_TOUCHBENDING_LAYER_BIT 63 CACHE STRING "Use TouchBending as the collision layer. The TouchBending layer can be a number from 1 to 63 (Default=63).")
-
 ly_add_target(
     NAME AzFramework STATIC
     NAMESPACE AZ
@@ -37,14 +35,6 @@ ly_add_target(
             3rdParty::lz4
 )
 
-ly_add_source_properties(
-    SOURCES 
-        AzFramework/Physics/Collision/CollisionGroups.cpp
-        AzFramework/Physics/Collision/CollisionLayers.cpp
-    PROPERTY COMPILE_DEFINITIONS
-    VALUES TOUCHBENDING_LAYER_BIT=${LY_TOUCHBENDING_LAYER_BIT}
-)
-
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
 
     ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Tests/Platform/${PAL_PLATFORM_NAME})

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp

@@ -650,7 +650,10 @@ namespace AzToolsFramework
 
         AZStd::unique_ptr<AZ::Entity> Instance::DetachContainerEntity()
         {
-            m_instanceEntityMapper->UnregisterEntity(m_containerEntity->GetId());
+            if (m_containerEntity)
+            {
+                m_instanceEntityMapper->UnregisterEntity(m_containerEntity->GetId());
+            }
             return AZStd::move(m_containerEntity);
         }
     }

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.cpp

@@ -65,16 +65,24 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils
             AzFramework::Spawnable::EntityList& entities = spawnable->GetEntities();
             for (auto it = entities.begin(); it != entities.end(); )
             {
-                (*it)->InvalidateDependencies();
-                AZ::Entity::DependencySortOutcome evaluation = (*it)->EvaluateDependenciesGetDetails();
-                if (evaluation.IsSuccess())
+                if (*it)
                 {
-                    ++it;
+                    (*it)->InvalidateDependencies();
+                    AZ::Entity::DependencySortOutcome evaluation = (*it)->EvaluateDependenciesGetDetails();
+                    if (evaluation.IsSuccess())
+                    {
+                        ++it;
+                    }
+                    else
+                    {
+                        AZ_Error(
+                            "Prefabs", false, "Entity '%s' %s cannot be activated for the following reason: %s", (*it)->GetName().c_str(),
+                            (*it)->GetId().ToString().c_str(), evaluation.GetError().m_message.c_str());
+                        it = entities.erase(it);
+                    }
                 }
                 else
                 {
-                    AZ_Error("Prefabs", false, "Entity '%s' %s cannot be activated for the following reason: %s",
-                        (*it)->GetName().c_str(), (*it)->GetId().ToString().c_str(), evaluation.GetError().m_message.c_str());
                     it = entities.erase(it);
                 }
             }

Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h

@@ -275,9 +275,7 @@ namespace AzToolsFramework
             virtual void BeginCursorCapture() = 0;
             //! Restores the cursor and ends locking it in place, allowing it to be moved freely.
             virtual void EndCursorCapture() = 0;
-            //! Gets the most recent recorded cursor position in the viewport in screen space coordinates.
-            virtual AzFramework::ScreenPoint ViewportCursorScreenPosition() = 0;
-            //! Is mouse over viewport.
+            //! Is the mouse over the viewport.
             virtual bool IsMouseOver() const = 0;
 
         protected:

Code/Tools/ProjectManager/Resources/ProjectManager.qss

@@ -20,8 +20,7 @@ QPushButton:focus {
 QTabBar {
     background-color: transparent;
 }
-QTabWidget::tab-bar
-{
+QTabWidget::tab-bar {
     left: 78px; /* make room for the logo */
 }
 QTabBar::tab {
@@ -32,27 +31,35 @@ QTabBar::tab {
     margin-right:40px;
     border-bottom: 3px solid transparent;
 }
-QTabBar::tab:text
-{
+QTabBar::tab:text {
     text-align:left;
 }
 QTabWidget::pane {
     background-color: #333333;
     border:0 none;
 }
-QTabBar::tab:selected
-{
+QTabBar::tab:selected {
+    background-color: transparent;
     border-bottom: 3px solid #1e70eb;
     color: #1e70eb;
+    font-weight: 500;
 }
-QTabBar::tab:hover
-{
+QTabBar::tab:hover {
     color: #1e70eb;
+    font-weight: 500;
 }
-QTabBar::tab:pressed
-{
+QTabBar::tab:pressed {
     color: #0e60eb;
 }
+QTabBar::focus {
+    outline: 0px;
+    outline: none;
+    outline-style: none;
+}
+QTabBar::tab:focus {
+    background-color: #525252;
+    color: #4082eb;
+}
 
 /************** General (Forms) **************/
 

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

@@ -117,7 +117,7 @@ namespace O3DE::ProjectManager
         gemNames.reserve(gems.size());
         for (const QModelIndex& modelIndex : gems)
         {
-            gemNames.push_back(GemModel::GetName(modelIndex));
+            gemNames.push_back(GemModel::GetDisplayName(modelIndex));
         }
         return gemNames;
     }

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

@@ -156,7 +156,7 @@ namespace O3DE::ProjectManager
             if (!result.IsSuccess())
             {
                 QMessageBox::critical(nullptr, "Operation failed",
-                    QString("Cannot add gem %1 to project.\n\nError:\n%2").arg(GemModel::GetName(modelIndex), result.GetError().c_str()));
+                    QString("Cannot add gem %1 to project.\n\nError:\n%2").arg(GemModel::GetDisplayName(modelIndex), result.GetError().c_str()));
 
                 return false;
             }
@@ -169,7 +169,7 @@ namespace O3DE::ProjectManager
             if (!result.IsSuccess())
             {
                 QMessageBox::critical(nullptr, "Operation failed",
-                    QString("Cannot remove gem %1 from project.\n\nError:\n%2").arg(GemModel::GetName(modelIndex), result.GetError().c_str()));
+                    QString("Cannot remove gem %1 from project.\n\nError:\n%2").arg(GemModel::GetDisplayName(modelIndex), result.GetError().c_str()));
 
                 return false;
             }

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

@@ -58,7 +58,7 @@ namespace O3DE::ProjectManager
             m_mainWidget->hide();
         }
 
-        m_nameLabel->setText(m_model->GetName(modelIndex));
+        m_nameLabel->setText(m_model->GetDisplayName(modelIndex));
         m_creatorLabel->setText(m_model->GetCreator(modelIndex));
 
         m_summaryLabel->setText(m_model->GetSummary(modelIndex));

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

@@ -75,7 +75,7 @@ namespace O3DE::ProjectManager
         }
 
         // Gem name
-        QString gemName = GemModel::GetName(modelIndex);
+        QString gemName = GemModel::GetDisplayName(modelIndex);
         QFont gemNameFont(options.font);
         const int firstColumnMaxTextWidth = s_summaryStartX - 30;
         gemNameFont.setPixelSize(static_cast<int>(s_gemNameFontSize));

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

@@ -30,6 +30,7 @@ namespace O3DE::ProjectManager
         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
 
         item->setData(gemInfo.m_name, RoleName);
+        item->setData(gemInfo.m_displayName, RoleDisplayName);
         item->setData(gemInfo.m_creator, RoleCreator);
         item->setData(gemInfo.m_gemOrigin, RoleGemOrigin);
         item->setData(aznumeric_cast<int>(gemInfo.m_platforms), RolePlatforms);
@@ -64,6 +65,20 @@ namespace O3DE::ProjectManager
         return modelIndex.data(RoleName).toString();
     }
 
+    QString GemModel::GetDisplayName(const QModelIndex& modelIndex)
+    {
+        QString displayName = modelIndex.data(RoleDisplayName).toString();
+
+        if (displayName.isEmpty())
+        {
+            return GetName(modelIndex);
+        }
+        else
+        {
+            return displayName;
+        }
+    }
+
     QString GemModel::GetCreator(const QModelIndex& modelIndex)
     {
         return modelIndex.data(RoleCreator).toString();
@@ -117,7 +132,7 @@ namespace O3DE::ProjectManager
             QModelIndex modelIndex = FindIndexByNameString(dependingGemString);
             if (modelIndex.isValid())
             {
-                dependingGemString = GetName(modelIndex);
+                dependingGemString = GetDisplayName(modelIndex);
             }
         }
     }

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

@@ -37,6 +37,7 @@ namespace O3DE::ProjectManager
         QStringList GetConflictingGemNames(const QModelIndex& modelIndex);
 
         static QString GetName(const QModelIndex& modelIndex);
+        static QString GetDisplayName(const QModelIndex& modelIndex);
         static QString GetCreator(const QModelIndex& modelIndex);
         static GemInfo::GemOrigin GetGemOrigin(const QModelIndex& modelIndex);
         static GemInfo::Platforms GetPlatforms(const QModelIndex& modelIndex);
@@ -69,6 +70,7 @@ namespace O3DE::ProjectManager
         enum UserRole
         {
             RoleName = Qt::UserRole,
+            RoleDisplayName,
             RoleCreator,
             RoleGemOrigin,
             RolePlatforms,

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

@@ -51,7 +51,7 @@ namespace O3DE::ProjectManager
         painter->fillRect(itemRect, itemBackgroundColor);
 
         // Gem name
-        QString gemName = GemModel::GetName(modelIndex);
+        QString gemName = GemModel::GetDisplayName(modelIndex);
         QFont gemNameFont(options.font);
         const int firstColumnMaxTextWidth = s_summaryStartX - 30;
         gemName = QFontMetrics(gemNameFont).elidedText(gemName, Qt::TextElideMode::ElideRight, firstColumnMaxTextWidth);

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

@@ -28,9 +28,26 @@ namespace O3DE::ProjectManager
             return false;
         }
 
-        if (!m_sourceModel->GetName(sourceIndex).contains(m_searchString, Qt::CaseInsensitive))
+        // Search Bar
+        if (!m_sourceModel->GetDisplayName(sourceIndex).contains(m_searchString, Qt::CaseInsensitive) &&
+            !m_sourceModel->GetName(sourceIndex).contains(m_searchString, Qt::CaseInsensitive) &&
+            !m_sourceModel->GetCreator(sourceIndex).contains(m_searchString, Qt::CaseInsensitive) &&
+            !m_sourceModel->GetSummary(sourceIndex).contains(m_searchString, Qt::CaseInsensitive))
         {
-            return false;
+            bool foundFeature = false;
+            for (const QString& feature : m_sourceModel->GetFeatures(sourceIndex))
+            {
+                if (feature.contains(m_searchString, Qt::CaseInsensitive))
+                {
+                    foundFeature = true;
+                    break;
+                }
+            }
+
+            if (!foundFeature)
+            {
+                return false;
+            }
         }
 
         // Gem status

Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp

@@ -52,6 +52,7 @@ namespace O3DE::ProjectManager
 
         if (projectButton)
         {
+            projectButton->SetProjectBuilding();
             projectButton->SetProjectButtonAction(tr("Cancel Build"), [this] { HandleCancel(); });
 
             if (m_lastProgress != 0)
@@ -111,6 +112,10 @@ namespace O3DE::ProjectManager
             emit Done(false);
             return;
         }
+        else
+        {
+            m_projectInfo.m_buildFailed = false;
+        }
 
         emit Done(true);
     }

Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp

@@ -162,22 +162,9 @@ namespace O3DE::ProjectManager
         QDesktopServices::openUrl(m_logUrl);
     }
 
-    ProjectButton::ProjectButton(const ProjectInfo& projectInfo, QWidget* parent, bool processing)
+    ProjectButton::ProjectButton(const ProjectInfo& projectInfo, QWidget* parent)
         : QFrame(parent)
         , m_projectInfo(projectInfo)
-    {
-        BaseSetup();
-        if (processing)
-        {
-            ProcessingSetup();
-        }
-        else
-        {
-            ReadySetup();
-        }
-    }
-
-    void ProjectButton::BaseSetup()
     {
         setObjectName("projectButton");
 
@@ -199,50 +186,63 @@ namespace O3DE::ProjectManager
         }
         m_projectImageLabel->setPixmap(QPixmap(projectPreviewPath).scaled(m_projectImageLabel->size(), Qt::KeepAspectRatioByExpanding));
 
-        m_projectFooter = new QFrame(this);
+        QFrame* projectFooter = new QFrame(this);
         QHBoxLayout* hLayout = new QHBoxLayout();
         hLayout->setContentsMargins(0, 0, 0, 0);
-        m_projectFooter->setLayout(hLayout);
+        projectFooter->setLayout(hLayout);
         {
             QLabel* projectNameLabel = new QLabel(m_projectInfo.GetProjectDisplayName(), this);
             hLayout->addWidget(projectNameLabel);
+
+            QMenu* menu = new QMenu(this);
+            menu->addAction(tr("Edit Project Settings..."), this, [this]() { emit EditProject(m_projectInfo.m_path); });
+            menu->addAction(tr("Build"), this, [this]() { emit BuildProject(m_projectInfo); });
+            menu->addSeparator();
+            menu->addAction(tr("Open Project folder..."), this, [this]()
+            { 
+                AzQtComponents::ShowFileOnDesktop(m_projectInfo.m_path);
+            });
+            menu->addSeparator();
+            menu->addAction(tr("Duplicate"), this, [this]() { emit CopyProject(m_projectInfo); });
+            menu->addSeparator();
+            menu->addAction(tr("Remove from O3DE"), this, [this]() { emit RemoveProject(m_projectInfo.m_path); });
+            menu->addAction(tr("Delete this Project"), this, [this]() { emit DeleteProject(m_projectInfo.m_path); });
+
+            m_projectMenuButton = new QPushButton(this);
+            m_projectMenuButton->setObjectName("projectMenuButton");
+            m_projectMenuButton->setMenu(menu);
+            hLayout->addWidget(m_projectMenuButton);
         }
 
-        vLayout->addWidget(m_projectFooter);
+        vLayout->addWidget(projectFooter);
+
+        connect(m_projectImageLabel->GetOpenEditorButton(), &QPushButton::clicked, [this](){ emit OpenProject(m_projectInfo.m_path); });
     }
 
-    void ProjectButton::ProcessingSetup()
+    const ProjectInfo& ProjectButton::GetProjectInfo() const
     {
-        m_projectImageLabel->SetEnabled(false);
-        m_projectImageLabel->SetOverlayText(tr("Processing...\n\n"));
+        return m_projectInfo;
+    }
+
+    void ProjectButton::RestoreDefaultState()
+    {
+        m_projectImageLabel->SetEnabled(true);
+        m_projectImageLabel->SetOverlayText("");
+        m_projectMenuButton->setVisible(true);
 
         QProgressBar* progressBar = m_projectImageLabel->GetProgressBar();
-        progressBar->setVisible(true);
+        progressBar->setVisible(false);
         progressBar->setValue(0);
-    }
 
-    void ProjectButton::ReadySetup()
-    {
-        connect(m_projectImageLabel->GetOpenEditorButton(), &QPushButton::clicked, [this](){ emit OpenProject(m_projectInfo.m_path); });
+        QPushButton* projectActionButton = m_projectImageLabel->GetActionButton();
+        projectActionButton->setVisible(false);
+        if (m_actionButtonConnection)
+        {
+            disconnect(m_actionButtonConnection);
+        }
 
-        QMenu* menu = new QMenu(this);
-        menu->addAction(tr("Edit Project Settings..."), this, [this]() { emit EditProject(m_projectInfo.m_path); });
-        menu->addAction(tr("Build"), this, [this]() { emit BuildProject(m_projectInfo); });
-        menu->addSeparator();
-        menu->addAction(tr("Open Project folder..."), this, [this]()
-        { 
-            AzQtComponents::ShowFileOnDesktop(m_projectInfo.m_path);
-        });
-        menu->addSeparator();
-        menu->addAction(tr("Duplicate"), this, [this]() { emit CopyProject(m_projectInfo); });
-        menu->addSeparator();
-        menu->addAction(tr("Remove from O3DE"), this, [this]() { emit RemoveProject(m_projectInfo.m_path); });
-        menu->addAction(tr("Delete this Project"), this, [this]() { emit DeleteProject(m_projectInfo.m_path); });
-
-        QPushButton* projectMenuButton = new QPushButton(this);
-        projectMenuButton->setObjectName("projectMenuButton");
-        projectMenuButton->setMenu(menu);
-        m_projectFooter->layout()->addWidget(projectMenuButton);
+        m_projectImageLabel->GetWarningIcon()->setVisible(false);
+        m_projectImageLabel->GetWarningLabel()->setVisible(false);
     }
 
     void ProjectButton::SetProjectButtonAction(const QString& text, AZStd::function<void()> lambda)
@@ -292,9 +292,15 @@ namespace O3DE::ProjectManager
         SetProjectButtonAction(tr("Build Project"), [this]() { emit BuildProject(m_projectInfo); });
     }
 
-    void ProjectButton::BuildThisProject()
+    void ProjectButton::SetProjectBuilding()
     {
-        emit BuildProject(m_projectInfo);
+        m_projectImageLabel->SetEnabled(false);
+        m_projectImageLabel->SetOverlayText(tr("Building...\n\n"));
+        m_projectMenuButton->setVisible(false);
+
+        QProgressBar* progressBar = m_projectImageLabel->GetProgressBar();
+        progressBar->setVisible(true);
+        progressBar->setValue(0);
     }
 
     void ProjectButton::SetLaunchButtonEnabled(bool enabled)

Code/Tools/ProjectManager/Source/ProjectButtonWidget.h

@@ -56,13 +56,14 @@ namespace O3DE::ProjectManager
         void OnLinkActivated(const QString& link);
 
     private:
-        QVBoxLayout* m_buildOverlayLayout;
-        QLabel* m_overlayLabel;
-        QProgressBar* m_progressBar;
-        QPushButton* m_openEditorButton;
-        QPushButton* m_actionButton;
-        QLabel* m_warningText;
-        QLabel* m_warningIcon;
+        QVBoxLayout* m_buildOverlayLayout = nullptr;
+        QLabel* m_overlayLabel = nullptr;
+        QProgressBar* m_progressBar = nullptr;
+        QPushButton* m_openEditorButton = nullptr;
+        QPushButton* m_actionButton = nullptr;
+        QLabel* m_warningText = nullptr;
+        QLabel* m_warningIcon = nullptr;
+
         QUrl m_logUrl;
         bool m_enabled = true;
     };
@@ -73,13 +74,18 @@ namespace O3DE::ProjectManager
         Q_OBJECT // AUTOMOC
 
     public:
-        explicit ProjectButton(const ProjectInfo& m_projectInfo, QWidget* parent = nullptr, bool processing = false);
+        explicit ProjectButton(const ProjectInfo& m_projectInfo, QWidget* parent = nullptr);
         ~ProjectButton() = default;
 
+        const ProjectInfo& GetProjectInfo() const;
+
+        void RestoreDefaultState();
+
         void SetProjectButtonAction(const QString& text, AZStd::function<void()> lambda);
         void SetProjectBuildButtonAction();
         void SetBuildLogsLink(const QUrl& logUrl);
         void ShowBuildFailed(bool show, const QUrl& logUrl);
+        void SetProjectBuilding();
 
         void SetLaunchButtonEnabled(bool enabled);
         void SetButtonOverlayText(const QString& text);
@@ -95,17 +101,14 @@ namespace O3DE::ProjectManager
         void BuildProject(const ProjectInfo& projectInfo);
 
     private:
-        void BaseSetup();
-        void ProcessingSetup();
-        void ReadySetup();
         void enterEvent(QEvent* event) override;
         void leaveEvent(QEvent* event) override;
-        void BuildThisProject();
 
         ProjectInfo m_projectInfo;
-        LabelButton* m_projectImageLabel;
-        QFrame* m_projectFooter;
-        QLayout* m_requiresBuildLayout;
+
+        LabelButton* m_projectImageLabel = nullptr;
+        QPushButton* m_projectMenuButton = nullptr;
+        QLayout* m_requiresBuildLayout = nullptr;
 
         QMetaObject::Connection m_actionButtonConnection;
     };

Code/Tools/ProjectManager/Source/ProjectsScreen.cpp

@@ -68,9 +68,7 @@ namespace O3DE::ProjectManager
     }
 
     ProjectsScreen::~ProjectsScreen()
-
     {
-        delete m_currentBuilder;
     }
 
     QFrame* ProjectsScreen::CreateFirstTimeContent()
@@ -114,10 +112,8 @@ namespace O3DE::ProjectManager
         return frame;
     }
 
-    QFrame* ProjectsScreen::CreateProjectsContent(QString buildProjectPath, ProjectButton** projectButton)
+    QFrame* ProjectsScreen::CreateProjectsContent()
     {
-        RemoveInvalidProjects();
-
         QFrame* frame = new QFrame(this);
         frame->setObjectName("projectsContent");
         {
@@ -126,7 +122,7 @@ namespace O3DE::ProjectManager
             layout->setContentsMargins(0, 0, 0, 0);
             frame->setLayout(layout);
 
-            QFrame* header = new QFrame(this);
+            QFrame* header = new QFrame(frame);
             QHBoxLayout* headerLayout = new QHBoxLayout();
             {
                 QLabel* titleLabel = new QLabel(tr("My Projects"), this);
@@ -150,87 +146,34 @@ namespace O3DE::ProjectManager
 
             layout->addWidget(header);
 
-            // 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();
+            QScrollArea* projectsScrollArea = new QScrollArea(this);
+            QWidget* scrollWidget = new QWidget();
 
-                FlowLayout* flowLayout = new FlowLayout(0, s_spacerSize, s_spacerSize);
-                scrollWidget->setLayout(flowLayout);
+            m_projectsFlowLayout = new FlowLayout(0, s_spacerSize, s_spacerSize);
+            scrollWidget->setLayout(m_projectsFlowLayout);
 
-                projectsScrollArea->setWidget(scrollWidget);
-                projectsScrollArea->setWidgetResizable(true);
+            projectsScrollArea->setWidget(scrollWidget);
+            projectsScrollArea->setWidgetResizable(true);
 
-                QVector<ProjectInfo> nonProcessingProjects;
-                buildProjectPath = QDir::fromNativeSeparators(buildProjectPath);
-                for (auto& project : projectsResult.GetValue())
-                {
-                    if (projectButton && !*projectButton)
-                    {
-                        if (QDir::fromNativeSeparators(project.m_path) == buildProjectPath)
-                        {
-                            *projectButton = CreateProjectButton(project, flowLayout, true);
-                            continue;
-                        }
-                    }
+            ResetProjectsContent();
 
-                    nonProcessingProjects.append(project);
-                }
-
-                for (auto& project : nonProcessingProjects)
-                {
-                    ProjectButton* projectButtonWidget = CreateProjectButton(project, flowLayout);
-
-                    if (BuildQueueContainsProject(project.m_path))
-                    {
-                        projectButtonWidget->SetProjectButtonAction(tr("Cancel Queued Build"),
-                            [this, project]
-                            {
-                                UnqueueBuildProject(project);
-                                SuggestBuildProjectMsg(project, false);
-                            });
-                    }
-                    else if (RequiresBuildProjectIterator(project.m_path) != m_requiresBuild.end())
-                    {
-                        auto buildProjectIterator = RequiresBuildProjectIterator(project.m_path);
-                        if (buildProjectIterator != m_requiresBuild.end())
-                        {
-                            if (buildProjectIterator->m_buildFailed)
-                            {
-                                projectButtonWidget->ShowBuildFailed(true, buildProjectIterator->m_logUrl);
-                            }
-                            else
-                            {
-                                projectButtonWidget->SetProjectBuildButtonAction();
-                            }
-                        }
-                        
-                    }
-                }
-
-                layout->addWidget(projectsScrollArea);
-            }
+            layout->addWidget(projectsScrollArea);
         }
 
         return frame;
     }
 
-    ProjectButton* ProjectsScreen::CreateProjectButton(ProjectInfo& project, QLayout* flowLayout, bool processing)
+    ProjectButton* ProjectsScreen::CreateProjectButton(const ProjectInfo& project)
     {
-        ProjectButton* projectButton = new ProjectButton(project, this, processing);
+        ProjectButton* projectButton = new ProjectButton(project, this);
+        m_projectButtons.insert(project.m_path, projectButton);
+        m_projectsFlowLayout->addWidget(projectButton);
 
-        flowLayout->addWidget(projectButton);
-
-        if (!processing)
-        {
-            connect(projectButton, &ProjectButton::OpenProject, this, &ProjectsScreen::HandleOpenProject);
-            connect(projectButton, &ProjectButton::EditProject, this, &ProjectsScreen::HandleEditProject);
-            connect(projectButton, &ProjectButton::CopyProject, this, &ProjectsScreen::HandleCopyProject);
-            connect(projectButton, &ProjectButton::RemoveProject, this, &ProjectsScreen::HandleRemoveProject);
-            connect(projectButton, &ProjectButton::DeleteProject, this, &ProjectsScreen::HandleDeleteProject);
-        }
+        connect(projectButton, &ProjectButton::OpenProject, this, &ProjectsScreen::HandleOpenProject);
+        connect(projectButton, &ProjectButton::EditProject, this, &ProjectsScreen::HandleEditProject);
+        connect(projectButton, &ProjectButton::CopyProject, this, &ProjectsScreen::HandleCopyProject);
+        connect(projectButton, &ProjectButton::RemoveProject, this, &ProjectsScreen::HandleRemoveProject);
+        connect(projectButton, &ProjectButton::DeleteProject, this, &ProjectsScreen::HandleDeleteProject);
         connect(projectButton, &ProjectButton::BuildProject, this, &ProjectsScreen::QueueBuildProject);
 
         return projectButton;
@@ -238,29 +181,128 @@ namespace O3DE::ProjectManager
 
     void ProjectsScreen::ResetProjectsContent()
     {
-        // refresh the projects content by re-creating it for now
-        if (m_projectsContent)
+        RemoveInvalidProjects();
+
+        // Get all projects and create a vertical scrolling list of them
+        // Sort building and queued projects first
+        auto projectsResult = PythonBindingsInterface::Get()->GetProjects();
+        if (projectsResult.IsSuccess() && !projectsResult.GetValue().isEmpty())
         {
-            m_stack->removeWidget(m_projectsContent);
-            m_projectsContent->deleteLater();
+            QVector<ProjectInfo> projectsVector = projectsResult.GetValue();
+            // If a project path is in this set then the button for it will be kept
+            QSet<QString> keepProject;
+            for (const ProjectInfo& project : projectsVector)
+            {
+                keepProject.insert(project.m_path);
+            }
+
+            // Clear flow and delete buttons for removed projects
+            auto projectButtonsIter = m_projectButtons.begin();
+            while (projectButtonsIter != m_projectButtons.end())
+            {
+                m_projectsFlowLayout->removeWidget(projectButtonsIter.value());
+
+                if (!keepProject.contains(projectButtonsIter.key()))
+                {
+                    projectButtonsIter = m_projectButtons.erase(projectButtonsIter);
+                }
+                else
+                {
+                    ++projectButtonsIter;
+                }
+            }
+
+            QString buildProjectPath = "";
+            if (m_currentBuilder)
+            {
+                buildProjectPath = m_currentBuilder->GetProjectInfo().m_path;
+            }
+
+            // Put currently building project in front, then queued projects, then sorts alphabetically
+            std::sort(projectsVector.begin(), projectsVector.end(), [buildProjectPath, this](const ProjectInfo& arg1, const ProjectInfo& arg2)
+            {
+                if (arg1.m_path == buildProjectPath)
+                {
+                    return true;
+                }
+                else if (arg2.m_path == buildProjectPath)
+                {
+                    return false;
+                }
+
+                bool arg1InBuildQueue = BuildQueueContainsProject(arg1.m_path);
+                bool arg2InBuildQueue = BuildQueueContainsProject(arg2.m_path);
+                if (arg1InBuildQueue && !arg2InBuildQueue)
+                {
+                    return true;
+                }
+                else if (!arg1InBuildQueue && arg2InBuildQueue)
+                {
+                    return false;
+                }
+                else
+                {
+                    return arg1.m_displayName.toLower() < arg2.m_displayName.toLower();
+                }
+            });
+
+            // Add any missing project buttons and restore buttons to default state
+            for (const ProjectInfo& project : projectsVector)
+            {
+                if (!m_projectButtons.contains(project.m_path))
+                {
+                    m_projectButtons.insert(project.m_path, CreateProjectButton(project));
+                }
+                else
+                {
+                    auto projectButtonIter = m_projectButtons.find(project.m_path);
+                    if (projectButtonIter != m_projectButtons.end())
+                    {
+                        projectButtonIter.value()->RestoreDefaultState();
+                        m_projectsFlowLayout->addWidget(projectButtonIter.value());
+                    }
+                }
+            }
+
+            // Setup building button again
+            auto buildProjectIter = m_projectButtons.find(buildProjectPath);
+            if (buildProjectIter != m_projectButtons.end())
+            {
+                m_currentBuilder->SetProjectButton(buildProjectIter.value());
+            }
+
+            for (const ProjectInfo& project : m_buildQueue)
+            {
+                auto projectIter = m_projectButtons.find(project.m_path);
+                if (projectIter != m_projectButtons.end())
+                {
+                    projectIter.value()->SetProjectButtonAction(
+                        tr("Cancel Queued Build"),
+                        [this, project]
+                        {
+                            UnqueueBuildProject(project);
+                            SuggestBuildProjectMsg(project, false);
+                        });
+                }
+            }
+
+            for (const ProjectInfo& project : m_requiresBuild)
+            {
+                auto projectIter = m_projectButtons.find(project.m_path);
+                if (projectIter != m_projectButtons.end())
+                {
+                    if (project.m_buildFailed)
+                    {
+                        projectIter.value()->ShowBuildFailed(true, project.m_logUrl);
+                    }
+                    else
+                    {
+                        projectIter.value()->SetProjectBuildButtonAction();
+                    }
+                }
+            }
         }
 
-        m_background.load(":/Backgrounds/DefaultBackground.jpg");
-
-        // Make sure to update builder with latest Project Button
-        if (m_currentBuilder)
-        {
-            ProjectButton* projectButtonPtr = nullptr;
-
-            m_projectsContent = CreateProjectsContent(m_currentBuilder->GetProjectInfo().m_path, &projectButtonPtr);
-            m_currentBuilder->SetProjectButton(projectButtonPtr);
-        }
-        else
-        {
-            m_projectsContent = CreateProjectsContent();
-        }
-
-        m_stack->addWidget(m_projectsContent);
         m_stack->setCurrentWidget(m_projectsContent);
     }
 
@@ -466,7 +508,7 @@ namespace O3DE::ProjectManager
             if (m_buildQueue.empty() && !m_currentBuilder)
             {
                 StartProjectBuild(projectInfo);
-                // Projects Content is already reset in fuction
+                // Projects Content is already reset in function
             }
             else
             {
@@ -491,6 +533,7 @@ namespace O3DE::ProjectManager
         }
         else
         {
+            m_background.load(":/Backgrounds/DefaultBackground.jpg");
             ResetProjectsContent();
         }
     }

Code/Tools/ProjectManager/Source/ProjectsScreen.h

@@ -18,6 +18,7 @@ QT_FORWARD_DECLARE_CLASS(QPaintEvent)
 QT_FORWARD_DECLARE_CLASS(QFrame)
 QT_FORWARD_DECLARE_CLASS(QStackedWidget)
 QT_FORWARD_DECLARE_CLASS(QLayout)
+QT_FORWARD_DECLARE_CLASS(FlowLayout)
 
 namespace O3DE::ProjectManager
 {
@@ -59,8 +60,8 @@ namespace O3DE::ProjectManager
 
     private:
         QFrame* CreateFirstTimeContent();
-        QFrame* CreateProjectsContent(QString buildProjectPath = "", ProjectButton** projectButton = nullptr);
-        ProjectButton* CreateProjectButton(ProjectInfo& project, QLayout* flowLayout, bool processing = false);
+        QFrame* CreateProjectsContent();
+        ProjectButton* CreateProjectButton(const ProjectInfo& project);
         void ResetProjectsContent();
         bool ShouldDisplayFirstTimeContent();
         bool RemoveInvalidProjects();
@@ -75,7 +76,9 @@ namespace O3DE::ProjectManager
         QPixmap m_background;
         QFrame* m_firstTimeContent = nullptr;
         QFrame* m_projectsContent = nullptr;
+        FlowLayout* m_projectsFlowLayout = nullptr;
         QStackedWidget* m_stack = nullptr;
+        QHash<QString, ProjectButton*> m_projectButtons;
         QList<ProjectInfo> m_requiresBuild;
         QQueue<ProjectInfo> m_buildQueue;
         ProjectBuilderController* m_currentBuilder = nullptr;

Code/Tools/ProjectManager/Source/ScreensCtrl.cpp

@@ -30,6 +30,7 @@ namespace O3DE::ProjectManager
 
         // add a tab widget at the bottom of the stack
         m_tabWidget = new QTabWidget();
+        m_tabWidget->tabBar()->setFocusPolicy(Qt::TabFocus);
         m_screenStack->addWidget(m_tabWidget);
         connect(m_tabWidget, &QTabWidget::currentChanged, this, &ScreensCtrl::TabChanged);
     }

Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp

@@ -54,6 +54,7 @@ namespace O3DE::ProjectManager
         QTabWidget* tabWidget = new QTabWidget();
         tabWidget->setObjectName("projectSettingsTab");
         tabWidget->tabBar()->setObjectName("projectSettingsTabBar");
+        tabWidget->tabBar()->setFocusPolicy(Qt::TabFocus);
         tabWidget->addTab(m_updateSettingsScreen, tr("General"));
 
         QPushButton* gemsButton = new QPushButton(tr("Configure Gems"), this);

Code/Tools/SceneAPI/SceneCore/SceneBuilderDependencyBus.h

@@ -24,7 +24,12 @@ namespace AZ
             : public AZ::EBusTraits
         {
         public:
-            virtual void ReportJobDependencies(JobDependencyList& jobDependencyList, const char* platformIdentifier) = 0;
+            //! Builders can implement this function to add job dependencies on other assets that may be used in the scene file conversion process.
+            virtual void ReportJobDependencies(JobDependencyList& jobDependencyList, const char* platformIdentifier) { AZ_UNUSED(jobDependencyList); AZ_UNUSED(platformIdentifier); }
+            
+            //! Builders can implement this function to append to the job analysis fingerprint. This can be used to trigger rebuilds when global configuration changes.
+            //! See also AssetBuilderDesc::m_analysisFingerprint.
+            virtual void AddFingerprintInfo(AZStd::set<AZStd::string>& fingerprintInfo) { AZ_UNUSED(fingerprintInfo); }
         };
         using SceneBuilderDependencyBus = EBus<SceneBuilderDependencyRequests>;
     } // namespace SceneAPI

Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp

@@ -67,8 +67,8 @@ namespace AZ
 
         ImGuiPass::ImGuiPass(const RPI::PassDescriptor& descriptor)
             : Base(descriptor)
-            , AzFramework::InputChannelEventListener(AzFramework::InputChannelEventListener::GetPriorityUI())
-            , AzFramework::InputTextEventListener(AzFramework::InputTextEventListener::GetPriorityUI())
+            , AzFramework::InputChannelEventListener(AzFramework::InputChannelEventListener::GetPriorityDebugUI() - 1) // Give ImGui manager priority over the pass
+            , AzFramework::InputTextEventListener(AzFramework::InputTextEventListener::GetPriorityDebugUI() - 1) // Give ImGui manager priority over the pass
         {
 
             const ImGuiPassData* imguiPassData = RPI::PassUtils::GetPassData<ImGuiPassData>(descriptor);
@@ -157,11 +157,6 @@ namespace AZ
             return io.WantTextInput;
         }
 
-        AZ::s32 ImGuiPass::GetPriority() const
-        {
-            return AzFramework::InputChannelEventListener::GetPriorityUI();
-        }
-
         bool ImGuiPass::OnInputChannelEventFiltered(const AzFramework::InputChannel& inputChannel)
         {
             if (!IsEnabled() || GetRenderPipeline()->GetScene() == nullptr)

Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.h

@@ -84,7 +84,6 @@ namespace AZ
 
             // AzFramework::InputChannelEventListener overrides...
             bool OnInputChannelEventFiltered(const AzFramework::InputChannel& inputChannel) override;
-            AZ::s32 GetPriority() const override;
 
         protected:
             explicit ImGuiPass(const RPI::PassDescriptor& descriptor);

Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.cpp

@@ -12,12 +12,26 @@
 #include <AzCore/Math/Color.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Settings/SettingsRegistry.h>
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 
+#include <Atom/RPI.Reflect/Material/MaterialAsset.h>
+
 namespace AZ
 {
     namespace Render
     {
+        void MaterialConverterSettings::Reflect(AZ::ReflectContext* context)
+        {
+            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+            {
+                serializeContext->Class<MaterialConverterSettings>()
+                    ->Version(1)
+                    ->Field("Enable", &MaterialConverterSettings::m_enable)
+                    ->Field("DefaultMaterial", &MaterialConverterSettings::m_defaultMaterial);
+            }
+        }
+
         void MaterialConverterSystemComponent::Reflect(AZ::ReflectContext* context)
         {
             if (auto* serialize = azrtti_cast<SerializeContext*>(context))
@@ -26,10 +40,22 @@ namespace AZ
                     ->Version(3)
                     ->Attribute(Edit::Attributes::SystemComponentTags, AZStd::vector<Crc32>({ AssetBuilderSDK::ComponentTags::AssetBuilder }));
             }
+
+            MaterialConverterSettings::Reflect(context);
+        }
+        
+        void MaterialConverterSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
+        {
+            services.emplace_back(AZ_CRC_CE("FingerprintModification"));
         }
 
         void MaterialConverterSystemComponent::Activate()
         {
+            if (auto* settingsRegistry = AZ::SettingsRegistry::Get())
+            {
+                settingsRegistry->GetObject(m_settings, "/O3DE/SceneAPI/MaterialConverter");
+            }
+
             RPI::MaterialConverterBus::Handler::BusConnect();
         }
 
@@ -37,11 +63,21 @@ namespace AZ
         {
             RPI::MaterialConverterBus::Handler::BusDisconnect();
         }
+        
+        bool MaterialConverterSystemComponent::IsEnabled() const
+        {
+            return m_settings.m_enable;
+        }
 
         bool MaterialConverterSystemComponent::ConvertMaterial(
             const AZ::SceneAPI::DataTypes::IMaterialData& materialData, RPI::MaterialSourceData& sourceData)
         {
             using namespace AZ::RPI;
+            
+            if (!m_settings.m_enable)
+            {
+                return false;
+            }
 
             // The source data for generating material asset
             sourceData.m_materialType = GetMaterialTypePath();
@@ -140,9 +176,20 @@ namespace AZ
             return true;
         }
 
-        const char* MaterialConverterSystemComponent::GetMaterialTypePath() const
+        AZStd::string MaterialConverterSystemComponent::GetMaterialTypePath() const
         {
             return "Materials/Types/StandardPBR.materialtype";
         }
+
+        AZStd::string MaterialConverterSystemComponent::GetDefaultMaterialPath() const
+        {
+            if (m_settings.m_defaultMaterial.empty())
+            {
+                AZ_Error("MaterialConverterSystemComponent", m_settings.m_enable,
+                    "Material conversion is disabled but a default material not specified in registry /O3DE/SceneAPI/MaterialConverter/DefaultMaterial");
+            }
+
+            return m_settings.m_defaultMaterial;
+        }
     }
 }

Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.h

@@ -18,6 +18,16 @@ namespace AZ
 {
     namespace Render
     {
+        struct MaterialConverterSettings
+        {
+            AZ_TYPE_INFO(MaterialConverterSettings, "{8D91601D-570A-4557-99C8-631DB4928040}");
+            
+            static void Reflect(AZ::ReflectContext* context);
+
+            bool m_enable = true;
+            AZStd::string m_defaultMaterial;
+        };
+
         //! Atom's implementation of converting SceneAPI data into Atom's default material: StandardPBR
         class MaterialConverterSystemComponent final
             : public AZ::Component
@@ -27,13 +37,20 @@ namespace AZ
             AZ_COMPONENT(MaterialConverterSystemComponent, "{C2338D45-6456-4521-B469-B000A13F2493}");
 
             static void Reflect(AZ::ReflectContext* context);
+            
+            static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services);
 
             void Activate() override;
             void Deactivate() override;
 
             // MaterialConverterBus overrides ...
+            bool IsEnabled() const override;
             bool ConvertMaterial(const AZ::SceneAPI::DataTypes::IMaterialData& materialData, RPI::MaterialSourceData& out) override;
-            const char* GetMaterialTypePath() const override;
+            AZStd::string GetMaterialTypePath() const override;
+            AZStd::string GetDefaultMaterialPath() const override;
+
+        private:
+            MaterialConverterSettings m_settings;
         };
     }
 }

Gems/Atom/RHI/Code/Include/Atom/RHI/CpuProfilerImpl.h

@@ -173,13 +173,14 @@ namespace AZ
                 static void Reflect(AZ::ReflectContext* context);
 
                 CpuProfilingStatisticsSerializerEntry() = default;
-                CpuProfilingStatisticsSerializerEntry(const RHI::CachedTimeRegion& cachedTimeRegion);
+                CpuProfilingStatisticsSerializerEntry(const RHI::CachedTimeRegion& cachedTimeRegion, AZStd::thread_id threadId);
 
                 Name m_groupName;
                 Name m_regionName;
                 uint16_t m_stackDepth;
                 AZStd::sys_time_t m_startTick;
                 AZStd::sys_time_t m_endTick;
+                size_t m_threadId;
             };
 
             AZ_TYPE_INFO(CpuProfilingStatisticsSerializer, "{D5B02946-0D27-474F-9A44-364C2706DD41}");

Gems/Atom/RHI/Code/Source/RHI/CpuProfilerImpl.cpp

@@ -417,14 +417,14 @@ namespace AZ
             // Create serializable entries
             for (const auto& timeRegionMap : continuousData)
             {
-                for (const auto& threadEntry : timeRegionMap)
+                for (const auto& [threadId, regionMap] : timeRegionMap)
                 {
-                    for (const auto& cachedRegionEntry : threadEntry.second)
+                    for (const auto& [regionName, regionVec] : regionMap)
                     {
-                        m_cpuProfilingStatisticsSerializerEntries.insert(
-                            m_cpuProfilingStatisticsSerializerEntries.end(),
-                            cachedRegionEntry.second.begin(),
-                            cachedRegionEntry.second.end());
+                        for (const auto& region : regionVec)
+                        {
+                            m_cpuProfilingStatisticsSerializerEntries.emplace_back(region, threadId);
+                        }
                     }
                 }
             }
@@ -445,13 +445,15 @@ namespace AZ
 
         // --- CpuProfilingStatisticsSerializerEntry ---
 
-        CpuProfilingStatisticsSerializer::CpuProfilingStatisticsSerializerEntry::CpuProfilingStatisticsSerializerEntry(const RHI::CachedTimeRegion& cachedTimeRegion)
+        CpuProfilingStatisticsSerializer::CpuProfilingStatisticsSerializerEntry::CpuProfilingStatisticsSerializerEntry(
+            const RHI::CachedTimeRegion& cachedTimeRegion, AZStd::thread_id threadId)
         {
             m_groupName = cachedTimeRegion.m_groupRegionName->m_groupName;
             m_regionName = cachedTimeRegion.m_groupRegionName->m_regionName;
             m_stackDepth = cachedTimeRegion.m_stackDepth;
             m_startTick = cachedTimeRegion.m_startTick;
             m_endTick = cachedTimeRegion.m_endTick;
+            m_threadId = AZStd::hash<AZStd::thread_id>{}(threadId);
         }
 
         void CpuProfilingStatisticsSerializer::CpuProfilingStatisticsSerializerEntry::Reflect(AZ::ReflectContext* context)
@@ -465,6 +467,7 @@ namespace AZ
                     ->Field("stackDepth", &CpuProfilingStatisticsSerializerEntry::m_stackDepth)
                     ->Field("startTick", &CpuProfilingStatisticsSerializerEntry::m_startTick)
                     ->Field("endTick", &CpuProfilingStatisticsSerializerEntry::m_endTick)
+                    ->Field("threadId", &CpuProfilingStatisticsSerializerEntry::m_threadId)
                     ;
             }
         }

Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialConverterBus.h

@@ -29,10 +29,19 @@ namespace AZ
             : public AZ::EBusTraits
         {
         public:
-            //! Returns true if the converion was successful
+
+            virtual bool IsEnabled() const = 0;
+
+            //! Converts data from a IMaterialData object to an Atom MaterialSourceData.
+            //! Only works when IsEnabled() is true.
+            //! @return true if the MaterialSourceData output was populated with converted material data.
             virtual bool ConvertMaterial(const AZ::SceneAPI::DataTypes::IMaterialData& materialData, MaterialSourceData& out) = 0;
-            //! Returns the path to the .materialtype file that the materials are based on, such as StandardPBR.materialtype, etc.
-            virtual const char* GetMaterialTypePath() const = 0;
+
+            //! Returns the path to the .materialtype file that the converted materials are based on, such as StandardPBR.materialtype, etc.
+            virtual AZStd::string GetMaterialTypePath() const = 0;
+
+            //! Returns the path to a .material file to use as the default material when conversion is disabled.
+            virtual AZStd::string GetDefaultMaterialPath() const = 0;
         };
 
         using MaterialConverterBus = AZ::EBus<MaterialConverterRequests>;

Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelMaterialSlot.h

@@ -25,6 +25,8 @@ namespace AZ
                 
             static void Reflect(AZ::ReflectContext* context);
 
+            // Note that StableId is uint32_t for legacy reasons: we used to use AssetId::m_subId as the material slot ID. But actually the original MaterialUid
+            // is 64 bit so we might want to switch this to be uint64_t at some point.
             using StableId = uint32_t;
             static const StableId InvalidStableId;
 

Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp

@@ -28,6 +28,7 @@
 
 #include <Atom/RPI.Edit/Material/MaterialSourceData.h>
 #include <Atom/RPI.Edit/Material/MaterialConverterBus.h>
+#include <Atom/RPI.Edit/Common/AssetUtils.h>
 
 #include <Atom/RPI.Reflect/Material/MaterialAsset.h>
 #include <AzCore/Settings/SettingsRegistry.h>
@@ -70,28 +71,74 @@ namespace AZ
 
         void MaterialAssetDependenciesComponent::ReportJobDependencies(SceneAPI::JobDependencyList& jobDependencyList, const char* platformIdentifier)
         {
-            AssetBuilderSDK::SourceFileDependency materialTypeSource;
+            bool conversionEnabled = false;
+            RPI::MaterialConverterBus::BroadcastResult(conversionEnabled, &RPI::MaterialConverterBus::Events::IsEnabled);
+            
             // Right now, scene file importing only supports a single material type, once that changes, this will have to be re-designed, see ATOM-3554
-            RPI::MaterialConverterBus::BroadcastResult(materialTypeSource.m_sourceFileDependencyPath, &RPI::MaterialConverterBus::Events::GetMaterialTypePath);
+            AZStd::string materialTypePath;
+            RPI::MaterialConverterBus::BroadcastResult(materialTypePath, &RPI::MaterialConverterBus::Events::GetMaterialTypePath);
 
-            AssetBuilderSDK::JobDependency jobDependency;
-            jobDependency.m_jobKey = "Atom Material Builder";
-            jobDependency.m_sourceFile = materialTypeSource;
-            jobDependency.m_platformIdentifier = platformIdentifier;
-            jobDependency.m_type = AssetBuilderSDK::JobDependencyType::Order;
-
-            if (!materialTypeSource.m_sourceFileDependencyPath.empty())
+            if (conversionEnabled && !materialTypePath.empty())
             {
+                AssetBuilderSDK::SourceFileDependency materialTypeSource;
+                materialTypeSource.m_sourceFileDependencyPath = materialTypePath;
+
+                AssetBuilderSDK::JobDependency jobDependency;
+                jobDependency.m_jobKey = "Atom Material Builder";
+                jobDependency.m_sourceFile = materialTypeSource;
+                jobDependency.m_platformIdentifier = platformIdentifier;
+                jobDependency.m_type = AssetBuilderSDK::JobDependencyType::Order;
+
                 jobDependencyList.push_back(jobDependency);
             }
         }
+        
+        void MaterialAssetDependenciesComponent::AddFingerprintInfo(AZStd::set<AZStd::string>& fingerprintInfo)
+        {
+            // This will cause scene files to be reprocessed whenever the global MaterialConverter settings change.
+
+            bool conversionEnabled = false;
+            RPI::MaterialConverterBus::BroadcastResult(conversionEnabled, &RPI::MaterialConverterBus::Events::IsEnabled);
+            fingerprintInfo.insert(AZStd::string::format("[MaterialConverter enabled=%d]", conversionEnabled));
+
+            if (!conversionEnabled)
+            {
+                AZStd::string defaultMaterialPath;
+                RPI::MaterialConverterBus::BroadcastResult(defaultMaterialPath, &RPI::MaterialConverterBus::Events::GetDefaultMaterialPath);
+                fingerprintInfo.insert(AZStd::string::format("[MaterialConverter defaultMaterial=%s]", defaultMaterialPath.c_str()));
+            }
+        }
 
         void MaterialAssetBuilderComponent::Reflect(ReflectContext* context)
         {
             if (auto* serialize = azrtti_cast<SerializeContext*>(context))
             {
                 serialize->Class<MaterialAssetBuilderComponent, SceneAPI::SceneCore::ExportingComponent>()
-                    ->Version(16);  // Optional material conversion
+                    ->Version(16);  // Optional material conversion 
+            }
+        }
+        
+        Data::Asset<MaterialAsset> MaterialAssetBuilderComponent::GetDefaultMaterialAsset() const
+        {
+            AZStd::string defaultMaterialPath;
+            RPI::MaterialConverterBus::BroadcastResult(defaultMaterialPath, &RPI::MaterialConverterBus::Events::GetDefaultMaterialPath);
+
+            if (defaultMaterialPath.empty())
+            {
+                return {};
+            }
+            else
+            {
+                auto defaultMaterialAssetId = RPI::AssetUtils::MakeAssetId(defaultMaterialPath, 0);
+                if (!defaultMaterialAssetId.IsSuccess())
+                {
+                    AZ_Error("MaterialAssetBuilderComponent", false, "Could not find asset '%s'", defaultMaterialPath.c_str());
+                    return {};
+                }
+                else
+                {
+                    return Data::AssetManager::Instance().CreateAsset<RPI::MaterialAsset>(defaultMaterialAssetId.GetValue(), Data::AssetLoadBehaviorNamespace::PreLoad);
+                }
             }
         }
 
@@ -119,8 +166,8 @@ namespace AZ
 
             BindToCall(&MaterialAssetBuilderComponent::BuildMaterials);
         }
-
-        SceneAPI::Events::ProcessingResult MaterialAssetBuilderComponent::BuildMaterials(MaterialAssetBuilderContext& context) const
+        
+        SceneAPI::Events::ProcessingResult MaterialAssetBuilderComponent::ConvertMaterials(MaterialAssetBuilderContext& context) const
         {
             const auto& scene = context.m_scene;
             const Uuid sourceSceneUuid = scene.GetSourceGuid();
@@ -193,6 +240,64 @@ namespace AZ
 
             return SceneAPI::Events::ProcessingResult::Success;
         }
+
+        SceneAPI::Events::ProcessingResult MaterialAssetBuilderComponent::AssignDefaultMaterials(MaterialAssetBuilderContext& context) const
+        {
+            Data::Asset<MaterialAsset> defaultMaterialAsset = GetDefaultMaterialAsset();
+
+            if (!defaultMaterialAsset.GetId().IsValid())
+            {
+                AZ_Warning("MaterialAssetBuilderComponent", false, "Material conversion is disabled but no default material was provided. The model will likely be invisible by default.");
+                // Return success because it's just a warning.
+                return SceneAPI::Events::ProcessingResult::Success;
+            }
+
+            const auto& scene = context.m_scene;
+            const Uuid sourceSceneUuid = scene.GetSourceGuid();
+            const auto& sceneGraph = scene.GetGraph();
+
+            auto names = sceneGraph.GetNameStorage();
+            auto content = sceneGraph.GetContentStorage();
+            auto pairView = SceneAPI::Containers::Views::MakePairView(names, content);
+
+            auto view = SceneAPI::Containers::Views::MakeSceneGraphDownwardsView<
+                SceneAPI::Containers::Views::BreadthFirst>(
+                    sceneGraph, sceneGraph.GetRoot(), pairView.cbegin(), true);
+
+            for (const auto& viewIt : view)
+            {
+                if (viewIt.second == nullptr)
+                {
+                    continue;
+                }
+
+                if (azrtti_istypeof<SceneAPI::DataTypes::IMaterialData>(viewIt.second.get()))
+                {
+                    auto materialData = AZStd::static_pointer_cast<const SceneAPI::DataTypes::IMaterialData>(viewIt.second);
+                    uint64_t materialUid = materialData->GetUniqueId();
+
+                    context.m_outputMaterialsByUid[materialUid] = { defaultMaterialAsset, materialData->GetMaterialName() };
+                }
+            }
+
+            return SceneAPI::Events::ProcessingResult::Success;
+        }
+
+        SceneAPI::Events::ProcessingResult MaterialAssetBuilderComponent::BuildMaterials(MaterialAssetBuilderContext& context) const
+        {
+            bool conversionEnabled = false;
+            RPI::MaterialConverterBus::BroadcastResult(conversionEnabled, &RPI::MaterialConverterBus::Events::IsEnabled);
+
+            if (conversionEnabled)
+            {
+                return ConvertMaterials(context);
+            }
+            else
+            {
+                return AssignDefaultMaterials(context);
+            }
+
+        }
     } // namespace RPI
 } // namespace AZ
 

Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.h

@@ -39,6 +39,13 @@ namespace AZ
 
             // Required for ExportingComponent
             static void Reflect(AZ::ReflectContext* context);
+
+        private:
+
+            SceneAPI::Events::ProcessingResult ConvertMaterials(MaterialAssetBuilderContext& context) const;
+            SceneAPI::Events::ProcessingResult AssignDefaultMaterials(MaterialAssetBuilderContext& context) const;
+            
+            Data::Asset<MaterialAsset> GetDefaultMaterialAsset() const;
         };
 
         /**
@@ -65,6 +72,7 @@ namespace AZ
 
             // SceneAPI::SceneBuilderDependencyBus::Handler overrides...
             void ReportJobDependencies(SceneAPI::JobDependencyList& jobDependencyList, const char* platformIdentifier) override;
+            void AddFingerprintInfo(AZStd::set<AZStd::string>& fingerprintInfo) override;
         };
     } // namespace RPI
 } // namespace AZ

Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.cpp

@@ -78,9 +78,17 @@ namespace AZ
             //Export MaterialAssets
             for (auto& materialPair : materialsByUid)
             {
+                const Data::Asset<MaterialAsset>& asset = materialPair.second.m_asset;
+                
+                // MaterialAssetBuilderContext could attach an independent material asset rather than
+                // generate one using the scene data, so we must skip the export step in that case.
+                if (asset.GetId().m_guid != exportEventContext.GetScene().GetSourceGuid())
+                {
+                    continue;
+                }
+
                 uint64_t materialUid = materialPair.first;
                 const AZStd::string& sceneName = exportEventContext.GetScene().GetName();
-                const Data::Asset<MaterialAsset>& asset = materialPair.second.m_asset;
 
                 // escape the material name acceptable for a filename
                 AZStd::string materialName = materialPair.second.m_name;

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

@@ -109,7 +109,6 @@ namespace AtomToolsFramework
         // AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler ...
         void BeginCursorCapture() override;
         void EndCursorCapture() override;
-        AzFramework::ScreenPoint ViewportCursorScreenPosition() override;
         bool IsMouseOver() const override;
 
         // AzFramework::WindowRequestBus::Handler ...

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

@@ -403,11 +403,6 @@ namespace AtomToolsFramework
         return aznumeric_cast<float>(devicePixelRatioF());
     }
 
-    AzFramework::ScreenPoint RenderViewportWidget::ViewportCursorScreenPosition()
-    {
-        return AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(m_mousePosition.toPoint());
-    }
-
     bool RenderViewportWidget::IsMouseOver() const
     {
         return m_mouseOver;

Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.h

@@ -43,7 +43,7 @@ namespace AZ
             };
 
             // Update running statistics with new region data 
-            void RecordRegion(const AZ::RHI::CachedTimeRegion& region, AZStd::thread_id threadId);
+            void RecordRegion(const AZ::RHI::CachedTimeRegion& region, size_t threadId);
 
             void ResetPerFrameStatistics();
 
@@ -58,7 +58,7 @@ namespace AZ
             u64 m_invocationsLastFrame = 0;
 
             // NOTE: set over unordered_set so the threads can be shown in increasing order in tooltip.
-            AZStd::set<AZStd::thread_id> m_executingThreads;
+            AZStd::set<size_t> m_executingThreads;
 
             AZStd::sys_time_t m_lastFrameTotalTicks = 0;
 
@@ -95,7 +95,7 @@ namespace AZ
             void Draw(bool& keepDrawing, const AZ::RHI::CpuTimingStatistics& cpuTimingStatistics);
 
         private:
-            static constexpr float RowHeight = 50.0;
+            static constexpr float RowHeight = 35.0;
             static constexpr int DefaultFramesToCollect = 50;
             static constexpr float MediumFrameTimeLimit = 16.6; // 60 fps
             static constexpr float HighFrameTimeLimit = 33.3; // 30 fps
@@ -134,7 +134,7 @@ namespace AZ
             void DrawThreadSeparator(u64 threadBoundary, u64 maxDepth);
 
             // Draw the "Thread XXXXX" label onto the viewport
-            void DrawThreadLabel(u64 baseRow, AZStd::thread_id threadId);
+            void DrawThreadLabel(u64 baseRow, size_t threadId);
 
             // Draw the vertical lines separating frames in the timeline
             void DrawFrameBoundaries();
@@ -169,7 +169,9 @@ namespace AZ
             AZStd::sys_time_t m_viewportEndTick;
 
             // Map to store each thread's TimeRegions, individual vectors are sorted by start tick
-            AZStd::unordered_map<AZStd::thread_id, AZStd::vector<TimeRegion>> m_savedData;
+            // note: we use size_t as a proxy for thread_id because native_thread_id_type differs differs from
+            // platform to platform, which causes problems when deserializing saved captures.
+            AZStd::unordered_map<size_t, AZStd::vector<TimeRegion>> m_savedData;
 
             // Region color cache
             AZStd::unordered_map<const GroupRegionName*, ImVec4> m_regionColorMap;
@@ -213,6 +215,11 @@ namespace AZ
 
             // Index into the file picker, used to determine which file to load when "Load File" is pressed.
             int m_currentFileIndex = 0;
+
+
+            // --- Loading capture state ---
+            AZStd::unordered_set<AZStd::string> m_deserializedStringPool;
+            AZStd::unordered_set<RHI::CachedTimeRegion::GroupRegionName, RHI::CachedTimeRegion::GroupRegionName::Hash> m_deserializedGroupRegionNamePool;
         };
     } // namespace Render
 } // namespace AZ

Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.inl

@@ -13,6 +13,7 @@
 #include <Atom/RPI.Edit/Common/JsonUtils.h>
 #include <Atom/RPI.Public/RPISystemInterface.h>
 
+#include <AzCore/Casting/lossy_cast.h>
 #include <AzCore/IO/FileIO.h>
 #include <AzCore/JSON/filereadstream.h>
 #include <AzCore/Serialization/Json/JsonSerialization.h>
@@ -30,19 +31,6 @@ namespace AZ
     {
         namespace CpuProfilerImGuiHelper
         {
-            // NOTE: Fix build error in case AZStd::thread_id is not of an arithmetic type, and instead a pointer
-            template<typename ThreadId, typename AZStd::enable_if<AZStd::is_pointer<ThreadId>::value>::type* = nullptr>
-            AZStd::string TextThreadId(ThreadId threadId)
-            {
-                return AZStd::string::format("Thread: %p", threadId);
-            }
-
-            template<typename ThreadId, typename AZStd::enable_if<!AZStd::is_pointer<ThreadId>::value>::type* = nullptr>
-            AZStd::string TextThreadId(ThreadId threadId)
-            {
-                return AZStd::string::format("Thread: %zu", static_cast<size_t>(threadId));
-            }
-
             inline float TicksToMs(AZStd::sys_time_t ticks)
             {
                 // Note: converting to microseconds integer before converting to milliseconds float
@@ -231,6 +219,7 @@ namespace AZ
                     m_lastCapturedFilePath = resolvedPath;
                     AZ::Render::ProfilingCaptureRequestBus::Broadcast(
                         &AZ::Render::ProfilingCaptureRequestBus::Events::EndContinuousCpuProfilingCapture, frameDataFilePath);
+                    m_paused = true;
                 }
 
                 else
@@ -447,13 +436,65 @@ namespace AZ
         inline void ImGuiCpuProfiler::LoadFile()
         {
             const IO::Path& pathToLoad = m_cachedCapturePaths[m_currentFileIndex];
-            auto res = CpuProfilerImGuiHelper::LoadSavedCpuProfilingStatistics(pathToLoad.String());
-            if (!res.IsSuccess())
+            auto loadResult = CpuProfilerImGuiHelper::LoadSavedCpuProfilingStatistics(pathToLoad.String());
+            if (!loadResult.IsSuccess())
             {
-                AZ_TracePrintf("ImGuiCpuProfiler", "%s", res.GetError().c_str());
+                AZ_TracePrintf("ImGuiCpuProfiler", "%s", loadResult.GetError().c_str());
                 return;
             }
-            // TODO ATOM-16022 Parse this data and display it in the visualizer widget.
+
+            AZStd::vector<RHI::CpuProfilingStatisticsSerializer::CpuProfilingStatisticsSerializerEntry> deserializedData = loadResult.TakeValue();
+
+            // Clear visualizer and statistics view state
+            m_savedRegionCount = deserializedData.size();
+            m_savedData.clear();
+            m_paused = true;
+            AZ::RHI::CpuProfiler::Get()->SetProfilerEnabled(false);
+            m_frameEndTicks.clear();
+
+            m_tableData.clear();
+            m_groupRegionMap.clear();
+
+            for (const auto& entry : deserializedData)
+            {
+                const auto [groupNameItr, wasGroupNameInserted] = m_deserializedStringPool.emplace(entry.m_groupName.GetCStr());
+                const auto [regionNameItr, wasRegionNameInserted] = m_deserializedStringPool.emplace(entry.m_regionName.GetCStr());
+                const auto [groupRegionNameItr, wasGroupRegionNameInserted] =
+                    m_deserializedGroupRegionNamePool.emplace(groupNameItr->c_str(), regionNameItr->c_str());
+
+                const RHI::CachedTimeRegion newRegion(&(*groupRegionNameItr), entry.m_stackDepth, entry.m_startTick, entry.m_endTick);
+                m_savedData[entry.m_threadId].push_back(newRegion);
+
+                // Since we don't serialize the frame boundaries, we need to use the RPI's OnSystemTick event as a heuristic. 
+                const static Name frameBoundaryName = Name("RPISystem: OnSystemTick");
+                if (entry.m_regionName == frameBoundaryName)
+                {
+                    m_frameEndTicks.push_back(entry.m_endTick);
+                }  
+
+                // Update running statistics 
+                if (!m_groupRegionMap[*groupNameItr].contains(*regionNameItr))
+                {
+                    m_groupRegionMap[*groupNameItr][*regionNameItr].m_groupName = *groupNameItr;
+                    m_groupRegionMap[*groupNameItr][*regionNameItr].m_regionName = *regionNameItr;
+                    m_tableData.push_back(&m_groupRegionMap[*groupNameItr][*regionNameItr]);
+                }
+                m_groupRegionMap[*groupNameItr][*regionNameItr].RecordRegion(newRegion, entry.m_threadId);
+            }
+
+            // Update viewport bounds with some added UX fudge factor
+            m_viewportStartTick = deserializedData.back().m_startTick - 1000;
+            m_viewportEndTick = deserializedData.back().m_endTick + 1000;
+
+            // Invariant: each vector in m_savedData must be sorted so that we can efficiently cull region data.
+            for (auto& [threadId, singleThreadData] : m_savedData)
+            {
+                AZStd::sort(singleThreadData.begin(), singleThreadData.end(), 
+                [](const TimeRegion& lhs, const TimeRegion& rhs)
+                {
+                    return lhs.m_startTick < rhs.m_startTick;
+                });
+            }
         }
 
         // -- CPU Visualizer --
@@ -465,7 +506,7 @@ namespace AZ
             if (ImGui::BeginChild("Options and Statistics", { 0, 0 }, true))
             {
                 ImGui::Columns(3, "Options", true);
-                ImGui::SliderInt("Saved Frames", &m_framesToCollect, 10, 10000, "%d", ImGuiSliderFlags_AlwaysClamp | ImGuiSliderFlags_Logarithmic);
+                ImGui::SliderInt("Saved Frames", &m_framesToCollect, 10, 20000, "%d", ImGuiSliderFlags_AlwaysClamp | ImGuiSliderFlags_Logarithmic);
                 m_visualizerHighlightFilter.Draw("Find Region");
 
                 ImGui::NextColumn();
@@ -631,6 +672,7 @@ namespace AZ
             // Iterate through the entire TimeRegionMap and copy the data since it will get deleted on the next frame
             for (const auto& [threadId, singleThreadRegionMap] : timeRegionMap)
             {
+                const size_t threadIdHashed = AZStd::hash<AZStd::thread_id>{}(threadId); 
                 // The profiler can sometime return threads without any profiling events when dropping threads, FIXME(ATOM-15949)
                 if (singleThreadRegionMap.size() == 0)
                 {
@@ -656,7 +698,7 @@ namespace AZ
                             m_tableData.push_back(&m_groupRegionMap[groupName][regionName]);
                         }
 
-                        m_groupRegionMap[groupName][regionName].RecordRegion(region, threadId);
+                        m_groupRegionMap[groupName][regionName].RecordRegion(region, threadIdHashed);
                     }
                 }
 
@@ -676,7 +718,7 @@ namespace AZ
                 m_savedRegionCount += newVisualizerData.size();
 
                 // Move onto the end of the current thread's saved data, sorted order maintained
-                AZStd::vector<TimeRegion>& savedDataVec = m_savedData[threadId];
+                AZStd::vector<TimeRegion>& savedDataVec = m_savedData[threadIdHashed];
                 savedDataVec.insert(
                     savedDataVec.end(), AZStd::make_move_iterator(newVisualizerData.begin()), AZStd::make_move_iterator(newVisualizerData.end()));
             }
@@ -696,6 +738,12 @@ namespace AZ
             {
                 AZStd::size_t sizeBeforeRemove = savedRegions.size();
 
+                // Early out to avoid the linear erase_if call
+                if (savedRegions.size() >= 1 && savedRegions.at(0).m_startTick > deleteBeforeTick)
+                {
+                    continue;
+                }
+
                 // Use erase_if over plain upper_bound + erase to avoid repeated shifts. erase requires a shift of all elements to the right
                 // for each element that is erased, while erase_if squashes all removes into a single shift which significantly improves perf.
                 AZStd::erase_if(
@@ -732,12 +780,19 @@ namespace AZ
             const float startPixel = ConvertTickToPixelSpace(block.m_startTick, m_viewportStartTick, m_viewportEndTick);
             const float endPixel = ConvertTickToPixelSpace(block.m_endTick, m_viewportStartTick, m_viewportEndTick);
 
-            const ImVec2 startPoint = { startPixel, wy + targetRow * RowHeight };
-            const ImVec2 endPoint = { endPixel, wy + targetRow * RowHeight + 40 };
+            if (endPixel - startPixel < 0.5f)
+            {
+                return;
+            }
+
+            const ImVec2 startPoint = { startPixel, wy + targetRow * RowHeight + 1};
+            const ImVec2 endPoint = { endPixel, wy + (targetRow + 1) * RowHeight };
 
             const ImU32 blockColor = GetBlockColor(block);
 
             drawList->AddRectFilled(startPoint, endPoint, blockColor, 0);
+            drawList->AddLine(startPoint, { endPixel, startPoint.y }, IM_COL32_BLACK, 0.5f);
+            drawList->AddLine({ startPixel, endPoint.y }, endPoint, IM_COL32_BLACK, 0.5f);
 
             // Draw the region name if possible
             // If the block's current width is too small, we skip drawing the label.
@@ -751,11 +806,13 @@ namespace AZ
 
                 if (regionPixelWidth < textWidth) // Not enough space in the block to draw the whole name, draw clipped text.
                 {
-                    // clipRect appears to only clip when a character is fully outside of its bounds which can lead to overflow
-                    // for now subtract the width of a character
                     const ImVec4 clipRect = { startPoint.x, startPoint.y, endPoint.x - maxCharWidth, endPoint.y };
-                    const float fontSize = ImGui::GetFont()->FontSize;
 
+                    // NOTE: RenderText calls do not automatically account for the global scale (which is modified at high DPI)
+                    // so we must adjust for the scale manually.
+                    const float scaleFactor = ImGui::GetIO().FontGlobalScale;
+                    const float fontSize = ImGui::GetFont()->FontSize * scaleFactor;
+                    
                     ImGui::GetFont()->RenderText(drawList, fontSize, startPoint, IM_COL32_WHITE, clipRect, label.c_str(), 0);
                 }
                 else // We have enough space to draw the entire label, draw and center text.
@@ -815,18 +872,18 @@ namespace AZ
             auto [wx, wy] = ImGui::GetWindowPos();
             wy -= ImGui::GetScrollY();
             const float windowWidth = ImGui::GetWindowWidth();
-            const float boundaryY = wy + (baseRow + maxDepth + 1) * RowHeight - 5;
+            const float boundaryY = wy + (baseRow + maxDepth + 1) * RowHeight;
 
-            ImGui::GetWindowDrawList()->AddLine({ wx, boundaryY }, { wx + windowWidth, boundaryY }, red, 2.0f);
+            ImGui::GetWindowDrawList()->AddLine({ wx, boundaryY }, { wx + windowWidth, boundaryY }, red, 1.0f);
         }
 
-        inline void ImGuiCpuProfiler::DrawThreadLabel(u64 baseRow, AZStd::thread_id threadId)
+        inline void ImGuiCpuProfiler::DrawThreadLabel(u64 baseRow, size_t threadId)
         {
             auto [wx, wy] = ImGui::GetWindowPos();
             wy -= ImGui::GetScrollY();
-            const AZStd::string threadIdText =  CpuProfilerImGuiHelper::TextThreadId(threadId.m_id);
+            const AZStd::string threadIdText = AZStd::string::format("Thread: %zu", threadId);
 
-            ImGui::GetWindowDrawList()->AddText({ wx + 10, wy + baseRow * RowHeight + 5 }, IM_COL32_WHITE, threadIdText.c_str());
+            ImGui::GetWindowDrawList()->AddText({ wx + 10, wy + baseRow * RowHeight}, IM_COL32_WHITE, threadIdText.c_str());
         }
 
         inline void ImGuiCpuProfiler::DrawFrameBoundaries()
@@ -884,8 +941,10 @@ namespace AZ
                     const float textBeginPixel = lastFrameBoundaryPixel + offset;
                     const float textEndPixel = textBeginPixel + labelWidth;
 
+                    const float verticalOffset = (ImGui::GetWindowHeight() - ImGui::GetFontSize()) / 2;
+
                     // Execution time label
-                    drawList->AddText({ textBeginPixel, wy + ImGui::GetWindowHeight() / 4 }, IM_COL32_WHITE, label.c_str());
+                    drawList->AddText({ textBeginPixel, wy + verticalOffset }, IM_COL32_WHITE, label.c_str());
 
                     // Left side
                     drawList->AddLine(
@@ -1043,7 +1102,7 @@ namespace AZ
 
         // ---- TableRow impl ----
 
-        inline void TableRow::RecordRegion(const AZ::RHI::CachedTimeRegion& region, AZStd::thread_id threadId)
+        inline void TableRow::RecordRegion(const AZ::RHI::CachedTimeRegion& region, size_t threadId)
         {
             const AZStd::sys_time_t deltaTime = region.m_endTick - region.m_startTick;
 
@@ -1072,7 +1131,7 @@ namespace AZ
             auto threadString = AZStd::string::format("Executed in %zu threads\n", m_executingThreads.size());
             for (const auto& threadId : m_executingThreads)
             {
-                threadString.append(CpuProfilerImGuiHelper::TextThreadId(threadId.m_id) + "\n");
+                threadString.append(AZStd::string::format("Thread: %zu\n", threadId));
             }
             return threadString;
         }

Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp

@@ -8,6 +8,7 @@
 
 #include <Material/MaterialComponentController.h>
 #include <Atom/RPI.Reflect/Material/MaterialAsset.h>
+#include <Atom/RPI.Reflect/Asset/AssetUtils.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AtomCore/Instance/InstanceDatabase.h>
 
@@ -133,7 +134,7 @@ namespace AZ
         {
             InitializeMaterialInstance(asset);
         }
-
+        
         void MaterialComponentController::OnTick([[maybe_unused]] float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
         {
             AZStd::unordered_set<MaterialAssignmentId> propertyOverrides;
@@ -208,6 +209,7 @@ namespace AZ
             for (auto& materialPair : m_configuration.m_materials)
             {
                 auto& materialAsset = materialPair.second.m_materialAsset;
+
                 if (materialAsset.GetId().IsValid() && !Data::AssetBus::MultiHandler::BusIsConnectedId(materialAsset.GetId()))
                 {
                     anyQueued = true;
@@ -221,7 +223,7 @@ namespace AZ
                 ReleaseMaterials();
             }
         }
-
+        
         void MaterialComponentController::InitializeMaterialInstance(const Data::Asset<Data::AssetData>& asset)
         {
             bool allReady = true;

Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.h

@@ -92,11 +92,11 @@ namespace AZ
 
             AZ_DISABLE_COPY(MaterialComponentController);
 
-            //! Data::AssetBus interface
+            //! Data::AssetBus overrides...
             void OnAssetReady(Data::Asset<Data::AssetData> asset) override;
             void OnAssetReloaded(Data::Asset<Data::AssetData> asset) override;
 
-            //! AZ::TickBus interface implementation
+            // AZ::TickBus overrides...
             void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
 
             void LoadMaterials();

Gems/ImGui/Code/Source/ImGuiManager.h

@@ -67,7 +67,7 @@ namespace ImGui
         // -- AzFramework::InputChannelEventListener and AzFramework::InputTextEventListener Interface ------------
         bool OnInputChannelEventFiltered(const AzFramework::InputChannel& inputChannel) override;
         bool OnInputTextEventFiltered(const AZStd::string& textUTF8) override;
-        int GetPriority() const override { return AzFramework::InputChannelEventListener::GetPriorityDebug(); }
+        int GetPriority() const override { return AzFramework::InputChannelEventListener::GetPriorityDebugUI(); }
         // -- AzFramework::InputChannelEventListener and AzFramework::InputTextEventListener Interface ------------
 
         // AzFramework::WindowNotificationBus::Handler overrides...

Gems/PhysX/Code/CMakeLists.txt

@@ -226,13 +226,4 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         OUTPUT_SUBDIRECTORY
             Test.Assets/Gems/PhysX/Code/Tests
             )
-endif()
-
-ly_add_source_properties(
-    SOURCES
-        Editor/CollisionLayersWidget.cpp
-        Source/Collision.cpp
-        Source/Configuration/PhysXConfiguration.cpp
-    PROPERTY COMPILE_DEFINITIONS 
-    VALUES TOUCHBENDING_LAYER_BIT=${LY_TOUCHBENDING_LAYER_BIT}
-)
+endif()

Gems/PhysX/Code/Editor/CollisionLayersWidget.cpp

@@ -22,9 +22,6 @@ namespace PhysX
     namespace Editor
     {
         const AZStd::string CollisionLayersWidget::s_defaultCollisionLayerName = "Default";
-#ifdef TOUCHBENDING_LAYER_BIT
-        const AZStd::string CollisionLayersWidget::s_touchBendCollisionLayerName = "TouchBend";
-#endif
 
         CollisionLayersWidget::CollisionLayersWidget(QWidget* parent)
             : QWidget(parent)
@@ -150,12 +147,6 @@ namespace PhysX
                 {
                     lineEditCtrl->setEnabled(false);
                 }
-#ifdef TOUCHBENDING_LAYER_BIT
-                else if (lineEditCtrl->value() == s_touchBendCollisionLayerName)
-                {
-                        lineEditCtrl->setEnabled(false);
-                }
-#endif
             }
         }
 

Gems/PhysX/Code/Editor/CollisionLayersWidget.h

@@ -35,9 +35,6 @@ namespace PhysX
 
             static const AZ::u32 s_maxCollisionLayerNameLength = 32;
             static const AZStd::string s_defaultCollisionLayerName;
-#ifdef TOUCHBENDING_LAYER_BIT
-            static const AZStd::string s_touchBendCollisionLayerName;
-#endif
 
             explicit CollisionLayersWidget(QWidget* parent = nullptr);
 

Gems/PhysX/Code/Source/Collision.cpp

@@ -38,21 +38,6 @@ namespace PhysX
                 return physx::PxFilterFlag::eDEFAULT;
             }
 
-//Enable/Disable this macro in the TouchBending Gem wscript
-#ifdef TOUCHBENDING_LAYER_BIT
-            //If any of the actors is in the TouchBend layer then we are not interested
-            //in contact data, nor interested in eNOTIFY_* callbacks.
-            const AZ::u64 touchBendLayerMask = AzPhysics::CollisionLayer::TouchBend.GetMask();
-            const AZ::u64 layer0 = Combine(filterData0.word0, filterData0.word1);
-            const AZ::u64 layer1 = Combine(filterData1.word0, filterData1.word1);
-            if (layer0 == touchBendLayerMask || layer1 == touchBendLayerMask)
-            {
-                pairFlags = physx::PxPairFlag::eSOLVE_CONTACT |
-                    physx::PxPairFlag::eDETECT_DISCRETE_CONTACT;
-                return physx::PxFilterFlag::eDEFAULT;
-            }
-#endif //TOUCHBENDING_LAYER_BIT
-
             // generate contacts for all that were not filtered above
             pairFlags =
                 physx::PxPairFlag::eCONTACT_DEFAULT |
@@ -89,22 +74,6 @@ namespace PhysX
                 return physx::PxFilterFlag::eDEFAULT;
             }
 
-//Enable/Disable this macro in the TouchBending Gem wscript
-#ifdef TOUCHBENDING_LAYER_BIT
-            //If any of the actors is in the TouchBend layer then we are not interested
-            //in contact data, nor interested in eNOTIFY_* callbacks.
-            const AZ::u64 layer0 = Combine(filterData0.word0, filterData0.word1);
-            const AZ::u64 layer1 = Combine(filterData1.word0, filterData1.word1);
-            const AZ::u64 touchBendLayerMask = AzPhysics::CollisionLayer::TouchBend.GetMask();
-            if (layer0 == touchBendLayerMask || layer1 == touchBendLayerMask)
-            {
-                pairFlags = physx::PxPairFlag::eSOLVE_CONTACT |
-                    physx::PxPairFlag::eDETECT_DISCRETE_CONTACT |
-                    physx::PxPairFlag::eDETECT_CCD_CONTACT;
-                return physx::PxFilterFlag::eDEFAULT;
-            }
-#endif
-
             // generate contacts for all that were not filtered above
             pairFlags =
                 physx::PxPairFlag::eCONTACT_DEFAULT |

Gems/PhysX/Code/Source/Configuration/PhysXConfiguration.cpp

@@ -23,11 +23,6 @@ namespace PhysX
             configuration.m_collisionGroups.CreateGroup("All", AzPhysics::CollisionGroup::All, AzPhysics::CollisionGroups::Id(), true);
             configuration.m_collisionGroups.CreateGroup("None", AzPhysics::CollisionGroup::None, AzPhysics::CollisionGroups::Id::Create(), true);
 
-#ifdef TOUCHBENDING_LAYER_BIT
-            configuration.m_collisionLayers.SetName(AzPhysics::CollisionLayer::TouchBend, "TouchBend");
-            configuration.m_collisionGroups.CreateGroup("All_NoTouchBend", AzPhysics::CollisionGroup::All_NoTouchBend, AzPhysics::CollisionGroups::Id::Create(), true);
-#endif
-
             return configuration;
         }
 

Gems/PhysX/Code/Source/EditorColliderComponent.cpp

@@ -122,7 +122,10 @@ namespace PhysX
         if (m_shapeType != Physics::ShapeType::PhysicsAsset &&
             m_lastShapeType == Physics::ShapeType::PhysicsAsset)
         {
+            //clean up any reference to a physics assets, and re-initialize to an empty Pipeline::MeshAsset asset.
             m_physicsAsset.m_pxAsset.Reset();
+            m_physicsAsset.m_pxAsset = AZ::Data::Asset<Pipeline::MeshAsset>(AZ::Data::AssetLoadBehavior::QueueLoad);
+
             m_physicsAsset.m_configuration = Physics::PhysicsAssetShapeConfiguration();
         }
         m_lastShapeType = m_shapeType;

Gems/PhysX/Code/Source/RigidBodyStatic.cpp

@@ -20,6 +20,8 @@
 
 namespace PhysX
 {
+    AZ_CLASS_ALLOCATOR_IMPL(PhysX::StaticRigidBody, AZ::SystemAllocator, 0);
+
     StaticRigidBody::StaticRigidBody(const AzPhysics::StaticRigidBodyConfiguration& configuration)
     {
         CreatePhysXActor(configuration);
@@ -40,7 +42,7 @@ namespace PhysX
 
         // Invalidate user data so it sets m_pxStaticRigidBody->userData to nullptr.
         // It's appropriate to do this as m_pxStaticRigidBody is a shared pointer and
-        // techniqucally it could survive m_actorUserData life's spam.
+        // technically it could survive m_actorUserData life's span.
         m_actorUserData.Invalidate();
     }
 

Gems/PhysX/Code/Source/RigidBodyStatic.h

@@ -26,8 +26,8 @@ namespace PhysX
         : public AzPhysics::StaticRigidBody
     {
     public:
-        AZ_CLASS_ALLOCATOR(StaticRigidBody, AZ::SystemAllocator, 0);
-        AZ_RTTI(StaticRigidBody, "{06E960EF-E1F3-466F-B34F-800E32775092}", AzPhysics::StaticRigidBody);
+        AZ_CLASS_ALLOCATOR_DECL;
+        AZ_RTTI(PhysX::StaticRigidBody, "{06E960EF-E1F3-466F-B34F-800E32775092}", AzPhysics::StaticRigidBody);
 
         StaticRigidBody() = default;
         StaticRigidBody(const AzPhysics::StaticRigidBodyConfiguration& configuration);

Gems/PhysX/Code/Tests/PhysXCollisionFilteringTest.cpp

@@ -24,7 +24,6 @@ namespace PhysX
     {
     protected:
         const AZStd::string DefaultLayer = "Default";
-        const AZStd::string TouchBendLayer = "TouchBend";
         const AZStd::string LayerA = "LayerA";
         const AZStd::string LayerB = "LayerB";
         const AZStd::string GroupA = "GroupA";
@@ -42,7 +41,6 @@ namespace PhysX
             AZStd::vector<AZStd::string> TestCollisionLayers =
             {
                 DefaultLayer,
-                TouchBendLayer, // This is needed here as placeholder as collision events are disabled on this layer.
                 LayerA,
                 LayerB
             };

Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.cpp

@@ -73,6 +73,13 @@ namespace SceneBuilder
         required.emplace_back(AZ_CRC_CE("AssetImportRequestHandler"));
     }
 
+    void BuilderPluginComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& services)
+    {
+        // Any components that can modify the analysis fingerprint via SceneBuilderDependencyRequests::AddFingerprintInfo must be activated first,
+        // so they contribute to the fingerprint calculated in BuilderPluginComponent::Activate().
+        services.emplace_back(AZ_CRC_CE("FingerprintModification"));
+    }
+
     void BuilderPluginComponent::Reflect(AZ::ReflectContext* context)
     {
         AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);

Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.h

@@ -29,6 +29,7 @@ namespace SceneBuilder
         void Deactivate() override;
         
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& services);
         
     private:
         SceneBuilderWorker m_sceneBuilder;

Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp

@@ -67,6 +67,8 @@ namespace SceneBuilder
                 context->EnumerateDerived(callback, azrtti_typeid<AZ::SceneAPI::SceneCore::GenerationComponent>(), azrtti_typeid<AZ::SceneAPI::SceneCore::GenerationComponent>());
                 context->EnumerateDerived(callback, azrtti_typeid<AZ::SceneAPI::SceneCore::LoadingComponent>(), azrtti_typeid<AZ::SceneAPI::SceneCore::LoadingComponent>());
             }
+            
+            AZ::SceneAPI::SceneBuilderDependencyBus::Broadcast(&AZ::SceneAPI::SceneBuilderDependencyRequests::AddFingerprintInfo, fragments);
 
             for (const AZStd::string& element : fragments)
             {

Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja

@@ -197,7 +197,8 @@ void {{attribute_QualifiedName}}::Reflect(AZ::ReflectContext* context)
 {% if item.attrib['Description'] is defined %}
     {% set description = item.attrib['Description'] %}
 {% endif %}
-        // {{ item.attrib['Name'] }}
+
+                        // {{ item.attrib['Name'] }}
                         {{preEdit}}->DataElement({{ uihandler }}, &{{ attribute_Name }}::{{ item.attrib['Name'] }}, "{{ item.attrib['Name'] }}", "{{ description }}"){{postEdit}}
 {%          for EditAttribute in item.iter('EditAttribute') %}
                         {{preEdit}}->Attribute({{ EditAttribute.attrib['Key'] }}, {{ EditAttribute.attrib['Value'] }}){{postEdit}}
@@ -272,6 +273,9 @@ void Nodes::{{ nodeableNodeName }}::Reflect(AZ::ReflectContext* context)
         {
             {% if ExtendReflectionEdit is defined %}auto {{preEdit}} = {%endif%}editContext->Class<{{ nodeableNodeName }}>("{{ attribute_PreferredClassName }}", "{{ attribute_Description }}"){{postEdit}}
                 {{preEdit}}->ClassElement(AZ::Edit::ClassElements::EditorData, ""){{postEdit}}
+{% if attribute_Category is defined %}
+                {{preEdit}}->Attribute(AZ::Edit::Attributes::Category, "{{ attribute_Category }}"){{postEdit}}
+{% endif %}
                 {{preEdit}}->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly){{postEdit}}
                 {{preEdit}}->Attribute(AZ::Edit::Attributes::AutoExpand, true){{postEdit}}
                 ;

Gems/ScriptCanvas/Code/Include/ScriptCanvas/CodeGen/NodeableCodegen.h

@@ -11,345 +11,28 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>
 
+
+/*
+    Any class that implements a nodeable AzAutoGen driver (i.e. *.ScriptCanvasNodeable.xml)
+    requires that the SCRIPTCANVAS_NODE macro be declared within its class declaration.
+
+    Example:
+
+    class CustomNode
+        : public ScriptCanvas::Nodeable
+    {
+    public:
+            SCRIPTCANVAS_NODE(CustomNode);
+    };
+
+    What will happen is that when AzAutoGen runs it will generate a preprocessor directive:
+
+    SCRIPTCANVAS_NODE_CustomNode
+
+    Which will define all of the node's boilerplate code and definitions. When CustomNode
+    is compiled, the preprocessor will replace the macro with the auto generated
+    code.
+*/
+
 #define SCRIPTCANVAS_NODE(ClassName) SCRIPTCANVAS_NODE_##ClassName
 
-/* ----------------------------------------------------------------------------------------------------------
-*
-* BaseDefinition
-* This tag must be included within the body of any custom nodeable class. It generates nodeable code only and it
-* should be used as a base class only.
-*
-* Note: This tag does not generate a node class, so it will be hidden during edit time.
-*
-* Example:
-*   BaseDefinition(BaseHelloWorld, "Base Hello World", "My BaseHelloWorld.")
-*
-* ----------------------------------------------------------------------------------------------------------- */
-#define BaseDefinition(ClassName, Name, Description, ...) AZ_JOIN(AZ_GENERATED_, ClassName)
-
-/* ----------------------------------------------------------------------------------------------------------
-*
-* NodeDefinition
-* This tag must be included within the body of any custom nodeable class. It generates the necessary code to support nodes
-* and customizes the serialization and reflection parameters(version, converter).
-*
-* Example:
-*   NodeDefinition(HelloWorld, "Hello World", "My HelloWorld Node.")
-*   NodeDefinition(HelloWorld, "Hello World", "My HelloWorld Node.",
-*                  NodeTags::Icon("Icons/ScriptCanvas/HelloWorld.png")
-*                  NodeTags::Version(3, VersionConverter))
-*
-* ----------------------------------------------------------------------------------------------------------- */
-#define NodeDefinition(ClassName, Name, Description, ...) AZ_JOIN(AZ_GENERATED_, ClassName)
-
-/*  ----------------------------------------------------------------------------------------------------------
-* InputMethod
-* Using InputMethod on a method will create execution in&out slots that is invoked
-* automatically. It will also allow the automatic generation of input or output data
-* slots according to the method's signature.
-*
-* Example
-*   InputMethod("Do Something", "My DoSomething Function.")
-*   InputMethod("Do Something", "My DoSomething Function.")
-*   DataInput(int, "DoSomething:Arg", 0, "My DoSomething argument.")
-*
-* ----------------------------------------------------------------------------------------------------------- */
-#define InputMethod(Name, Description, ...)
-
-/*  ----------------------------------------------------------------------------------------------------------
-* BranchMethod
-* Using BranchMethod on a method will create execution input&output slots that is invoked
-* automatically. It will also allow the automatic generation of input data
-* slots according to the method's signature. BranchMethod should not be used on method
-* having return type.
-*
-* Coupled with macro ExecutionOutput to generate branch out execution slots.
-*
-* Example
-*   BranchMethod("Branches", "My Branches Function.")
-*   ExecutionOutput("Branch1", "My Branch1 Function.", SlotTags::BranchOf("Branches"))
-*   ExecutionOutput("Branch2", "My Branch2 Function.", SlotTags::BranchOf("Branches"))
-*
-* ----------------------------------------------------------------------------------------------------------- */
-#define BranchMethod(Name, Description, ...)
-
-/*  ----------------------------------------------------------------------------------------------------------
-* OnInputChangeMethod
-* Using OnInputChangeMethod on a method will create one data input slot that is invoked
-* automatically, and it should be used only with one input method.
-*
-* Example
-*   OnInputChangeMethod("MyInputChangeMethod", "My OnInputChange Function.")
-*   DataInput(int, "MyInputChangeMethod:Arg", 0, "My MyInputChangeMethod argument.", SlotTags::DisplayGroup("MyInputChangeMethod"))
-*
-* ----------------------------------------------------------------------------------------------------------- */
-#define OnInputChangeMethod(Name, Description, ...)
-
-/*
-*----------------------------------------------------------------------------------------------------------
-*
-* ExecutionInput
-* This is a shorthand macro to easily create an execution input slot.
-*
-* Examples:
-*   ExecutionInput("Start Process", "Signals this node to begin processing.")
-*
-* ---------------------------------------------------------------------------------------------------------- */
-#define ExecutionInput(Name, Description, ...)
-
-/*
-*----------------------------------------------------------------------------------------------------------
-*
-* ExecutionOutput
-* This is a shorthand macro to easily create an execution output slot.
-*
-* Examples:
-*   ExecutionOutput("On Start Process", "Output of start process execution.");
-*
-* ---------------------------------------------------------------------------------------------------------- */
-#define ExecutionOutput(Name, Description, ...)
-
-/*
-*----------------------------------------------------------------------------------------------------------
-*
-* ExecutionLatentOutput
-* Similar to ExecutionOutput however it is used to make it explicit that the output slot will be latent,
-* this means that the node maintains state and may not signal this slot immediately.
-*
-* Example:
-*   ExecutionLatentOutput("On Finished", "Will be signaled when the operation is complete.");
-*
-* ---------------------------------------------------------------------------------------------------------- */
-#define ExecutionLatentOutput(Name, Description, ...)
-
-/*
-*----------------------------------------------------------------------------------------------------------
-*
-* Data
-* Provides shorthand for exposing data to serialize context and edit context,
-* mainly used with SlotTags::PropertyReference for property data.
-*
-* Example:
-*   int m_data = 1;
-*   PropertyData(int, "My Data", "My Serialized Data.", SlotTags::PropertyReference(m_data));
-*
-* ---------------------------------------------------------------------------------------------------------- */
-#define PropertyData(Type, Name, Description, ...)
-
-/*
-*----------------------------------------------------------------------------------------------------------
-*
-* DataInput
-* Provides shorthand for creating an input data slot. 
-*
-* Coupled with macro InputMethod/BranchMethod/OnInputChangeMethod to give parameter editor definition
-*
-* Example:
-*   InputMethod("Do Something", "My DoSomething Function.")
-*   DataInput(int, "DoSomething:Arg", 0, "My DoSomething argument.")
-*
-* ---------------------------------------------------------------------------------------------------------- */
-#define DataInput(Type, Name, DefaultVal, Description, ...)
-
-/*
-*----------------------------------------------------------------------------------------------------------
-*
-* DataOutput
-* Provides shorthand for creating an output data slot.
-*
-* Coupled with macro InputMethod/BranchMethod/OnInputChangeMethod to give result editor definition
-*
-* Example:
-*   InputMethod("Do Something", "My DoSomething Function.")
-*   DataOutput(int, "DoSomething:Result", 0, "My DoSomething result.")
-*
-* ---------------------------------------------------------------------------------------------------------- */
-#define DataOutput(Type, Name, Description, ...)
-
-/*
-*----------------------------------------------------------------------------------------------------------
-*
-* DynamicValueDataInput
-* Provides shorthand for creating an input dynamic value data slot.
-*
-* Examples:
-*     DynamicValueDataInput("ValueData", "A generic value data.")
-*
-* ---------------------------------------------------------------------------------------------------------- */
-#define DynamicValueDataInput(Name, Description, ...)
-
-/*
-*----------------------------------------------------------------------------------------------------------
-*
-* DynamicValueDataOutput
-* Provides shorthand for creating an output dynamic value data slot.
-*
-* Examples:
-*     DynamicValueDataOutput("ValueData", "A generic value data.")
-*
-* ---------------------------------------------------------------------------------------------------------- */
-#define DynamicValueDataOutput(Name, Description, ...)
-
-/*
-*----------------------------------------------------------------------------------------------------------
-*
-* DynamicContainerDataInput
-* Provides shorthand for creating an input dynamic container data slot.
-*
-* Coupled with macro ExecutionInput/ExecutionOutput/ExecutionLatentOutput to generate dynamic data input slot
-*
-* Examples:
-*     DynamicContainerDataInput("ContainerData", "A generic container data.")
-*
-* ---------------------------------------------------------------------------------------------------------- */
-#define DynamicContainerDataInput(Name, Description, ...)
-
-/*
-*----------------------------------------------------------------------------------------------------------
-*
-* DynamicContainerDataOutput
-* Provides shorthand for creating an output dynamic container data slot.
-*
-* Coupled with macro ExecutionInput/ExecutionOutput/ExecutionLatentOutput to generate dynamic data output slot
-*
-* Examples:
-*     DynamicContainerDataOutput("ContainerData", "A generic container data.")
-*
-* ---------------------------------------------------------------------------------------------------------- */
-#define DynamicContainerDataOutput(Name, Description, ...)
-
-/*
-*----------------------------------------------------------------------------------------------------------
-*
-* DynamicAnyDataInput
-* Provides shorthand for creating an input dynamic any data slot.
-*
-* Coupled with macro ExecutionInput/ExecutionOutput/ExecutionLatentOutput to generate dynamic data input slot
-*
-* Examples:
-*     DynamicAnyDataInput("AnyData", "A generic any data.")
-*
-* ---------------------------------------------------------------------------------------------------------- */
-#define DynamicAnyDataInput(Name, Description, ...)
-
-/*
-*----------------------------------------------------------------------------------------------------------
-*
-* DynamicAnyDataOutput
-* Provides shorthand for creating an output dynamic any data slot.
-*
-* Coupled with macro ExecutionInput/ExecutionOutput/ExecutionLatentOutput to generate dynamic data output slot
-*
-* Examples:
-*     DynamicAnyDataOutput("AnyData", "A generic any data.")
-*
-* ---------------------------------------------------------------------------------------------------------- */
-#define DynamicAnyDataOutput(Name, Description, ...)
-
-// Intellisense helpers, the following definitions exist to provide code completion details regarding what attributes are
-// supported by the different tags.
-
-// Revisited common tags, we should be able to remove NodeableCodegen eventually
-namespace NodeableCodegen
-{
-    namespace ScriptCanvasTags
-    {
-        using OverrideName = const char*;
-        using Uuid = const char*;
-        using Category = const char*;
-        using Icon = const char*;
-        using Deprecated = const char*;
-
-        struct Version
-        {
-            using ConverterFunction = bool(class AZ::SerializeContext& context, class AZ::SerializeContext::DataElementNode& classElement);
-            Version(unsigned int /*version*/) {}
-            Version(unsigned int /*version*/, ConverterFunction /*converter*/) {}
-        };
-
-        template <class EventHandlerType>
-        struct EventHandler
-        {
-            EventHandler() = default;
-        };
-
-        namespace Edit
-        {
-            struct UIHandler
-            {
-                UIHandler([[maybe_unused]] const AZ::Crc32& uiHandler = AZ::Edit::UIHandlers::Default) {}
-            };
-        }
-
-        struct EditAttributes
-        {
-            template <typename ...Args>
-            EditAttributes(Args&& ... args) {}
-        };
-
-        struct BaseClass
-        {
-            BaseClass(AZStd::initializer_list<const char*>) {}
-        };
-
-        //struct Contracts
-        //{
-        //    explicit Contracts(AZStd::initializer_list<ScriptCanvas::Contract>) {}
-        //};
-
-        //struct RestrictedTypeContractTag
-        //{
-        //    explicit RestrictedTypeContractTag(AZStd::initializer_list<ScriptCanvas::Data::Type>) {}
-        //};
-
-        struct SupportsMethodContractTag
-        {
-            explicit SupportsMethodContractTag(const char*) {}
-        };
-    }
-}
-
-namespace NodeTags
-{
-    using NodeableCodegen::ScriptCanvasTags::OverrideName;
-    using NodeableCodegen::ScriptCanvasTags::Uuid;
-    using NodeableCodegen::ScriptCanvasTags::Version;
-    using NodeableCodegen::ScriptCanvasTags::Icon;
-    using NodeableCodegen::ScriptCanvasTags::EditAttributes;
-    using NodeableCodegen::ScriptCanvasTags::Category;
-    using NodeableCodegen::ScriptCanvasTags::Deprecated;
-
-    using GraphEntryPoint = bool;
-}
-
-namespace SlotTags
-{
-    using NodeableCodegen::ScriptCanvasTags::OverrideName;
-    //using NodeableCodegen::ScriptCanvasTags::Contracts;
-
-    // Data specific
-    using DisplayGroup = const char*;
-
-    // PropertyData specific
-    using PropertyReference = const char*;
-    using PropertyInterface = const char*;
-
-    // ExecutionSlot specific
-    using BranchOf = const char*;
-
-    // EditContext specific
-    using NodeableCodegen::ScriptCanvasTags::EditAttributes;
-    using NodeableCodegen::ScriptCanvasTags::Edit::UIHandler;
-    using AzCommon::Attributes::ChangeNotify;
-    using AzCommon::Attributes::Visibility;
-    using AzCommon::Attributes::AutoExpand;
-    using AzCommon::Attributes::DescriptionTextOverride;
-    using AzCommon::Attributes::NameLabelOverride;
-    using AzCommon::Attributes::Min;
-    using AzCommon::Attributes::Max;
-
-    // DynamicData specific
-    //using NodeableCodegen::ScriptCanvasTags::RestrictedTypeContractTag;
-    using NodeableCodegen::ScriptCanvasTags::SupportsMethodContractTag;
-    using DynamicGroup = const char*;
-}

Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp

@@ -10,7 +10,6 @@
 #include <SurfaceDataSystemComponent.h>
 #include <Components/SurfaceDataColliderComponent.h>
 #include <Components/SurfaceDataShapeComponent.h>
-#include <TerrainSurfaceDataSystemComponent.h>
 
 namespace SurfaceData
 {
@@ -20,7 +19,6 @@ namespace SurfaceData
             SurfaceDataSystemComponent::CreateDescriptor(),
             SurfaceDataColliderComponent::CreateDescriptor(),
             SurfaceDataShapeComponent::CreateDescriptor(),
-            Terrain::TerrainSurfaceDataSystemComponent::CreateDescriptor(),
         });
     }
 
@@ -28,7 +26,6 @@ namespace SurfaceData
     {
         return AZ::ComponentTypeList{
             azrtti_typeid<SurfaceDataSystemComponent>(),
-            azrtti_typeid<Terrain::TerrainSurfaceDataSystemComponent>(),
         };
     }
 }

Gems/SurfaceData/Code/surfacedata_files.cmake

@@ -19,8 +19,6 @@ set(FILES
     Include/SurfaceData/Utility/SurfaceDataUtility.h
     Source/SurfaceDataSystemComponent.cpp
     Source/SurfaceDataSystemComponent.h
-    Source/TerrainSurfaceDataSystemComponent.cpp
-    Source/TerrainSurfaceDataSystemComponent.h
     Source/SurfaceTag.cpp
     Source/Components/SurfaceDataColliderComponent.cpp
     Source/Components/SurfaceDataColliderComponent.h

Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Terrain Height</title>
+    <g id="icon-/-Environmental-/-Terrain-Height" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15,4 L22,20 L7.9986687,19.9993631 L7.9986687,14.9993631 L10,15 L8,11 L7.9986687,11.0013631 L7.9986687,8.00136309 L8,8 L10.8,13.6 L15,4 Z M15,7 L13,12 L17,12 L15,7 Z M7.21914721,0.964363085 L7.21914721,5.50135833 L5.8081113,5.50135833 L5.8081113,6.20344432 L7.21914721,6.20344432 L7.21914721,7.31885826 L5.8081113,7.31885826 L5.8081113,7.94758992 L7.21914721,7.94758992 L7.21914721,9.12604407 L6.01490518,9.12604407 L6.01490518,9.69309095 L7.21914721,9.69309095 L7.21914721,10.8434468 L6.01490518,10.8434468 L6.01490518,11.3367478 L7.21914721,11.3367478 L7.21914721,12.561057 L6.01490518,12.561057 L6.01490518,13.2062487 L7.21914721,13.2062487 L7.21914721,14.3024381 L6.01490518,14.3024381 L6.01490518,14.9912747 L7.21914721,14.9912747 L7.21914721,16.0640829 L6.01490518,16.0640829 L6.01490518,16.762272 L7.21914721,16.762272 L7.21914721,17.9022362 L6.01490518,17.9022362 L6.01490518,18.5465186 L7.21914721,18.5465186 L7.21914721,19.5980239 L6.01490518,19.5980239 L6.01490518,20.2294467 L7.21914721,20.2294467 L7.21914721,21.2565316 L5.8081113,21.2565316 L5.8081113,21.9825184 L7.21914721,21.9825184 L7.21914721,23.0479225 L2.9026687,23.0479225 C2.35038395,23.0479225 1.9026687,22.6002072 1.9026687,22.0479225 L1.9026687,1.96436309 C1.9026687,1.41207834 2.35038395,0.964363085 2.9026687,0.964363085 L7.21914721,0.964363085 Z M4.60708525,1.76269886 C4.1792616,1.76269886 3.832442,2.10951846 3.832442,2.53734212 C3.832442,2.96516577 4.1792616,3.31198537 4.60708525,3.31198537 C5.03490891,3.31198537 5.38172851,2.96516577 5.38172851,2.53734212 C5.38172851,2.10951846 5.03490891,1.76269886 4.60708525,1.76269886 Z" id="Combined-Shape" fill="#8B572A"></path>
+    </g>
+</svg>

Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerRenderer.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Terrain Mesh</title>
+    <g id="icon-/-Environmental-/-Terrain-Mesh" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M16,5.23640192 L23,21.2364019 L1,21.2364019 L3.153,16.9310652 L10.848,16.9310652 L10.867,16.9694019 L16,5.23640192 Z M11.279112,8.05162125 C11.8313968,8.05162125 12.279112,8.4993365 12.279112,9.05162125 L12.279112,9.57054521 L9.49851168,15.5710293 L2,15.5710293 C1.44771525,15.5710293 1,15.123314 1,14.5710293 L1,9.05162125 C1,8.4993365 1.44771525,8.05162125 2,8.05162125 L11.279112,8.05162125 Z M16,8.23640192 L14,13.2364019 L18,13.2364019 L16,8.23640192 Z M11.339186,5.23184324 L11.339186,7.11169525 L1.939926,7.11169525 L1.939926,5.23184324 L11.339186,5.23184324 Z M10.39926,2.41206524 L10.39926,4.29191724 L2.879852,4.29191724 L2.879852,2.41206524 L10.39926,2.41206524 Z" id="Combined-Shape" fill="#8B572A"></path>
+    </g>
+</svg>

Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Generate Terrian </title>
+    <g id="icon-/-Environmental-/-Generate-Terrian-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M16,5.23640192 L23,21.2364019 L1,21.2364019 L3.153,16.9311553 L10.7351274,16.9317461 L10.786,16.8081553 L10.867,16.9694019 L16,5.23640192 Z M10.7866981,7.88269686 C11.1462033,8.9008023 11.3517156,9.91858532 11.3517156,10.6951961 C11.3517156,13.0695588 9.43072532,14.9943601 7.06106374,14.9943601 C4.69140216,14.9943601 2.77041189,13.0695588 2.77041189,10.6951961 C2.77041189,9.98779834 2.94092524,9.08030022 3.24301589,8.15472512 L5.48573411,10.2222098 L7.16571378,8.51342542 L8.83993571,10.2222098 L10.7866981,7.88269686 Z M16,8.23640192 L14,13.2364019 L18,13.2364019 L16,8.23640192 Z M7.06106374,3.69215527 C8.35768587,3.69215527 9.51997507,5.07798918 10.306728,6.72204766 L8.83082438,8.28190713 L7.15660245,6.58611652 L5.47662277,8.28190713 L3.80919728,6.73502979 C4.59603726,5.08529116 5.76103013,3.69215527 7.06106374,3.69215527 Z" id="Combined-Shape" fill="#8B572A"></path>
+    </g>
+</svg>

Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Terrain Refactor</title>
+    <g id="icon-/-Environmental-/-Terrain-Refactor" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
+        <path d="M2,20 L8,8 L10.8,13.6 L15,4 L22,20 L2,20 Z M8,11 L6,15 L10,15 L8,11 Z M15,7 L13,12 L17,12 L15,7 Z" id="Combined-Shape" fill="#8B572A"></path>
+    </g>
+</svg>

Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Terrain World Debugger</title>
+    <g id="icon-/-Environmental-/-Terrain-World-Debugger" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
+        <path d="M16,5.23640192 L23,21.2364019 L1,21.2364019 L4.034,15.1675981 L5.534,15.1675981 L5,16.2364019 L9,16.2364019 L8.466,15.1675981 L9.966,15.1675981 L10.867,16.9694019 L16,5.23640192 Z M5.7575896,2.84113022 C6.03130743,3.01216811 5.99303429,3.29144758 5.82199641,3.56516541 C5.5939459,3.93012252 5.63692265,4.11800916 5.79661523,4.47152561 C6.28699059,4.39735197 7.01109383,4.59333567 7.42167058,4.8498925 C7.55852949,4.93541144 7.6668821,5.06655002 7.80374101,5.15206897 C8.11735815,5.15774162 8.40246897,5.20903391 8.76170575,5.24321288 L9.24631309,4.46767902 C8.9379383,4.03250676 8.70982422,3.7208123 8.56197083,3.53259562 C8.34019074,3.25027061 9.17154039,2.55841555 9.4400416,2.93949264 C9.57872751,3.13632611 9.82791397,3.48184986 10.187601,3.9760639 C10.2921591,4.119728 10.3942808,4.6608066 10.3267772,4.76883491 L9.87364273,5.4940017 C10.1587536,5.54529399 10.3697384,5.61369961 10.5807233,5.68210522 C10.8373278,5.77901716 11.1395519,5.9044354 11.4132698,6.07547329 L11.7101975,5.60028961 C11.8353154,5.40005911 12.2927086,5.36754107 12.4693791,5.39797939 C13.0265899,5.49398048 13.4462261,5.56768275 13.7282877,5.61908617 C14.2855266,5.72063845 13.9217192,6.73248862 13.5801311,6.66829019 C13.3524057,6.62549124 12.9722579,6.55710151 12.4396878,6.46312102 L12.2686499,6.73683885 C12.5480881,7.10174828 13.0794962,7.47936459 13.5424736,8.2230391 C13.2332304,8.82332896 12.3709586,10.4987773 10.9556581,13.249384 C10.2300617,13.3746794 8.81376094,13.077921 8.3917912,12.9411097 L8.22075331,13.2148276 C8.50116176,13.5796109 8.72927585,13.8913054 8.90509558,14.149911 C9.16882518,14.5378194 8.27592007,15.0939625 8.02702481,14.743014 C7.89765153,14.5605944 7.64842782,14.2153849 7.2793537,13.7073854 C7.12105098,13.489495 7.07511207,13.0179769 7.14377888,12.908087 L7.42238579,12.4622227 C7.14866796,12.2911849 6.90345644,12.0745273 6.70386456,11.8863761 C6.50427268,11.6982249 6.37880675,11.4929604 6.22483451,11.3333155 L5.71101869,12.1555927 C5.66374222,12.2312508 5.39038727,12.3573847 5.30398078,12.3447359 C4.6772029,12.2529836 4.15546889,12.1592118 3.73877875,12.0634204 C3.21667547,11.8756628 3.41280304,11.0226842 3.88693529,11.0142164 C4.12232485,11.0454571 4.51197472,11.0986403 5.0558849,11.1737659 L5.54049224,10.3982321 C5.32378704,10.1359549 5.18120779,9.85656443 5.03862853,9.57717395 C4.8732633,9.53727464 4.70789807,9.49737534 4.57103915,9.4118564 C4.1604624,9.15529957 3.78986942,8.48459472 3.61306352,8.05695233 C3.17970079,8.03988668 2.99858532,8.18114181 2.77053481,8.54609893 C2.59949692,8.81981676 2.32495313,9.10238902 2.0512353,8.93135114 C1.77751746,8.76031325 1.77825895,8.55548589 1.94929684,8.28176806 C2.34838524,7.64309311 2.76327156,7.33075241 3.4931381,7.27936476 C3.53871006,6.80038239 3.65840797,6.3042867 3.94347111,5.84809031 C4.22853425,5.39189392 4.59344369,5.11245575 5.00397276,4.86152389 C4.73020724,4.18299733 4.73852278,3.70999986 5.13761117,3.07132492 C5.30864906,2.79760708 5.48387176,2.67009234 5.7575896,2.84113022 Z M16,8.23640192 L14,13.2364019 L18,13.2364019 L16,8.23640192 Z M8.03008933,6.27169476 C7.86593803,6.90855503 7.62722372,7.47571465 7.31394641,7.9731736 C7.00066911,8.47063256 6.59764439,8.93015918 6.10487226,9.35175347 C6.78174598,10.4775099 7.41236887,11.2247577 7.99674093,11.5934967 C8.5453571,11.9396737 9.08387287,12.311171 9.87590139,12.1865085 C10.2486081,11.6217646 11.911756,8.7895471 12.3207747,8.14675221 C11.6119238,7.43916872 11.2609677,7.0257827 10.6750595,6.74648915 C9.90539682,6.37960262 8.70735067,6.16885245 8.03008933,6.27169476 Z M4.85586389,6.41821659 C4.37125655,7.19375045 4.50249049,8.10037522 5.14116544,8.49946362 C5.27802436,8.58498256 5.3267053,8.57787184 5.47944458,8.48580763 C5.99590493,8.07119781 6.32940283,7.74343935 6.4799383,7.50253224 C6.63347019,7.25682987 6.79975217,6.83183484 6.97878426,6.22754717 C7.02310864,5.99705844 6.98840321,5.84780422 6.85154429,5.76228528 C6.21286935,5.36319688 5.34047123,5.64268273 4.85586389,6.41821659 Z" id="Combined-Shape" fill="#8B572A"></path>
+    </g>
+</svg>

Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Terrain World Renderer</title>
+    <g id="icon-/-Environmental-/-Terrain-World-Renderer" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
+        <path d="M14.128,5.993 L14.1280665,8 L16.5280665,8 L16.528,7.493 L16.75,7.999 L16.5280665,8 L16.5280665,10.4 L17.8,10.399 L18.85,12.799 L16.5280665,12.8 L16.5280665,15.2 L18.9280665,15.2 L18.928,12.978 L19.9,15.199 L18.9280665,15.2 L18.9280665,17.6 L20.95,17.599 L22,20 L14.1280665,20 L14.1280665,17.6 L11.7280665,17.6 L11.7280665,20 L2,20 L8,8 L10.8,13.6 L12.2,10.399 L14.1280665,10.4 L14.1280665,8 L13.25,7.999 L14.128,5.993 Z M18.9280665,17.6 L16.5280665,17.6 L16.5280665,20 L18.9280665,20 L18.9280665,17.6 Z M16.5280665,15.2 L14.1280665,15.2 L14.1280665,17.6 L16.5280665,17.6 L16.5280665,15.2 Z M14.1280665,12.8 L11.7280665,12.8 L11.7280665,15.2 L14.1280665,15.2 L14.1280665,12.8 Z M8,11 L6,15 L10,15 L8,11 Z M16.5280665,10.4 L14.1280665,10.4 L14.1280665,12.8 L16.5280665,12.8 L16.5280665,10.4 Z M15,4 L15.7,5.599 L14.3,5.599 L15,4 Z" id="Combined-Shape" fill="#8B572A"></path>
+    </g>
+</svg>

Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Terrain Height - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Environmental-/-Terrain-Height---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#8B572A">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M15.0973313,4.03563691 L22.0973313,20.0356369 L8.096,20.035 L8.096,15.035 L10.0973313,15.0356369 L8.0973313,11.0356369 L8.096,11.037 L8.096,8.037 L8.0973313,8.03563691 L10.8973313,13.6356369 L15.0973313,4.03563691 Z M15.0973313,7.03563691 L13.0973313,12.0356369 L17.0973313,12.0356369 L15.0973313,7.03563691 Z M7.31647851,1 L7.31647851,5.53699525 L5.9054426,5.53699525 L5.9054426,6.23908123 L7.31647851,6.23908123 L7.31647851,7.35449518 L5.9054426,7.35449518 L5.9054426,7.98322684 L7.31647851,7.98322684 L7.31647851,9.16168098 L6.11223647,9.16168098 L6.11223647,9.72872786 L7.31647851,9.72872786 L7.31647851,10.8790837 L6.11223647,10.8790837 L6.11223647,11.3723847 L7.31647851,11.3723847 L7.31647851,12.5966939 L6.11223647,12.5966939 L6.11223647,13.2418856 L7.31647851,13.2418856 L7.31647851,14.338075 L6.11223647,14.338075 L6.11223647,15.0269116 L7.31647851,15.0269116 L7.31647851,16.0997198 L6.11223647,16.0997198 L6.11223647,16.7979089 L7.31647851,16.7979089 L7.31647851,17.9378731 L6.11223647,17.9378731 L6.11223647,18.5821555 L7.31647851,18.5821555 L7.31647851,19.6336608 L6.11223647,19.6336608 L6.11223647,20.2650836 L7.31647851,20.2650836 L7.31647851,21.2921685 L5.9054426,21.2921685 L5.9054426,22.0181553 L7.31647851,22.0181553 L7.31647851,23.0835594 L3,23.0835594 C2.44771525,23.0835594 2,22.6358441 2,22.0835594 L2,2 C2,1.44771525 2.44771525,1 3,1 L7.31647851,1 Z M4.70441655,1.79833578 C4.27659289,1.79833578 3.92977329,2.14515537 3.92977329,2.57297903 C3.92977329,3.00080269 4.27659289,3.34762229 4.70441655,3.34762229 C5.13224021,3.34762229 5.47905981,3.00080269 5.47905981,2.57297903 C5.47905981,2.14515537 5.13224021,1.79833578 4.70441655,1.79833578 Z" id="Combined-Shape-Copy" fill="#FFFFFF"></path>
+    </g>
+</svg>

Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerRenderer.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Terrain Mesh - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Environmental-/-Terrain-Mesh---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#8B572A">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M16,5.23640192 L23,21.2364019 L1,21.2364019 L3.153,16.9310652 L10.848,16.9310652 L10.867,16.9694019 L16,5.23640192 Z M11.279112,8.05162125 C11.8313968,8.05162125 12.279112,8.4993365 12.279112,9.05162125 L12.279112,9.57054521 L9.49851168,15.5710293 L2,15.5710293 C1.44771525,15.5710293 1,15.123314 1,14.5710293 L1,9.05162125 C1,8.4993365 1.44771525,8.05162125 2,8.05162125 L11.279112,8.05162125 Z M16,8.23640192 L14,13.2364019 L18,13.2364019 L16,8.23640192 Z M11.339186,5.23184324 L11.339186,7.11169525 L1.939926,7.11169525 L1.939926,5.23184324 L11.339186,5.23184324 Z M10.39926,2.41206524 L10.39926,4.29191724 L2.879852,4.29191724 L2.879852,2.41206524 L10.39926,2.41206524 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>

Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Generate Terrian - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Environmental-/-Generate-Terrian---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#8B572A">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M16,5.23640192 L23,21.2364019 L1,21.2364019 L3.153,16.9311553 L10.7351274,16.9317461 L10.786,16.8081553 L10.867,16.9694019 L16,5.23640192 Z M10.7866981,7.88269686 C11.1462033,8.9008023 11.3517156,9.91858532 11.3517156,10.6951961 C11.3517156,13.0695588 9.43072532,14.9943601 7.06106374,14.9943601 C4.69140216,14.9943601 2.77041189,13.0695588 2.77041189,10.6951961 C2.77041189,9.98779834 2.94092524,9.08030022 3.24301589,8.15472512 L5.48573411,10.2222098 L7.16571378,8.51342542 L8.83993571,10.2222098 L10.7866981,7.88269686 Z M16,8.23640192 L14,13.2364019 L18,13.2364019 L16,8.23640192 Z M7.06106374,3.69215527 C8.35768587,3.69215527 9.51997507,5.07798918 10.306728,6.72204766 L8.83082438,8.28190713 L7.15660245,6.58611652 L5.47662277,8.28190713 L3.80919728,6.73502979 C4.59603726,5.08529116 5.76103013,3.69215527 7.06106374,3.69215527 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>

Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Terrain Refactor - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Environmental-/-Terrain-Refactor---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#8B572A">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M2,20 L8,8 L10.8,13.6 L15,4 L22,20 L2,20 Z M8,11 L6,15 L10,15 L8,11 Z M15,7 L13,12 L17,12 L15,7 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>

Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Terrain World Debugger - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Environmental-/-Terrain-World-Debugger---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#8B572A">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M16.1386919,4 L23.1386919,20 L1.13869185,20 L4.17269185,13.9311962 L5.67269185,13.9311962 L5.13869185,15 L9.13869185,15 L8.60469185,13.9311962 L10.1046919,13.9311962 L11.0056919,15.733 L16.1386919,4 Z M5.89628145,1.6047283 C6.16999928,1.77576619 6.13172615,2.05504566 5.96068826,2.32876349 C5.73263775,2.6937206 5.7756145,2.88160724 5.93530708,3.23512368 C6.42568244,3.16095005 7.14978568,3.35693375 7.56036243,3.61349058 C7.69722134,3.69900952 7.80557395,3.8301481 7.94243286,3.91566705 C8.25605,3.9213397 8.54116082,3.97263199 8.9003976,4.00681096 L9.38500494,3.2312771 C9.07663015,2.79610484 8.84851607,2.48441038 8.70066268,2.2961937 C8.47888259,2.01386869 9.31023224,1.32201362 9.57873345,1.70309072 C9.71741936,1.89992419 9.96660582,2.24544794 10.3262928,2.73966198 C10.430851,2.88332607 10.5329727,3.42440468 10.4654691,3.53243299 L10.0123346,4.25759977 C10.2974454,4.30889207 10.5084303,4.37729768 10.7194151,4.4457033 C10.9760197,4.54261523 11.2782438,4.66803348 11.5519616,4.83907137 L11.8488893,4.36388769 C11.9740073,4.16365719 12.4314004,4.13113915 12.6080709,4.16157747 C13.1652817,4.25757856 13.5849179,4.33128082 13.8669795,4.38268425 C14.4242185,4.48423653 14.0604111,5.4960867 13.718823,5.43188827 C13.4910975,5.38908932 13.1109498,5.32069959 12.5783797,5.2267191 L12.4073418,5.50043693 C12.68678,5.86534636 13.2181881,6.24296266 13.6811655,6.98663718 C13.3719223,7.58692704 12.5096505,9.26237536 11.09435,12.0129821 C10.3687536,12.1382775 8.95245279,11.8415191 8.53048305,11.7047078 L8.35944516,11.9784257 C8.63985361,12.343209 8.8679677,12.6549035 9.04378743,12.9135091 C9.30751703,13.3014174 8.41461192,13.8575606 8.16571666,13.506612 C8.03634338,13.3241925 7.78711967,12.9789829 7.41804555,12.4709835 C7.25974283,12.2530931 7.21380392,11.7815749 7.28247073,11.6716851 L7.56107764,11.2258208 C7.28735981,11.0547829 7.04214829,10.8381254 6.84255641,10.6499742 C6.64296453,10.461823 6.5174986,10.2565585 6.36352636,10.0969136 L5.84971054,10.9191908 C5.80243407,10.9948489 5.52907912,11.1209828 5.44267263,11.108334 C4.81589475,11.0165817 4.29416074,10.9228098 3.8774706,10.8270185 C3.35536732,10.6392609 3.55149489,9.78628232 4.02562714,9.77781449 C4.2610167,9.8090552 4.65066657,9.86223838 5.19457675,9.93736403 L5.67918409,9.16183016 C5.46247889,8.899553 5.31989964,8.62016251 5.17732038,8.34077202 C5.01195515,8.30087272 4.84658992,8.26097342 4.709731,8.17545447 C4.29915425,7.91889765 3.92856127,7.2481928 3.75175537,6.82055041 C3.31839264,6.80348476 3.13727717,6.94473989 2.90922666,7.309697 C2.73818877,7.58341484 2.46364498,7.8659871 2.18992715,7.69494921 C1.91620931,7.52391133 1.91695081,7.31908397 2.08798869,7.04536614 C2.48707709,6.40669119 2.90196341,6.09435049 3.63182995,6.04296284 C3.67740191,5.56398047 3.79709982,5.06788478 4.08216296,4.61168839 C4.36722611,4.155492 4.73213554,3.87605383 5.14266461,3.62512197 C4.86889909,2.9465954 4.87721463,2.47359794 5.27630303,1.834923 C5.44734091,1.56120516 5.62256361,1.43369042 5.89628145,1.6047283 Z M16.1386919,7 L14.1386919,12 L18.1386919,12 L16.1386919,7 Z M8.16878118,5.03529284 C8.00462988,5.67215311 7.76591557,6.23931272 7.45263826,6.73677168 C7.13936096,7.23423064 6.73633624,7.69375726 6.24356411,8.11535154 C6.92043783,9.241108 7.55106072,9.98835574 8.13543278,10.3570948 C8.68404895,10.7032718 9.22256472,11.0747691 10.0145932,10.9501066 C10.3872999,10.3853627 12.0504479,7.55314517 12.4594665,6.91035029 C11.7506156,6.20276679 11.3996595,5.78938078 10.8137513,5.51008723 C10.0440887,5.1432007 8.84604252,4.93245053 8.16878118,5.03529284 Z M4.99455574,5.18181467 C4.5099484,5.95734853 4.64118234,6.8639733 5.27985729,7.2630617 C5.41671621,7.34858064 5.46539716,7.34146992 5.61813643,7.24940571 C6.13459678,6.83479589 6.46809468,6.50703743 6.61863015,6.26613032 C6.77216204,6.02042794 6.93844402,5.59543292 7.11747611,4.99114525 C7.16180049,4.76065652 7.12709506,4.6114023 6.99023614,4.52588336 C6.3515612,4.12679496 5.47916308,4.40628081 4.99455574,5.18181467 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>

Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Terrain World Renderer - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Environmental-/-Terrain-World-Renderer---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#8B572A">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M14.128,5.993 L14.1280665,8 L16.5280665,8 L16.528,7.493 L16.75,7.999 L16.5280665,8 L16.5280665,10.4 L17.8,10.399 L18.85,12.799 L16.5280665,12.8 L16.5280665,15.2 L18.9280665,15.2 L18.928,12.978 L19.9,15.199 L18.9280665,15.2 L18.9280665,17.6 L20.95,17.599 L22,20 L14.1280665,20 L14.1280665,17.6 L11.7280665,17.6 L11.7280665,20 L2,20 L8,8 L10.8,13.6 L12.2,10.399 L14.1280665,10.4 L14.1280665,8 L13.25,7.999 L14.128,5.993 Z M18.9280665,17.6 L16.5280665,17.6 L16.5280665,20 L18.9280665,20 L18.9280665,17.6 Z M16.5280665,15.2 L14.1280665,15.2 L14.1280665,17.6 L16.5280665,17.6 L16.5280665,15.2 Z M14.1280665,12.8 L11.7280665,12.8 L11.7280665,15.2 L14.1280665,15.2 L14.1280665,12.8 Z M8,11 L6,15 L10,15 L8,11 Z M16.5280665,10.4 L14.1280665,10.4 L14.1280665,12.8 L16.5280665,12.8 L16.5280665,10.4 Z M15,4 L15.7,5.599 L14.3,5.599 L15,4 Z" id="Combined-Shape-Copy" fill="#FFFFFF"></path>
+    </g>
+</svg>

Gems/Terrain/CMakeLists.txt

@@ -0,0 +1,8 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+add_subdirectory(Code)

Gems/Terrain/Code/CMakeLists.txt

@@ -0,0 +1,139 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+ly_add_target(
+    NAME Terrain.Static STATIC
+    NAMESPACE Gem
+    FILES_CMAKE
+        terrain_files.cmake
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            Include
+        PRIVATE
+            Source
+    BUILD_DEPENDENCIES
+        PUBLIC
+            AZ::AzCore
+            AZ::AzFramework
+            Gem::Atom_RPI.Public
+            Gem::Atom_Utils.Static
+            Gem::GradientSignal
+            Gem::SurfaceData
+            Gem::LmbrCentral
+)
+
+ly_add_target(
+    NAME Terrain ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
+    NAMESPACE Gem
+    FILES_CMAKE
+        terrain_shared_files.cmake
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            Include
+        PRIVATE
+            Source
+    BUILD_DEPENDENCIES
+        PRIVATE
+            Gem::Terrain.Static
+            Gem::LmbrCentral
+    RUNTIME_DEPENDENCIES
+        Gem::LmbrCentral
+)
+
+# the above module is for use in all client/server types 
+ly_create_alias(NAME Terrain.Servers  NAMESPACE Gem TARGETS Gem::Terrain)
+ly_create_alias(NAME Terrain.Clients  NAMESPACE Gem TARGETS Gem::Terrain)
+
+# If we are on a host platform, we want to add the host tools targets like the Terrain.Editor target which
+# will also depend on Terrain.Static
+if(PAL_TRAIT_BUILD_HOST_TOOLS)
+    ly_add_target(
+        NAME Terrain.Editor MODULE
+        NAMESPACE Gem
+        AUTOMOC
+        OUTPUT_NAME Gem.Terrain.Editor
+        FILES_CMAKE
+            terrain_editor_shared_files.cmake
+        COMPILE_DEFINITIONS
+            PRIVATE
+                TERRAIN_EDITOR
+        INCLUDE_DIRECTORIES
+            PRIVATE
+                Source
+            PUBLIC
+                Include
+        BUILD_DEPENDENCIES
+            PUBLIC
+                AZ::AzToolsFramework
+                Gem::GradientSignal
+                Gem::LmbrCentral
+                Gem::Terrain.Static
+    )
+
+    # the above module is for use in dev tool situations
+    ly_create_alias(NAME Terrain.Builders NAMESPACE Gem TARGETS Gem::Terrain.Editor)
+    ly_create_alias(NAME Terrain.Tools    NAMESPACE Gem TARGETS Gem::Terrain.Editor)
+endif()
+
+################################################################################
+# Tests
+################################################################################
+# See if globally, tests are supported
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
+    # We globally support tests, see if we support tests on this platform for Terrain.Static
+    if(PAL_TRAIT_TERRAIN_TEST_SUPPORTED)
+        # We support Terrain.Tests on this platform, add Terrain.Tests target which depends on Terrain.Static
+        ly_add_target(
+            NAME Terrain.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
+            NAMESPACE Gem
+            FILES_CMAKE
+                terrain_files.cmake
+                terrain_tests_files.cmake
+            INCLUDE_DIRECTORIES
+                PRIVATE
+                    Tests
+                    Source
+            BUILD_DEPENDENCIES
+                PRIVATE
+                    AZ::AzTest
+                    AZ::AzFramework
+                    Gem::Terrain.Static
+        )
+
+        # Add Terrain.Tests to googletest
+        ly_add_googletest(
+            NAME Gem::Terrain.Tests
+        )
+    endif()
+
+    # If we are a host platform we want to add tools test like editor tests here
+    if(PAL_TRAIT_BUILD_HOST_TOOLS)
+        # We are a host platform, see if Editor tests are supported on this platform
+        if(PAL_TRAIT_TERRAIN_EDITOR_TEST_SUPPORTED)
+            # We support Terrain.Editor.Tests on this platform, add Terrain.Editor.Tests target which depends on Terrain.Editor
+            ly_add_target(
+                NAME Terrain.Editor.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
+                NAMESPACE Gem
+                FILES_CMAKE
+                    terrain_editor_tests_files.cmake
+                INCLUDE_DIRECTORIES
+                    PRIVATE
+                        Tests
+                        Source
+                BUILD_DEPENDENCIES
+                    PRIVATE
+                        AZ::AzTest
+                        Gem::Terrain.Editor
+            )
+
+            # Add Terrain.Editor.Tests to googletest
+            ly_add_googletest(
+                NAME Gem::Terrain.Editor.Tests
+            )
+        endif()
+    endif()
+endif()

Gems/Terrain/Code/Source/Components/TerrainSurfaceDataSystemComponent.cpp

@@ -6,7 +6,7 @@
  *
  */
 
-#include <TerrainSurfaceDataSystemComponent.h>
+#include <Components/TerrainSurfaceDataSystemComponent.h>
 #include <AzCore/Debug/Profiler.h> 
 #include <AzCore/Math/MathUtils.h>
 #include <AzCore/Serialization/EditContext.h>
@@ -58,7 +58,7 @@ namespace Terrain
                 editContext->Class<TerrainSurfaceDataSystemComponent>("Terrain Surface Data System", "Manages surface data requests against legacy terrain")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Surface Data")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System", 0xc94d118b))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("System"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->DataElement(0, &TerrainSurfaceDataSystemComponent::m_configuration, "Configuration", "")
                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
@@ -78,18 +78,18 @@ namespace Terrain
 
     void TerrainSurfaceDataSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
     {
-        services.push_back(AZ_CRC("SurfaceDataProviderService", 0xfe9fb95e));
-        services.push_back(AZ_CRC("TerrainSurfaceDataProviderService", 0xa1ac7717));
+        services.push_back(AZ_CRC_CE("SurfaceDataProviderService"));
+        services.push_back(AZ_CRC_CE("TerrainSurfaceDataProviderService"));
     }
 
     void TerrainSurfaceDataSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
     {
-        services.push_back(AZ_CRC("TerrainSurfaceDataProviderService", 0xa1ac7717));
+        services.push_back(AZ_CRC_CE("TerrainSurfaceDataProviderService"));
     }
 
     void TerrainSurfaceDataSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& services)
     {
-        services.push_back(AZ_CRC("SurfaceDataSystemService", 0x1d44d25f));
+        services.push_back(AZ_CRC_CE("SurfaceDataSystemService"));
     }
 
     void TerrainSurfaceDataSystemComponent::Activate()

Gems/Terrain/Code/Source/Components/TerrainSystemComponent.cpp

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include <Components/TerrainSystemComponent.h>
+
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/Serialization/EditContextConstants.inl>
+
+#include <Atom/RPI.Public/FeatureProcessorFactory.h>
+
+namespace Terrain
+{
+    void TerrainSystemComponent::Reflect(AZ::ReflectContext* context)
+    {
+        if (AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serialize->Class<TerrainSystemComponent, AZ::Component>()
+                ->Version(0);
+
+            if (AZ::EditContext* ec = serialize->GetEditContext())
+            {
+                ec->Class<TerrainSystemComponent>("Terrain", "The Terrain System Component enables Terrain.")
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("System"))
+                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                ;
+            }
+        }
+    }
+
+    void TerrainSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+    {
+        provided.push_back(AZ_CRC_CE("TerrainService"));
+    }
+
+    void TerrainSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC_CE("TerrainService"));
+    }
+
+    void TerrainSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
+    {
+        required.push_back(AZ_CRC_CE("RPISystem"));
+    }
+
+    void TerrainSystemComponent::GetDependentServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& dependent)
+    {
+    }
+
+    void TerrainSystemComponent::Init()
+    {
+    }
+
+    void TerrainSystemComponent::Activate()
+    {
+    }
+
+    void TerrainSystemComponent::Deactivate()
+    {
+    }
+}

Gems/Terrain/Code/Source/Components/TerrainSystemComponent.h

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Component/Component.h>
+
+namespace Terrain
+{
+    class TerrainSystem;
+
+    class TerrainSystemComponent
+        : public AZ::Component
+    {
+    public:
+        AZ_COMPONENT(TerrainSystemComponent, "{CD5A517E-3BD8-49AE-8F9B-33C6FC47EC67}");
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
+        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
+
+    protected:
+        ////////////////////////////////////////////////////////////////////////
+        // AZ::Component interface implementation
+        void Init() override;
+        void Activate() override;
+        void Deactivate() override;
+        ////////////////////////////////////////////////////////////////////////
+
+        TerrainSystem* m_terrainSystem{ nullptr };
+    };
+}

Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSystemComponent.cpp

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/Serialization/SerializeContext.h>
+#include <EditorComponents/EditorTerrainSystemComponent.h>
+
+namespace Terrain
+{
+    void EditorTerrainSystemComponent::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<EditorTerrainSystemComponent, AZ::Component>()->Version(1);
+        }
+    }
+
+    void EditorTerrainSystemComponent::Activate()
+    {
+        AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
+    }
+
+    void EditorTerrainSystemComponent::Deactivate()
+    {
+        AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
+    }
+
+} // namespace Terrain

Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSystemComponent.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Component/Component.h>
+
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+
+namespace Terrain
+{
+    /// System component for Terrain editor
+    class EditorTerrainSystemComponent
+        : public AZ::Component
+        , private AzToolsFramework::EditorEvents::Bus::Handler
+    {
+    public:
+        AZ_COMPONENT(EditorTerrainSystemComponent, "{5E9f2200-9099-4325-BABD-6A533A1ABEA8}");
+        static void Reflect(AZ::ReflectContext* context);
+
+        EditorTerrainSystemComponent() = default;
+
+    private:
+        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+        {
+            provided.push_back(AZ_CRC_CE("TerrainEditorService"));
+        }
+
+        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
+        {
+            required.push_back(AZ_CRC_CE("TerrainService"));
+        }
+
+        // AZ::Component
+        void Activate() override;
+        void Deactivate() override;
+    };
+} // namespace Terrain

Gems/Terrain/Code/Source/EditorTerrainModule.cpp

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <EditorTerrainModule.h>
+#include <EditorComponents/EditorTerrainSystemComponent.h>
+
+namespace Terrain
+{
+    EditorTerrainModule::EditorTerrainModule()
+    {
+        m_descriptors.insert(
+            m_descriptors.end(),
+            {
+                Terrain::EditorTerrainSystemComponent::CreateDescriptor(),
+            });
+    }
+
+    AZ::ComponentTypeList EditorTerrainModule::GetRequiredSystemComponents() const
+    {
+        AZ::ComponentTypeList requiredComponents = TerrainModule::GetRequiredSystemComponents();
+        requiredComponents.insert(
+            requiredComponents.end(),
+            {
+                azrtti_typeid<EditorTerrainSystemComponent>(),
+            });
+
+        return requiredComponents;
+    }
+}
+
+AZ_DECLARE_MODULE_CLASS(Gem_TerrainEditor, Terrain::EditorTerrainModule)

Gems/Terrain/Code/Source/EditorTerrainModule.h

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <TerrainModule.h>
+
+namespace Terrain
+{
+    class EditorTerrainModule
+        : public TerrainModule
+    {
+    public:
+        AZ_RTTI(EditorTerrainModule, "{68693F28-7051-4C14-85EA-DE6FD8CFCBD6}", TerrainModule);
+        AZ_CLASS_ALLOCATOR(EditorTerrainModule, AZ::SystemAllocator, 0);
+
+        EditorTerrainModule();
+
+        AZ::ComponentTypeList GetRequiredSystemComponents() const override;
+    };
+}

Gems/Terrain/Code/Source/TerrainModule.cpp

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Module/Module.h>
+
+#include <TerrainModule.h>
+#include <Components/TerrainSystemComponent.h>
+#include <Components/TerrainSurfaceDataSystemComponent.h>
+
+namespace Terrain
+{
+    TerrainModule::TerrainModule()
+        : AZ::Module()
+    {
+        m_descriptors.insert(m_descriptors.end(), {
+                TerrainSystemComponent::CreateDescriptor(),
+                TerrainSurfaceDataSystemComponent::CreateDescriptor(),
+            });
+    }
+
+    AZ::ComponentTypeList TerrainModule::GetRequiredSystemComponents() const
+    {
+        return AZ::ComponentTypeList{
+            azrtti_typeid<TerrainSystemComponent>(),
+            azrtti_typeid<TerrainSurfaceDataSystemComponent>(),
+        };
+    }
+}
+
+#if !defined(TERRAIN_EDITOR)
+// DO NOT MODIFY THIS LINE UNLESS YOU RENAME THE GEM
+// The first parameter should be GemName_GemIdLower
+// The second should be the fully qualified name of the class above
+AZ_DECLARE_MODULE_CLASS(Gem_Terrain, Terrain::TerrainModule)
+#endif
+