Răsfoiți Sursa

Merge pull request #304 from thecelloman/moveroads

Relocate default road & path assets.
SilentMike 12 ani în urmă
părinte
comite
b5a6514dae

+ 0 - 0
Templates/Empty/game/core/art/defaultRoadTextureOther.png → Templates/Empty/game/art/roads/defaultRoadTextureOther.png


+ 0 - 0
Templates/Empty/game/core/art/defaultRoadTextureTop.png → Templates/Empty/game/art/roads/defaultRoadTextureTop.png


+ 0 - 0
Templates/Empty/game/core/art/defaultpath.png → Templates/Empty/game/art/roads/defaultpath.png


+ 0 - 0
Templates/Empty/game/core/art/defaultpath_normal.png → Templates/Empty/game/art/roads/defaultpath_normal.png


+ 42 - 0
Templates/Empty/game/art/roads/materials.cs

@@ -0,0 +1,42 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+singleton Material(DefaultDecalRoadMaterial)
+{
+   diffuseMap[0] = "art/roads/defaultRoadTextureTop.png";
+   mapTo = "unmapped_mat";
+   materialTag0 = "RoadAndPath";
+};
+
+singleton Material(DefaultRoadMaterialTop)
+{
+   mapTo = "unmapped_mat";
+   diffuseMap[0] = "art/roads/defaultRoadTextureTop.png";
+   materialTag0 = "RoadAndPath";
+};
+
+singleton Material(DefaultRoadMaterialOther)
+{
+   mapTo = "unmapped_mat";
+   diffuseMap[0] = "art/roads/defaultRoadTextureOther.png";
+   materialTag0 = "RoadAndPath";
+};

+ 0 - 22
Templates/Empty/game/core/art/materials.cs

@@ -20,13 +20,6 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-singleton Material( DefaultDecalRoadMaterial )
-{
-   diffuseMap[0] = "core/art/defaultRoadTextureTop.png";
-   mapTo = "unmapped_mat";
-   materialTag0 = "RoadAndPath";
-};
-
 singleton Material( BlankWhite )
 {
    diffuseMap[0] = "core/art/white";
@@ -37,18 +30,3 @@ singleton Material( BlankWhite )
 singleton Material( Empty )
 {
 };
-
-singleton Material(DefaultRoadMaterialTop)
-{
-   mapTo = "unmapped_mat";
-   diffuseMap[0] = "core/art/defaultRoadTextureTop.png";
-   materialTag0 = "RoadAndPath";
-};
-
-singleton Material(DefaultRoadMaterialOther)
-{
-   mapTo = "unmapped_mat";
-   diffuseMap[0] = "core/art/defaultRoadTextureOther.png";
-   materialTag0 = "RoadAndPath";
-};
-

+ 0 - 0
Templates/Full/game/core/art/defaultRoadTextureOther.png → Templates/Full/game/art/roads/defaultRoadTextureOther.png


+ 0 - 0
Templates/Full/game/core/art/defaultRoadTextureTop.png → Templates/Full/game/art/roads/defaultRoadTextureTop.png


+ 0 - 0
Templates/Full/game/core/art/defaultpath.png → Templates/Full/game/art/roads/defaultpath.png


+ 0 - 0
Templates/Full/game/core/art/defaultpath_normal.png → Templates/Full/game/art/roads/defaultpath_normal.png


+ 42 - 0
Templates/Full/game/art/roads/materials.cs

@@ -0,0 +1,42 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+singleton Material(DefaultDecalRoadMaterial)
+{
+   diffuseMap[0] = "art/roads/defaultRoadTextureTop.png";
+   mapTo = "unmapped_mat";
+   materialTag0 = "RoadAndPath";
+};
+
+singleton Material(DefaultRoadMaterialTop)
+{
+   mapTo = "unmapped_mat";
+   diffuseMap[0] = "art/roads/defaultRoadTextureTop.png";
+   materialTag0 = "RoadAndPath";
+};
+
+singleton Material(DefaultRoadMaterialOther)
+{
+   mapTo = "unmapped_mat";
+   diffuseMap[0] = "art/roads/defaultRoadTextureOther.png";
+   materialTag0 = "RoadAndPath";
+};

+ 0 - 22
Templates/Full/game/core/art/materials.cs

@@ -20,13 +20,6 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-singleton Material( DefaultDecalRoadMaterial )
-{
-   diffuseMap[0] = "core/art/defaultRoadTextureTop.png";
-   mapTo = "unmapped_mat";
-   materialTag0 = "RoadAndPath";
-};
-
 singleton Material( BlankWhite )
 {
    diffuseMap[0] = "core/art/white";
@@ -37,18 +30,3 @@ singleton Material( BlankWhite )
 singleton Material( Empty )
 {
 };
-
-singleton Material(DefaultRoadMaterialTop)
-{
-   mapTo = "unmapped_mat";
-   diffuseMap[0] = "core/art/defaultRoadTextureTop.png";
-   materialTag0 = "RoadAndPath";
-};
-
-singleton Material(DefaultRoadMaterialOther)
-{
-   mapTo = "unmapped_mat";
-   diffuseMap[0] = "core/art/defaultRoadTextureOther.png";
-   materialTag0 = "RoadAndPath";
-};
-