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

Moved the ImageProcessingDefines to the Include folder and added it to the header only target

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
monroegm-disable-blank-issue-2
Chris Galvan 4 years ago
parent 4e15cef2fc
commit 22f018c310
17 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File

14
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h → Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageProcessingDefines.h
Unescape Escape View File

@ -49,6 +49,20 @@ namespace ImageProcessingAtom
static const unsigned int s_MinReduceLevel = 0;
static const unsigned int s_MaxReduceLevel = 5;
static const char* s_SupportedImageExtensions[] = {
"*.tif",
"*.tiff",
"*.png",
"*.bmp",
"*.jpg",
"*.jpeg",
"*.tga",
"*.gif",
"*.dds",
"*.exr"
};
static constexpr int s_TotalSupportedImageExtensions = AZ_ARRAY_SIZE(s_SupportedImageExtensions);
enum class RGBWeight : AZ::u32
{
uniform, // uniform weights (1.0, 1.0, 1.0) (default)

2
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h
Unescape Escape View File

@ -8,12 +8,12 @@
#pragma once
#include <BuilderSettings/ImageProcessingDefines.h>
#include <BuilderSettings/BuilderSettings.h>
#include <AzCore/base.h>
#include <AzCore/IO/Path/Path.h>
#include <AzCore/std/containers/set.h>
#include <Atom/ImageProcessing/ImageObject.h>
#include <Atom/ImageProcessing/ImageProcessingDefines.h>
#include <QDateTime>
#include <QFileSystemWatcher>

2
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h
Unescape Escape View File

@ -11,7 +11,7 @@
#include <AzCore/RTTI/TypeInfo.h>
#include <AzCore/RTTI/ReflectContext.h>
#include <AzCore/Memory/Memory.h>
#include <BuilderSettings/ImageProcessingDefines.h>
#include <Atom/ImageProcessing/ImageProcessingDefines.h>
#include <Atom/RPI.Reflect/Image/StreamingImageAsset.h>
namespace ImageProcessingAtom

2
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.h
Unescape Escape View File

@ -8,7 +8,7 @@
#pragma once
#include <BuilderSettings/ImageProcessingDefines.h>
#include <Atom/ImageProcessing/ImageProcessingDefines.h>
#include <AzCore/RTTI/TypeInfo.h>
#include <AzCore/RTTI/ReflectContext.h>
#include <AzCore/Memory/Memory.h>

2
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PlatformSettings.h
Unescape Escape View File

@ -10,7 +10,7 @@
#include <AzCore/RTTI/TypeInfo.h>
#include <AzCore/Memory/SystemAllocator.h>
#include <BuilderSettings/ImageProcessingDefines.h>
#include <Atom/ImageProcessing/ImageProcessingDefines.h>
#include <Atom/ImageProcessing/PixelFormats.h>
namespace ImageProcessingAtom

2
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.h
Unescape Escape View File

@ -11,9 +11,9 @@
#include <AzCore/RTTI/TypeInfo.h>
#include <AzCore/Asset/AssetCommon.h>
#include <BuilderSettings/ImageProcessingDefines.h>
#include <BuilderSettings/CubemapSettings.h>
#include <BuilderSettings/MipmapSettings.h>
#include <Atom/ImageProcessing/ImageProcessingDefines.h>
#include <Atom/ImageProcessing/PixelFormats.h>
namespace ImageProcessingAtom

2
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.h
Unescape Escape View File

@ -8,7 +8,7 @@
#pragma once
#include <BuilderSettings/ImageProcessingDefines.h>
#include <Atom/ImageProcessing/ImageProcessingDefines.h>
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/RTTI/ReflectContext.h>
#include <AzCore/Serialization/DataPatch.h>

2
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.h
Unescape Escape View File

@ -8,7 +8,7 @@
#pragma once
#include <BuilderSettings/ImageProcessingDefines.h>
#include <Atom/ImageProcessing/ImageProcessingDefines.h>
#include <Atom/ImageProcessing/PixelFormats.h>
#include <Atom/ImageProcessing/ImageObject.h>

5
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
Unescape Escape View File

@ -27,7 +27,6 @@
#include <Atom/RPI.Reflect/Asset/AssetHandler.h>
#include <Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h>
#include <Atom/RPI.Reflect/Image/Image.h>
#include <Atom/RPI.Reflect/Image/ImageMipChainAsset.h>
namespace ImageProcessingAtom
@ -67,9 +66,9 @@ namespace ImageProcessingAtom
AssetBuilderSDK::AssetBuilderDesc builderDescriptor;
builderDescriptor.m_name = "Atom Image Builder";
for (int i = 0; i < AZ::RPI::s_TotalSupportedImageExtensions; i++)
for (int i = 0; i < s_TotalSupportedImageExtensions; i++)
{
builderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern(AZ::RPI::s_SupportedImageExtensions[i], AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
builderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern(s_SupportedImageExtensions[i], AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
}
builderDescriptor.m_busId = azrtti_typeid<ImageBuilderWorker>();

5
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp
Unescape Escape View File

@ -7,7 +7,6 @@
*/
#include <Atom/RPI.Reflect/Image/Image.h>
#include <Atom/RPI.Reflect/Image/StreamingImageAsset.h>
#include <AzCore/Component/ComponentApplicationBus.h>
@ -224,9 +223,9 @@ namespace ImageProcessingAtom
{
AZStd::string targetExtension = entry->GetExtension();
for (int i = 0; i < AZ::RPI::s_TotalSupportedImageExtensions; i++)
for (int i = 0; i < s_TotalSupportedImageExtensions; i++)
{
if (AZStd::wildcard_match(AZ::RPI::s_SupportedImageExtensions[i], targetExtension.c_str()))
if (AZStd::wildcard_match(s_SupportedImageExtensions[i], targetExtension.c_str()))
{
return true;
}

2
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h
Unescape Escape View File

@ -10,10 +10,10 @@
#include <QRect>
#include <BuilderSettings/ImageProcessingDefines.h>
#include <BuilderSettings/PresetSettings.h>
#include <BuilderSettings/TextureSettings.h>
#include <Atom/ImageProcessing/ImageObject.h>
#include <Atom/ImageProcessing/ImageProcessingDefines.h>
#include <Compressors/Compressor.h>
#include <AzCore/Jobs/Job.h>

2
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h
Unescape Escape View File

@ -8,10 +8,10 @@
#pragma once
#include <BuilderSettings/ImageProcessingDefines.h>
#include <BuilderSettings/PresetSettings.h>
#include <BuilderSettings/TextureSettings.h>
#include <Atom/ImageProcessing/ImageObject.h>
#include <Atom/ImageProcessing/ImageProcessingDefines.h>
#include <AzCore/Jobs/Job.h>
namespace ImageProcessingAtom

2
Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
Unescape Escape View File

@ -32,6 +32,7 @@
#include <AzFramework/IO/LocalFileIO.h>
#include <Atom/ImageProcessing/ImageObject.h>
#include <Atom/ImageProcessing/ImageProcessingDefines.h>
#include <Processing/PixelFormatInfo.h>
#include <Processing/ImageConvert.h>
#include <Processing/ImageToProcess.h>
@ -45,7 +46,6 @@
#include <BuilderSettings/BuilderSettingManager.h>
#include <BuilderSettings/CubemapSettings.h>
#include <BuilderSettings/ImageProcessingDefines.h>
#include <BuilderSettings/PresetSettings.h>
#include <Editor/EditorCommon.h>

2
Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake
Unescape Escape View File

@ -13,6 +13,7 @@ set(FILES
Include/Atom/ImageProcessing/ImageProcessingEditorBus.h
Include/Atom/ImageProcessing/PixelFormats.h
Include/Atom/ImageProcessing/ImageObject.h
Include/Atom/ImageProcessing/ImageProcessingDefines.h
../Assets/Editor/Resources.qrc
../Assets/Editor/Backward.png
../Assets/Editor/Forward.png
@ -28,7 +29,6 @@ set(FILES
Source/BuilderSettings/BuilderSettings.h
Source/BuilderSettings/CubemapSettings.cpp
Source/BuilderSettings/CubemapSettings.h
Source/BuilderSettings/ImageProcessingDefines.h
Source/BuilderSettings/MipmapSettings.cpp
Source/BuilderSettings/MipmapSettings.h
Source/BuilderSettings/PlatformSettings.h

1
Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessingatom_headers_files.cmake
Unescape Escape View File

@ -7,4 +7,5 @@
#
set(FILES
Include/Atom/ImageProcessing/ImageProcessingDefines.h
)

14
Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/Image.h
Unescape Escape View File

@ -22,20 +22,6 @@ namespace AZ
{
class ImageAsset;
static const int s_TotalSupportedImageExtensions = 10;
static const char* s_SupportedImageExtensions[s_TotalSupportedImageExtensions] = {
"*.tif",
"*.tiff",
"*.png",
"*.bmp",
"*.jpg",
"*.jpeg",
"*.tga",
"*.gif",
"*.dds",
"*.exr"
};
//! A base class for images providing access to common image information.
class Image
: public Data::InstanceData

6
Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp
Unescape Escape View File

@ -7,7 +7,7 @@
*/
#include <GradientSignal/Components/ImageGradientComponent.h>
#include <Atom/RPI.Reflect/Image/Image.h>
#include <Atom/ImageProcessing/ImageProcessingDefines.h>
#include <AzCore/Asset/AssetManager.h>
#include <AzCore/Asset/AssetSerializer.h>
#include <AzCore/Debug/Profiler.h>
@ -52,9 +52,9 @@ namespace GradientSignal
// We don't know what image format the original source was, so we need to loop through
// all the supported image extensions to check if they have a valid corresponding
// streaming image asset
for (int i = 0; i < AZ::RPI::s_TotalSupportedImageExtensions; i++)
for (int i = 0; i < ImageProcessingAtom::s_TotalSupportedImageExtensions; i++)
{
AZStd::string imageExtension(AZ::RPI::s_SupportedImageExtensions[i]);
AZStd::string imageExtension(ImageProcessingAtom::s_SupportedImageExtensions[i]);
// The image extensions are stored with a wildcard (e.g. *.png) so we need to strip that off first
AZ::StringFunc::Replace(imageExtension, "*", "");

Write Preview
Loading…
Cancel
Save