Integrating latest 47acbe8

Gems/ImageProcessing/Code/Source/Compressors/PVRTC.cpp

@@ -148,7 +148,7 @@ namespace ImageProcessing
             }
             else if (quality <= eQuality_Normal)
             {
-                internalQuality = pvrtexture::eETCFastPerceptual;
+                internalQuality = pvrtexture::eETCNormal;
             }
             else if (isUniform)
             {
@@ -156,7 +156,7 @@ namespace ImageProcessing
             }
             else
             {
-                internalQuality = pvrtexture::eETCSlowPerceptual;
+                internalQuality = pvrtexture::eETCSlow;
             }
         }
         else if (IsASTCFormat(fmtDst))

Gems/ImageProcessing/Code/Source/Editor/EditorCommon.cpp

@@ -116,10 +116,6 @@ namespace ImageProcessingEditor
         {
             readableString = "macOS";
         }
-        else if (platformStrLowerCase == "xenia")
-        {
-            readableString = "Xenia";
-        }
         else if (platformStrLowerCase == "provo")
         {
             readableString = "Provo";

Gems/ImageProcessing/Code/Source/ImageBuilderComponent.cpp

@@ -72,13 +72,10 @@ namespace ImageProcessing
         builderDescriptor.m_processJobFunction = AZStd::bind(&ImageBuilderWorker::ProcessJob, &m_imageBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
         m_imageBuilder.BusConnect(builderDescriptor.m_busId);
         AssetBuilderSDK::AssetBuilderBus::Broadcast(&AssetBuilderSDK::AssetBuilderBusTraits::RegisterBuilderInformation, builderDescriptor);
-
-        ImageProcessingRequestBus::Handler::BusConnect();
     }
 
     void BuilderPluginComponent::Deactivate()
     {
-        ImageProcessingRequestBus::Handler::BusDisconnect();
         m_imageBuilder.BusDisconnect();
         BuilderSettingManager::DestroyInstance();
         CPixelFormats::DestroyInstance();
@@ -114,11 +111,6 @@ namespace ImageProcessing
         incompatible.push_back(AZ_CRC("ImagerBuilderPluginService", 0x6dc0db6e));
     }
 
-    IImageObject* BuilderPluginComponent::LoadImage(const AZStd::string& filePath)
-    {
-        return LoadImageFromFile(filePath);
-    }
-
     void ImageBuilderWorker::ShutDown()
     {
         // it is important to note that this will be called on a different thread than your process job thread

Gems/ImageProcessing/Code/Source/ImageBuilderComponent.h

@@ -17,8 +17,6 @@
 #include <AssetBuilderSDK/AssetBuilderSDK.h>
 #include <AzCore/Outcome/Outcome.h>
 
-#include <ImageProcessing/ImageProcessingBus.h>
-
 namespace ImageProcessing
 {
     //! Builder to process images 
@@ -50,7 +48,6 @@ namespace ImageProcessing
     //! BuilderPluginComponent is to handle the lifecycle of ImageBuilder module.
     class BuilderPluginComponent
         : public AZ::Component
-        , protected ImageProcessingRequestBus::Handler
     {
     public:
         AZ_COMPONENT(BuilderPluginComponent, "{2F12E1BE-D8F6-47A4-AC3E-6C5527C55840}")
@@ -69,12 +66,6 @@ namespace ImageProcessing
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
         //////////////////////////////////////////////////////////////////////////
 
-    protected:
-        ////////////////////////////////////////////////////////////////////////
-        // ImageProcessingRequestBus interface implementation
-        IImageObject* LoadImage(const AZStd::string& filePath) override;
-        ////////////////////////////////////////////////////////////////////////
-
     private:
         ImageBuilderWorker m_imageBuilder;
     };

Gems/ImageProcessing/Code/Source/ImageProcessingSystemComponent.cpp

@@ -25,7 +25,11 @@
 
 #include <BuilderSettings/BuilderSettingManager.h>
 #include <Editor/TexturePropertyEditor.h>
+
+#include <ImageLoader/ImageLoaders.h>
+#include <Processing/ImageConvert.h>
 #include <Processing/ImagePreview.h>
+#include <Processing/ImageToProcess.h>
 
 #include "ImageProcessingSystemComponent.h"
 #include <QMenu>
@@ -76,10 +80,12 @@ namespace ImageProcessing
         ImageProcessingEditor::ImageProcessingEditorRequestBus::Handler::BusConnect();
         AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusConnect();
         AzToolsFramework::AssetBrowser::AssetBrowserTexturePreviewRequestsBus::Handler::BusConnect();
+        ImageProcessingRequestBus::Handler::BusConnect();
     }
 
     void ImageProcessingSystemComponent::Deactivate()
     {
+        ImageProcessingRequestBus::Handler::BusDisconnect();
         ImageProcessingEditor::ImageProcessingEditorRequestBus::Handler::BusDisconnect();
         AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusDisconnect();
         AzToolsFramework::AssetBrowser::AssetBrowserTexturePreviewRequestsBus::Handler::BusDisconnect();
@@ -109,6 +115,23 @@ namespace ImageProcessing
         }
     }
 
+    IImageObjectPtr ImageProcessingSystemComponent::LoadImage(const AZStd::string& filePath)
+    {
+        return IImageObjectPtr(LoadImageFromFile(filePath));
+    }
+
+    IImageObjectPtr ImageProcessingSystemComponent::LoadImagePreview(const AZStd::string& filePath)
+    {
+        IImageObjectPtr image(LoadImageFromFile(filePath));
+        if (image)
+        {
+            ImageToProcess imageToProcess(image);
+            imageToProcess.ConvertFormat(ePixelFormat_R8G8B8A8);
+            return imageToProcess.Get();
+        }
+        return image;
+    }
+
     void ImageProcessingSystemComponent::AddSourceFileOpeners(const char* fullSourceFileName, [[maybe_unused]] const AZ::Uuid& sourceUUID, AzToolsFramework::AssetBrowser::SourceFileOpenerList& openers)
     {
         if (HandlesSource(fullSourceFileName))

Gems/ImageProcessing/Code/Source/ImageProcessingSystemComponent.h

@@ -23,6 +23,7 @@ namespace ImageProcessing
 {
     class ImageProcessingSystemComponent
         : public AZ::Component
+        , protected ImageProcessingRequestBus::Handler
         , protected ImageProcessingEditor::ImageProcessingEditorRequestBus::Handler
         , protected AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
         , protected AzToolsFramework::AssetBrowser::AssetBrowserTexturePreviewRequestsBus::Handler
@@ -43,6 +44,12 @@ namespace ImageProcessing
         void OpenSourceTextureFile(const AZ::Uuid& textureSourceID) override;
         ////////////////////////////////////////////////////////////////////////
 
+        ////////////////////////////////////////////////////////////////////////
+        // ImageProcessingRequestBus interface implementation
+        IImageObjectPtr LoadImage(const AZStd::string& filePath) override;
+        IImageObjectPtr LoadImagePreview(const AZStd::string& filePath) override;
+        ////////////////////////////////////////////////////////////////////////
+
         ////////////////////////////////////////////////////////////////////////
         // AZ::Component interface implementation
         void Init() override;

Gems/ImageProcessing/Code/Source/Processing/ImageConvert.cpp

@@ -37,9 +37,6 @@
 #define MinSizeToSplit 1<<5
 
 #if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
-    #if defined(TOOLS_SUPPORT_XENIA)
-        #include AZ_RESTRICTED_FILE_EXPLICIT(ImageProcess, Xenia)
-    #endif
     #if defined(TOOLS_SUPPORT_JASPER)
         #include AZ_RESTRICTED_FILE_EXPLICIT(ImageProcess, Jasper)
     #endif