ImageProcessingAtom

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-13 12:41:45 -07:00
parent 5e15d91d76
commit 89b13513ef
71 changed files with 24 additions and 101 deletions
@@ -6,6 +6,7 @@
 */
 #pragma once

+#include <AzCore/RTTI/RTTI.h>

 namespace ImageProcessingAtom
 {
@@ -5,7 +5,6 @@
 *
 */

-#include "ImageProcessing_precompiled.h"

 #include "BuilderSettingManager.h"
 #include <QDirIterator>
@@ -4,7 +4,6 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include "ImageProcessing_precompiled.h"
 #include <BuilderSettings/BuilderSettings.h>
 #include <AzCore/Serialization/SerializeContext.h>

@@ -5,7 +5,6 @@
 *
 */

-#include "ImageProcessing_precompiled.h"
 #include <BuilderSettings/CubemapSettings.h>
 #include <AzCore/Serialization/SerializeContext.h>

@@ -5,7 +5,6 @@
 *
 */

-#include "ImageProcessing_precompiled.h"
 #include <BuilderSettings/MipmapSettings.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
@@ -5,7 +5,6 @@
 *
 */

-#include "ImageProcessing_precompiled.h"
 #include <BuilderSettings/PresetSettings.h>
 #include <Processing/PixelFormatInfo.h>

@@ -5,7 +5,6 @@
 *
 */

-#include "ImageProcessing_precompiled.h"
 #include <BuilderSettings/TextureSettings.h>
 #include <AzCore/RTTI/ReflectContext.h>
 #include <AzCore/Serialization/EditContext.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Atom/ImageProcessing/ImageObject.h>
 #include <Processing/ImageToProcess.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Compressors/CTSquisher.h>
 #include <Compressors/PVRTC.h>
@@ -6,7 +6,6 @@
 */


-#include <ImageProcessing_precompiled.h>

 #include <AzCore/Math/MathUtils.h>

@@ -6,7 +6,6 @@
 */


-#include <ImageProcessing_precompiled.h>

 #include <AzCore/Math/MathUtils.h>

@@ -6,7 +6,6 @@
 */


-#include <ImageProcessing_precompiled.h>

 #include <AzCore/Math/MathUtils.h>

@@ -5,9 +5,10 @@
 *
 */

-
 #pragma once

+#include <ImageBuilderBaseType.h>
+
 namespace ImageProcessingAtom
 {
    // 32 bit 8888 RGBA color
@@ -6,7 +6,6 @@
 */


-#include <ImageProcessing_precompiled.h>
 #include <ImageProcessing_Traits_Platform.h>
 #include "ColorBlockRGBA4x4c.h"
 #include "ColorBlockRGBA4x4s.h"
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Atom/ImageProcessing/ImageObject.h>
 #include <Processing/PixelFormatInfo.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <AzCore/std/function/function_template.h>

@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>
 #include <ImageProcessing_Traits_Platform.h>
 #include <Atom/ImageProcessing/ImageObject.h>
 #include <Processing/ImageFlags.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Processing/ImageObjectImpl.h>
 #include <Processing/ImageConvert.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Processing/ImageObjectImpl.h>
 #include <Processing/ImageToProcess.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Processing/ImageFlags.h>
 #include <Processing/ImageObjectImpl.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Processing/ImageObjectImpl.h>
 #include <Processing/ImageToProcess.h>
@@ -7,6 +7,8 @@

 #pragma once

+#include <ImageBuilderBaseType.h>
+
 namespace ImageProcessingAtom
 {
    // note: O3DE is right hand Z up coordinate
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <AzCore/Memory/OSAllocator.h>
 #include <AzCore/base.h>
@@ -5,11 +5,9 @@
 *
 */

-
-#include <ImageProcessing_precompiled.h>
-
 #include <math.h>
 #include "FIR-Weights.h"
+#include <AzCore/Debug/Trace.h>

 /* ####################################################################################################################
 */
@@ -4,7 +4,6 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include <ImageProcessing_precompiled.h>

 #include <Atom/ImageProcessing/ImageObject.h>
 #include <Processing/ImageToProcess.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Processing/ImageObjectImpl.h>
 #include <Processing/ImageToProcess.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Atom/ImageProcessing/PixelFormats.h>
 #include <Atom/ImageProcessing/ImageObject.h>
@@ -6,7 +6,6 @@
 */


-#include <ImageProcessing_precompiled.h>

 #include <Processing/ImageObjectImpl.h>
 #include <Processing/ImageFlags.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <AzCore/std/smart_ptr/make_shared.h>

@@ -8,6 +8,7 @@
 #pragma once

 #include <Atom/ImageProcessing/PixelFormats.h>
+#include <ImageBuilderBaseType.h>

 namespace ImageProcessingAtom
 {
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>
 #include <ImageProcessing_Traits_Platform.h>
 #include <Editor/EditorCommon.h>
 #include <Processing/ImageToProcess.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>
 #include "ImagePopup.h"

 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>
 #include "MipmapSettingWidget.h"
 #include <Source/Editor/ui_MipmapSettingWidget.h>

@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>
 #include "PresetInfoPopup.h"
 #include <Source/Editor/ui_PresetInfoPopup.h>
 #include <BuilderSettings/PresetSettings.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>
 #include "ResolutionSettingItemWidget.h"
 #include <Source/Editor/ui_ResolutionSettingItemWidget.h>
 #include <BuilderSettings/PresetSettings.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>
 #include "ResolutionSettingWidget.h"
 #include <Source/Editor/ui_ResolutionSettingWidget.h>
 #include <QVBoxLayout>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>
 #include "TexturePresetSelectionWidget.h"
 #include <Source/Editor/ui_TexturePresetSelectionWidget.h>

@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>
 #include "TexturePreviewWidget.h"
 #include <Processing/PixelFormatInfo.h>
 #include <Atom/ImageProcessing/ImageObject.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>
 #include "TexturePropertyEditor.h"

 // warning C4251: 'QBrush::d': class 'QScopedPointer<QBrushData,QBrushDataPointerDeleter>' needs to have dll-interface to be used by clients of class 'QBrush'
@@ -8,6 +8,7 @@
 #pragma once

 #if !defined(Q_MOC_RUN)
+#include <AzCore/PlatformDef.h>
 // warning C4251: 'QBrush::d': class 'QScopedPointer<QBrushData,QBrushDataPointerDeleter>' needs to have dll-interface to be used by clients of class 'QBrush'
 // warning C4800: 'uint': forcing value to bool 'true' or 'false' (performance warning)
 AZ_PUSH_DISABLE_WARNING(4800 4251, "-Wunknown-warning-option")
@@ -5,7 +5,6 @@
 *
 */

-#include "ImageProcessing_precompiled.h"
 #include <ImageBuilderComponent.h>
 #include <AzCore/std/string/conversions.h>
 #include <AzCore/Serialization/SerializeContext.h>
@@ -5,7 +5,6 @@
 *
 */

-#include "ImageProcessing_precompiled.h"

 #include <AzCore/Debug/Trace.h>
 #include <AzCore/Math/MathUtils.h>
@@ -5,7 +5,6 @@
 *
 */

-#include "ImageProcessing_precompiled.h"

 #include <ImageLoader/ImageLoaders.h>
 #include <Atom/ImageProcessing/ImageObject.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <ImageLoader/ImageLoaders.h>
 #include <Atom/ImageProcessing/ImageObject.h>
@@ -4,10 +4,10 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include "ImageProcessing_precompiled.h"

 #include <ImageLoader/ImageLoaders.h>
 #include <Atom/ImageProcessing/ImageObject.h>
+#include <ImageBuilderBaseType.h>

 //  warning C4251: class QT_Type needs to have dll-interface to be used by clients of class 'QT_Type'
 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
@@ -5,7 +5,6 @@
 *
 */

-#include "ImageProcessing_precompiled.h"

 #include <AzCore/Debug/Trace.h>
 #include <AzCore/Math/MathUtils.h>
@@ -5,7 +5,6 @@
 *
 */

-#include "ImageProcessing_precompiled.h"
 #include <AzCore/Module/Module.h>
 #include "ImageProcessingSystemComponent.h"
 #include "ImageBuilderComponent.h"
@@ -5,7 +5,6 @@
 *
 */

-#include "ImageProcessing_precompiled.h"

 #include <Atom/RPI.Reflect/Image/StreamingImageAsset.h>

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-/////////////////////////////////////////////////////////////////////////////
-// Qt
-/////////////////////////////////////////////////////////////////////////////
-#include <QWidget>
-#include <QMainWindow>
-#include <QApplication>
-
-/////////////////////////////////////////////////////////////////////////////
-// AZCore
-/////////////////////////////////////////////////////////////////////////////
-#include <AzCore/Math/Color.h>
-#include <AzCore/Math/Vector4.h>
-#include <AzCore/Memory/Memory.h>
-#include <AzCore/Debug/Trace.h>
-#include <AzCore/PlatformIncl.h>
-
-/////////////////////////////////////////////////////////////////////////////
-//Type definitions
-/////////////////////////////////////////////////////////////////////////////
-#include <ImageBuilderBaseType.h>
@@ -4,10 +4,9 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include <ImageProcessing_precompiled.h>

+#include <AzCore/PlatformDef.h>
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
-
 #include <Source/Previewer/ImagePreviewer.h>
 #include <Source/Previewer/ui_ImagePreviewer.h>
 #include <Editor/EditorCommon.h>
@@ -4,8 +4,8 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include <ImageProcessing_precompiled.h>

+#include <AzCore/PlatformDef.h>
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT

 #include <Source/Previewer/ImagePreviewer.h>
@@ -6,9 +6,11 @@
 */

 #pragma once
+
 #include <AzCore/Math/Color.h>
 #include <AzCore/std/algorithm.h>
 #include <ImageProcessing_Traits_Platform.h>
+#include <ImageBuilderBaseType.h>

 #define IMAGE_BUIDER_MAKEFOURCC(ch0, ch1, ch2, ch3)           \
    ((AZ::u32)(AZ::u8)(ch0) | ((AZ::u32)(AZ::u8)(ch1) << 8) | \
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Processing/ImageAssetProducer.h>
 #include <Processing/ImageObjectImpl.h>
@@ -5,8 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>
-
 #include <Processing/PixelFormatInfo.h>
 #include <Processing/ImageToProcess.h>
 #include <Processing/ImageConvert.h>
@@ -24,10 +22,6 @@

 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>

-// qt has convenience functions to handle file
-#include <qfile.h>
-#include <qdir.h>
-
 // for texture splitting
 // minimum number of low level mips will be saved in the base file.
 #define MinPersistantMips 3
@@ -20,6 +20,7 @@
 #include <AzCore/Asset/AssetCommon.h>

 #include <AssetBuilderSDK/AssetBuilderSDK.h>
+#include <ImageBuilderBaseType.h>

 namespace ImageProcessingAtom
 {
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Processing/ImageConvertJob.h>
 #include <Processing/PixelFormatInfo.h>
@@ -7,6 +7,8 @@

 #pragma once

+#include <AzCore/base.h>
+
 namespace ImageProcessingAtom
 {
    // flags to propagate from the RC to the engine through GetImageFlags()
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Processing/ImageObjectImpl.h>
 #include <Processing/PixelFormatInfo.h>
@@ -5,8 +5,7 @@
 *
 */

-#include <ImageProcessing_precompiled.h>
-
+#include <AzCore/PlatformIncl.h>
 #include <Processing/ImagePreview.h>
 #include <BuilderSettings/BuilderSettingManager.h>
 #include <ImageLoader/ImageLoaders.h>
@@ -10,6 +10,7 @@
 #include <Atom/ImageProcessing/PixelFormats.h>
 #include <Atom/ImageProcessing/ImageObject.h>
 #include <Compressors/Compressor.h>
+#include <ImageBuilderBaseType.h>

 namespace ImageProcessingAtom
 {
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Processing/PixelFormatInfo.h>
 #include <Processing/DDSHeader.h>
@@ -14,6 +14,8 @@
 #include <AzCore/std/containers/map.h>
 #include <AzCore/std/string/string.h>

+#include <ImageBuilderBaseType.h>
+
 namespace ImageProcessingAtom
 {
    //The original implementation was from cryhalf's CryConvertFloatToHalf and CryConvertHalfToFloat function
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <Atom/RPI.Reflect/Image/StreamingImageAsset.h>
 #include <Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h>
@@ -5,7 +5,6 @@
 *
 */

-#include "ImageProcessing_precompiled.h"

 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
@@ -5,7 +5,6 @@
 *
 */

-#include <ImageProcessing_precompiled.h>

 #include <AzTest/AzTest.h>
 #include <AzTest/Utils.h>
@@ -6,7 +6,6 @@
 #

 set(FILES
-    Source/ImageProcessing_precompiled.h
    Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp
    Source/Compressors/CryTextureSquisher/CryTextureSquisher.h
    Include/Atom/ImageProcessing/ImageProcessingBus.h
@@ -8,7 +8,6 @@
 //=============================================================================
 // Modified from original

-#include <ImageProcessing_precompiled.h>

 #include "CBBoxInt32.h"

@@ -9,6 +9,8 @@

 #pragma once

+#include <ImageBuilderBaseType.h>
+
 namespace ImageProcessingAtom
 {
    //bounding box class with coords specified as int32
@@ -3,7 +3,6 @@
 //=============================================================================
 // Modified from original

-#include <ImageProcessing_precompiled.h>
 #include "CCubeMapProcessor.h"

 #include <AzCore/std/bind/bind.h>
@@ -14,11 +14,8 @@
 //--------------------------------------------------------------------------------------
 // Modified from original

-#include <ImageProcessing_precompiled.h>
-
 #include "CImageSurface.h"

-
 namespace ImageProcessingAtom
 {
    //--------------------------------------------------------------------------------------
@@ -275,7 +272,7 @@ namespace ImageProcessingAtom

        SAFE_DELETE_ARRAY(m_ImgData);   //safe delete old image data

-        m_ImgData = new(std::nothrow) CP_ITYPE[m_Width * m_Height * m_NumChannels];   //assume tight data packing
+        m_ImgData = new CP_ITYPE[m_Width * m_Height * m_NumChannels];   //assume tight data packing
        if (!m_ImgData)
        {
            FatalError(L"Unable to allocate data for image in CImageSurface::Init.");
@@ -13,7 +13,7 @@
 #include <stdio.h>

 #include "VectorMacros.h"
-
+#include <ImageBuilderBaseType.h>

 #ifndef WCHAR 
 #define WCHAR wchar_t