TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-27 08:09:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2043 from John3/toolShapes_3

Browse source 
cleaning the modules
This commit is contained in:
Areloch 2019-03-31 14:41:35 -05:00 • committed by GitHub
commit b759bde0c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 20 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/shapeImage.cpp
View file

@ -189,7 +189,7 @@ ShapeBaseImageData::ShapeBaseImageData()
lightRadius = 10.f;
lightBrightness = 1.0f;
shapeName = "core/art/shapes/noshape.dts";
shapeName = "core/shapes/noshape.dts";
shapeNameFP = "";
imageAnimPrefix = "";
imageAnimPrefixFP = "";

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("tools/shapes/unit_capsule.dts");
String TSShapeConstructor::smCubeShapePath("tools/shapes/unit_cube.dts");
String TSShapeConstructor::smSphereShapePath("tools/shapes/unit_sphere.dts");
ResourceRegisterPostLoadSignal< TSShape > TSShapeConstructor::_smAutoLoad( &TSShapeConstructor::_onTSShapeLoaded );
ResourceRegisterUnloadSignal< TSShape > TSShapeConstructor::_smAutoUnload( &TSShapeConstructor::_onTSShapeUnloaded );