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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ImageProcessing/Code/Source/AtlasBuilder/AtlasBuilderWorker.cpp
-2
View File
@@ -70,8 +70,6 @@ namespace TextureAtlasBuilder
bool ResolveRelativePath(const AZStd::string& relativePath, const AZStd::string& watchDirectory, AZStd::string& resolvedFullPathOut)
{
bool resolved = false;
// Get full path by appending the relative path to the watch directory
AZ::IO::FixedMaxPath resolvedPath;
AZ::IO::FileIOBase::GetInstance()->ReplaceAlias(resolvedPath, AZ::IO::PathView{relativePath});
Gems/ImageProcessing/Code/Source/BuilderSettings/BuilderSettingManager.cpp
-1
View File
@@ -669,7 +669,6 @@ AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
StringOutcome BuilderSettingManager::LoadBuilderSettings()
{
StringOutcome outcome = STRING_OUTCOME_ERROR("");
AZ::IO::FileIOBase* ioInstance = AZ::IO::FileIOBase::GetInstance();
// Construct the project setting path that is used by the tool for loading setting file
const char* gameFolderPath = nullptr;
AzToolsFramework::AssetSystemRequestBus::BroadcastResult(gameFolderPath, &AzToolsFramework::AssetSystemRequestBus::Events::GetAbsoluteDevGameFolderPath);
Gems/ImageProcessing/Code/Source/Converters/ColorChart.cpp
-1
View File
@@ -148,7 +148,6 @@ namespace ImageProcessing
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)
Gems/ImageProcessing/Code/Source/Editor/TexturePropertyEditor.cpp
-2
View File
@@ -178,8 +178,6 @@ namespace ImageProcessingEditor
if (sourceControlActive)
{
bool checkoutResult = false;
AzToolsFramework::SourceControlCommandBus::Broadcast(&AzToolsFramework::SourceControlCommandBus::Events::RequestDelete, legacyFile.c_str(),
[](bool success, const AzToolsFramework::SourceControlFileInfo& info)
{
Gems/ImageProcessing/Code/Source/ImageLoader/QtImageLoader.cpp
-1
View File
@@ -33,7 +33,6 @@ namespace ImageProcessing
}
//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/ImageProcessing/Code/Source/Processing/ImageConvert.cpp
-1
View File
@@ -955,7 +955,6 @@ namespace ImageProcessing
uint32 pitch1, pitch2;
float sumDeltaSqLinear = 0;
AZ::u32 sumPixelCount = 0;
//only process the highest mip
image1->GetImagePointer(0, mem1, pitch1);
Gems/ImageProcessing/Code/Source/Processing/ImageObjectImpl.cpp
+1 -4
View File
@@ -254,7 +254,7 @@ namespace ImageProcessing
AZ::u32 dwMips = pRet->GetMipCount();
for (AZ::u32 dwMip = 0; dwMip < dwMips; ++dwMip)
{
AZ::u32 dwLocalWidth = GetWidth(dwMip); // we get error on NVidia with this (assumes input is 4x4 as well)
//AZ::u32 dwLocalWidth = GetWidth(dwMip); // we get error on NVidia with this (assumes input is 4x4 as well)
AZ::u32 dwLocalHeight = GetHeight(dwMip);
AZ::u32 dwLines = dwLocalHeight;
@@ -716,8 +716,6 @@ namespace ImageProcessing
const PixelFormatInfo* const pPixelFormatInfo = CPixelFormats::GetInstance().GetPixelFormatInfo(format);
DXGI_FORMAT d3dformat = pPixelFormatInfo->d3d10Format;
memset(&header, 0, sizeof(DDS_HEADER));
header.dwSize = sizeof(DDS_HEADER);
@@ -914,7 +912,6 @@ namespace ImageProcessing
{
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);
}
}