TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #601 from BeamNG/rename_GFXTextureProfile_None

Browse source 
Rename enum GFXTextureProfile::None for avoid conficts on Linux.
This commit is contained in:
Daniel Buckmaster 2014-05-10 11:01:18 +10:00
commit a42c92391a
13 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gfx/gFont.cpp
View file

@ -42,7 +42,7 @@ GFX_ImplementTextureProfile(GFXFontTextureProfile,
GFXTextureProfile::Static |
GFXTextureProfile::KeepBitmap |
GFXTextureProfile::NoMipmap,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
template<> void *Resource<GFont>::create(const Torque::Path &path)
{

2
Engine/source/gfx/gfxTextureManager.cpp
View file

@ -1031,7 +1031,7 @@ void GFXTextureManager::_validateTexParams( const U32 width, const U32 height,
// If the format is non-compressed, and the profile requests a compressed format
// than change the format.
GFXFormat testingFormat = inOutFormat;
if( profile->getCompression() != GFXTextureProfile::None )
if( profile->getCompression() != GFXTextureProfile::NONE )
{
const int offset = profile->getCompression() - GFXTextureProfile::DXT1;
testingFormat = GFXFormat( GFXFormatDXT1 + offset );

12
Engine/source/gfx/gfxTextureProfile.cpp
View file

@ -34,15 +34,15 @@
GFX_ImplementTextureProfile(GFXDefaultRenderTargetProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::RenderTarget,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultStaticDiffuseProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::Static,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultStaticNormalMapProfile,
GFXTextureProfile::NormalMap,
GFXTextureProfile::Static,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultStaticDXT5nmProfile,
GFXTextureProfile::NormalMap,
GFXTextureProfile::Static,
@ -50,15 +50,15 @@ GFX_ImplementTextureProfile(GFXDefaultStaticDXT5nmProfile,
GFX_ImplementTextureProfile(GFXDefaultPersistentProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::Static | GFXTextureProfile::KeepBitmap,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXSystemMemProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::SystemMemory,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultZTargetProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::ZTarget | GFXTextureProfile::NoDiscard,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
//-----------------------------------------------------------------------------

4
Engine/source/gfx/gfxTextureProfile.h
View file

@ -106,7 +106,7 @@ public:
enum Compression
{
None,
NONE,
DXT1,
DXT2,
DXT3,
@ -114,7 +114,7 @@ public:
DXT5,
};
GFXTextureProfile(const String &name, Types type, U32 flags, Compression compression = None);
GFXTextureProfile(const String &name, Types type, U32 flags, Compression compression = NONE);
// Accessors
String getName() const { return mName; };

2
Engine/source/gfx/video/theoraTexture.cpp
View file

@ -60,7 +60,7 @@
GFX_ImplementTextureProfile( GFXTheoraTextureProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::NoMipmap | GFXTextureProfile::Dynamic,
GFXTextureProfile::None );
GFXTextureProfile::NONE );
//-----------------------------------------------------------------------------