TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
parent 477869db57 39e5fe689b
commit 59b6e67ecf
8 changed files with 20 additions and 4 deletions
Show stats 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 );

16
Templates/BaseGame/game/core/shapes/materials.cs Normal file
View file

@ -0,0 +1,16 @@
//--- noshape.dts MATERIALS BEGIN ---
singleton Material(noshape_NoShape)
{
mapTo = "NoShape";
diffuseMap[0] = "";
diffuseColor[0] = "0.8 0.003067 0 .8";
emissive[0] = 0;
doubleSided = false;
translucent = 1;
translucentBlendOp = "LerpAlpha";
castShadows = false;
materialTag0 = "WorldEditor";
};
//--- noshape.dts MATERIALS END ---

BIN
Templates/BaseGame/game/core/shapes/noshape.dts Normal file
View file

Binary file not shown.

BIN
Templates/BaseGame/game/core/shapes/noshape.mb Normal file
View file

Binary file not shown.

BIN
Templates/BaseGame/game/tools/shapes/unit_capsule.dts Normal file
View file

Binary file not shown.

BIN
Templates/BaseGame/game/tools/shapes/unit_cube.dts Normal file
View file

Binary file not shown.

BIN
Templates/BaseGame/game/tools/shapes/unit_sphere.dts Normal file
View file

Binary file not shown.