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

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::Static |
GFXTextureProfile::KeepBitmap | GFXTextureProfile::KeepBitmap |
GFXTextureProfile::NoMipmap, GFXTextureProfile::NoMipmap,
GFXTextureProfile::None); GFXTextureProfile::NONE);
template<> void *Resource<GFont>::create(const Torque::Path &path) 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 // If the format is non-compressed, and the profile requests a compressed format
// than change the format. // than change the format.
GFXFormat testingFormat = inOutFormat; GFXFormat testingFormat = inOutFormat;
if( profile->getCompression() != GFXTextureProfile::None ) if( profile->getCompression() != GFXTextureProfile::NONE )
{ {
const int offset = profile->getCompression() - GFXTextureProfile::DXT1; const int offset = profile->getCompression() - GFXTextureProfile::DXT1;
testingFormat = GFXFormat( GFXFormatDXT1 + offset ); testingFormat = GFXFormat( GFXFormatDXT1 + offset );

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

@ -34,15 +34,15 @@
GFX_ImplementTextureProfile(GFXDefaultRenderTargetProfile, GFX_ImplementTextureProfile(GFXDefaultRenderTargetProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::RenderTarget, GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::RenderTarget,
GFXTextureProfile::None); GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultStaticDiffuseProfile, GFX_ImplementTextureProfile(GFXDefaultStaticDiffuseProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::Static, GFXTextureProfile::Static,
GFXTextureProfile::None); GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultStaticNormalMapProfile, GFX_ImplementTextureProfile(GFXDefaultStaticNormalMapProfile,
GFXTextureProfile::NormalMap, GFXTextureProfile::NormalMap,
GFXTextureProfile::Static, GFXTextureProfile::Static,
GFXTextureProfile::None); GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultStaticDXT5nmProfile, GFX_ImplementTextureProfile(GFXDefaultStaticDXT5nmProfile,
GFXTextureProfile::NormalMap, GFXTextureProfile::NormalMap,
GFXTextureProfile::Static, GFXTextureProfile::Static,
@ -50,15 +50,15 @@ GFX_ImplementTextureProfile(GFXDefaultStaticDXT5nmProfile,
GFX_ImplementTextureProfile(GFXDefaultPersistentProfile, GFX_ImplementTextureProfile(GFXDefaultPersistentProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::Static | GFXTextureProfile::KeepBitmap, GFXTextureProfile::PreserveSize | GFXTextureProfile::Static | GFXTextureProfile::KeepBitmap,
GFXTextureProfile::None); GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXSystemMemProfile, GFX_ImplementTextureProfile(GFXSystemMemProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::SystemMemory, GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::SystemMemory,
GFXTextureProfile::None); GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultZTargetProfile, GFX_ImplementTextureProfile(GFXDefaultZTargetProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::ZTarget | GFXTextureProfile::NoDiscard, 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 enum Compression
{ {
None, NONE,
DXT1, DXT1,
DXT2, DXT2,
DXT3, DXT3,
@ -114,7 +114,7 @@ public:
DXT5, DXT5,
}; };
GFXTextureProfile(const String &name, Types type, U32 flags, Compression compression = None); GFXTextureProfile(const String &name, Types type, U32 flags, Compression compression = NONE);
// Accessors // Accessors
String getName() const { return mName; }; String getName() const { return mName; };

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

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

2
Engine/source/gui/controls/guiMLTextCtrl.cpp
View file

@ -91,7 +91,7 @@ GFX_ImplementTextureProfile(GFXMLTextureProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::PreserveSize |
GFXTextureProfile::Static, GFXTextureProfile::Static,
GFXTextureProfile::None); GFXTextureProfile::NONE);
const U32 GuiMLTextCtrl::csmTextBufferGrowthSize = 1024; const U32 GuiMLTextCtrl::csmTextBufferGrowthSize = 1024;

4
Engine/source/gui/core/guiTypes.cpp
View file

@ -63,13 +63,13 @@ GFX_ImplementTextureProfile(GFXGuiCursorProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::PreserveSize |
GFXTextureProfile::Static, GFXTextureProfile::Static,
GFXTextureProfile::None); GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultGUIProfile, GFX_ImplementTextureProfile(GFXDefaultGUIProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::PreserveSize |
GFXTextureProfile::Static | GFXTextureProfile::Static |
GFXTextureProfile::NoPadding, GFXTextureProfile::NoPadding,
GFXTextureProfile::None); GFXTextureProfile::NONE);
GuiCursor::GuiCursor() GuiCursor::GuiCursor()

4
Engine/source/lighting/common/projectedShadow.cpp
View file

@ -62,14 +62,14 @@ GFX_ImplementTextureProfile( BLProjectedShadowProfile,
GFXTextureProfile::PreserveSize | GFXTextureProfile::PreserveSize |
GFXTextureProfile::RenderTarget | GFXTextureProfile::RenderTarget |
GFXTextureProfile::Pooled, GFXTextureProfile::Pooled,
GFXTextureProfile::None ); GFXTextureProfile::NONE );
GFX_ImplementTextureProfile( BLProjectedShadowZProfile, GFX_ImplementTextureProfile( BLProjectedShadowZProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::PreserveSize |
GFXTextureProfile::ZTarget | GFXTextureProfile::ZTarget |
GFXTextureProfile::Pooled, GFXTextureProfile::Pooled,
GFXTextureProfile::None ); GFXTextureProfile::NONE );
ProjectedShadow::ProjectedShadow( SceneObject *object ) ProjectedShadow::ProjectedShadow( SceneObject *object )

4
Engine/source/lighting/shadowMap/lightShadowMap.cpp
View file

@ -70,7 +70,7 @@ GFX_ImplementTextureProfile( ShadowMapProfile,
GFXTextureProfile::PreserveSize | GFXTextureProfile::PreserveSize |
GFXTextureProfile::RenderTarget | GFXTextureProfile::RenderTarget |
GFXTextureProfile::Pooled, GFXTextureProfile::Pooled,
GFXTextureProfile::None ); GFXTextureProfile::NONE );
GFX_ImplementTextureProfile( ShadowMapZProfile, GFX_ImplementTextureProfile( ShadowMapZProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
@ -78,7 +78,7 @@ GFX_ImplementTextureProfile( ShadowMapZProfile,
GFXTextureProfile::NoMipmap | GFXTextureProfile::NoMipmap |
GFXTextureProfile::ZTarget | GFXTextureProfile::ZTarget |
GFXTextureProfile::Pooled, GFXTextureProfile::Pooled,
GFXTextureProfile::None ); GFXTextureProfile::NONE );
LightShadowMap::LightShadowMap( LightInfo *light ) LightShadowMap::LightShadowMap( LightInfo *light )

2
Engine/source/lighting/shadowMap/shadowMapManager.cpp
View file

@ -37,7 +37,7 @@
GFX_ImplementTextureProfile(ShadowMapTexProfile, GFX_ImplementTextureProfile(ShadowMapTexProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::Dynamic , GFXTextureProfile::PreserveSize | GFXTextureProfile::Dynamic ,
GFXTextureProfile::None); GFXTextureProfile::NONE);
MODULE_BEGIN( ShadowMapManager ) MODULE_BEGIN( ShadowMapManager )

4
Engine/source/postFx/postEffect.cpp
View file

@ -134,7 +134,7 @@ GFX_ImplementTextureProfile( PostFxTargetProfile,
GFXTextureProfile::PreserveSize | GFXTextureProfile::PreserveSize |
GFXTextureProfile::RenderTarget | GFXTextureProfile::RenderTarget |
GFXTextureProfile::Pooled, GFXTextureProfile::Pooled,
GFXTextureProfile::None ); GFXTextureProfile::NONE );
IMPLEMENT_CONOBJECT(PostEffect); IMPLEMENT_CONOBJECT(PostEffect);
@ -142,7 +142,7 @@ IMPLEMENT_CONOBJECT(PostEffect);
GFX_ImplementTextureProfile( PostFxTextureProfile, GFX_ImplementTextureProfile( PostFxTextureProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::Static | GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap, GFXTextureProfile::Static | GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap,
GFXTextureProfile::None ); GFXTextureProfile::NONE );
void PostEffect::EffectConst::set( const String &newVal ) void PostEffect::EffectConst::set( const String &newVal )

4
Engine/source/scene/reflectionManager.cpp
View file

@ -59,14 +59,14 @@ MODULE_END;
GFX_ImplementTextureProfile( ReflectRenderTargetProfile, GFX_ImplementTextureProfile( ReflectRenderTargetProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::RenderTarget | GFXTextureProfile::Pooled, GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::RenderTarget | GFXTextureProfile::Pooled,
GFXTextureProfile::None ); GFXTextureProfile::NONE );
GFX_ImplementTextureProfile( RefractTextureProfile, GFX_ImplementTextureProfile( RefractTextureProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::PreserveSize |
GFXTextureProfile::RenderTarget | GFXTextureProfile::RenderTarget |
GFXTextureProfile::Pooled, GFXTextureProfile::Pooled,
GFXTextureProfile::None ); GFXTextureProfile::NONE );
static S32 QSORT_CALLBACK compareReflectors( const void *a, const void *b ) static S32 QSORT_CALLBACK compareReflectors( const void *a, const void *b )
{ {

2
Engine/source/terrain/terrRender.cpp
View file

@ -62,7 +62,7 @@ GFX_ImplementTextureProfile( TerrainLayerTexProfile,
GFXTextureProfile::DiffuseMap, GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::PreserveSize |
GFXTextureProfile::Dynamic, GFXTextureProfile::Dynamic,
GFXTextureProfile::None ); GFXTextureProfile::NONE );
void TerrainBlock::_onFlushMaterials() void TerrainBlock::_onFlushMaterials()