Merge branch 'development' into profiler_capture_api

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

Code/Framework/AzCore/AzCore/Component/TransformBus.h

@@ -168,6 +168,11 @@ namespace AZ
 
         //! Rotation modifiers
         //! @{
+        //! Set the world rotation matrix using the composition of rotations around
+        //! the principle axes in the order of z-axis first and y-axis and then x-axis.
+        //! @param eulerRadianAngles A Vector3 denoting radian angles of the rotations around each principle axis.
+        virtual void SetWorldRotation([[maybe_unused]] const AZ::Vector3& eulerAnglesRadian) {}
+
         //! Sets the entity's rotation in the world in quaternion notation.
         //! The origin of the axes is the entity's position in world space.
         //! @param quaternion A quaternion that represents the rotation to use for the entity.

Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp

@@ -323,6 +323,13 @@ namespace AzFramework
         return localZ;
     }
 
+    void TransformComponent::SetWorldRotation(const AZ::Vector3& eulerAnglesRadian)
+    {
+        AZ::Transform newWorldTransform = m_worldTM;
+        newWorldTransform.SetRotation(AZ::Quaternion::CreateFromEulerAnglesRadians(eulerAnglesRadian));
+        SetWorldTM(newWorldTransform);
+    }
+
     void TransformComponent::SetWorldRotationQuaternion(const AZ::Quaternion& quaternion)
     {
         AZ::Transform newWorldTransform = m_worldTM;

Code/Framework/AzFramework/AzFramework/Components/TransformComponent.h

@@ -108,6 +108,7 @@ namespace AzFramework
         float GetLocalZ() override;
 
         // Rotation modifiers
+        void SetWorldRotation(const AZ::Vector3& eulerAnglesRadian) override;
         void SetWorldRotationQuaternion(const AZ::Quaternion& quaternion) override;
 
         AZ::Vector3 GetWorldRotation() override;

Code/Framework/AzFramework/AzFramework/Physics/Configuration/JointConfiguration.cpp

@@ -10,6 +10,7 @@
 
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
 
 namespace AzPhysics
 {
@@ -28,6 +29,71 @@ namespace AzPhysics
                 ->Field("ChildLocalPosition", &JointConfiguration::m_childLocalPosition)
                 ->Field("StartSimulationEnabled", &JointConfiguration::m_startSimulationEnabled)
                 ;
+
+            if (auto* editContext = serializeContext->GetEditContext())
+            {
+                editContext->Class<JointConfiguration>("Joint Configuration", "Joint configuration.")
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &JointConfiguration::m_parentLocalRotation,
+                        "Parent local rotation", "Parent joint frame relative to parent body.")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, &JointConfiguration::GetParentLocalRotationVisibility)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &JointConfiguration::m_parentLocalPosition,
+                        "Parent local position", "Joint position relative to parent body.")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, &JointConfiguration::GetParentLocalPositionVisibility)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &JointConfiguration::m_childLocalRotation,
+                        "Child local rotation", "Child joint frame relative to child body.")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, &JointConfiguration::GetChildLocalRotationVisibility)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &JointConfiguration::m_childLocalPosition,
+                        "Child local position", "Joint position relative to child body.")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, &JointConfiguration::GetChildLocalPositionVisibility)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &JointConfiguration::m_startSimulationEnabled,
+                        "Start simulation enabled", "When active, the joint will be enabled when the simulation begins.")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, &JointConfiguration::GetStartSimulationEnabledVisibility)
+                    ;
+            }
         }
     }
-}
+
+    AZ::Crc32 JointConfiguration::GetPropertyVisibility(JointConfiguration::PropertyVisibility property) const
+    {
+        return (m_propertyVisibilityFlags & property) != 0 ? AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide;
+    }
+
+    void JointConfiguration::SetPropertyVisibility(JointConfiguration::PropertyVisibility property, bool isVisible)
+    {
+        if (isVisible)
+        {
+            m_propertyVisibilityFlags |= property;
+        }
+        else
+        {
+            m_propertyVisibilityFlags &= ~property;
+        }
+    }
+
+    AZ::Crc32 JointConfiguration::GetParentLocalRotationVisibility() const
+    {
+        return GetPropertyVisibility(JointConfiguration::PropertyVisibility::ParentLocalRotation);
+    }
+
+    AZ::Crc32 JointConfiguration::GetParentLocalPositionVisibility() const
+    {
+        return GetPropertyVisibility(JointConfiguration::PropertyVisibility::ParentLocalPosition);
+    }
+
+    AZ::Crc32 JointConfiguration::GetChildLocalRotationVisibility() const
+    {
+        return GetPropertyVisibility(JointConfiguration::PropertyVisibility::ChildLocalRotation);
+    }
+
+    AZ::Crc32 JointConfiguration::GetChildLocalPositionVisibility() const
+    {
+        return GetPropertyVisibility(JointConfiguration::PropertyVisibility::ChildLocalPosition);
+    }
+
+    AZ::Crc32 JointConfiguration::GetStartSimulationEnabledVisibility() const
+    {
+        return GetPropertyVisibility(JointConfiguration::PropertyVisibility::StartSimulationEnabled);
+    }
+} // namespace AzPhysics

Code/Framework/AzFramework/AzFramework/Physics/Configuration/JointConfiguration.h

@@ -31,6 +31,25 @@ namespace AzPhysics
         JointConfiguration() = default;
         virtual ~JointConfiguration() = default;
 
+        // Visibility helpers for use in the Editor when reflected.
+        enum PropertyVisibility : AZ::u8
+        {
+            ParentLocalRotation = 1 << 0, //!< Whether the parent local rotation is visible.
+            ParentLocalPosition = 1 << 1, //!< Whether the parent local position is visible.
+            ChildLocalRotation = 1 << 2, //!< Whether the child local rotation is visible.
+            ChildLocalPosition = 1 << 3, //!< Whether the child local position is visible.
+            StartSimulationEnabled = 1 << 4 //!< Whether the start simulation enabled setting is visible.
+        };
+
+        AZ::Crc32 GetPropertyVisibility(PropertyVisibility property) const;
+        void SetPropertyVisibility(PropertyVisibility property, bool isVisible);
+
+        AZ::Crc32 GetParentLocalRotationVisibility() const;
+        AZ::Crc32 GetParentLocalPositionVisibility() const;
+        AZ::Crc32 GetChildLocalRotationVisibility() const;
+        AZ::Crc32 GetChildLocalPositionVisibility() const;
+        AZ::Crc32 GetStartSimulationEnabledVisibility() const;
+
         // Entity/object association.
         void* m_customUserData = nullptr;
 
@@ -40,8 +59,11 @@ namespace AzPhysics
         AZ::Quaternion m_childLocalRotation = AZ::Quaternion::CreateIdentity(); ///< Child joint frame relative to child body.
         AZ::Vector3 m_childLocalPosition = AZ::Vector3::CreateZero(); ///< Joint position relative to child body.
         bool m_startSimulationEnabled = true;
-        
+
         // For debugging/tracking purposes only.
         AZStd::string m_debugName;
+
+        // Default all visibility settings to invisible, since most joint configurations don't need to display these.
+        AZ::u8 m_propertyVisibilityFlags = 0;
     };
 }

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

@@ -1387,7 +1387,10 @@ namespace AzToolsFramework
                     QDataStream stream(&pixmapBytes, QIODevice::ReadOnly);
                     QPixmap pixmap;
                     stream >> pixmap;
-                    GUI->SetBrowseButtonIcon(pixmap);
+                    if (!pixmap.isNull())
+                    {
+                        GUI->SetBrowseButtonIcon(pixmap);
+                    }
                 }
             }
         }
@@ -1417,6 +1420,8 @@ namespace AzToolsFramework
         }
         else if (attrib == AZ_CRC_CE("ThumbnailIcon"))
         {
+            GUI->SetCustomThumbnailEnabled(false);
+
             AZStd::string iconPath;
             if (attrValue->Read<AZStd::string>(iconPath) && !iconPath.empty())
             {
@@ -1434,8 +1439,11 @@ namespace AzToolsFramework
                     QDataStream stream(&pixmapBytes, QIODevice::ReadOnly);
                     QPixmap pixmap;
                     stream >> pixmap;
-                    GUI->SetCustomThumbnailEnabled(true);
-                    GUI->SetCustomThumbnailPixmap(pixmap);
+                    if (!pixmap.isNull())
+                    {
+                        GUI->SetCustomThumbnailEnabled(true);
+                        GUI->SetCustomThumbnailPixmap(pixmap);
+                    }
                 }
             }
         }

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

@@ -67,16 +67,9 @@ namespace AzToolsFramework
 
     void ThumbnailPropertyCtrl::SetThumbnailKey(Thumbnailer::SharedThumbnailKey key, const char* contextName)
     {
-        if (m_customThumbnailEnabled)
-        {
-            ClearThumbnail();
-        }
-        else
-        {
-            m_key = key;
-            m_thumbnail->SetThumbnailKey(m_key, contextName);
-            m_thumbnailEnlarged->SetThumbnailKey(m_key, contextName);
-        }
+        m_key = key;
+        m_thumbnail->SetThumbnailKey(m_key, contextName);
+        m_thumbnailEnlarged->SetThumbnailKey(m_key, contextName);
         UpdateVisibility();
     }
 

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp

@@ -301,6 +301,7 @@ namespace AzToolsFramework::ViewportUi::Internal
             HighlightBorderSize + ViewportUiOverlayMargin, HighlightBorderSize + ViewportUiOverlayMargin);
         m_componentModeBorderText.setVisible(true);
         m_componentModeBorderText.setText(borderTitle.c_str());
+        UpdateUiOverlayGeometry();
     }
 
     void ViewportUiDisplay::RemoveViewportBorder()