TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-01 11:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

multiplayer decals and art/core filepaths fixes

Browse source
This commit is contained in:
Duion 2015-12-27 00:39:52 +01:00
parent aa6d9b8ec2
commit 79c6a25050
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/T3D/decal/decalData.cpp
View file

@ -284,6 +284,7 @@ void DecalData::unpackData( BitStream *stream )
Parent::unpackData( stream );
stream->read( &lookupName );
assignName(lookupName);
stream->read( &size );
stream->read( &materialName );
_updateMaterial();

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

@ -42,9 +42,9 @@ using namespace Torque;
S32 GFXTextureManager::smTextureReductionLevel = 0;
String GFXTextureManager::smMissingTexturePath("core/art/missingTexture");
String GFXTextureManager::smUnavailableTexturePath("core/art/unavailable");
String GFXTextureManager::smWarningTexturePath("core/art/warnmat");
String GFXTextureManager::smMissingTexturePath("art/core/missingTexture");
String GFXTextureManager::smUnavailableTexturePath("art/core/unavailable");
String GFXTextureManager::smWarningTexturePath("art/core/warnMat");
GFXTextureManager::EventSignal GFXTextureManager::smEventSignal;

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

@ -74,9 +74,9 @@ EndImplementEnumType;
//-----------------------------------------------------------------------------
String TSShapeConstructor::smCapsuleShapePath("core/art/shapes/unit_capsule.dts");
String TSShapeConstructor::smCubeShapePath("core/art/shapes/unit_cube.dts");
String TSShapeConstructor::smSphereShapePath("core/art/shapes/unit_sphere.dts");
String TSShapeConstructor::smCapsuleShapePath("art/core/shapes/unit_capsule.dts");
String TSShapeConstructor::smCubeShapePath("art/core/shapes/unit_cube.dts");
String TSShapeConstructor::smSphereShapePath("art/core/shapes/unit_sphere.dts");
ResourceRegisterPostLoadSignal< TSShape > TSShapeConstructor::_smAutoLoad( &TSShapeConstructor::_onTSShapeLoaded );
ResourceRegisterUnloadSignal< TSShape > TSShapeConstructor::_smAutoUnload( &TSShapeConstructor::_onTSShapeUnloaded );