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

Merge pull request #316 from DavidWyand-GG/FixRealStringPaths

Browse source 
Fix texture and object console paths
This commit is contained in:
David Wyand 2013-04-09 07:07:34 -07:00
commit a8d499f7f1
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,16 +57,16 @@ void GFXTextureManager::init()
"as not allowing down scaling.\n" "as not allowing down scaling.\n"
"@ingroup GFX\n" ); "@ingroup GFX\n" );
Con::addVariable( "$pref::Video::missingTexturePath", TypeString, &smMissingTexturePath, Con::addVariable( "$pref::Video::missingTexturePath", TypeRealString, &smMissingTexturePath,
"The file path of the texture to display when the requested texture is missing.\n" "The file path of the texture to display when the requested texture is missing.\n"
"@ingroup GFX\n" ); "@ingroup GFX\n" );
Con::addVariable( "$pref::Video::unavailableTexturePath", TypeString, &smUnavailableTexturePath, Con::addVariable( "$pref::Video::unavailableTexturePath", TypeRealString, &smUnavailableTexturePath,
"@brief The file path of the texture to display when the requested texture is unavailable.\n\n" "@brief The file path of the texture to display when the requested texture is unavailable.\n\n"
"Often this texture is used by GUI controls to indicate that the request image is unavailable.\n" "Often this texture is used by GUI controls to indicate that the request image is unavailable.\n"
"@ingroup GFX\n" ); "@ingroup GFX\n" );
Con::addVariable( "$pref::Video::warningTexturePath", TypeString, &smWarningTexturePath, Con::addVariable( "$pref::Video::warningTexturePath", TypeRealString, &smWarningTexturePath,
"The file path of the texture used to warn the developer.\n" "The file path of the texture used to warn the developer.\n"
"@ingroup GFX\n" ); "@ingroup GFX\n" );
} }

2
Engine/source/materials/processedMaterial.cpp
View file

@ -394,7 +394,7 @@ void ProcessedMaterial::_setStageData()
// Load a debug texture to make it clear to the user // Load a debug texture to make it clear to the user
// that the texture for this stage was missing. // that the texture for this stage was missing.
mStages[i].setTex( MFT_DiffuseMap, _createTexture( GFXTextureManager::getMissingTexturePath(), &GFXDefaultStaticDiffuseProfile ) ); mStages[i].setTex( MFT_DiffuseMap, _createTexture( GFXTextureManager::getMissingTexturePath().c_str(), &GFXDefaultStaticDiffuseProfile ) );
} }
} }

6
Engine/source/ts/tsShapeConstruct.cpp
View file

@ -288,15 +288,15 @@ void TSShapeConstructor::consoleInit()
{ {
Parent::consoleInit(); Parent::consoleInit();
Con::addVariable( "$pref::TSShapeConstructor::CapsuleShapePath", TypeString, &TSShapeConstructor::smCapsuleShapePath, Con::addVariable( "$pref::TSShapeConstructor::CapsuleShapePath", TypeRealString, &TSShapeConstructor::smCapsuleShapePath,
"The file path to the capsule shape used by tsMeshFit.\n\n" "The file path to the capsule shape used by tsMeshFit.\n\n"
"@ingroup MeshFit\n" ); "@ingroup MeshFit\n" );
Con::addVariable( "$pref::TSShapeConstructor::CubeShapePath", TypeString, &TSShapeConstructor::smCubeShapePath, Con::addVariable( "$pref::TSShapeConstructor::CubeShapePath", TypeRealString, &TSShapeConstructor::smCubeShapePath,
"The file path to the cube shape used by tsMeshFit.\n\n" "The file path to the cube shape used by tsMeshFit.\n\n"
"@ingroup MeshFit\n" ); "@ingroup MeshFit\n" );
Con::addVariable( "$pref::TSShapeConstructor::SphereShapePath", TypeString, &TSShapeConstructor::smSphereShapePath, Con::addVariable( "$pref::TSShapeConstructor::SphereShapePath", TypeRealString, &TSShapeConstructor::smSphereShapePath,
"The file path to the sphere shape used by tsMeshFit.\n\n" "The file path to the sphere shape used by tsMeshFit.\n\n"
"@ingroup MeshFit\n" ); "@ingroup MeshFit\n" );
} }