From 6f8161b0984b59bde1cd0d1ee438f71bc46f76c4 Mon Sep 17 00:00:00 2001 From: thecelloman Date: Thu, 4 Apr 2013 15:29:38 -0400 Subject: [PATCH] Relocate default road & path assets. --- .../roads}/defaultRoadTextureOther.png | Bin .../roads}/defaultRoadTextureTop.png | Bin .../{core/art => art/roads}/defaultpath.png | Bin .../art => art/roads}/defaultpath_normal.png | Bin Templates/Empty/game/art/roads/materials.cs | 42 ++++++++++++++++++ Templates/Empty/game/core/art/materials.cs | 22 --------- .../roads}/defaultRoadTextureOther.png | Bin .../roads}/defaultRoadTextureTop.png | Bin .../{core/art => art/roads}/defaultpath.png | Bin .../art => art/roads}/defaultpath_normal.png | Bin Templates/Full/game/art/roads/materials.cs | 42 ++++++++++++++++++ Templates/Full/game/core/art/materials.cs | 22 --------- 12 files changed, 84 insertions(+), 44 deletions(-) rename Templates/Empty/game/{core/art => art/roads}/defaultRoadTextureOther.png (100%) rename Templates/Empty/game/{core/art => art/roads}/defaultRoadTextureTop.png (100%) rename Templates/Empty/game/{core/art => art/roads}/defaultpath.png (100%) rename Templates/Empty/game/{core/art => art/roads}/defaultpath_normal.png (100%) create mode 100644 Templates/Empty/game/art/roads/materials.cs rename Templates/Full/game/{core/art => art/roads}/defaultRoadTextureOther.png (100%) rename Templates/Full/game/{core/art => art/roads}/defaultRoadTextureTop.png (100%) rename Templates/Full/game/{core/art => art/roads}/defaultpath.png (100%) rename Templates/Full/game/{core/art => art/roads}/defaultpath_normal.png (100%) create mode 100644 Templates/Full/game/art/roads/materials.cs diff --git a/Templates/Empty/game/core/art/defaultRoadTextureOther.png b/Templates/Empty/game/art/roads/defaultRoadTextureOther.png similarity index 100% rename from Templates/Empty/game/core/art/defaultRoadTextureOther.png rename to Templates/Empty/game/art/roads/defaultRoadTextureOther.png diff --git a/Templates/Empty/game/core/art/defaultRoadTextureTop.png b/Templates/Empty/game/art/roads/defaultRoadTextureTop.png similarity index 100% rename from Templates/Empty/game/core/art/defaultRoadTextureTop.png rename to Templates/Empty/game/art/roads/defaultRoadTextureTop.png diff --git a/Templates/Empty/game/core/art/defaultpath.png b/Templates/Empty/game/art/roads/defaultpath.png similarity index 100% rename from Templates/Empty/game/core/art/defaultpath.png rename to Templates/Empty/game/art/roads/defaultpath.png diff --git a/Templates/Empty/game/core/art/defaultpath_normal.png b/Templates/Empty/game/art/roads/defaultpath_normal.png similarity index 100% rename from Templates/Empty/game/core/art/defaultpath_normal.png rename to Templates/Empty/game/art/roads/defaultpath_normal.png diff --git a/Templates/Empty/game/art/roads/materials.cs b/Templates/Empty/game/art/roads/materials.cs new file mode 100644 index 000000000..a3ff683d2 --- /dev/null +++ b/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"; +}; \ No newline at end of file diff --git a/Templates/Empty/game/core/art/materials.cs b/Templates/Empty/game/core/art/materials.cs index c7db049da..c2bcf52a6 100644 --- a/Templates/Empty/game/core/art/materials.cs +++ b/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"; -}; - diff --git a/Templates/Full/game/core/art/defaultRoadTextureOther.png b/Templates/Full/game/art/roads/defaultRoadTextureOther.png similarity index 100% rename from Templates/Full/game/core/art/defaultRoadTextureOther.png rename to Templates/Full/game/art/roads/defaultRoadTextureOther.png diff --git a/Templates/Full/game/core/art/defaultRoadTextureTop.png b/Templates/Full/game/art/roads/defaultRoadTextureTop.png similarity index 100% rename from Templates/Full/game/core/art/defaultRoadTextureTop.png rename to Templates/Full/game/art/roads/defaultRoadTextureTop.png diff --git a/Templates/Full/game/core/art/defaultpath.png b/Templates/Full/game/art/roads/defaultpath.png similarity index 100% rename from Templates/Full/game/core/art/defaultpath.png rename to Templates/Full/game/art/roads/defaultpath.png diff --git a/Templates/Full/game/core/art/defaultpath_normal.png b/Templates/Full/game/art/roads/defaultpath_normal.png similarity index 100% rename from Templates/Full/game/core/art/defaultpath_normal.png rename to Templates/Full/game/art/roads/defaultpath_normal.png diff --git a/Templates/Full/game/art/roads/materials.cs b/Templates/Full/game/art/roads/materials.cs new file mode 100644 index 000000000..a3ff683d2 --- /dev/null +++ b/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"; +}; \ No newline at end of file diff --git a/Templates/Full/game/core/art/materials.cs b/Templates/Full/game/core/art/materials.cs index c7db049da..c2bcf52a6 100644 --- a/Templates/Full/game/core/art/materials.cs +++ b/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"; -}; -