Removal last CryTek references
- 'Crytek application' is now 'O3DE application' in ISystem.h - 'CryTek' is now 'O3DE' in ProjectDefines.h (comment) - 'Crytek Legacy' is now 'O3DE Legacy' in LocalizedStringManager.cpp - 'Crytek extended data' references are now 'O3DE extended data' Signed-off-by: spham <spham@amazon.com>
This commit is contained in:
Steve Pham
GitHub
@@ -11,7 +11,7 @@
|
||||
<LastPrinted>2006-02-22T12:05:03Z</LastPrinted>
|
||||
<Created>2005-10-12T15:13:39Z</Created>
|
||||
<LastSaved>2014-04-08T17:21:06Z</LastSaved>
|
||||
<Company>Crytek</Company>
|
||||
<Company>Contributors to the Open 3D Engine Project</Company>
|
||||
<Version>12.00</Version>
|
||||
</DocumentProperties>
|
||||
<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
|
||||
|
||||
@@ -9,7 +9,4 @@
|
||||
|
||||
#include <AzCore/PlatformDef.h>
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// CryTek
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <platform.h>
|
||||
|
||||
@@ -143,8 +143,6 @@ private:
|
||||
// Registered Tool Names
|
||||
TToolNamesMap m_toolNames;
|
||||
TToolNamesMap m_toolVersions;
|
||||
|
||||
//static B4BugCrytekExtension s_b4BugCrytekExtension;
|
||||
};
|
||||
|
||||
#endif // CRYINCLUDE_EDITOR_SETTINGSMANAGER_H
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
*/
|
||||
|
||||
|
||||
// Description : Implementation of the Crytek package files management
|
||||
|
||||
|
||||
#include <AzCore/base.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:
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -5,8 +5,7 @@
|
||||
//--------------------------------------------------------------------------------------
|
||||
// (C) 2005 ATI Research, Inc., All rights reserved.
|
||||
//--------------------------------------------------------------------------------------
|
||||
// modifications by Crytek GmbH
|
||||
// modifications by Amazon
|
||||
// Modified from original
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
Reference in New Issue
Block a user