Merge pull request #5116 from aws-lumberyard-dev/barlev/gitflow_211028_O3DE

Barlev/gitflow 211028 O3DE

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/Tools/AssetBundler/CMakeLists.txt

@@ -47,6 +47,10 @@ ly_add_target(
             AZ::AssetBundlerBatch.Static
 )
 
+# Adds a specialized .setreg to identify gems enabled in the active project.
+# This associates the AssetBundlerBatch target with the .Builders gem variants.
+ly_set_gem_variant_to_load(TARGETS AssetBundlerBatch VARIANTS Builders)
+
 # AssetBundler - Qt GUI Application
 ly_add_target(
     NAME AssetBundler ${PAL_TRAIT_BUILD_ASSETBUNDLER_APPLICATION_TYPE}
@@ -73,6 +77,10 @@ ly_add_target(
             ${additional_dependencies}
 )
 
+# Adds a specialized .setreg to identify gems enabled in the active project.
+# This associates the AssetBundler target with the .Builders gem variants.
+ly_set_gem_variant_to_load(TARGETS AssetBundler VARIANTS Builders)
+
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
 
     ly_add_target(

Code/Tools/AssetBundler/source/utils/applicationManager.cpp

@@ -54,7 +54,12 @@ namespace AssetBundler
     bool ApplicationManager::Init()
     {
         AZ::Debug::TraceMessageBus::Handler::BusConnect();
-        Start(AzFramework::Application::Descriptor());
+
+        ComponentApplication::StartupParameters startupParameters;
+        // The AssetBundler does not need to load gems
+        startupParameters.m_loadDynamicModules = false;
+        Start(AzFramework::Application::Descriptor(), startupParameters);
+
         AZ::SerializeContext* context;
         EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
         AZ_Assert(context, "No serialize context");

Code/Tools/AssetBundler/tests/applicationManagerTests.cpp

@@ -71,7 +71,11 @@ namespace AssetBundler
 
 
             m_data->m_applicationManager.reset(aznew MockApplicationManagerTest(0, 0));
-            m_data->m_applicationManager->Start(AzFramework::Application::Descriptor());
+
+            AZ::ComponentApplication::StartupParameters startupParameters;
+            // The AssetBundler does not need to load gems
+            startupParameters.m_loadDynamicModules = false;
+            m_data->m_applicationManager->Start(AzFramework::Application::Descriptor(), startupParameters);
 
             // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
             // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash 

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

@@ -145,10 +145,11 @@ namespace O3DE::ProjectManager
         }
     }
 
-    void GemCatalogScreen::OnGemStatusChanged(const QModelIndex& modelIndex, uint32_t numChangedDependencies) 
+    void GemCatalogScreen::OnGemStatusChanged(const QString& gemName, uint32_t numChangedDependencies) 
     {
         if (m_notificationsEnabled)
         {
+            QModelIndex modelIndex = m_gemModel->FindIndexByNameString(gemName);
             bool added = GemModel::IsAdded(modelIndex);
             bool dependency = GemModel::IsAddedDependency(modelIndex);
 
@@ -233,7 +234,11 @@ namespace O3DE::ProjectManager
                 const QVector<GemInfo> allRepoGemInfos = allRepoGemInfosResult.GetValue();
                 for (const GemInfo& gemInfo : allRepoGemInfos)
                 {
-                    m_gemModel->AddGem(gemInfo);
+                    // do not add gems that have already been downloaded
+                    if (!m_gemModel->FindIndexByNameString(gemInfo.m_name).isValid())
+                    {
+                        m_gemModel->AddGem(gemInfo);
+                    }
                 }
             }
             else
@@ -257,7 +262,8 @@ namespace O3DE::ProjectManager
                         GemModel::SetWasPreviouslyAdded(*m_gemModel, modelIndex, true);
                         GemModel::SetIsAdded(*m_gemModel, modelIndex, true);
                     }
-                    else
+                    // ${Name} is a special name used in templates and is not really an error
+                    else if (enabledGemName != "${Name}")
                     {
                         AZ_Warning("ProjectManager::GemCatalog", false,
                             "Cannot find entry for gem with name '%s'. The CMake target name probably does not match the specified name in the gem.json.",

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

@@ -46,7 +46,7 @@ namespace O3DE::ProjectManager
         DownloadController* GetDownloadController() const { return m_downloadController; }
 
     public slots:
-        void OnGemStatusChanged(const QModelIndex& modelIndex, uint32_t numChangedDependencies);
+        void OnGemStatusChanged(const QString& gemName, uint32_t numChangedDependencies);
         void OnAddGemClicked();
 
     protected:

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

@@ -27,6 +27,14 @@ namespace O3DE::ProjectManager
 
     void GemModel::AddGem(const GemInfo& gemInfo)
     {
+        if (FindIndexByNameString(gemInfo.m_name).isValid())
+        {
+            // do not add gems with duplicate names
+            // this can happen by mistake or when a gem repo has a gem with the same name as a local gem
+            AZ_TracePrintf("GemModel", "Ignoring duplicate gem: %s", gemInfo.m_name.toUtf8().constData());
+            return;
+        }
+
         QStandardItem* item = new QStandardItem();
 
         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
@@ -276,9 +284,11 @@ namespace O3DE::ProjectManager
 
     void GemModel::SetIsAdded(QAbstractItemModel& model, const QModelIndex& modelIndex, bool isAdded)
     {
+        // get the gemName first, because the modelIndex data change after adding because of filters
+        QString gemName = modelIndex.data(RoleName).toString();
         model.setData(modelIndex, isAdded, RoleIsAdded);
 
-        UpdateDependencies(model, modelIndex);
+        UpdateDependencies(model, gemName, isAdded);
     }
 
     bool GemModel::HasDependentGems(const QModelIndex& modelIndex) const
@@ -294,15 +304,17 @@ namespace O3DE::ProjectManager
         return false;
     }
 
-    void GemModel::UpdateDependencies(QAbstractItemModel& model, const QModelIndex& modelIndex)
+    void GemModel::UpdateDependencies(QAbstractItemModel& model, const QString& gemName, bool isAdded)
     {
         GemModel* gemModel = GetSourceModel(&model);
         AZ_Assert(gemModel, "Failed to obtain GemModel");
 
+        QModelIndex modelIndex = gemModel->FindIndexByNameString(gemName);
+
         QVector<QModelIndex> dependencies = gemModel->GatherGemDependencies(modelIndex);
         uint32_t numChangedDependencies = 0;
 
-        if (IsAdded(modelIndex))
+        if (isAdded)
         {
             for (const QModelIndex& dependency : dependencies)
             {
@@ -324,7 +336,7 @@ namespace O3DE::ProjectManager
             bool hasDependentGems = gemModel->HasDependentGems(modelIndex);
             if (IsAddedDependency(modelIndex) != hasDependentGems)
             {
-                SetIsAddedDependency(model, modelIndex, hasDependentGems);
+                SetIsAddedDependency(*gemModel, modelIndex, hasDependentGems);
             }
 
             for (const QModelIndex& dependency : dependencies)
@@ -343,7 +355,7 @@ namespace O3DE::ProjectManager
             }
         }
 
-        gemModel->emit gemStatusChanged(modelIndex, numChangedDependencies);
+        gemModel->emit gemStatusChanged(gemName, numChangedDependencies);
     }
 
     void GemModel::SetIsAddedDependency(QAbstractItemModel& model, const QModelIndex& modelIndex, bool isAdded)

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

@@ -64,7 +64,7 @@ namespace O3DE::ProjectManager
         static bool NeedsToBeAdded(const QModelIndex& modelIndex, bool includeDependencies = false);
         static bool NeedsToBeRemoved(const QModelIndex& modelIndex, bool includeDependencies = false);
         static bool HasRequirement(const QModelIndex& modelIndex);
-        static void UpdateDependencies(QAbstractItemModel& model, const QModelIndex& modelIndex);
+        static void UpdateDependencies(QAbstractItemModel& model, const QString& gemName, bool isAdded);
         static void SetDownloadStatus(QAbstractItemModel& model, const QModelIndex& modelIndex, GemInfo::DownloadStatus status);
 
         bool DoGemsToBeAddedHaveRequirements() const;
@@ -78,7 +78,7 @@ namespace O3DE::ProjectManager
         int TotalAddedGems(bool includeDependencies = false) const;
 
     signals:
-        void gemStatusChanged(const QModelIndex& modelIndex, uint32_t numChangedDependencies);
+        void gemStatusChanged(const QString& gemName, uint32_t numChangedDependencies);
 
     private:
         void FindGemDisplayNamesByNameStrings(QStringList& inOutGemNames);