diff --git a/Assets/Engine/Libs/MaterialEffects/materialeffects.xml b/Assets/Engine/Libs/MaterialEffects/materialeffects.xml
index 04977c9e80..a7f1c43958 100644
--- a/Assets/Engine/Libs/MaterialEffects/materialeffects.xml
+++ b/Assets/Engine/Libs/MaterialEffects/materialeffects.xml
@@ -11,7 +11,7 @@
2006-02-22T12:05:03Z
2005-10-12T15:13:39Z
2014-04-08T17:21:06Z
- Crytek
+ Contributors to the Open 3D Engine Project
12.00
diff --git a/Code/Editor/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.h b/Code/Editor/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.h
index 16785f74d7..aa9b430dc0 100644
--- a/Code/Editor/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.h
+++ b/Code/Editor/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.h
@@ -9,7 +9,4 @@
#include
-/////////////////////////////////////////////////////////////////////////////
-// CryTek
-/////////////////////////////////////////////////////////////////////////////
#include
diff --git a/Code/Editor/SettingsManager.h b/Code/Editor/SettingsManager.h
index 2a85b7566d..a67599959b 100644
--- a/Code/Editor/SettingsManager.h
+++ b/Code/Editor/SettingsManager.h
@@ -143,8 +143,6 @@ private:
// Registered Tool Names
TToolNamesMap m_toolNames;
TToolNamesMap m_toolVersions;
-
- //static B4BugCrytekExtension s_b4BugCrytekExtension;
};
#endif // CRYINCLUDE_EDITOR_SETTINGSMANAGER_H
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
index 8958c996a2..092dfc9527 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
@@ -6,8 +6,6 @@
*/
-// Description : Implementation of the Crytek package files management
-
#include
diff --git a/Code/Legacy/CryCommon/ISystem.h b/Code/Legacy/CryCommon/ISystem.h
index c3b0b591dc..67a7991d4e 100644
--- a/Code/Legacy/CryCommon/ISystem.h
+++ b/Code/Legacy/CryCommon/ISystem.h
@@ -1027,7 +1027,7 @@ struct ISystem
virtual void SetUIDrawEnabled(bool enabled) = 0;
// Summary:
- // Get the index of the currently running Crytek application. (0 = first instance, 1 = second instance, etc)
+ // Get the index of the currently running O3DE application. (0 = first instance, 1 = second instance, etc)
virtual int GetApplicationInstance() = 0;
// Summary:
diff --git a/Code/Legacy/CryCommon/ProjectDefines.h b/Code/Legacy/CryCommon/ProjectDefines.h
index 8cf4c472e0..0d98dd73e2 100644
--- a/Code/Legacy/CryCommon/ProjectDefines.h
+++ b/Code/Legacy/CryCommon/ProjectDefines.h
@@ -129,7 +129,7 @@ typedef uint32 vtx_idx;
-//This feature allows automatic crash submission to JIRA, but does not work outside of CryTek
+//This feature allows automatic crash submission to JIRA, but does not work outside of O3DE
//Note: This #define will be commented out during code export
#define ENABLE_CRASH_HANDLER
diff --git a/Code/Legacy/CrySystem/LocalizedStringManager.cpp b/Code/Legacy/CrySystem/LocalizedStringManager.cpp
index 64489cb4fd..952b51e64e 100644
--- a/Code/Legacy/CrySystem/LocalizedStringManager.cpp
+++ b/Code/Legacy/CrySystem/LocalizedStringManager.cpp
@@ -197,7 +197,7 @@ CLocalizedStringsManager::CLocalizedStringsManager(ISystem* pSystem)
REGISTER_CVAR2(c_sys_localization_format, &m_cvarLocalizationFormat, 1, VF_NULL,
"Usage: sys_localization_format [0..1]\n"
- " 0: Crytek Legacy Localization (Excel 2003)\n"
+ " 0: O3DE Legacy Localization (Excel 2003)\n"
" 1: AGS XML\n"
"Default is 1 (AGS Xml)");
//Check that someone hasn't added a language ID without a language name
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp
index 1c56dbd1d0..fa1a6c55a8 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp
@@ -414,7 +414,7 @@ namespace ImageProcessingAtom
AZ::u32 marker = 0;
fileLoadStream.Read(4, &marker);
- if (marker == FOURCC_CExt) // marker for the start of Crytek Extended data
+ if (marker == FOURCC_CExt) // marker for the start of O3DE Extended data
{
fileLoadStream.Read(4, &marker);
if (FOURCC_AttC == marker) // Attached Channel chunk
@@ -426,7 +426,7 @@ namespace ImageProcessingAtom
fileLoadStream.Read(4, &marker);
}
- if (FOURCC_CEnd == marker) // marker for the end of Crytek Extended data
+ if (FOURCC_CEnd == marker) // marker for the end of O3DE Extended data
{
fileLoadStream.Read(4, &marker);
}
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h
index 13f1c73985..20790939fb 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h
@@ -148,7 +148,7 @@ namespace ImageProcessingAtom
AZ::u32 dwDepth; // only if DDS_HEADER_FLAGS_VOLUME is set in dwHeaderFlags
AZ::u32 dwMipMapCount;
AZ::u32 dwAlphaBitDepth;
- AZ::u32 dwReserved1; // Crytek image flags
+ AZ::u32 dwReserved1; // Image flags
float fAvgBrightness; // Average top mip brightness. Could be f16/half
float cMinColor[4];
float cMaxColor[4];
@@ -230,8 +230,8 @@ namespace ImageProcessingAtom
};
// chunk identifier
- const static AZ::u32 FOURCC_CExt = IMAGE_BUIDER_MAKEFOURCC('C', 'E', 'x', 't'); // Crytek extension start
- const static AZ::u32 FOURCC_CEnd = IMAGE_BUIDER_MAKEFOURCC('C', 'E', 'n', 'd'); // Crytek extension end
+ const static AZ::u32 FOURCC_CExt = IMAGE_BUIDER_MAKEFOURCC('C', 'E', 'x', 't'); // O3DE extension start
+ const static AZ::u32 FOURCC_CEnd = IMAGE_BUIDER_MAKEFOURCC('C', 'E', 'n', 'd'); // O3DE extension end
const static AZ::u32 FOURCC_AttC = IMAGE_BUIDER_MAKEFOURCC('A', 't', 't', 'C'); // Chunk Attached Channel
//Fourcc for pixel formats which aren't supported by dx10, such as astc formats, etc formats, pvrtc formats
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
index 667fc9f8bc..e3b6ac41ee 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
@@ -350,7 +350,7 @@ namespace ImageProcessingAtom
if (bOk && alphaImage && !hasSplitFlag)
{
//4 bytes extension tag, 4 bytes attached alpha tag, then 4 bytes of chunk size
- fileSaveStream.Write(sizeof(FOURCC_CExt), &FOURCC_CExt); // marker for the start of Crytek Extended data
+ fileSaveStream.Write(sizeof(FOURCC_CExt), &FOURCC_CExt); // marker for the start of O3DE Extended data
fileSaveStream.Write(sizeof(FOURCC_AttC), &FOURCC_AttC); // Attached Channel chunk
uint32_t size = 0;
@@ -368,7 +368,7 @@ namespace ImageProcessingAtom
fileSaveStream.Write(sizeBytes, &size);
fileSaveStream.Seek(endPos, AZ::IO::GenericStream::ST_SEEK_BEGIN);
- // marker for the end of Crytek Extended data
+ // marker for the end of O3DE Extended data
fileSaveStream.Write(sizeof(FOURCC_CEnd), &FOURCC_CEnd);
}
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp
index 30e0573c16..5effe56867 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp
@@ -202,7 +202,7 @@ namespace ImageProcessingAtom
// Data in a Float format is floating point data.
InitPixelFormat(ePixelFormat_R9G9B9E5, PixelFormatInfo(32, 3, false, "0", 1, 1, 1, 1, 32, false, DXGI_FORMAT_R9G9B9E5_SHAREDEXP, FOURCC_DX10, ESampleType::eSampleType_Compressed, "R9G9B9E5", "32-bit RGB pixel format with shared exponent", false, true));
InitPixelFormat(ePixelFormat_R32G32B32A32F, PixelFormatInfo(128, 4, true, "23", 1, 1, 1, 1, 128, false, DXGI_FORMAT_R32G32B32A32_FLOAT, FOURCC_DX10, ESampleType::eSampleType_Float, "R32G32B32A32F", "four float channels", false, false));
- InitPixelFormat(ePixelFormat_R32G32F, PixelFormatInfo(64, 2, false, "0", 1, 1, 1, 1, 64, false, DXGI_FORMAT_R32G32_FLOAT, FOURCC_DX10, ESampleType::eSampleType_Float, "R32G32F", "two float channels", false, false)); // FIXME: This should be eTF_R32G32F, but CryTek did not add that enum to ITexture.h yet
+ InitPixelFormat(ePixelFormat_R32G32F, PixelFormatInfo(64, 2, false, "0", 1, 1, 1, 1, 64, false, DXGI_FORMAT_R32G32_FLOAT, FOURCC_DX10, ESampleType::eSampleType_Float, "R32G32F", "two float channels", false, false)); // FIXME: This should be eTF_R32G32F, but that enum is not in ITexture.h yet
InitPixelFormat(ePixelFormat_R32F, PixelFormatInfo(32, 1, false, "0", 1, 1, 1, 1, 32, false, DXGI_FORMAT_R32_FLOAT, FOURCC_DX10, ESampleType::eSampleType_Float, "R32F", "one float channel", false, false));
InitPixelFormat(ePixelFormat_R16G16B16A16F, PixelFormatInfo(64, 4, true, "10", 1, 1, 1, 1, 64, false, DXGI_FORMAT_R16G16B16A16_FLOAT, FOURCC_DX10, ESampleType::eSampleType_Half, "R16G16B16A16F", "four half channels", false, false));
InitPixelFormat(ePixelFormat_R16G16F, PixelFormatInfo(32, 2, false, "0", 1, 1, 1, 1, 32, false, DXGI_FORMAT_R16G16_FLOAT, FOURCC_DX10, ESampleType::eSampleType_Half, "R16G16F", "two half channel", false, false));
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h
index 33644372a3..6ad8f68ebc 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h
@@ -5,8 +5,7 @@
//--------------------------------------------------------------------------------------
// (C) 2005 ATI Research, Inc., All rights reserved.
//--------------------------------------------------------------------------------------
-// modifications by Crytek GmbH
-// modifications by Amazon
+// Modified from original
#pragma once