Răsfoiți Sursa

ATOM-16575 clean up image builder presets files (#4611)

 ATOM-16575 clean up image builder presets files
Removed unused image builder presets
Deprecating preset UUID and use preset name as unique id
Delete all .exportsettings file which were only used for legacy imageProcessing gem.

Signed-off-by: Qing Tao <[email protected]>
Qing Tao 3 ani în urmă
părinte
comite
89e6df1c7f
81 a modificat fișierele cu 159 adăugiri și 1856 ștergeri
  1. 0 1
      Assets/Editor/Materials/Stripes.tif.exportsettings
  2. 0 1
      Assets/Editor/Materials/voxel_editor.png.exportsettings
  3. 0 1
      Assets/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF.exportsettings
  4. 0 1
      Assets/Engine/EngineAssets/Icons/HighMemoryUsage.TIF.exportsettings
  5. 0 1
      Assets/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif.exportsettings
  6. 0 1
      Assets/Engine/EngineAssets/Icons/LivePreview.TIF.exportsettings
  7. 0 1
      Assets/Engine/EngineAssets/Icons/LowMemoryUsage.TIF.exportsettings
  8. 0 1
      Assets/Engine/EngineAssets/Icons/NavigationProcessing.tif.exportsettings
  9. 0 1
      Assets/Engine/EngineAssets/Icons/NullSoundSystem.tif.exportsettings
  10. 0 1
      Assets/Engine/EngineAssets/Icons/ShaderCompiling.tif.exportsettings
  11. 0 1
      Assets/Engine/EngineAssets/Icons/Streaming.tif.exportsettings
  12. 0 1
      Assets/Engine/EngineAssets/Icons/StreamingTerrain.tif.exportsettings
  13. 0 1
      Assets/Engine/textures/default_icon.png.exportsettings
  14. 0 1
      AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_diff.tif.exportsettings
  15. 0 1
      AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_sss.tif.exportsettings
  16. 0 1
      AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C30936451/test_texture_sequence000.png.exportsettings
  17. 0 1
      AutomatedTesting/Objects/LumberTank/ProxyGray_ddna.tif.exportsettings
  18. 0 1
      AutomatedTesting/textures/lights/flare01.tif.exportsettings
  19. 0 1
      AutomatedTesting/textures/milestone2/AMA_Grey_01.tif.exportsettings
  20. 0 1
      AutomatedTesting/textures/milestone2/AMA_Grey_02.tif.exportsettings
  21. 0 1
      AutomatedTesting/textures/milestone2/AMA_Grey_03.tif.exportsettings
  22. 0 1
      AutomatedTesting/textures/milestone2/particles/FX_LauncherMuzzleFront_01.tif.exportsettings
  23. 0 1
      AutomatedTesting/textures/milestone2/particles/FX_LauncherMuzzleRing_01.tif.exportsettings
  24. 30 48
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp
  25. 11 13
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h
  26. 4 4
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h
  27. 3 1
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h
  28. 2 1
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.h
  29. 18 9
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp
  30. 5 2
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.h
  31. 9 16
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
  32. 1 1
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.h
  33. 3 3
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp
  34. 1 1
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp
  35. 1 1
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.h
  36. 10 10
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp
  37. 1 1
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.h
  38. 4 4
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
  39. 8 10
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp
  40. 1 1
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h
  41. 1 1
      Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp
  42. 10 1
      Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
  43. 0 1
      Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/TestAssets/1024x1024_24bit.tif.exportsettings
  44. 0 104
      Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithOpacity.preset
  45. 0 44
      Gems/Atom/Asset/ImageProcessingAtom/Config/CloudShadows.preset
  46. 0 64
      Gems/Atom/Asset/ImageProcessingAtom/Config/ColorChart.preset
  47. 0 79
      Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness.preset
  48. 0 74
      Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness_Lossless.preset
  49. 2 2
      Gems/Atom/Asset/ImageProcessingAtom/Config/IBLGlobal.preset
  50. 10 10
      Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset
  51. 19 23
      Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings
  52. 0 34
      Gems/Atom/Asset/ImageProcessingAtom/Config/LensOptics.preset
  53. 0 59
      Gems/Atom/Asset/ImageProcessingAtom/Config/LightProjector.preset
  54. 0 34
      Gems/Atom/Asset/ImageProcessingAtom/Config/LoadingScreen.preset
  55. 0 64
      Gems/Atom/Asset/ImageProcessingAtom/Config/Minimap.preset
  56. 0 59
      Gems/Atom/Asset/ImageProcessingAtom/Config/MuzzleFlash.preset
  57. 5 0
      Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset
  58. 0 86
      Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsFromDisplacement.preset
  59. 0 101
      Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness_Legacy.preset
  60. 0 71
      Gems/Atom/Asset/ImageProcessingAtom/Config/ReflectanceWithSmoothness_Legacy.preset
  61. 0 81
      Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset
  62. 0 49
      Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Font.preset
  63. 0 49
      Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Gradient.preset
  64. 0 54
      Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image.preset
  65. 0 49
      Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image_nonpower2.preset
  66. 0 69
      Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo.preset
  67. 0 64
      Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo_HighPassed.preset
  68. 0 54
      Gems/Atom/Asset/ImageProcessingAtom/Config/Uncompressed.preset
  69. 0 65
      Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_diff.png.imagesettings
  70. 0 126
      Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Textures/Cowboy_01_ddna.tif.imagesettings
  71. 0 126
      Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Textures/Cowboy_01_spec.tif.imagesettings
  72. 0 1
      Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_a_pressed.tif.exportsettings
  73. 0 1
      Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_a_unpressed.tif.exportsettings
  74. 0 1
      Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_b_pressed.tif.exportsettings
  75. 0 1
      Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_b_unpressed.tif.exportsettings
  76. 0 1
      Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_x_pressed.tif.exportsettings
  77. 0 1
      Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_x_unpressed.tif.exportsettings
  78. 0 1
      Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_y_pressed.tif.exportsettings
  79. 0 1
      Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_y_unpressed.tif.exportsettings
  80. 0 1
      Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_thumbstick_centre.tif.exportsettings
  81. 0 1
      Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_thumbstick_radial.tif.exportsettings

+ 0 - 1
Assets/Editor/Materials/Stripes.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Diffuse_lowQ

+ 0 - 1
Assets/Editor/Materials/voxel_editor.png.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /mipmaps=0 /preset=AlbedoWithGenericAlpha /reduce=-1

+ 0 - 1
Assets/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Uncompressed

+ 0 - 1
Assets/Engine/EngineAssets/Icons/HighMemoryUsage.TIF.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Uncompressed

+ 0 - 1
Assets/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Uncompressed

+ 0 - 1
Assets/Engine/EngineAssets/Icons/LivePreview.TIF.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=Uncompressed

+ 0 - 1
Assets/Engine/EngineAssets/Icons/LowMemoryUsage.TIF.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Uncompressed

+ 0 - 1
Assets/Engine/EngineAssets/Icons/NavigationProcessing.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=Uncompressed

+ 0 - 1
Assets/Engine/EngineAssets/Icons/NullSoundSystem.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=Uncompressed

+ 0 - 1
Assets/Engine/EngineAssets/Icons/ShaderCompiling.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=Uncompressed

+ 0 - 1
Assets/Engine/EngineAssets/Icons/Streaming.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=Uncompressed

+ 0 - 1
Assets/Engine/EngineAssets/Icons/StreamingTerrain.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=Uncompressed

+ 0 - 1
Assets/Engine/textures/default_icon.png.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /mipmaps=0 /preset=Albedo /reduce=-1 /ser=1

+ 0 - 1
AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_diff.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=AlbedoWithGenericAlpha /reduce="android:2,ios:2,mac:0,pc:0,provo:0"

+ 0 - 1
AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_sss.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Albedo /reduce="android:3,ios:3,mac:0,pc:0,provo:0"

+ 0 - 1
AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C30936451/test_texture_sequence000.png.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Terrain_Albedo_HighPassed /reduce=0

+ 0 - 1
AutomatedTesting/Objects/LumberTank/ProxyGray_ddna.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="android:1,ios:1,mac:0,pc:0,provo:0"

+ 0 - 1
AutomatedTesting/textures/lights/flare01.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=LensOptics /reduce=-1

+ 0 - 1
AutomatedTesting/textures/milestone2/AMA_Grey_01.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Albedo /reduce=0

+ 0 - 1
AutomatedTesting/textures/milestone2/AMA_Grey_02.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Terrain_Albedo_HighPassed /reduce=0

+ 0 - 1
AutomatedTesting/textures/milestone2/AMA_Grey_03.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Terrain_Albedo_HighPassed /reduce=0

+ 0 - 1
AutomatedTesting/textures/milestone2/particles/FX_LauncherMuzzleFront_01.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=AlbedoWithOpacity /reduce=0

+ 0 - 1
AutomatedTesting/textures/milestone2/particles/FX_LauncherMuzzleRing_01.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=AlbedoWithOpacity /reduce=0

+ 30 - 48
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp

@@ -137,25 +137,6 @@ namespace ImageProcessingAtom
         return nullptr;
     }
 
-    const PresetSettings* BuilderSettingManager::GetPreset(const AZ::Uuid presetId, const PlatformName& platform, AZStd::string_view* settingsFilePathOut)
-    {
-        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
-
-        for (const auto& namePreset : m_presets)
-        {
-            if (namePreset.second.m_multiPreset.GetPresetId() == presetId)
-            {
-                if (settingsFilePathOut)
-                {
-                    *settingsFilePathOut = namePreset.second.m_presetFilePath;
-                }
-                return namePreset.second.m_multiPreset.GetPreset(platform);
-            }
-        }
-
-        return nullptr;
-    }
-
     const BuilderSettings* BuilderSettingManager::GetBuilderSetting(const PlatformName& platform)
     {
         if (m_builderSettings.find(platform) != m_builderSettings.end())
@@ -180,26 +161,12 @@ namespace ImageProcessingAtom
         return platforms;
     }
 
-    const AZStd::map <FileMask, AZStd::set<PresetName>>& BuilderSettingManager::GetPresetFilterMap()
+    const AZStd::map <FileMask, AZStd::unordered_set<PresetName>>& BuilderSettingManager::GetPresetFilterMap()
     {
         AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
         return m_presetFilterMap;
     }
 
-    const AZ::Uuid BuilderSettingManager::GetPresetIdFromName(const PresetName& presetName)
-    {
-        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
-
-        auto itr = m_presets.find(presetName);
-
-        if (itr != m_presets.end())
-        {
-            return itr->second.m_multiPreset.GetPresetId();
-        }
-
-        return AZ::Uuid::CreateNull();
-    }
-
     const PresetName BuilderSettingManager::GetPresetNameFromId(const AZ::Uuid& presetId)
     {
         AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
@@ -212,7 +179,7 @@ namespace ImageProcessingAtom
             }
         }
 
-        return "Unknown";
+        return {};
     }
 
     void BuilderSettingManager::ClearSettings()
@@ -296,7 +263,7 @@ namespace ImageProcessingAtom
 
             AZ_Warning("Image Processing", presetName == preset.GetPresetName(), "Preset file name '%s' is not"
                 " same as preset name '%s'. Using preset file name as preset name",
-                filePath.toUtf8().data(), preset.GetPresetName().c_str());
+                filePath.toUtf8().data(), preset.GetPresetName().GetCStr());
 
             preset.SetPresetName(presetName);
 
@@ -442,8 +409,20 @@ namespace ImageProcessingAtom
         return AZStd::string();
     }
 
-    AZ::Uuid BuilderSettingManager::GetSuggestedPreset(AZStd::string_view imageFilePath, IImageObjectPtr imageFromFile)
+    bool BuilderSettingManager::IsValidPreset(PresetName presetName) const
+    {
+        if (presetName.IsEmpty())
+        {
+            return false;
+        }
+
+        return m_presets.find(presetName) != m_presets.end();
+    }
+
+    PresetName BuilderSettingManager::GetSuggestedPreset(AZStd::string_view imageFilePath, IImageObjectPtr imageFromFile)
     {
+        PresetName emptyPreset;
+
         //load the image to get its size for later use
         IImageObjectPtr image = imageFromFile;
         //if the input image is empty we will try to load it from the path
@@ -454,34 +433,37 @@ namespace ImageProcessingAtom
 
         if (image == nullptr)
         {
-            return AZ::Uuid::CreateNull();
+            return emptyPreset;
         }
 
         //get file mask of this image file
         AZStd::string fileMask = GetFileMask(imageFilePath);
 
-        AZ::Uuid outPreset = AZ::Uuid::CreateNull();
+        PresetName outPreset = emptyPreset;
 
         //check default presets for some file masks
         if (m_defaultPresetByFileMask.find(fileMask) != m_defaultPresetByFileMask.end())
         {
             outPreset = m_defaultPresetByFileMask[fileMask];
+            if (!IsValidPreset(outPreset))
+            {
+                outPreset = emptyPreset;
+            }
         }
 
         //use the preset filter map to find
-        if (outPreset.IsNull() && !fileMask.empty())
+        if (outPreset.IsEmpty() && !fileMask.empty())
         {
             auto& presetFilterMap = GetPresetFilterMap();
             if (presetFilterMap.find(fileMask) != presetFilterMap.end())
             {
-                AZStd::string presetName = *(presetFilterMap.find(fileMask)->second.begin());
-                outPreset = GetPresetIdFromName(presetName);
+                outPreset = *(presetFilterMap.find(fileMask)->second.begin());
             }
         }
 
         const PresetSettings* presetInfo = nullptr;
 
-        if (!outPreset.IsNull())
+        if (!outPreset.IsEmpty())
         {
             presetInfo = GetPreset(outPreset);
 
@@ -491,12 +473,12 @@ namespace ImageProcessingAtom
                 // If it's not a latitude-longitude map or it doesn't match any cubemap layouts then reset its preset
                 if (!IsValidLatLongMap(image) && CubemapLayout::GetCubemapLayoutInfo(image) == nullptr)
                 {
-                    outPreset = AZ::Uuid::CreateNull();
+                    outPreset = emptyPreset;
                 }
             }
         }
 
-        if (outPreset.IsNull())
+        if (outPreset == emptyPreset)
         {
             if (image->GetAlphaContent() == EAlphaContent::eAlphaContent_Absent)
             {
@@ -521,7 +503,7 @@ namespace ImageProcessingAtom
             }
             else
             {
-                AZ_Warning("Image Processing", false, "Image dimensions are not compatible with preset '%s'. The default preset will be used.", presetInfo->m_name.c_str());
+                AZ_Warning("Image Processing", false, "Image dimensions are not compatible with preset '%s'. The default preset will be used.", presetInfo->m_name.GetCStr());
             }
         }
 
@@ -540,7 +522,7 @@ namespace ImageProcessingAtom
         for (const auto& element : m_presets)
         {
             const PresetEntry& presetEntry = element.second;
-            AZStd::string fileName = AZStd::string::format("%s.preset", presetEntry.m_multiPreset.GetDefaultPreset().m_name.c_str());
+            AZStd::string fileName = AZStd::string::format("%s.preset", presetEntry.m_multiPreset.GetDefaultPreset().m_name.GetCStr());
             AZStd::string filePath;
             if (!AzFramework::StringFunc::Path::Join(outputFolder.data(), fileName.c_str(), filePath))
             {
@@ -552,7 +534,7 @@ namespace ImageProcessingAtom
             if (!result.IsSuccess())
             {
                 AZ_Warning("Image Processing", false, "Failed to save preset '%s' to file '%s'. Error: %s", 
-                    presetEntry.m_multiPreset.GetDefaultPreset().m_name.c_str(), filePath.c_str(), result.GetError().c_str());
+                    presetEntry.m_multiPreset.GetDefaultPreset().m_name.GetCStr(), filePath.c_str(), result.GetError().c_str());
             }
         }
     }

+ 11 - 13
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h

@@ -49,7 +49,6 @@ namespace ImageProcessingAtom
         static void DestroyInstance();
         static void Reflect(AZ::ReflectContext* context);
         
-        const PresetSettings* GetPreset(const AZ::Uuid presetId, const PlatformName& platform = "", AZStd::string_view* settingsFilePathOut = nullptr);
         const PresetSettings* GetPreset(const PresetName& presetName, const PlatformName& platform = "", AZStd::string_view* settingsFilePathOut = nullptr);
 
         const BuilderSettings* GetBuilderSetting(const PlatformName& platform);
@@ -60,10 +59,7 @@ namespace ImageProcessingAtom
         //! Return A map of preset settings based on their filemasks.
         //!      @key filemask string, empty string means no filemask
         //!      @value set of preset setting names supporting the specified filemask
-        const AZStd::map<FileMask, AZStd::set<PresetName>>& GetPresetFilterMap();
-
-        //!Find preset id list based on the preset name.
-        const AZ::Uuid GetPresetIdFromName(const PresetName& presetName);
+        const AZStd::map<FileMask, AZStd::unordered_set<PresetName>>& GetPresetFilterMap();
 
         //! Find preset name based on the preset id.
         const PresetName GetPresetNameFromId(const AZ::Uuid& presetId);
@@ -84,8 +80,10 @@ namespace ImageProcessingAtom
         //! Find a suitable preset a given image file.
         //! @param imageFilePath: Filepath string of the image file. The function may load the image from the path for better detection
         //! @param image: an optional image object which can be used for preset selection if there is no match based file mask.
-        //! @return suggested preset uuid.
-        AZ::Uuid GetSuggestedPreset(AZStd::string_view imageFilePath, IImageObjectPtr image = nullptr);
+        //! @return suggested preset name.
+        PresetName GetSuggestedPreset(AZStd::string_view imageFilePath, IImageObjectPtr image = nullptr);
+
+        bool IsValidPreset(PresetName presetName) const;
 
         bool DoesSupportPlatform(AZStd::string_view platformId);
 
@@ -131,27 +129,27 @@ namespace ImageProcessingAtom
         // Builder settings for each platform
         AZStd::map <PlatformName, BuilderSettings> m_builderSettings;
 
-        AZStd::map<PresetName, PresetEntry> m_presets;
+        AZStd::unordered_map<PresetName, PresetEntry> m_presets;
 
         // Cached list of presets mapped by their file masks.
         // @Key file mask, use empty string to indicate all presets without filtering
         // @Value set of preset names that matches the file mask
-        AZStd::map <FileMask, AZStd::set<PresetName>> m_presetFilterMap;
+        AZStd::map <FileMask, AZStd::unordered_set<PresetName>> m_presetFilterMap;
 
         // A mutex to protect when modifying any map in this manager        
         AZStd::recursive_mutex m_presetMapLock;
 
         // Default presets for certain file masks
-        AZStd::map <FileMask, AZ::Uuid > m_defaultPresetByFileMask;
+        AZStd::map <FileMask, PresetName > m_defaultPresetByFileMask;
 
         // Default preset for none power of two image
-        AZ::Uuid m_defaultPresetNonePOT;
+        PresetName m_defaultPresetNonePOT;
 
         // Default preset for power of two
-        AZ::Uuid m_defaultPreset;
+        PresetName m_defaultPreset;
 
         // Default preset for power of two with alpha
-        AZ::Uuid m_defaultPresetAlpha;
+        PresetName m_defaultPresetAlpha;
 
         // Image builder's version
         AZStd::string m_analysisFingerprint;

+ 4 - 4
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h

@@ -43,14 +43,14 @@ namespace ImageProcessingAtom
         // generate an IBL specular cubemap
         bool m_generateIBLSpecular = false;
 
-        // the UUID of the preset to be used for generating the IBL specular cubemap
-        AZ::Uuid m_iblSpecularPreset = AZ::Uuid::CreateNull();
+        // the name of the preset to be used for generating the IBL specular cubemap
+        PresetName m_iblSpecularPreset;
 
         // generate an IBL diffuse cubemap
         bool m_generateIBLDiffuse = false;
 
-        // the UUID of the preset to be used for generating the IBL diffuse cubemap
-        AZ::Uuid m_iblDiffusePreset = AZ::Uuid::CreateNull();
+        // the name of the preset to be used for generating the IBL diffuse cubemap
+        PresetName m_iblDiffusePreset;
 
         // "cm_requiresconvolve", convolve the cubemap mips
         bool m_requiresConvolve = true;

+ 3 - 1
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h

@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <AzCore/Name/Name.h>
 #include <AzCore/std/containers/map.h>
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/std/containers/list.h>
@@ -38,7 +39,8 @@ namespace ImageProcessingAtom
 #define STRING_OUTCOME_ERROR(error) AZ::Failure(AZStd::string(error))
 
     // Common typedefs (with dependent forward-declarations)
-    typedef AZStd::string PlatformName, PresetName, FileMask;
+    typedef AZStd::string PlatformName, FileMask;
+    typedef AZ::Name PresetName;
     typedef AZStd::vector<PlatformName> PlatformNameVector;
     typedef AZStd::list<PlatformName> PlatformNameList;
 

+ 2 - 1
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.h

@@ -31,7 +31,8 @@ namespace ImageProcessingAtom
         bool operator== (const PresetSettings& other) const;
         static void Reflect(AZ::ReflectContext* context);
         
-        //unique id for the preset
+        // unique id for the preset
+        // this uuid will be deprecated. The preset name will be used as an unique id for the preset
         AZ::Uuid m_uuid = 0;
 
         PresetName m_name;

+ 18 - 9
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp

@@ -23,7 +23,7 @@ namespace ImageProcessingAtom
     const char* TextureSettings::ExtensionName = ".assetinfo";
 
     TextureSettings::TextureSettings()
-        : m_preset(0)
+        : m_presetId(0)
         , m_sizeReduceLevel(0)
         , m_suppressEngineReduce(false)
         , m_enableMipmap(true)
@@ -45,8 +45,9 @@ namespace ImageProcessingAtom
         if (serialize)
         {
             serialize->Class<TextureSettings>()
-                ->Version(1)
-                ->Field("PresetID", &TextureSettings::m_preset)
+                ->Version(2)
+                ->Field("PresetID", &TextureSettings::m_presetId)
+                ->Field("Preset", &TextureSettings::m_preset)
                 ->Field("SizeReduceLevel", &TextureSettings::m_sizeReduceLevel)
                 ->Field("EngineReduce", &TextureSettings::m_suppressEngineReduce)
                 ->Field("EnableMipmap", &TextureSettings::m_enableMipmap)
@@ -169,9 +170,9 @@ namespace ImageProcessingAtom
         return 0.5f - fVal / 100.0f;
     }
 
-    void TextureSettings::ApplyPreset(AZ::Uuid presetId)
+    void TextureSettings::ApplyPreset(PresetName presetName)
     {
-        const PresetSettings* presetSetting = BuilderSettingManager::Instance()->GetPreset(presetId);
+        const PresetSettings* presetSetting = BuilderSettingManager::Instance()->GetPreset(presetName);
         if (presetSetting != nullptr)
         {
             m_sizeReduceLevel = presetSetting->m_sizeReduceLevel;
@@ -181,11 +182,11 @@ namespace ImageProcessingAtom
                 m_mipGenType = presetSetting->m_mipmapSetting->m_type;
             }
 
-            m_preset = presetId;
+            m_preset = presetName;
         }
         else
         {
-            AZ_Error("Image Processing", false, "Cannot set an invalid preset %s!", presetId.ToString<AZStd::string>().c_str());
+            AZ_Error("Image Processing", false, "Cannot set an invalid preset %s!", presetName.GetCStr());
         }
     }
 
@@ -199,6 +200,14 @@ namespace ImageProcessingAtom
         }
 
         textureSettingPtrOut = *loadedTextureSettingPtr;
+
+        // In old format, the preset name doesn't exist. Using preset id to get preset name
+        // We can remove this when we fully deprecate the preset uuid
+        if (textureSettingPtrOut.m_preset.IsEmpty())
+        {
+            textureSettingPtrOut.m_preset = BuilderSettingManager::Instance()->GetPresetNameFromId(textureSettingPtrOut.m_presetId);
+        }
+
         return AZ::Success(AZStd::string());
     }
 
@@ -216,7 +225,7 @@ namespace ImageProcessingAtom
     {
         MultiplatformTextureSettings settings;
         PlatformNameList platformsList = BuilderSettingManager::Instance()->GetPlatformList();
-        AZ::Uuid suggestedPreset = BuilderSettingManager::Instance()->GetSuggestedPreset(imageFilepath);
+        PresetName suggestedPreset = BuilderSettingManager::Instance()->GetSuggestedPreset(imageFilepath);
         for (PlatformName& platform : platformsList)
         {
             TextureSettings textureSettings;
@@ -234,7 +243,7 @@ namespace ImageProcessingAtom
         if (overrideIter == baseTextureSettings.m_platfromOverrides.end())
         {
             return STRING_OUTCOME_ERROR(AZStd::string::format("TextureSettings preset [%s] does not have override for platform [%s]",
-                baseTextureSettings.m_preset.ToString<AZStd::string>().c_str(), platformName.c_str()));
+                baseTextureSettings.m_preset.GetCStr(), platformName.c_str()));
         }
         AZ::DataPatch& platformOverride = const_cast<AZ::DataPatch&>(overrideIter->second);
 

+ 5 - 2
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.h

@@ -43,7 +43,7 @@ namespace ImageProcessingAtom
         /**
          * Apply value of some preset settings to this texture settings
          */
-        void ApplyPreset(AZ::Uuid presetId);
+        void ApplyPreset(PresetName presetName);
 
         /**
         * Performs a comprehensive comparison between two TextureSettings instances.
@@ -116,7 +116,10 @@ namespace ImageProcessingAtom
         static const size_t s_MaxMipMaps = 6;
 
         // uuid of selected preset for this texture
-        AZ::Uuid m_preset;
+        // We are deprecating preset UUID and switching to preset name as an unique id
+        AZ::Uuid m_presetId;
+
+        PresetName m_preset;
 
         // texture size reduce level. the value of this variable will override the same variable in PresetSettings
         unsigned int m_sizeReduceLevel;

+ 9 - 16
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp

@@ -165,17 +165,17 @@ namespace ImageProcessingAtomEditor
 
         // Get the preset id from one platform. The preset id for each platform should always be same
         AZ_Assert(m_settingsMap.size() > 0, "There is no platform information");
-        AZ::Uuid presetId = m_settingsMap.begin()->second.m_preset;
-        const PresetSettings* preset = BuilderSettingManager::Instance()->GetPreset(presetId);
+        PresetName presetName = m_settingsMap.begin()->second.m_preset;
+        const PresetSettings* preset = BuilderSettingManager::Instance()->GetPreset(presetName);
 
         if (!preset)
         {
-            AZ_Warning("Texture Editor", false, "Cannot find preset %s! Will assign a suggested one for the texture.", presetId.ToString<AZStd::string>().c_str());
-            presetId = BuilderSettingManager::Instance()->GetSuggestedPreset(m_fullPath, m_img);
+            AZ_Warning("Texture Editor", false, "Cannot find preset %s! Will assign a suggested one for the texture.", presetName.GetCStr());
+            presetName = BuilderSettingManager::Instance()->GetSuggestedPreset(m_fullPath, m_img);
 
             for (auto& settingIter : m_settingsMap)
             {
-                settingIter.second.ApplyPreset(presetId);
+                settingIter.second.ApplyPreset(presetName);
             }
         }
     }
@@ -198,25 +198,18 @@ namespace ImageProcessingAtomEditor
             }
             else
             {
-                AZ_Error("Texture Editor", false, "Texture Preset %s is not found!", textureSetting.m_preset.ToString<AZStd::string>().c_str());
+                AZ_Error("Texture Editor", false, "Texture Preset %s is not found!", textureSetting.m_preset.GetCStr());
             }
         }
     }
 
-    void EditorTextureSetting::SetToPreset(const AZStd::string& presetName)
+    void EditorTextureSetting::SetToPreset(const PresetName& presetName)
     {
         m_overrideFromPreset = false;
 
-        AZ::Uuid presetId = BuilderSettingManager::Instance()->GetPresetIdFromName(presetName);
-        if (presetId.IsNull())
-        {
-            AZ_Error("Texture Editor", false, "Texture Preset %s has no associated UUID.", presetName.c_str());
-            return;
-        }
-
         for (auto& settingIter : m_settingsMap)
         {
-            settingIter.second.ApplyPreset(presetId);
+            settingIter.second.ApplyPreset(presetName);
         }
     }
     
@@ -305,7 +298,7 @@ namespace ImageProcessingAtomEditor
                 {
                     it.second.m_enableMipmap = false;
                     enabled = false;
-                    AZ_Error("Texture Editor", false, "Preset %s does not support mipmap!", preset->m_name.c_str());
+                    AZ_Error("Texture Editor", false, "Preset %s does not support mipmap!", preset->m_name.GetCStr());
                 }
             }
             else

+ 1 - 1
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.h

@@ -62,7 +62,7 @@ namespace ImageProcessingAtomEditor
         
         void SetIsOverrided();
         
-        void SetToPreset(const AZStd::string& presetName);
+        void SetToPreset(const ImageProcessingAtom::PresetName& presetName);
         
         //Get the texture setting on certain platform
         ImageProcessingAtom::TextureSettings& GetMultiplatformTextureSetting(const AZStd::string& platform = "");

+ 3 - 3
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp

@@ -66,7 +66,7 @@ namespace ImageProcessingAtomEditor
         }
 
         presetInfoText += QString("UUID: %1\n").arg(presetSettings->m_uuid.ToString<AZStd::string>().c_str());
-        presetInfoText += QString("Name: %1\n").arg(presetSettings->m_name.c_str());
+        presetInfoText += QString("Name: %1\n").arg(presetSettings->m_name.GetCStr());
         presetInfoText += QString("Generate IBL Only: %1\n").arg(presetSettings->m_generateIBLOnly ? "True" : "False");
         presetInfoText += QString("RGB Weight: %1\n").arg(RGBWeightToString(presetSettings->m_rgbWeight));
         presetInfoText += QString("Source ColorSpace: %1\n").arg(ColorSpaceToString(presetSettings->m_srcColorSpace));
@@ -98,9 +98,9 @@ namespace ImageProcessingAtomEditor
             presetInfoText += QString("Mip Slope: %1\n").arg(presetSettings->m_cubemapSetting->m_mipSlope);
             presetInfoText += QString("Edge Fixup: %1\n").arg(presetSettings->m_cubemapSetting->m_edgeFixup);
             presetInfoText += QString("Generate IBL Specular: %1\n").arg(presetSettings->m_cubemapSetting->m_generateIBLSpecular ? "True" : "False");
-            presetInfoText += QString("IBL Specular Preset: %1\n").arg(presetSettings->m_cubemapSetting->m_iblSpecularPreset.ToString<AZStd::string>().c_str());
+            presetInfoText += QString("IBL Specular Preset: %1\n").arg(presetSettings->m_cubemapSetting->m_iblSpecularPreset.GetCStr());
             presetInfoText += QString("Generate IBL Diffuse: %1\n").arg(presetSettings->m_cubemapSetting->m_generateIBLDiffuse ? "True" : "False");
-            presetInfoText += QString("IBL Diffuse Preset: %1\n").arg(presetSettings->m_cubemapSetting->m_iblDiffusePreset.ToString<AZStd::string>().c_str());
+            presetInfoText += QString("IBL Diffuse Preset: %1\n").arg(presetSettings->m_cubemapSetting->m_iblDiffusePreset.GetCStr());
             presetInfoText += QString("Requires Convolve: %1\n").arg(presetSettings->m_cubemapSetting->m_requiresConvolve ? "True" : "False");
             presetInfoText += QString("SubId: %1\n").arg(presetSettings->m_cubemapSetting->m_subId);
         }

+ 1 - 1
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp

@@ -104,7 +104,7 @@ namespace ImageProcessingAtomEditor
         }
     }
 
-    QString ResolutionSettingItemWidget::GetFinalFormat([[maybe_unused]] const AZ::Uuid& presetId)
+    QString ResolutionSettingItemWidget::GetFinalFormat([[maybe_unused]] const ImageProcessingAtom::PresetName& preset)
     {
         if (m_preset && m_preset->m_pixelFormat >= 0 && m_preset->m_pixelFormat < ePixelFormat_Count)
         {

+ 1 - 1
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.h

@@ -60,7 +60,7 @@ namespace ImageProcessingAtomEditor
         void SetupFormatComboBox();
         void SetupResolutionInfo();
         void RefreshUI();
-        QString GetFinalFormat(const AZ::Uuid& presetId);
+        QString GetFinalFormat(const ImageProcessingAtom::PresetName& preset);
 
         QScopedPointer<Ui::ResolutionSettingItemWidget> m_ui;
         ResoultionWidgetType m_type;

+ 10 - 10
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp

@@ -29,7 +29,7 @@ namespace ImageProcessingAtomEditor
         m_presetList.clear();
         auto& presetFilterMap = BuilderSettingManager::Instance()->GetPresetFilterMap();
 
-        AZStd::set<AZStd::string> noFilterPresetList;
+        AZStd::unordered_set<ImageProcessingAtom::PresetName> noFilterPresetList;
 
         // Check if there is any filtered preset list first
         for(auto& presetFilter : presetFilterMap)
@@ -40,7 +40,7 @@ namespace ImageProcessingAtomEditor
             }
             else if (IsMatchingWithFileMask(m_textureSetting->m_textureName, presetFilter.first))
             {
-                for(const AZStd::string& presetName : presetFilter.second)
+                for(const auto& presetName : presetFilter.second)
                 {
                     m_presetList.insert(presetName);
                 }
@@ -52,18 +52,18 @@ namespace ImageProcessingAtomEditor
             m_presetList = noFilterPresetList;
         }
 
-        foreach (const AZStd::string& presetName, m_presetList)
+        foreach (const auto& presetName, m_presetList)
         {
-            m_ui->presetComboBox->addItem(QString(presetName.c_str()));
+            m_ui->presetComboBox->addItem(QString(presetName.GetCStr()));
         }
 
         // Set current preset
-        const AZ::Uuid& currPreset = m_textureSetting->GetMultiplatformTextureSetting().m_preset;
+        const auto& currPreset = m_textureSetting->GetMultiplatformTextureSetting().m_preset;
         const PresetSettings* presetSetting = BuilderSettingManager::Instance()->GetPreset(currPreset);
 
         if (presetSetting)
         {
-            m_ui->presetComboBox->setCurrentText(presetSetting->m_name.c_str());
+            m_ui->presetComboBox->setCurrentText(presetSetting->m_name.GetCStr());
             QObject::connect(m_ui->presetComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &TexturePresetSelectionWidget::OnChangePreset);
 
             // Suppress engine reduction checkbox
@@ -109,20 +109,20 @@ namespace ImageProcessingAtomEditor
 
     void TexturePresetSelectionWidget::OnRestButton()
     {
-        m_textureSetting->SetToPreset(AZStd::string(m_ui->presetComboBox->currentText().toUtf8().data()));
+        m_textureSetting->SetToPreset(PresetName(m_ui->presetComboBox->currentText().toUtf8().data()));
         EditorInternalNotificationBus::Broadcast(&EditorInternalNotificationBus::Events::OnEditorSettingsChanged, true, BuilderSettingManager::s_defaultPlatform);
     }
 
     void TexturePresetSelectionWidget::OnChangePreset(int index)
     {
         QString text = m_ui->presetComboBox->itemText(index);
-        m_textureSetting->SetToPreset(AZStd::string(text.toUtf8().data()));
+        m_textureSetting->SetToPreset(PresetName(text.toUtf8().data()));
         EditorInternalNotificationBus::Broadcast(&EditorInternalNotificationBus::Events::OnEditorSettingsChanged, true, BuilderSettingManager::s_defaultPlatform);
     }
 
     void ImageProcessingAtomEditor::TexturePresetSelectionWidget::OnPresetInfoButton()
     {
-        const AZ::Uuid& currPreset = m_textureSetting->GetMultiplatformTextureSetting().m_preset;
+        const auto& currPreset = m_textureSetting->GetMultiplatformTextureSetting().m_preset;
         const PresetSettings* presetSetting = BuilderSettingManager::Instance()->GetPreset(currPreset);
         m_presetPopup.reset(new PresetInfoPopup(presetSetting, this));
         m_presetPopup->installEventFilter(this);
@@ -136,7 +136,7 @@ namespace ImageProcessingAtomEditor
             bool oldState = m_ui->serCheckBox->blockSignals(true);
             m_ui->serCheckBox->setChecked(m_textureSetting->GetMultiplatformTextureSetting().m_suppressEngineReduce);
             // If the preset's SER is true, texture setting should not override
-            const AZ::Uuid& currPreset = m_textureSetting->GetMultiplatformTextureSetting().m_preset;
+            const auto& currPreset = m_textureSetting->GetMultiplatformTextureSetting().m_preset;
             const PresetSettings* presetSetting = BuilderSettingManager::Instance()->GetPreset(currPreset);
             if (presetSetting)
             {

+ 1 - 1
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.h

@@ -49,7 +49,7 @@ namespace ImageProcessingAtomEditor
 
     private:
         QScopedPointer<Ui::TexturePresetSelectionWidget> m_ui;
-        AZStd::set<AZStd::string> m_presetList;
+        AZStd::unordered_set<ImageProcessingAtom::PresetName> m_presetList;
         EditorTextureSetting* m_textureSetting;
         QScopedPointer<PresetInfoPopup> m_presetPopup;
         bool IsMatchingWithFileMask(const AZStd::string& filename, const AZStd::string& fileMask);

+ 4 - 4
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp

@@ -74,7 +74,7 @@ namespace ImageProcessingAtom
         builderDescriptor.m_busId = azrtti_typeid<ImageBuilderWorker>();
         builderDescriptor.m_createJobFunction = AZStd::bind(&ImageBuilderWorker::CreateJobs, &m_imageBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
         builderDescriptor.m_processJobFunction = AZStd::bind(&ImageBuilderWorker::ProcessJob, &m_imageBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
-        builderDescriptor.m_version = 24;   // [SPEC-7821]
+        builderDescriptor.m_version = 25;   // [ATOM-16575]
         builderDescriptor.m_analysisFingerprint = ImageProcessingAtom::BuilderSettingManager::Instance()->GetAnalysisFingerprint();
         m_imageBuilder.BusConnect(builderDescriptor.m_busId);
         AssetBuilderSDK::AssetBuilderBus::Broadcast(&AssetBuilderSDK::AssetBuilderBusTraits::RegisterBuilderInformation, builderDescriptor);
@@ -164,7 +164,7 @@ namespace ImageProcessingAtom
         AZStd::vector<AssetBuilderSDK::JobProduct> outProducts;
 
         AZStd::string_view presetFilePath;
-        const PresetSettings* preset = BuilderSettingManager::Instance()->GetPreset(presetName, platformName, &presetFilePath);
+        const PresetSettings* preset = BuilderSettingManager::Instance()->GetPreset(PresetName(presetName), platformName, &presetFilePath);
         if (preset == nullptr)
         {
             AZ_Assert(false, "Cannot find preset with name %s.", presetName.c_str());
@@ -173,7 +173,7 @@ namespace ImageProcessingAtom
 
         AZStd::unique_ptr<ImageConvertProcessDescriptor> desc = AZStd::make_unique<ImageConvertProcessDescriptor>();
         TextureSettings& textureSettings = desc->m_textureSetting;
-        textureSettings.m_preset = preset->m_uuid;
+        textureSettings.m_preset = preset->m_name;
         desc->m_inputImage = imageObject;
         desc->m_presetSetting = *preset;
         desc->m_isPreview = false;
@@ -204,7 +204,7 @@ namespace ImageProcessingAtom
     bool BuilderPluginComponent::IsPresetFormatSquarePow2(const AZStd::string& presetName, const AZStd::string& platformName)
     {
         AZStd::string_view filePath;
-        const PresetSettings* preset = BuilderSettingManager::Instance()->GetPreset(presetName, platformName, &filePath);
+        const PresetSettings* preset = BuilderSettingManager::Instance()->GetPreset(PresetName(presetName), platformName, &filePath);
         if (preset == nullptr)
         {
             AZ_Assert(false, "Cannot find preset with name %s.", presetName.c_str());

+ 8 - 10
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp

@@ -186,12 +186,12 @@ namespace ImageProcessingAtom
             {
                 // check and generate IBL specular and diffuse, if necessary
                 AZStd::unique_ptr<CubemapSettings>& cubemapSettings = m_input->m_presetSetting.m_cubemapSetting;
-                if (cubemapSettings->m_generateIBLSpecular && !cubemapSettings->m_iblSpecularPreset.IsNull())
+                if (cubemapSettings->m_generateIBLSpecular && !cubemapSettings->m_iblSpecularPreset.IsEmpty())
                 {
                     CreateIBLCubemap(cubemapSettings->m_iblSpecularPreset, SpecularCubemapSuffix, m_iblSpecularCubemapImage);
                 }
 
-                if (cubemapSettings->m_generateIBLDiffuse && !cubemapSettings->m_iblDiffusePreset.IsNull())
+                if (cubemapSettings->m_generateIBLDiffuse && !cubemapSettings->m_iblDiffusePreset.IsEmpty())
                 {
                     CreateIBLCubemap(cubemapSettings->m_iblDiffusePreset, DiffuseCubemapSuffix, m_iblDiffuseCubemapImage);
                 }
@@ -367,7 +367,7 @@ namespace ImageProcessingAtom
             else
             {
                 AZ_TracePrintf("Image Processing", "Image converted with preset [%s] [%s] and saved to [%s] (%d bytes) taking %f seconds\n",
-                    m_input->m_presetSetting.m_name.c_str(),
+                    m_input->m_presetSetting.m_name.GetCStr(),
                     m_input->m_filePath.c_str(),
                     m_input->m_outputFolder.c_str(), sizeTotal, m_processTime);
             }
@@ -834,7 +834,7 @@ namespace ImageProcessingAtom
 
         // if get textureSetting failed, use the default texture setting, and find suitable preset for this file
         // in very rare user case, an old texture setting file may not have a preset. We fix it over here too. 
-        if (textureSettings.m_preset.IsNull())
+        if (textureSettings.m_preset.IsEmpty())
         {
             textureSettings.m_preset = BuilderSettingManager::Instance()->GetSuggestedPreset(imageFilePath, srcImage);
         }
@@ -845,9 +845,7 @@ namespace ImageProcessingAtom
 
         if (preset == nullptr)
         {
-            AZStd::string uuidStr;
-            textureSettings.m_preset.ToString(uuidStr);
-            AZ_Assert(false, "%s cannot find image preset with ID %s.", imageFilePath.c_str(), uuidStr.c_str());
+            AZ_Assert(false, "%s cannot find image preset %s.", imageFilePath.c_str(), textureSettings.m_preset.GetCStr());
             return nullptr;
         }
 
@@ -875,11 +873,11 @@ namespace ImageProcessingAtom
         return process;
     }
 
-    void ImageConvertProcess::CreateIBLCubemap(AZ::Uuid presetUUID, const char* fileNameSuffix, IImageObjectPtr& cubemapImage)
+    void ImageConvertProcess::CreateIBLCubemap(PresetName preset, const char* fileNameSuffix, IImageObjectPtr& cubemapImage)
     {
         const AZStd::string& platformId = m_input->m_platform;
         AZStd::string_view filePath;
-        const PresetSettings* presetSettings = BuilderSettingManager::Instance()->GetPreset(presetUUID, platformId, &filePath);
+        const PresetSettings* presetSettings = BuilderSettingManager::Instance()->GetPreset(preset, platformId, &filePath);
         if (presetSettings == nullptr)
         {
             AZ_Error("Image Processing", false, "Couldn't find preset for IBL cubemap generation");
@@ -900,7 +898,7 @@ namespace ImageProcessingAtom
 
         // the diffuse irradiance cubemap is generated with a separate ImageConvertProcess
         TextureSettings textureSettings = m_input->m_textureSetting;
-        textureSettings.m_preset = presetUUID;
+        textureSettings.m_preset = preset;
 
         AZStd::unique_ptr<ImageConvertProcessDescriptor> desc = AZStd::make_unique<ImageConvertProcessDescriptor>();
         desc->m_presetSetting = *presetSettings;

+ 1 - 1
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h

@@ -163,7 +163,7 @@ namespace ImageProcessingAtom
         bool FillCubemapMipmaps();
 
         //IBL cubemap generation, this creates a separate ImageConvertProcess
-        void CreateIBLCubemap(AZ::Uuid presetUUID, const char* fileNameSuffix, IImageObjectPtr& cubemapImage);
+        void CreateIBLCubemap(PresetName preset, const char* fileNameSuffix, IImageObjectPtr& cubemapImage);
 
         //convert color space to linear with pixel format rgba32f
         bool ConvertToLinear();

+ 1 - 1
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp

@@ -43,7 +43,7 @@ namespace ImageProcessingAtom
             m_inputImage = IImageObjectPtr(LoadImageFromFile(m_imageFileName));
         }
         // Get preset if the setting in texture is changed
-        if (m_presetSetting == nullptr || m_presetSetting->m_uuid != m_textureSetting->m_preset)
+        if (m_presetSetting == nullptr || m_presetSetting->m_name != m_textureSetting->m_preset)
         {
             m_presetSetting = BuilderSettingManager::Instance()->GetPreset(m_textureSetting->m_preset);
         }

+ 10 - 1
Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp

@@ -20,6 +20,7 @@
 #include <AzCore/Jobs/JobManager.h>
 #include <AzCore/Memory/Memory.h>
 #include <AzCore/Memory/PoolAllocator.h>
+#include <AzCore/Name/NameDictionary.h>
 #include <AzCore/RTTI/ReflectionManager.h>
 #include <AzCore/Serialization/DataPatch.h>
 #include <AzCore/Serialization/Json/JsonSystemComponent.h>
@@ -145,6 +146,8 @@ namespace UnitTest
             AZ::Data::AssetManager::Descriptor desc;
             AZ::Data::AssetManager::Create(desc);
 
+            AZ::NameDictionary::Create();
+
             m_assetHandlers.emplace_back(AZ::RPI::MakeAssetHandler<AZ::RPI::ImageMipChainAssetHandler>());
             m_assetHandlers.emplace_back(AZ::RPI::MakeAssetHandler<AZ::RPI::StreamingImageAssetHandler>());
             m_assetHandlers.emplace_back(AZ::RPI::MakeAssetHandler<AZ::RPI::StreamingImagePoolAssetHandler>());
@@ -153,6 +156,7 @@ namespace UnitTest
 
             //prepare reflection
             m_context = AZStd::make_unique<AZ::SerializeContext>();
+            AZ::Name::Reflect(m_context.get());
             BuilderPluginComponent::Reflect(m_context.get());
             AZ::DataPatch::Reflect(m_context.get());
             AZ::RHI::ReflectSystemComponent::Reflect(m_context.get());
@@ -164,6 +168,7 @@ namespace UnitTest
             m_jsonRegistrationContext = AZStd::make_unique<AZ::JsonRegistrationContext>();
             m_jsonSystemComponent = AZStd::make_unique<AZ::JsonSystemComponent>();
             m_jsonSystemComponent->Reflect(m_jsonRegistrationContext.get());
+            AZ::Name::Reflect(m_jsonRegistrationContext.get());
             BuilderPluginComponent::Reflect(m_jsonRegistrationContext.get());
 
             // Setup job context for job system
@@ -227,14 +232,18 @@ namespace UnitTest
             m_jsonRegistrationContext->EnableRemoveReflection();
             m_jsonSystemComponent->Reflect(m_jsonRegistrationContext.get());
             BuilderPluginComponent::Reflect(m_jsonRegistrationContext.get());
+            AZ::Name::Reflect(m_jsonRegistrationContext.get());
             m_jsonRegistrationContext->DisableRemoveReflection();
             m_jsonRegistrationContext.reset();
             m_jsonSystemComponent.reset();
 
             m_context.reset();
             BuilderSettingManager::DestroyInstance();
+
             CPixelFormats::DestroyInstance();
 
+            AZ::NameDictionary::Destroy();
+
             AZ::Data::AssetManager::Destroy();
 
             AZ::AllocatorInstance<AZ::ThreadPoolAllocator>::Destroy();
@@ -1027,7 +1036,7 @@ namespace UnitTest
 
         // Fill-in structure with test data
         TextureSettings fakeTextureSettings;
-        fakeTextureSettings.m_preset = AZ::Uuid::CreateRandom();
+        fakeTextureSettings.m_preset = "testPreset";
         fakeTextureSettings.m_sizeReduceLevel = 0;
         fakeTextureSettings.m_suppressEngineReduce = true;
         fakeTextureSettings.m_enableMipmap = false;

+ 0 - 1
Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/TestAssets/1024x1024_24bit.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /bumptype=none /M=62,18,32,83,50,50 /preset=Diffuse_highQ /mipgentype=kaiser /reduce="android:0,ios:3,mac:0,pc:4,provo:1" /ser=0

+ 0 - 104
Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithOpacity.preset

@@ -1,104 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{7BB7BC6C-D3DA-4184-AC42-BCD8C57DE565}",
-            "Name": "AlbedoWithOpacity",
-            "RGB_Weight": "CIEXYZ",
-            "FileMasks": [
-                "_diff",
-                "_color",
-                "_albedo",
-                "_alb",
-                "_basecolor",
-                "_bc",
-                "_diffuse"
-            ],
-            "PixelFormat": "BC7t",
-            "IsPowerOf2": true,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{7BB7BC6C-D3DA-4184-AC42-BCD8C57DE565}",
-                "Name": "AlbedoWithOpacity",
-                "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
-                "PixelFormat": "ASTC_6x6",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{7BB7BC6C-D3DA-4184-AC42-BCD8C57DE565}",
-                "Name": "AlbedoWithOpacity",
-                "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
-                "PixelFormat": "ASTC_6x6",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{7BB7BC6C-D3DA-4184-AC42-BCD8C57DE565}",
-                "Name": "AlbedoWithOpacity",
-                "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
-                "PixelFormat": "BC3",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{7BB7BC6C-D3DA-4184-AC42-BCD8C57DE565}",
-                "Name": "AlbedoWithOpacity",
-                "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
-                "PixelFormat": "BC7t",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 0 - 44
Gems/Atom/Asset/ImageProcessingAtom/Config/CloudShadows.preset

@@ -1,44 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}",
-            "Name": "CloudShadows",
-            "DestColor": "Linear",
-            "PixelFormat": "BC4",
-            "IsPowerOf2": true
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}",
-                "Name": "CloudShadows",
-                "DestColor": "Linear",
-                "PixelFormat": "ASTC_4x4",
-                "IsPowerOf2": true
-            },
-            "ios": {
-                "UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}",
-                "Name": "CloudShadows",
-                "DestColor": "Linear",
-                "PixelFormat": "ASTC_4x4",
-                "IsPowerOf2": true
-            },
-            "mac": {
-                "UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}",
-                "Name": "CloudShadows",
-                "DestColor": "Linear",
-                "PixelFormat": "BC4",
-                "IsPowerOf2": true
-            },
-            "provo": {
-                "UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}",
-                "Name": "CloudShadows",
-                "DestColor": "Linear",
-                "PixelFormat": "BC4",
-                "IsPowerOf2": true
-            }
-        }
-    }
-}

+ 0 - 64
Gems/Atom/Asset/ImageProcessingAtom/Config/ColorChart.preset

@@ -1,64 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{0A17A85F-07EE-48A0-8BF8-D42F0A5E0B3C}",
-            "Name": "ColorChart",
-            "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "FileMasks": [
-                "_cch"
-            ],
-            "PixelFormat": "R8G8B8X8",
-            "IsColorChart": true
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{0A17A85F-07EE-48A0-8BF8-D42F0A5E0B3C}",
-                "Name": "ColorChart",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_cch"
-                ],
-                "PixelFormat": "R8G8B8X8",
-                "IsColorChart": true
-            },
-            "ios": {
-                "UUID": "{0A17A85F-07EE-48A0-8BF8-D42F0A5E0B3C}",
-                "Name": "ColorChart",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_cch"
-                ],
-                "PixelFormat": "R8G8B8X8",
-                "IsColorChart": true
-            },
-            "mac": {
-                "UUID": "{0A17A85F-07EE-48A0-8BF8-D42F0A5E0B3C}",
-                "Name": "ColorChart",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_cch"
-                ],
-                "PixelFormat": "R8G8B8X8",
-                "IsColorChart": true
-            },
-            "provo": {
-                "UUID": "{0A17A85F-07EE-48A0-8BF8-D42F0A5E0B3C}",
-                "Name": "ColorChart",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_cch"
-                ],
-                "PixelFormat": "R8G8B8X8",
-                "IsColorChart": true
-            }
-        }
-    }
-}

+ 0 - 79
Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness.preset

@@ -1,79 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{5096FC7B-0B2D-4466-9943-AD59922968E8}",
-            "Name": "Detail_MergedAlbedoNormalsSmoothness",
-            "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "FileMasks": [
-                "_detail"
-            ],
-            "PixelFormat": "BC7",
-            "IsPowerOf2": true,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{5096FC7B-0B2D-4466-9943-AD59922968E8}",
-                "Name": "Detail_MergedAlbedoNormalsSmoothness",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_detail"
-                ],
-                "PixelFormat": "ASTC_4x4",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{5096FC7B-0B2D-4466-9943-AD59922968E8}",
-                "Name": "Detail_MergedAlbedoNormalsSmoothness",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_detail"
-                ],
-                "PixelFormat": "ASTC_4x4",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{5096FC7B-0B2D-4466-9943-AD59922968E8}",
-                "Name": "Detail_MergedAlbedoNormalsSmoothness",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_detail"
-                ],
-                "PixelFormat": "BC3",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{5096FC7B-0B2D-4466-9943-AD59922968E8}",
-                "Name": "Detail_MergedAlbedoNormalsSmoothness",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_detail"
-                ],
-                "PixelFormat": "BC7",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 0 - 74
Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness_Lossless.preset

@@ -1,74 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{B6FC1AEF-907C-4157-9A1A-D9960F0E5B9A}",
-            "Name": "Detail_MergedAlbedoNormalsSmoothness_Lossless",
-            "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "FileMasks": [
-                "_detail"
-            ],
-            "IsPowerOf2": true,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{B6FC1AEF-907C-4157-9A1A-D9960F0E5B9A}",
-                "Name": "Detail_MergedAlbedoNormalsSmoothness_Lossless",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_detail"
-                ],
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{B6FC1AEF-907C-4157-9A1A-D9960F0E5B9A}",
-                "Name": "Detail_MergedAlbedoNormalsSmoothness_Lossless",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_detail"
-                ],
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{B6FC1AEF-907C-4157-9A1A-D9960F0E5B9A}",
-                "Name": "Detail_MergedAlbedoNormalsSmoothness_Lossless",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_detail"
-                ],
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{B6FC1AEF-907C-4157-9A1A-D9960F0E5B9A}",
-                "Name": "Detail_MergedAlbedoNormalsSmoothness_Lossless",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_detail"
-                ],
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 2 - 2
Gems/Atom/Asset/ImageProcessingAtom/Config/IBLGlobal.preset

@@ -15,9 +15,9 @@
             ],
             "CubemapSettings": {
                 "GenerateIBLSpecular": true,
-                "IBLSpecularPreset": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
+                "IBLSpecularPreset": "IBLSpecular",
                 "GenerateIBLDiffuse": true,
-                "IBLDiffusePreset": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}"
+                "IBLDiffusePreset": "IBLDiffuse"
             }
         }
     }

+ 10 - 10
Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset

@@ -20,9 +20,9 @@
             "CubemapSettings": {
                 "RequiresConvolve": false,
                 "GenerateIBLSpecular": true,
-                "IBLSpecularPreset": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
+                "IBLSpecularPreset": "IBLSpecular",
                 "GenerateIBLDiffuse": true,
-                "IBLDiffusePreset": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}"
+                "IBLDiffusePreset": "IBLDiffuse"
             }
         },
         "PlatformsPresets": {
@@ -42,9 +42,9 @@
                 "CubemapSettings": {
                     "RequiresConvolve": false,
                     "GenerateIBLSpecular": true,
-                    "IBLSpecularPreset": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
+                    "IBLSpecularPreset": "IBLSpecular",
                     "GenerateIBLDiffuse": true,
-                    "IBLDiffusePreset": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}"
+                    "IBLDiffusePreset": "IBLDiffuse"
                 }
             },
             "ios": {
@@ -63,9 +63,9 @@
                 "CubemapSettings": {
                     "RequiresConvolve": false,
                     "GenerateIBLSpecular": true,
-                    "IBLSpecularPreset": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
+                    "IBLSpecularPreset": "IBLSpecular",
                     "GenerateIBLDiffuse": true,
-                    "IBLDiffusePreset": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}"
+                    "IBLDiffusePreset": "IBLDiffuse"
                 }
             },
             "mac": {
@@ -84,9 +84,9 @@
                 "CubemapSettings": {
                     "RequiresConvolve": false,
                     "GenerateIBLSpecular": true,
-                    "IBLSpecularPreset": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
+                    "IBLSpecularPreset": "IBLSpecular",
                     "GenerateIBLDiffuse": true,
-                    "IBLDiffusePreset": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}"
+                    "IBLDiffusePreset": "IBLDiffuse"
                 }
             },
             "provo": {
@@ -105,9 +105,9 @@
                 "CubemapSettings": {
                     "RequiresConvolve": false,
                     "GenerateIBLSpecular": true,
-                    "IBLSpecularPreset": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
+                    "IBLSpecularPreset": "IBLSpecular",
                     "GenerateIBLDiffuse": true,
-                    "IBLDiffusePreset": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}"
+                    "IBLDiffusePreset": "IBLDiffuse"
                 }
             }
         }

+ 19 - 23
Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings

@@ -43,29 +43,25 @@
             }
         },
         "DefaultPresetsByFileMask": {
-            "_basecolor": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
-            "_cch": "{0A17A85F-07EE-48A0-8BF8-D42F0A5E0B3C}",
-            "_ccm": "{2174E04B-73BB-4DF1-8961-4900DC3C9D72}",
-            "_cm": "{A13B2FCE-2F6A-4634-B112-5A0A912B50CE}",
-            "_ddn": "{508B21D5-5250-4003-97EC-1CF28D571ACF}",
-            "_ddna": "{6EE749F4-846E-4F7A-878C-F211F85EA59F}",
-            "_diff": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
-            "_diffuse": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",			
-            "_glossness": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
-            "_ibldiffusecm": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}",
-            "_iblskyboxcm": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}",
-            "_iblglobalcm": "{A13B2FCE-2F6A-4634-B112-5A0A912B50CE}",
-            "_iblspecularcm": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
-            "_metallic": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
-            "_normal": "{508B21D5-5250-4003-97EC-1CF28D571ACF}",
-            "_refl": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
-            "_roughness": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
-            "_skyboxcm": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}",
-            "_spec": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
-            "_specular": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}"
+            "_basecolor": "Albedo",
+            "_diff": "Albedo",
+            "_diffuse": "Albedo",
+            "_ddn": "Normals",
+            "_normal": "Normals",
+            "_ddna": "NormalsWithSmoothness",
+            "_glossness": "Reflectance",
+            "_spec": "Reflectance",
+            "_specular": "Reflectance",
+            "_metallic": "Reflectance",
+            "_refl": "Reflectance",
+            "_roughness": "Reflectance",
+            "_ibldiffusecm": "IBLDiffuse",
+            "_iblskyboxcm": "IBLSkybox",
+            "_iblspecularcm": "IBLSpecular",
+            "_skyboxcm": "Skybox"
         },
-        "DefaultPreset": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
-        "DefaultPresetAlpha": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}",
-        "DefaultPresetNonePOT": "{C659D222-F56B-4B61-A2F8-C1FA547F3C39}"
+        "DefaultPreset": "Albedo",
+        "DefaultPresetAlpha": "AlbedoWithGenericAlpha",
+        "DefaultPresetNonePOT": "ReferenceImage"
     }
 }

+ 0 - 34
Gems/Atom/Asset/ImageProcessingAtom/Config/LensOptics.preset

@@ -1,34 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}",
-            "Name": "LensOptics",
-            "PixelFormat": "BC1"
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}",
-                "Name": "LensOptics",
-                "PixelFormat": "ASTC_4x4"
-            },
-            "ios": {
-                "UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}",
-                "Name": "LensOptics",
-                "PixelFormat": "ASTC_4x4"
-            },
-            "mac": {
-                "UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}",
-                "Name": "LensOptics",
-                "PixelFormat": "BC1"
-            },
-            "provo": {
-                "UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}",
-                "Name": "LensOptics",
-                "PixelFormat": "BC1"
-            }
-        }
-    }
-}

+ 0 - 59
Gems/Atom/Asset/ImageProcessingAtom/Config/LightProjector.preset

@@ -1,59 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}",
-            "Name": "LightProjector",
-            "DestColor": "Linear",
-            "PixelFormat": "BC4",
-            "IsPowerOf2": true,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}",
-                "Name": "LightProjector",
-                "DestColor": "Linear",
-                "PixelFormat": "ASTC_4x4",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}",
-                "Name": "LightProjector",
-                "DestColor": "Linear",
-                "PixelFormat": "ASTC_4x4",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}",
-                "Name": "LightProjector",
-                "DestColor": "Linear",
-                "PixelFormat": "BC4",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}",
-                "Name": "LightProjector",
-                "DestColor": "Linear",
-                "PixelFormat": "BC4",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 0 - 34
Gems/Atom/Asset/ImageProcessingAtom/Config/LoadingScreen.preset

@@ -1,34 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{9ED87726-12AB-4BE0-9397-AD62AE56D9E2}",
-            "Name": "LoadingScreen",
-            "PixelFormat": "R8G8B8X8"
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{9ED87726-12AB-4BE0-9397-AD62AE56D9E2}",
-                "Name": "LoadingScreen",
-                "PixelFormat": "R8G8B8X8"
-            },
-            "ios": {
-                "UUID": "{9ED87726-12AB-4BE0-9397-AD62AE56D9E2}",
-                "Name": "LoadingScreen",
-                "PixelFormat": "R8G8B8X8"
-            },
-            "mac": {
-                "UUID": "{9ED87726-12AB-4BE0-9397-AD62AE56D9E2}",
-                "Name": "LoadingScreen",
-                "PixelFormat": "R8G8B8X8"
-            },
-            "provo": {
-                "UUID": "{9ED87726-12AB-4BE0-9397-AD62AE56D9E2}",
-                "Name": "LoadingScreen",
-                "PixelFormat": "R8G8B8X8"
-            }
-        }
-    }
-}

+ 0 - 64
Gems/Atom/Asset/ImageProcessingAtom/Config/Minimap.preset

@@ -1,64 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{0D2F4C31-A665-4862-9C63-9E49A58E9A37}",
-            "Name": "Minimap",
-            "SuppressEngineReduce": true,
-            "PixelFormat": "BC1",
-            "IsPowerOf2": true,
-            "SizeReduceLevel": 1,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{0D2F4C31-A665-4862-9C63-9E49A58E9A37}",
-                "Name": "Minimap",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "ASTC_6x6",
-                "IsPowerOf2": true,
-                "SizeReduceLevel": 1,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{0D2F4C31-A665-4862-9C63-9E49A58E9A37}",
-                "Name": "Minimap",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "ASTC_6x6",
-                "IsPowerOf2": true,
-                "SizeReduceLevel": 1,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{0D2F4C31-A665-4862-9C63-9E49A58E9A37}",
-                "Name": "Minimap",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true,
-                "SizeReduceLevel": 1,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{0D2F4C31-A665-4862-9C63-9E49A58E9A37}",
-                "Name": "Minimap",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true,
-                "SizeReduceLevel": 1,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 0 - 59
Gems/Atom/Asset/ImageProcessingAtom/Config/MuzzleFlash.preset

@@ -1,59 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{8BCC23A5-D08E-458E-B0B3-087C65FA1D31}",
-            "Name": "MuzzleFlash",
-            "SuppressEngineReduce": true,
-            "PixelFormat": "BC1",
-            "IsPowerOf2": true,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{8BCC23A5-D08E-458E-B0B3-087C65FA1D31}",
-                "Name": "MuzzleFlash",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "ASTC_6x6",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{8BCC23A5-D08E-458E-B0B3-087C65FA1D31}",
-                "Name": "MuzzleFlash",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "ASTC_6x6",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{8BCC23A5-D08E-458E-B0B3-087C65FA1D31}",
-                "Name": "MuzzleFlash",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{8BCC23A5-D08E-458E-B0B3-087C65FA1D31}",
-                "Name": "MuzzleFlash",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 5 - 0
Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset

@@ -11,6 +11,7 @@
             "FileMasks": [
                 "_ddn",
                 "_normal",
+                "_normalmap",
                 "_normals",
                 "_norm",
                 "_nor",
@@ -35,6 +36,7 @@
                 "FileMasks": [
                     "_ddn",
                     "_normal",
+                    "_normalmap",
                     "_normals",
                     "_norm",
                     "_nor",
@@ -59,6 +61,7 @@
                 "FileMasks": [
                     "_ddn",
                     "_normal",
+                    "_normalmap",
                     "_normals",
                     "_norm",
                     "_nor",
@@ -83,6 +86,7 @@
                 "FileMasks": [
                     "_ddn",
                     "_normal",
+                    "_normalmap",
                     "_normals",
                     "_norm",
                     "_nor",
@@ -106,6 +110,7 @@
                 "FileMasks": [
                     "_ddn",
                     "_normal",
+                    "_normalmap",
                     "_normals",
                     "_norm",
                     "_nor",

+ 0 - 86
Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsFromDisplacement.preset

@@ -1,86 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{8AE5D8D7-ECF8-4B7D-91DE-8F787E3B4210}",
-            "Name": "NormalsFromDisplacement",
-            "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "FileMasks": [
-                "_bump"
-            ],
-            "PixelFormat": "BC5s",
-            "IsPowerOf2": true,
-            "MipRenormalize": true,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{8AE5D8D7-ECF8-4B7D-91DE-8F787E3B4210}",
-                "Name": "NormalsFromDisplacement",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_bump"
-                ],
-                "PixelFormat": "ASTC_4x4",
-                "MaxTextureSize": 2048,
-                "IsPowerOf2": true,
-                "MipRenormalize": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{8AE5D8D7-ECF8-4B7D-91DE-8F787E3B4210}",
-                "Name": "NormalsFromDisplacement",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_bump"
-                ],
-                "PixelFormat": "ASTC_4x4",
-                "MaxTextureSize": 2048,
-                "IsPowerOf2": true,
-                "MipRenormalize": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{8AE5D8D7-ECF8-4B7D-91DE-8F787E3B4210}",
-                "Name": "NormalsFromDisplacement",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_bump"
-                ],
-                "PixelFormat": "BC5s",
-                "IsPowerOf2": true,
-                "MipRenormalize": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{8AE5D8D7-ECF8-4B7D-91DE-8F787E3B4210}",
-                "Name": "NormalsFromDisplacement",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_bump"
-                ],
-                "PixelFormat": "BC5s",
-                "IsPowerOf2": true,
-                "MipRenormalize": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 0 - 101
Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness_Legacy.preset

@@ -1,101 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{A92541B8-2E70-4EF1-BA88-1DC1EA2A2341}",
-            "Name": "NormalsWithSmoothness_Legacy",
-            "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "FileMasks": [
-                "_ddna"
-            ],
-            "PixelFormat": "BC5s",
-            "PixelFormatAlpha": "BC4",
-            "IsPowerOf2": true,
-            "GlossFromNormal": 1,
-            "UseLegacyGloss": true,
-            "MipRenormalize": true,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{A92541B8-2E70-4EF1-BA88-1DC1EA2A2341}",
-                "Name": "NormalsWithSmoothness_Legacy",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_ddna"
-                ],
-                "PixelFormat": "ASTC_4x4",
-                "PixelFormatAlpha": "ASTC_4x4",
-                "MaxTextureSize": 2048,
-                "IsPowerOf2": true,
-                "GlossFromNormal": 1,
-                "UseLegacyGloss": true,
-                "MipRenormalize": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{A92541B8-2E70-4EF1-BA88-1DC1EA2A2341}",
-                "Name": "NormalsWithSmoothness_Legacy",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_ddna"
-                ],
-                "PixelFormat": "ASTC_4x4",
-                "PixelFormatAlpha": "ASTC_4x4",
-                "MaxTextureSize": 2048,
-                "IsPowerOf2": true,
-                "GlossFromNormal": 1,
-                "UseLegacyGloss": true,
-                "MipRenormalize": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{A92541B8-2E70-4EF1-BA88-1DC1EA2A2341}",
-                "Name": "NormalsWithSmoothness_Legacy",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_ddna"
-                ],
-                "PixelFormat": "BC5s",
-                "PixelFormatAlpha": "BC4",
-                "IsPowerOf2": true,
-                "GlossFromNormal": 1,
-                "UseLegacyGloss": true,
-                "MipRenormalize": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{A92541B8-2E70-4EF1-BA88-1DC1EA2A2341}",
-                "Name": "NormalsWithSmoothness_Legacy",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_ddna"
-                ],
-                "PixelFormat": "BC5s",
-                "PixelFormatAlpha": "BC4",
-                "IsPowerOf2": true,
-                "GlossFromNormal": 1,
-                "UseLegacyGloss": true,
-                "MipRenormalize": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 0 - 71
Gems/Atom/Asset/ImageProcessingAtom/Config/ReflectanceWithSmoothness_Legacy.preset

@@ -1,71 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{851128B5-7454-42C4-83CE-FCFE071834C5}",
-            "Name": "ReflectanceWithSmoothness_Legacy",
-            "FileMasks": [
-                "_spec"
-            ],
-            "PixelFormat": "BC7",
-            "IsPowerOf2": true,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{851128B5-7454-42C4-83CE-FCFE071834C5}",
-                "Name": "ReflectanceWithSmoothness_Legacy",
-                "FileMasks": [
-                    "_spec"
-                ],
-                "PixelFormat": "ASTC_4x4",
-                "MaxTextureSize": 2048,
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{851128B5-7454-42C4-83CE-FCFE071834C5}",
-                "Name": "ReflectanceWithSmoothness_Legacy",
-                "FileMasks": [
-                    "_spec"
-                ],
-                "PixelFormat": "ASTC_4x4",
-                "MaxTextureSize": 2048,
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{851128B5-7454-42C4-83CE-FCFE071834C5}",
-                "Name": "ReflectanceWithSmoothness_Legacy",
-                "FileMasks": [
-                    "_spec"
-                ],
-                "PixelFormat": "BC3",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{851128B5-7454-42C4-83CE-FCFE071834C5}",
-                "Name": "ReflectanceWithSmoothness_Legacy",
-                "FileMasks": [
-                    "_spec"
-                ],
-                "PixelFormat": "BC7",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 0 - 81
Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset

@@ -1,81 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{9B2114F5-118A-4B3A-9CFE-97FA01EC8CFE}",
-            "Name": "Reflectance_Linear",
-            "DestColor": "Linear",
-            "FileMasks": [
-                "_spec",
-                "_refl"
-            ],
-            "PixelFormat": "BC1",
-            "IsPowerOf2": true,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{9B2114F5-118A-4B3A-9CFE-97FA01EC8CFE}",
-                "Name": "Reflectance_Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_spec",
-                    "_refl"
-                ],
-                "PixelFormat": "ASTC_4x4",
-                "MaxTextureSize": 2048,
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{9B2114F5-118A-4B3A-9CFE-97FA01EC8CFE}",
-                "Name": "Reflectance_Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_spec",
-                    "_refl"
-                ],
-                "PixelFormat": "ASTC_4x4",
-                "MaxTextureSize": 2048,
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{9B2114F5-118A-4B3A-9CFE-97FA01EC8CFE}",
-                "Name": "Reflectance_Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_spec",
-                    "_refl"
-                ],
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{9B2114F5-118A-4B3A-9CFE-97FA01EC8CFE}",
-                "Name": "Reflectance_Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_spec",
-                    "_refl"
-                ],
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 0 - 49
Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Font.preset

@@ -1,49 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{F34E3711-5F34-4DBC-8F5D-6340D3989F4B}",
-            "Name": "SF_Font",
-            "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "SuppressEngineReduce": true,
-            "IsPowerOf2": true
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{F34E3711-5F34-4DBC-8F5D-6340D3989F4B}",
-                "Name": "SF_Font",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "IsPowerOf2": true
-            },
-            "ios": {
-                "UUID": "{F34E3711-5F34-4DBC-8F5D-6340D3989F4B}",
-                "Name": "SF_Font",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "IsPowerOf2": true
-            },
-            "mac": {
-                "UUID": "{F34E3711-5F34-4DBC-8F5D-6340D3989F4B}",
-                "Name": "SF_Font",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "IsPowerOf2": true
-            },
-            "provo": {
-                "UUID": "{F34E3711-5F34-4DBC-8F5D-6340D3989F4B}",
-                "Name": "SF_Font",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "IsPowerOf2": true
-            }
-        }
-    }
-}

+ 0 - 49
Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Gradient.preset

@@ -1,49 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{E7F9DF56-DCB0-4683-96EE-F04DA547BE24}",
-            "Name": "SF_Gradient",
-            "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "SuppressEngineReduce": true,
-            "IsPowerOf2": true
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{E7F9DF56-DCB0-4683-96EE-F04DA547BE24}",
-                "Name": "SF_Gradient",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "IsPowerOf2": true
-            },
-            "ios": {
-                "UUID": "{E7F9DF56-DCB0-4683-96EE-F04DA547BE24}",
-                "Name": "SF_Gradient",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "IsPowerOf2": true
-            },
-            "mac": {
-                "UUID": "{E7F9DF56-DCB0-4683-96EE-F04DA547BE24}",
-                "Name": "SF_Gradient",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "IsPowerOf2": true
-            },
-            "provo": {
-                "UUID": "{E7F9DF56-DCB0-4683-96EE-F04DA547BE24}",
-                "Name": "SF_Gradient",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "IsPowerOf2": true
-            }
-        }
-    }
-}

+ 0 - 54
Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image.preset

@@ -1,54 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{189A42CB-AEE3-4B80-B276-0FDB0ECA140C}",
-            "Name": "SF_Image",
-            "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "SuppressEngineReduce": true,
-            "PixelFormat": "BC1",
-            "IsPowerOf2": true
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{189A42CB-AEE3-4B80-B276-0FDB0ECA140C}",
-                "Name": "SF_Image",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "ASTC_4x4",
-                "IsPowerOf2": true
-            },
-            "ios": {
-                "UUID": "{189A42CB-AEE3-4B80-B276-0FDB0ECA140C}",
-                "Name": "SF_Image",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "ASTC_4x4",
-                "IsPowerOf2": true
-            },
-            "mac": {
-                "UUID": "{189A42CB-AEE3-4B80-B276-0FDB0ECA140C}",
-                "Name": "SF_Image",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true
-            },
-            "provo": {
-                "UUID": "{189A42CB-AEE3-4B80-B276-0FDB0ECA140C}",
-                "Name": "SF_Image",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true
-            }
-        }
-    }
-}

+ 0 - 49
Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image_nonpower2.preset

@@ -1,49 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}",
-            "Name": "SF_Image_nonpower2",
-            "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "SuppressEngineReduce": true,
-            "PixelFormat": "BC1"
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}",
-                "Name": "SF_Image_nonpower2",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "ASTC_4x4"
-            },
-            "ios": {
-                "UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}",
-                "Name": "SF_Image_nonpower2",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "ASTC_4x4"
-            },
-            "mac": {
-                "UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}",
-                "Name": "SF_Image_nonpower2",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "BC1"
-            },
-            "provo": {
-                "UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}",
-                "Name": "SF_Image_nonpower2",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "SuppressEngineReduce": true,
-                "PixelFormat": "BC1"
-            }
-        }
-    }
-}

+ 0 - 69
Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo.preset

@@ -1,69 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{88D07159-2FC0-4CBE-82CC-A9DC258C9351}",
-            "Name": "Terrain_Albedo",
-            "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "PixelFormat": "BC1",
-            "IsPowerOf2": true,
-            "HighPassMip": 5,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{88D07159-2FC0-4CBE-82CC-A9DC258C9351}",
-                "Name": "Terrain_Albedo",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "PixelFormat": "ASTC_6x6",
-                "IsPowerOf2": true,
-                "HighPassMip": 5,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{88D07159-2FC0-4CBE-82CC-A9DC258C9351}",
-                "Name": "Terrain_Albedo",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "PixelFormat": "ASTC_6x6",
-                "IsPowerOf2": true,
-                "HighPassMip": 5,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{88D07159-2FC0-4CBE-82CC-A9DC258C9351}",
-                "Name": "Terrain_Albedo",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true,
-                "HighPassMip": 5,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{88D07159-2FC0-4CBE-82CC-A9DC258C9351}",
-                "Name": "Terrain_Albedo",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true,
-                "HighPassMip": 5,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 0 - 64
Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo_HighPassed.preset

@@ -1,64 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{7827AA52-0A7B-43E7-8CD4-55E0BC513AF1}",
-            "Name": "Terrain_Albedo_HighPassed",
-            "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "PixelFormat": "BC1",
-            "IsPowerOf2": true,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{7827AA52-0A7B-43E7-8CD4-55E0BC513AF1}",
-                "Name": "Terrain_Albedo_HighPassed",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "PixelFormat": "ASTC_6x6",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{7827AA52-0A7B-43E7-8CD4-55E0BC513AF1}",
-                "Name": "Terrain_Albedo_HighPassed",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "PixelFormat": "ASTC_6x6",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{7827AA52-0A7B-43E7-8CD4-55E0BC513AF1}",
-                "Name": "Terrain_Albedo_HighPassed",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{7827AA52-0A7B-43E7-8CD4-55E0BC513AF1}",
-                "Name": "Terrain_Albedo_HighPassed",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 0 - 54
Gems/Atom/Asset/ImageProcessingAtom/Config/Uncompressed.preset

@@ -1,54 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{E996A696-991C-4FFC-B270-F5AD408B0618}",
-            "Name": "Uncompressed",
-            "PixelFormat": "R8G8B8X8",
-            "IsPowerOf2": true,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{E996A696-991C-4FFC-B270-F5AD408B0618}",
-                "Name": "Uncompressed",
-                "PixelFormat": "R8G8B8X8",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{E996A696-991C-4FFC-B270-F5AD408B0618}",
-                "Name": "Uncompressed",
-                "PixelFormat": "R8G8B8X8",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{E996A696-991C-4FFC-B270-F5AD408B0618}",
-                "Name": "Uncompressed",
-                "PixelFormat": "R8G8B8X8",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{E996A696-991C-4FFC-B270-F5AD408B0618}",
-                "Name": "Uncompressed",
-                "PixelFormat": "R8G8B8X8",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}

+ 0 - 65
Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_diff.png.imagesettings

@@ -1,65 +0,0 @@
-<ObjectStream version="3">
-	<Class name="TextureSettings" version="1" type="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}">
-		<Class name="AZ::Uuid" field="PresetID" value="{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		<Class name="bool" field="EngineReduce" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		<Class name="bool" field="EnableMipmap" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		</Class>
-		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		<Class name="unsigned int" field="MipMapGenType" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{B2CCA964-7EF4-5D2C-9287-3459190A2409}">
-			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}"/>
-				</Class>
-			</Class>
-			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000000000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-					</Class>
-				</Class>
-			</Class>
-			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000000000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000100000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-					</Class>
-				</Class>
-			</Class>
-			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}"/>
-				</Class>
-			</Class>
-		</Class>
-		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-	</Class>
-</ObjectStream>
-

+ 0 - 126
Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Textures/Cowboy_01_ddna.tif.imagesettings

@@ -1,126 +0,0 @@
-<ObjectStream version="3">
-	<Class name="TextureSettings" version="1" type="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}">
-		<Class name="AZ::Uuid" field="PresetID" value="{6EE749F4-846E-4F7A-878C-F211F85EA59F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-		<Class name="unsigned int" field="SizeReduceLevel" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		<Class name="bool" field="EngineReduce" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		<Class name="bool" field="EnableMipmap" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		</Class>
-		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		<Class name="unsigned int" field="MipMapGenType" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{B2CCA964-7EF4-5D2C-9287-3459190A2409}">
-			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="3A6E1B7100000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="00000000031B03AAAB3F5C475A669EBCD5FA4DB353C96573330000" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000200000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000300000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000000000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="245A331800000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="00000000031C43DA906B7DEF4CA89790854106D3F983000000000000" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000100000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-					</Class>
-				</Class>
-			</Class>
-			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="3A6E1B7100000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="00000000031B03AAAB3F5C475A669EBCD5FA4DB353C9696F730000" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000200000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000300000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000000000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="245A331800000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="00000000031C43DA906B7DEF4CA89790854106D3F983000000000000" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000100000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-					</Class>
-				</Class>
-			</Class>
-			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="3A6E1B7100000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="00000000031E03AAAB3F5C475A669EBCD5FA4DB353C96F73785F676C0000" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000200000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000300000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000000000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="245A331800000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="00000000031C43DA906B7DEF4CA89790854106D3F983000000000000" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000100000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-					</Class>
-				</Class>
-			</Class>
-			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}"/>
-				</Class>
-			</Class>
-		</Class>
-		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-	</Class>
-</ObjectStream>
-

+ 0 - 126
Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Textures/Cowboy_01_spec.tif.imagesettings

@@ -1,126 +0,0 @@
-<ObjectStream version="3">
-	<Class name="TextureSettings" version="1" type="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}">
-		<Class name="AZ::Uuid" field="PresetID" value="{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-		<Class name="unsigned int" field="SizeReduceLevel" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		<Class name="bool" field="EngineReduce" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		</Class>
-		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		<Class name="unsigned int" field="MipMapGenType" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{B2CCA964-7EF4-5D2C-9287-3459190A2409}">
-			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="3A6E1B7100000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="00000000031B03AAAB3F5C475A669EBCD5FA4DB353C96573330000" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000200000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000300000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000000000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="245A331800000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="00000000031C43DA906B7DEF4CA89790854106D3F983000000000000" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000100000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-					</Class>
-				</Class>
-			</Class>
-			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="3A6E1B7100000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="00000000031B03AAAB3F5C475A669EBCD5FA4DB353C9696F730000" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000200000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000000000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000300000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="245A331800000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="00000000031C43DA906B7DEF4CA89790854106D3F983000000000000" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000100000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-					</Class>
-				</Class>
-			</Class>
-			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="3A6E1B7100000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="00000000031E03AAAB3F5C475A669EBCD5FA4DB353C96F73785F676C0000" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000200000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000300000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000000000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="245A331800000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="00000000031C43DA906B7DEF4CA89790854106D3F983000000000000" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{07DEDB71-0585-5BE6-83FF-1C9029B9E5DB}">
-							<Class name="AddressType" field="value1" value="CC377C37000000000100000000000000" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="ByteStream" field="value2" value="" type="{ADFD596B-7177-5519-9752-BC418FE42963}"/>
-						</Class>
-					</Class>
-				</Class>
-			</Class>
-			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}"/>
-				</Class>
-			</Class>
-		</Class>
-		<Class name="AZStd::string" field="OverridingPlatform" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-	</Class>
-</ObjectStream>
-

+ 0 - 1
Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_a_pressed.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0

+ 0 - 1
Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_a_unpressed.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0

+ 0 - 1
Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_b_pressed.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0

+ 0 - 1
Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_b_unpressed.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0

+ 0 - 1
Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_x_pressed.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0

+ 0 - 1
Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_x_unpressed.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0

+ 0 - 1
Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_y_pressed.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0

+ 0 - 1
Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_button_y_unpressed.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0

+ 0 - 1
Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_thumbstick_centre.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0

+ 0 - 1
Gems/VirtualGamepad/Assets/UI/Textures/VirtualGamepad/virtual_gamepad_thumbstick_radial.tif.exportsettings

@@ -1 +0,0 @@
-/autooptimizefile=0 /dns=1 /preset=ReferenceImage_Linear /reduce=0 /ser=0