Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -16,6 +16,7 @@
 #include <AssetBuilderSDK/AssetBuilderBusses.h>
 #include <AssetBuilderSDK/AssetBuilderSDK.h>
 #include <AzCore/Outcome/Outcome.h>
+#include <ImageProcessing/ImageProcessingBus.h>

 namespace ImageProcessing
 {
@@ -48,6 +49,7 @@ 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}")
@@ -66,6 +68,12 @@ namespace ImageProcessing
        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
        //////////////////////////////////////////////////////////////////////////

+        ////////////////////////////////////////////////////////////////////////
+        // ImageProcessingRequestBus interface implementation
+        IImageObjectPtr LoadImage(const AZStd::string& filePath) override;
+        IImageObjectPtr LoadImagePreview(const AZStd::string& filePath) override;
+        ////////////////////////////////////////////////////////////////////////
+
    private:
        ImageBuilderWorker m_imageBuilder;
    };