birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageObject.h
+3 -3
View File
@@ -63,10 +63,10 @@ namespace ImageProcessingAtom
virtual ~IImageObject() {};
public:
//creating new image object outof this image object
virtual IImageObject* Clone(uint32_t maxMipCount = std::numeric_limits<uint32>::max()) const = 0;
virtual IImageObject* Clone(uint32_t maxMipCount = std::numeric_limits<uint32_t>::max()) const = 0;
// allocate an empty image object with requested format and same properties with current image
virtual IImageObject* AllocateImage(EPixelFormat pixelFormat, uint32_t maxMipCount = std::numeric_limits<uint32>::max()) const = 0;
virtual IImageObject* AllocateImage(uint32_t maxMipCount = std::numeric_limits<uint32>::max()) const = 0;
virtual IImageObject* AllocateImage(EPixelFormat pixelFormat, uint32_t maxMipCount = std::numeric_limits<uint32_t>::max()) const = 0;
virtual IImageObject* AllocateImage(uint32_t maxMipCount = std::numeric_limits<uint32_t>::max()) const = 0;
//get pixel format
virtual EPixelFormat GetPixelFormat() const = 0;
Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageProcessingBus.h
+6 -3
View File
@@ -13,11 +13,10 @@
#pragma once
#include <AzCore/EBus/EBus.h>
#include <Atom/ImageProcessing/ImageObject.h>
namespace ImageProcessingAtom
{
class IImageObject;
class ImageProcessingRequests
: public AZ::EBusTraits
{
@@ -28,7 +27,11 @@ namespace ImageProcessingAtom
static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
//////////////////////////////////////////////////////////////////////////
virtual IImageObject* LoadImage(const AZStd::string& filePath) = 0;
// Loads an image from a source file path
virtual IImageObjectPtr LoadImage(const AZStd::string& filePath) = 0;
// Loads an image from a source file path and converts it to a format suitable for previewing in tools
virtual IImageObjectPtr LoadImagePreview(const AZStd::string& filePath) = 0;
};
using ImageProcessingRequestBus = AZ::EBus<ImageProcessingRequests>;
} // namespace ImageProcessingAtom