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

Merge branch 'main' into TexturePresets-ATOM-14765

Browse Source
This commit is contained in:
Chris Santora
2021-04-19 20:35:50 -07:00
parent 5935426276 2cd2550771
commit c0e7f475d7
2921 changed files with 52208 additions and 546658 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageProcessingBus.h
+1
View File
@@ -25,6 +25,7 @@ namespace ImageProcessingAtom
// EBusTraits overrides
static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
typedef AZStd::recursive_mutex MutexType;
//////////////////////////////////////////////////////////////////////////
// Loads an image from a source file path
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h
+2 -2
View File
@@ -105,7 +105,7 @@ namespace ImageProcessingAtom
{
}
explicit ColorRGBA16(uint64 a_u)
explicit ColorRGBA16(AZ::u64 a_u)
: u(a_u)
{
}
@@ -152,7 +152,7 @@ namespace ImageProcessingAtom
uint16 b;
uint16 a;
};
uint64 u;
AZ::u64 u;
};
};
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp
+2 -2
View File
@@ -224,7 +224,7 @@ namespace ImageProcessingAtom
srcImage->GetImagePointer(mip, srcMem, srcPitch);
const pvrtexture::CPVRTextureHeader srcHeader(
srcPixelType.PixelTypeID, // uint64 u64PixelFormat,
srcPixelType.PixelTypeID, // AZ::u64 u64PixelFormat,
width, // uint32 u32Height=1,
height, // uint32 u32Width=1,
1, // uint32 u32Depth=1,
@@ -315,7 +315,7 @@ namespace ImageProcessingAtom
// Preparing source compressed data
const pvrtexture::CPVRTextureHeader compressedHeader(
FindPvrPixelFormat(fmtSrc), // uint64 u64PixelFormat,
FindPvrPixelFormat(fmtSrc), // AZ::u64 u64PixelFormat,
width, // uint32 u32Height=1,
height, // uint32 u32Width=1,
1, // uint32 u32Depth=1,
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp
+1 -2
View File
@@ -148,7 +148,6 @@ namespace ImageProcessingAtom
size_t nSlicePitch = (pitch / ePS_Blue);
AZ::u32 src = 0;
AZ::u32 dst = 0;
for (int b = 0; b < ePS_Blue; ++b)
{
for (int g = 0; g < ePS_Green; ++g)
@@ -311,4 +310,4 @@ namespace ImageProcessingAtom
//save color chart data to an image and save as current
m_img = colorChart.GenerateChartImage();
}
}
}
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h
+1 -1
View File
@@ -14,7 +14,7 @@
namespace ImageProcessingAtom
{
// note: lumberyard is right hand Z up coordinate
// note: O3DE is right hand Z up coordinate
// please don't change the order of the enum since we are using it to match the face id defined in AMD's CubemapGen
// and they are using left hand Y up coordinate
enum CubemapFace
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderBaseType.h
-4
View File
@@ -25,9 +25,5 @@ typedef AZ::s32 int32;
typedef AZ::s32 sint32;
typedef AZ::u32 uint32;
typedef AZ::s64 int64;
typedef AZ::s64 sint64;
typedef AZ::u64 uint64;
typedef float f32;
typedef double f64;
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp
-1
View File
@@ -638,7 +638,6 @@ namespace ImageProcessingAtom
DDS_FILE_DESC desc;
DDS_HEADER_DXT10 exthead;
AZ::IO::SizeType startPos = fileLoadStream.GetCurPos();
fileLoadStream.Read(sizeof(desc), &desc);
if (desc.dwMagic != FOURCC_DDS || !desc.IsValid())
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp
-2
View File
@@ -119,8 +119,6 @@ namespace ImageProcessingAtom
ImfMath::Box2i dw = header.dataWindow();
width = dw.max.x - dw.min.x + 1;
height = dw.max.y - dw.min.y + 1;
int dx = dw.min.x;
int dy = dw.min.y;
// Create IImageObject
IImageObject* newImage = IImageObject::CreateImage(width, height, 1, format);
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.h
+1 -1
View File
@@ -49,7 +49,7 @@ namespace ImageProcessingAtom
bool IsExtensionSupported(const char* extension);
IImageObject* LoadImageFromFile(const AZStd::string& filename);
// These functions are for loading legacy lumberyard dds files
// These functions are for loading legacy O3DE dds files
IImageObject* LoadImageFromFileLegacy(const AZStd::string& filename);
IImageObject* LoadImageFromFileStreamLegacy(AZ::IO::SystemFileStream& fileLoadStream);
IImageObject* LoadAttachedImageFromDdsFileLegacy(const AZStd::string& filename, IImageObjectPtr originImage);
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp
-1
View File
@@ -36,7 +36,6 @@ namespace ImageProcessingAtom
}
//convert to format which compatiable our pixel format
QImage::Format format = qimage.format();
if (qimage.format() != QImage::Format_RGBA8888)
{
qimage = qimage.convertToFormat(QImage::Format_RGBA8888);
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <QString>
#include <libtiff/tiffio.h> // TIFF library
#include <tiffio.h> // TIFF library
namespace ImageProcessingAtom
{
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp
+2 -2
View File
@@ -193,7 +193,7 @@ namespace ImageProcessingAtom
AZ::Uuid sourceId = source->GetSourceUuid();
QAction* editImportSettingsAction = menu->addAction("Edit Texture Settings...", [sourceId, this]()
menu->addAction("Edit Texture Settings...", [sourceId, this]()
{
OpenSourceTextureFile(sourceId);
});
@@ -205,7 +205,7 @@ namespace ImageProcessingAtom
if (product->GetAssetType() == azrtti_typeid<AZ::RPI::StreamingImageAsset>())
{
AZ::Data::AssetId assetId = product->GetAssetId();
QAction* editImportSettingsAction = menu->addAction("Save as DDS...", [assetId, this]()
menu->addAction("Save as DDS...", [assetId, this]()
{
QString filePath = QFileDialog::getSaveFileName(nullptr, QString("Save to file"), m_lastSavedPath, QString("DDS file (*.dds)"));
if (filePath.isEmpty())
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h
+1 -1
View File
@@ -144,7 +144,7 @@ namespace ImageProcessingAtom
AZ::u32 reserved;
};
// Dds header for lumberyard dds format.
// Dds header for O3DE dds format.
// It has same size as standard dds header but uses several reserved slots for customized information
struct DDS_HEADER_LEGACY
{
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp
-1
View File
@@ -118,7 +118,6 @@ namespace ImageProcessingAtom
// Build mip chain assets.
// Start from smallest mips so the mip chain asset for the lowest resolutions may contain more high level mips
bool ready = false;
uint32_t lastMip = imageDesc.m_mipLevels;
uint32_t totalSize = 0;
AZStd::vector<Data::Asset<RPI::ImageMipChainAsset>> mipChains;
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp
-1
View File
@@ -1090,7 +1090,6 @@ namespace ImageProcessingAtom
uint32 pitch1, pitch2;
float sumDeltaSqLinear = 0;
AZ::u32 sumPixelCount = 0;
//only process the highest mip
image1->GetImagePointer(0, mem1, pitch1);
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
-3
View File
@@ -504,8 +504,6 @@ namespace ImageProcessingAtom
const PixelFormatInfo* const pPixelFormatInfo = CPixelFormats::GetInstance().GetPixelFormatInfo(format);
DXGI_FORMAT d3dformat = pPixelFormatInfo->d3d10Format;
memset(&header, 0, sizeof(DDS_HEADER_LEGACY));
header.dwSize = sizeof(DDS_HEADER_LEGACY);
@@ -702,7 +700,6 @@ namespace ImageProcessingAtom
{
const MipLevel& level = *m_mips[mip];
AZ::u32 faceBufSize = level.m_pitch * level.m_rowCount / faces;
AZ::u32 start = faceBufSize * face;
saveFileStream.Write(faceBufSize, level.m_pData + faceBufSize * face);
}
}
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp
-3
View File
@@ -342,9 +342,6 @@ namespace ImageProcessingAtom
AZ::Data::Asset<AZ::RPI::StreamingImageAsset> LoadImageAsset(const AZ::Data::AssetId& imageAssetId)
{
RPI::StreamingImageAssetHandler* imageAssetHandler = static_cast<RPI::StreamingImageAssetHandler*>(
Data::AssetManager::Instance().GetHandler(RPI::StreamingImageAsset::RTTI_Type()));
// Blocking loading streaming image asset with its mipchain assets
AZ::Data::Asset<AZ::RPI::StreamingImageAsset> imageAsset = AZ::Data::AssetManager::Instance().GetAsset<AZ::RPI::StreamingImageAsset>(imageAssetId, AZ::Data::AssetLoadBehavior::PreLoad);
Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
+2
View File
@@ -103,6 +103,8 @@ namespace UnitTest
ComponentApplication* GetApplication() override { return nullptr; }
void RegisterComponentDescriptor(const ComponentDescriptor*) override { }
void UnregisterComponentDescriptor(const ComponentDescriptor*) override { }
void RegisterEntityAddedEventHandler(EntityAddedEvent::Handler&) override { }
void RegisterEntityRemovedEventHandler(EntityRemovedEvent::Handler&) override { }
bool AddEntity(Entity*) override { return false; }
bool RemoveEntity(Entity*) override { return false; }
bool DeleteEntity(const EntityId&) override { return false; }