Changed the overall strategy for how to handle missing image references. Instead of replacing it with one of the placeholder assets, we replace it with an random UUID which will be interpreted as a missing asset (unless some discovers discovers a UUID collision). This eventually gets replaced by one of the placeholder textures at runtime. This approach gives more consistent results in how missing texture are handled between Material Editor and Material Component.

I actually tried this approach before and it didn't seem to work the way we needed, but I realized that's because PropertyAssetCtrl wasn't handling missing assets properly. I fixed a few issues there including showing the error button when the asset can't be found, and fixing a broken reference to the error icon file. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-15 16:51:22 -08:00
parent 282c93c20c
commit 7d849cc0d2
7 changed files with 40 additions and 24 deletions
@@ -527,8 +527,8 @@ namespace AzToolsFramework
            m_errorButton = nullptr;
        }
    }
-
-    void PropertyAssetCtrl::UpdateErrorButton(const AZStd::string& errorLog)
+    
+    void PropertyAssetCtrl::UpdateErrorButton()
    {
        if (m_errorButton)
        {
@@ -543,12 +543,17 @@ namespace AzToolsFramework
            m_errorButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
            m_errorButton->setFixedSize(QSize(16, 16));
            m_errorButton->setMouseTracking(true);
-            m_errorButton->setIcon(QIcon("Icons/PropertyEditor/error_icon.png"));
+            m_errorButton->setIcon(QIcon(":/PropertyEditor/Resources/error_icon.png"));
            m_errorButton->setToolTip("Show Errors");

            // Insert the error button after the asset label
            qobject_cast<QHBoxLayout*>(layout())->insertWidget(1, m_errorButton);
        }
+    }
+
+    void PropertyAssetCtrl::UpdateErrorButtonWithLog(const AZStd::string& errorLog)
+    {
+        UpdateErrorButton();

        // Connect pressed to opening the error dialog
        // Must capture this for call to QObject::connect
@@ -587,6 +592,21 @@ namespace AzToolsFramework
            logDialog->show();
        });
    }
+    
+    void PropertyAssetCtrl::UpdateErrorButtonWithMessage(const AZStd::string& message)
+    {
+        UpdateErrorButton();
+        
+        connect(m_errorButton, &QPushButton::clicked, this, [this, message]() {
+            QMessageBox::critical(nullptr, "Error", message.c_str());
+
+            // Without this, the error button would maintain focus after clicking, which left the red error icon in a blue-highlighted state
+            if (parentWidget())
+            {
+                parentWidget()->setFocus();
+            }
+        });
+    }

    void PropertyAssetCtrl::ClearAssetInternal()
    {
@@ -960,7 +980,6 @@ namespace AzToolsFramework
        else
        {
            const AZ::Data::AssetId assetID = GetCurrentAssetID();
-            m_currentAssetHint = "";

            AZ::Outcome<AssetSystem::JobInfoContainer> jobOutcome = AZ::Failure();
            AssetSystemJobRequestBus::BroadcastResult(jobOutcome, &AssetSystemJobRequestBus::Events::GetAssetJobsInfoByAssetID, assetID, false, false);
@@ -1018,7 +1037,7 @@ namespace AzToolsFramework
                        // In case of failure, render failure icon
                        case AssetSystem::JobStatus::Failed:
                        {
-                            UpdateErrorButton(errorLog);
+                            UpdateErrorButtonWithLog(errorLog);
                        }
                        break;

@@ -1043,6 +1062,10 @@ namespace AzToolsFramework
                    m_currentAssetHint = assetPath;
                }
            }
+            else
+            {
+                UpdateErrorButtonWithMessage(AZStd::string::format("Asset is missing.\n\nID: %s\nHint:%s", assetID.ToString<AZStd::string>().c_str(), GetCurrentAssetHint().c_str()));
+            }
        }

        // Get the asset file name
@@ -168,7 +168,9 @@ namespace AzToolsFramework

        bool IsCorrectMimeData(const QMimeData* pData, AZ::Data::AssetId* pAssetId = nullptr, AZ::Data::AssetType* pAssetType = nullptr) const;
        void ClearErrorButton();
-        void UpdateErrorButton(const AZStd::string& errorLog);
+        void UpdateErrorButton();
+        void UpdateErrorButtonWithLog(const AZStd::string& errorLog);
+        void UpdateErrorButtonWithMessage(const AZStd::string& message);
        virtual const AZStd::string GetFolderSelection() const { return AZStd::string(); }
        virtual void SetFolderSelection(const AZStd::string& /* folderPath */) {}
        virtual void ClearAssetInternal();