Merge pull request #2043 from John3/toolShapes_3

cleaning the modules

Engine/source/T3D/shapeImage.cpp

@@ -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 = "";

Engine/source/ts/tsShapeConstruct.cpp

@@ -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 );

Templates/BaseGame/game/core/shapes/materials.cs

@@ -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 ---