diff --git a/Templates/Empty/game/art/skies/.gitignore b/Templates/Empty/game/art/skies/.gitignore deleted file mode 100644 index 1bc0e838a..000000000 --- a/Templates/Empty/game/art/skies/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Keep directory in git repo diff --git a/Templates/Empty/game/core/art/skies/clouds/cloud1.png b/Templates/Empty/game/art/skies/clouds/cloud1.png similarity index 100% rename from Templates/Empty/game/core/art/skies/clouds/cloud1.png rename to Templates/Empty/game/art/skies/clouds/cloud1.png diff --git a/Templates/Empty/game/core/art/skies/clouds/cloud2.png b/Templates/Empty/game/art/skies/clouds/cloud2.png similarity index 100% rename from Templates/Empty/game/core/art/skies/clouds/cloud2.png rename to Templates/Empty/game/art/skies/clouds/cloud2.png diff --git a/Templates/Empty/game/core/art/skies/clouds/cloud3.png b/Templates/Empty/game/art/skies/clouds/cloud3.png similarity index 100% rename from Templates/Empty/game/core/art/skies/clouds/cloud3.png rename to Templates/Empty/game/art/skies/clouds/cloud3.png diff --git a/Templates/Empty/game/core/art/skies/clouds/clouds_normal_displacement.png b/Templates/Empty/game/art/skies/clouds/clouds_normal_displacement.png similarity index 100% rename from Templates/Empty/game/core/art/skies/clouds/clouds_normal_displacement.png rename to Templates/Empty/game/art/skies/clouds/clouds_normal_displacement.png diff --git a/Templates/Full/game/core/art/skies/night/materials.cs b/Templates/Empty/game/art/skies/night/materials.cs similarity index 95% rename from Templates/Full/game/core/art/skies/night/materials.cs rename to Templates/Empty/game/art/skies/night/materials.cs index beaa90dd3..79cc050fc 100644 --- a/Templates/Full/game/core/art/skies/night/materials.cs +++ b/Templates/Empty/game/art/skies/night/materials.cs @@ -30,6 +30,12 @@ singleton CubemapData( NightCubemap ) cubeFace[5] = "./skybox_6"; }; +singleton Material( NightSkyMat ) +{ + cubemap = NightCubemap; + materialTag0 = "Skies"; +}; + singleton Material( Moon_Glow_Mat ) { baseTex = "./moon_wglow.png"; diff --git a/Templates/Empty/game/core/art/skies/night/moon_noglow.png b/Templates/Empty/game/art/skies/night/moon_noglow.png similarity index 100% rename from Templates/Empty/game/core/art/skies/night/moon_noglow.png rename to Templates/Empty/game/art/skies/night/moon_noglow.png diff --git a/Templates/Empty/game/core/art/skies/night/moon_wcorona.png b/Templates/Empty/game/art/skies/night/moon_wcorona.png similarity index 100% rename from Templates/Empty/game/core/art/skies/night/moon_wcorona.png rename to Templates/Empty/game/art/skies/night/moon_wcorona.png diff --git a/Templates/Empty/game/core/art/skies/night/moon_wglow.png b/Templates/Empty/game/art/skies/night/moon_wglow.png similarity index 100% rename from Templates/Empty/game/core/art/skies/night/moon_wglow.png rename to Templates/Empty/game/art/skies/night/moon_wglow.png diff --git a/Templates/Empty/game/core/art/skies/night/skybox_1.png b/Templates/Empty/game/art/skies/night/skybox_1.png similarity index 100% rename from Templates/Empty/game/core/art/skies/night/skybox_1.png rename to Templates/Empty/game/art/skies/night/skybox_1.png diff --git a/Templates/Empty/game/core/art/skies/night/skybox_2.png b/Templates/Empty/game/art/skies/night/skybox_2.png similarity index 100% rename from Templates/Empty/game/core/art/skies/night/skybox_2.png rename to Templates/Empty/game/art/skies/night/skybox_2.png diff --git a/Templates/Empty/game/core/art/skies/night/skybox_3.png b/Templates/Empty/game/art/skies/night/skybox_3.png similarity index 100% rename from Templates/Empty/game/core/art/skies/night/skybox_3.png rename to Templates/Empty/game/art/skies/night/skybox_3.png diff --git a/Templates/Empty/game/core/art/skies/night/skybox_4.png b/Templates/Empty/game/art/skies/night/skybox_4.png similarity index 100% rename from Templates/Empty/game/core/art/skies/night/skybox_4.png rename to Templates/Empty/game/art/skies/night/skybox_4.png diff --git a/Templates/Empty/game/core/art/skies/night/skybox_5.png b/Templates/Empty/game/art/skies/night/skybox_5.png similarity index 100% rename from Templates/Empty/game/core/art/skies/night/skybox_5.png rename to Templates/Empty/game/art/skies/night/skybox_5.png diff --git a/Templates/Empty/game/core/art/skies/night/skybox_6.png b/Templates/Empty/game/art/skies/night/skybox_6.png similarity index 100% rename from Templates/Empty/game/core/art/skies/night/skybox_6.png rename to Templates/Empty/game/art/skies/night/skybox_6.png diff --git a/Templates/Empty/game/core/art/skies/Black_sky/sky_skybox.dml b/Templates/Empty/game/core/art/skies/Black_sky/sky_skybox.dml deleted file mode 100644 index 5ca0a1cb6..000000000 --- a/Templates/Empty/game/core/art/skies/Black_sky/sky_skybox.dml +++ /dev/null @@ -1,7 +0,0 @@ -skybox_1 -skybox_2 -skybox_3 -skybox_4 -skybox_5 -skybox_6 -skybox_6 \ No newline at end of file diff --git a/Templates/Empty/game/core/art/skies/Black_sky/skybox_2.jpg b/Templates/Empty/game/core/art/skies/Black_sky/skybox_2.jpg deleted file mode 100644 index 5a81cd241..000000000 Binary files a/Templates/Empty/game/core/art/skies/Black_sky/skybox_2.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Black_sky/skybox_3.jpg b/Templates/Empty/game/core/art/skies/Black_sky/skybox_3.jpg deleted file mode 100644 index ed7d05fd6..000000000 Binary files a/Templates/Empty/game/core/art/skies/Black_sky/skybox_3.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Black_sky/skybox_4.jpg b/Templates/Empty/game/core/art/skies/Black_sky/skybox_4.jpg deleted file mode 100644 index f08164be2..000000000 Binary files a/Templates/Empty/game/core/art/skies/Black_sky/skybox_4.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Black_sky/skybox_5.jpg b/Templates/Empty/game/core/art/skies/Black_sky/skybox_5.jpg deleted file mode 100644 index aa987b79e..000000000 Binary files a/Templates/Empty/game/core/art/skies/Black_sky/skybox_5.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Black_sky/skybox_6.jpg b/Templates/Empty/game/core/art/skies/Black_sky/skybox_6.jpg deleted file mode 100644 index 3ebfb6e4f..000000000 Binary files a/Templates/Empty/game/core/art/skies/Black_sky/skybox_6.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Blank_sky/materials.cs b/Templates/Empty/game/core/art/skies/Blank_sky/materials.cs deleted file mode 100644 index 08e1c2b58..000000000 --- a/Templates/Empty/game/core/art/skies/Blank_sky/materials.cs +++ /dev/null @@ -1,36 +0,0 @@ -//----------------------------------------------------------------------------- -// 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 CubemapData( BlankSkyCubemap ) -{ - cubeFace[0] = "./skybox_1"; - cubeFace[1] = "./skybox_2"; - cubeFace[2] = "./skybox_3"; - cubeFace[3] = "./skybox_4"; - cubeFace[4] = "./skybox_5"; - cubeFace[5] = "./skybox_6"; -}; - -singleton Material( BlankSkyMat ) -{ - cubemap = BlankSkyCubemap; -}; diff --git a/Templates/Empty/game/core/art/skies/Blank_sky/sky_skybox.dml b/Templates/Empty/game/core/art/skies/Blank_sky/sky_skybox.dml deleted file mode 100644 index 5ca0a1cb6..000000000 --- a/Templates/Empty/game/core/art/skies/Blank_sky/sky_skybox.dml +++ /dev/null @@ -1,7 +0,0 @@ -skybox_1 -skybox_2 -skybox_3 -skybox_4 -skybox_5 -skybox_6 -skybox_6 \ No newline at end of file diff --git a/Templates/Empty/game/core/art/skies/Blank_sky/skybox_1.jpg b/Templates/Empty/game/core/art/skies/Blank_sky/skybox_1.jpg deleted file mode 100644 index 871322e94..000000000 Binary files a/Templates/Empty/game/core/art/skies/Blank_sky/skybox_1.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Blank_sky/skybox_2.jpg b/Templates/Empty/game/core/art/skies/Blank_sky/skybox_2.jpg deleted file mode 100644 index 3e2a810de..000000000 Binary files a/Templates/Empty/game/core/art/skies/Blank_sky/skybox_2.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Blank_sky/skybox_3.jpg b/Templates/Empty/game/core/art/skies/Blank_sky/skybox_3.jpg deleted file mode 100644 index 757f99b33..000000000 Binary files a/Templates/Empty/game/core/art/skies/Blank_sky/skybox_3.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Blank_sky/skybox_4.jpg b/Templates/Empty/game/core/art/skies/Blank_sky/skybox_4.jpg deleted file mode 100644 index 30eb1d2a3..000000000 Binary files a/Templates/Empty/game/core/art/skies/Blank_sky/skybox_4.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Blank_sky/skybox_5.jpg b/Templates/Empty/game/core/art/skies/Blank_sky/skybox_5.jpg deleted file mode 100644 index 10a24db73..000000000 Binary files a/Templates/Empty/game/core/art/skies/Blank_sky/skybox_5.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Desert_Sky/materials.cs b/Templates/Empty/game/core/art/skies/Desert_Sky/materials.cs deleted file mode 100644 index fe5ec60ef..000000000 --- a/Templates/Empty/game/core/art/skies/Desert_Sky/materials.cs +++ /dev/null @@ -1,36 +0,0 @@ -//----------------------------------------------------------------------------- -// 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 CubemapData( DesertSkyCubemap ) -{ - cubeFace[0] = "./cubemap/skybox_1"; - cubeFace[1] = "./cubemap/skybox_2"; - cubeFace[2] = "./cubemap/skybox_3"; - cubeFace[3] = "./cubemap/skybox_4"; - cubeFace[4] = "./cubemap/skybox_5"; - cubeFace[5] = "./cubemap/skybox_6"; -}; - -singleton Material( DesertSkyMat ) -{ - cubemap = DesertSkyCubemap; -}; diff --git a/Templates/Empty/game/core/art/skies/Desert_Sky/sky_skybox.dml b/Templates/Empty/game/core/art/skies/Desert_Sky/sky_skybox.dml deleted file mode 100644 index 5ca0a1cb6..000000000 --- a/Templates/Empty/game/core/art/skies/Desert_Sky/sky_skybox.dml +++ /dev/null @@ -1,7 +0,0 @@ -skybox_1 -skybox_2 -skybox_3 -skybox_4 -skybox_5 -skybox_6 -skybox_6 \ No newline at end of file diff --git a/Templates/Empty/game/core/art/skies/Grey_sky/materials.cs b/Templates/Empty/game/core/art/skies/Grey_sky/materials.cs deleted file mode 100644 index ea9d7b0dd..000000000 --- a/Templates/Empty/game/core/art/skies/Grey_sky/materials.cs +++ /dev/null @@ -1,32 +0,0 @@ -//----------------------------------------------------------------------------- -// 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 CubemapData( GreySkyCubemap ) -{ - cubeFace[0] = "./skybox_1"; - cubeFace[1] = "./skybox_2"; - cubeFace[2] = "./skybox_3"; - cubeFace[3] = "./skybox_4"; - cubeFace[4] = "./skybox_5"; - cubeFace[5] = "./skybox_6"; -}; - diff --git a/Templates/Empty/game/core/art/skies/Grey_sky/sky_skybox.dml b/Templates/Empty/game/core/art/skies/Grey_sky/sky_skybox.dml deleted file mode 100644 index 5ca0a1cb6..000000000 --- a/Templates/Empty/game/core/art/skies/Grey_sky/sky_skybox.dml +++ /dev/null @@ -1,7 +0,0 @@ -skybox_1 -skybox_2 -skybox_3 -skybox_4 -skybox_5 -skybox_6 -skybox_6 \ No newline at end of file diff --git a/Templates/Empty/game/core/art/skies/Grey_sky/skybox_1.jpg b/Templates/Empty/game/core/art/skies/Grey_sky/skybox_1.jpg deleted file mode 100644 index d24d1e671..000000000 Binary files a/Templates/Empty/game/core/art/skies/Grey_sky/skybox_1.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Grey_sky/skybox_2.jpg b/Templates/Empty/game/core/art/skies/Grey_sky/skybox_2.jpg deleted file mode 100644 index fb799cbd1..000000000 Binary files a/Templates/Empty/game/core/art/skies/Grey_sky/skybox_2.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Grey_sky/skybox_4.jpg b/Templates/Empty/game/core/art/skies/Grey_sky/skybox_4.jpg deleted file mode 100644 index 32761aab3..000000000 Binary files a/Templates/Empty/game/core/art/skies/Grey_sky/skybox_4.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Grey_sky/skybox_5.jpg b/Templates/Empty/game/core/art/skies/Grey_sky/skybox_5.jpg deleted file mode 100644 index dfdf4aaf8..000000000 Binary files a/Templates/Empty/game/core/art/skies/Grey_sky/skybox_5.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/Grey_sky/skybox_6.jpg b/Templates/Empty/game/core/art/skies/Grey_sky/skybox_6.jpg deleted file mode 100644 index f1fc74d6e..000000000 Binary files a/Templates/Empty/game/core/art/skies/Grey_sky/skybox_6.jpg and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_1.png b/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_1.png deleted file mode 100644 index 12e4a1119..000000000 Binary files a/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_1.png and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_2.png b/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_2.png deleted file mode 100644 index d75e4265d..000000000 Binary files a/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_2.png and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_3.png b/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_3.png deleted file mode 100644 index 5468975fb..000000000 Binary files a/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_3.png and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_4.png b/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_4.png deleted file mode 100644 index 6cf2b6e8d..000000000 Binary files a/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_4.png and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_5.png b/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_5.png deleted file mode 100644 index ec34b0f5f..000000000 Binary files a/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_5.png and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_6.png b/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_6.png deleted file mode 100644 index e8cebd131..000000000 Binary files a/Templates/Empty/game/core/art/skies/NewLevel_sky/cubemap/skybox_6.png and /dev/null differ diff --git a/Templates/Empty/game/core/art/skies/NewLevel_sky/materials.cs b/Templates/Empty/game/core/art/skies/NewLevel_sky/materials.cs deleted file mode 100644 index df7cf4926..000000000 --- a/Templates/Empty/game/core/art/skies/NewLevel_sky/materials.cs +++ /dev/null @@ -1,36 +0,0 @@ -//----------------------------------------------------------------------------- -// 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 CubemapData( NewLevelSkyCubemap ) -{ - cubeFace[0] = "./cubemap/skybox_1"; - cubeFace[1] = "./cubemap/skybox_2"; - cubeFace[2] = "./cubemap/skybox_3"; - cubeFace[3] = "./cubemap/skybox_4"; - cubeFace[4] = "./cubemap/skybox_5"; - cubeFace[5] = "./cubemap/skybox_6"; -}; - -singleton Material( NewLevelSkyMat ) -{ - cubemap = NewLevelSkyCubemap; -}; diff --git a/Templates/Empty/game/core/art/skies/NewLevel_sky/sky_skybox.dml b/Templates/Empty/game/core/art/skies/NewLevel_sky/sky_skybox.dml deleted file mode 100644 index 5ca0a1cb6..000000000 --- a/Templates/Empty/game/core/art/skies/NewLevel_sky/sky_skybox.dml +++ /dev/null @@ -1,7 +0,0 @@ -skybox_1 -skybox_2 -skybox_3 -skybox_4 -skybox_5 -skybox_6 -skybox_6 \ No newline at end of file diff --git a/Templates/Empty/game/core/art/skies/Black_sky/materials.cs b/Templates/Empty/game/core/art/skies/blank/materials.cs similarity index 59% rename from Templates/Empty/game/core/art/skies/Black_sky/materials.cs rename to Templates/Empty/game/core/art/skies/blank/materials.cs index 8967025df..179eafcf2 100644 --- a/Templates/Empty/game/core/art/skies/Black_sky/materials.cs +++ b/Templates/Empty/game/core/art/skies/blank/materials.cs @@ -22,15 +22,48 @@ singleton CubemapData( BlackSkyCubemap ) { - cubeFace[0] = "./skybox_1"; - cubeFace[1] = "./skybox_2"; - cubeFace[2] = "./skybox_3"; - cubeFace[3] = "./skybox_4"; - cubeFace[4] = "./skybox_5"; - cubeFace[5] = "./skybox_6"; + cubeFace[0] = "./solidsky_black"; + cubeFace[1] = "./solidsky_black"; + cubeFace[2] = "./solidsky_black"; + cubeFace[3] = "./solidsky_black"; + cubeFace[4] = "./solidsky_black"; + cubeFace[5] = "./solidsky_black"; }; singleton Material( BlackSkyMat ) { cubemap = BlackSkyCubemap; + materialTag0 = "Skies"; +}; + +singleton CubemapData( BlueSkyCubemap ) +{ + cubeFace[0] = "./solidsky_blue"; + cubeFace[1] = "./solidsky_blue"; + cubeFace[2] = "./solidsky_blue"; + cubeFace[3] = "./solidsky_blue"; + cubeFace[4] = "./solidsky_blue"; + cubeFace[5] = "./solidsky_blue"; +}; + +singleton Material( BlueSkyMat ) +{ + cubemap = BlueSkyCubemap; + materialTag0 = "Skies"; +}; + +singleton CubemapData( GreySkyCubemap ) +{ + cubeFace[0] = "./solidsky_grey"; + cubeFace[1] = "./solidsky_grey"; + cubeFace[2] = "./solidsky_grey"; + cubeFace[3] = "./solidsky_grey"; + cubeFace[4] = "./solidsky_grey"; + cubeFace[5] = "./solidsky_grey"; +}; + +singleton Material( GreySkyMat ) +{ + cubemap = GreySkyCubemap; + materialTag0 = "Skies"; }; diff --git a/Templates/Empty/game/core/art/skies/Black_sky/skybox_1.jpg b/Templates/Empty/game/core/art/skies/blank/solidsky_black.jpg similarity index 100% rename from Templates/Empty/game/core/art/skies/Black_sky/skybox_1.jpg rename to Templates/Empty/game/core/art/skies/blank/solidsky_black.jpg diff --git a/Templates/Empty/game/core/art/skies/Blank_sky/skybox_6.jpg b/Templates/Empty/game/core/art/skies/blank/solidsky_blue.jpg similarity index 100% rename from Templates/Empty/game/core/art/skies/Blank_sky/skybox_6.jpg rename to Templates/Empty/game/core/art/skies/blank/solidsky_blue.jpg diff --git a/Templates/Empty/game/core/art/skies/Grey_sky/skybox_3.jpg b/Templates/Empty/game/core/art/skies/blank/solidsky_grey.jpg similarity index 100% rename from Templates/Empty/game/core/art/skies/Grey_sky/skybox_3.jpg rename to Templates/Empty/game/core/art/skies/blank/solidsky_grey.jpg diff --git a/Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui b/Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui index d510c7af0..84b8f44bb 100644 --- a/Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui +++ b/Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui @@ -672,7 +672,7 @@ function ObjectBuilderGui::buildCloudLayer(%this) { OBObjectName.setValue( "" ); %this.objectClassName = "CloudLayer"; - %this.addField( "texture", "TypeImageFilename", "Texture", "art/images/skies/clouds/clouds_normal_displacement" ); + %this.addField( "texture", "TypeImageFilename", "Texture", "art/skies/clouds/clouds_normal_displacement" ); %this.process(); } @@ -684,9 +684,9 @@ function ObjectBuilderGui::buildBasicClouds(%this) // This is a trick... any fields added after process won't show // up as controls, but will be applied to the created object. - %this.addField( "texture[0]", "TypeImageFilename", "Texture", "core/art/skies/clouds/cloud1" ); - %this.addField( "texture[1]", "TypeImageFilename", "Texture", "core/art/skies/clouds/cloud2" ); - %this.addField( "texture[2]", "TypeImageFilename", "Texture", "core/art/skies/clouds/cloud3" ); + %this.addField( "texture[0]", "TypeImageFilename", "Texture", "art/skies/clouds/cloud1" ); + %this.addField( "texture[1]", "TypeImageFilename", "Texture", "art/skies/clouds/cloud2" ); + %this.addField( "texture[2]", "TypeImageFilename", "Texture", "art/skies/clouds/cloud3" ); } function ObjectBuilderGui::checkExists( %this, %classname ) diff --git a/Templates/Full/game/art/skies/.gitignore b/Templates/Full/game/art/skies/.gitignore deleted file mode 100644 index 1bc0e838a..000000000 --- a/Templates/Full/game/art/skies/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Keep directory in git repo diff --git a/Templates/Empty/game/core/art/skies/Desert_Sky/cubemap/skybox_1.png b/Templates/Full/game/art/skies/Desert_Sky/cubemap/skybox_1.png similarity index 100% rename from Templates/Empty/game/core/art/skies/Desert_Sky/cubemap/skybox_1.png rename to Templates/Full/game/art/skies/Desert_Sky/cubemap/skybox_1.png diff --git a/Templates/Empty/game/core/art/skies/Desert_Sky/cubemap/skybox_2.png b/Templates/Full/game/art/skies/Desert_Sky/cubemap/skybox_2.png similarity index 100% rename from Templates/Empty/game/core/art/skies/Desert_Sky/cubemap/skybox_2.png rename to Templates/Full/game/art/skies/Desert_Sky/cubemap/skybox_2.png diff --git a/Templates/Empty/game/core/art/skies/Desert_Sky/cubemap/skybox_3.png b/Templates/Full/game/art/skies/Desert_Sky/cubemap/skybox_3.png similarity index 100% rename from Templates/Empty/game/core/art/skies/Desert_Sky/cubemap/skybox_3.png rename to Templates/Full/game/art/skies/Desert_Sky/cubemap/skybox_3.png diff --git a/Templates/Empty/game/core/art/skies/Desert_Sky/cubemap/skybox_4.png b/Templates/Full/game/art/skies/Desert_Sky/cubemap/skybox_4.png similarity index 100% rename from Templates/Empty/game/core/art/skies/Desert_Sky/cubemap/skybox_4.png rename to Templates/Full/game/art/skies/Desert_Sky/cubemap/skybox_4.png diff --git a/Templates/Empty/game/core/art/skies/Desert_Sky/cubemap/skybox_5.png b/Templates/Full/game/art/skies/Desert_Sky/cubemap/skybox_5.png similarity index 100% rename from Templates/Empty/game/core/art/skies/Desert_Sky/cubemap/skybox_5.png rename to Templates/Full/game/art/skies/Desert_Sky/cubemap/skybox_5.png diff --git a/Templates/Empty/game/core/art/skies/Desert_Sky/cubemap/skybox_6.png b/Templates/Full/game/art/skies/Desert_Sky/cubemap/skybox_6.png similarity index 100% rename from Templates/Empty/game/core/art/skies/Desert_Sky/cubemap/skybox_6.png rename to Templates/Full/game/art/skies/Desert_Sky/cubemap/skybox_6.png diff --git a/Templates/Full/game/core/art/skies/Desert_Sky/materials.cs b/Templates/Full/game/art/skies/Desert_Sky/materials.cs similarity index 98% rename from Templates/Full/game/core/art/skies/Desert_Sky/materials.cs rename to Templates/Full/game/art/skies/Desert_Sky/materials.cs index fe5ec60ef..af6a979c8 100644 --- a/Templates/Full/game/core/art/skies/Desert_Sky/materials.cs +++ b/Templates/Full/game/art/skies/Desert_Sky/materials.cs @@ -33,4 +33,5 @@ singleton CubemapData( DesertSkyCubemap ) singleton Material( DesertSkyMat ) { cubemap = DesertSkyCubemap; + materialTag0 = "Skies"; }; diff --git a/Templates/Full/game/core/art/skies/clouds/cloud1.png b/Templates/Full/game/art/skies/clouds/cloud1.png similarity index 100% rename from Templates/Full/game/core/art/skies/clouds/cloud1.png rename to Templates/Full/game/art/skies/clouds/cloud1.png diff --git a/Templates/Full/game/core/art/skies/clouds/cloud2.png b/Templates/Full/game/art/skies/clouds/cloud2.png similarity index 100% rename from Templates/Full/game/core/art/skies/clouds/cloud2.png rename to Templates/Full/game/art/skies/clouds/cloud2.png diff --git a/Templates/Full/game/core/art/skies/clouds/cloud3.png b/Templates/Full/game/art/skies/clouds/cloud3.png similarity index 100% rename from Templates/Full/game/core/art/skies/clouds/cloud3.png rename to Templates/Full/game/art/skies/clouds/cloud3.png diff --git a/Templates/Full/game/core/art/skies/clouds/clouds_normal_displacement.png b/Templates/Full/game/art/skies/clouds/clouds_normal_displacement.png similarity index 100% rename from Templates/Full/game/core/art/skies/clouds/clouds_normal_displacement.png rename to Templates/Full/game/art/skies/clouds/clouds_normal_displacement.png diff --git a/Templates/Empty/game/core/art/skies/night/materials.cs b/Templates/Full/game/art/skies/night/materials.cs similarity index 95% rename from Templates/Empty/game/core/art/skies/night/materials.cs rename to Templates/Full/game/art/skies/night/materials.cs index beaa90dd3..79cc050fc 100644 --- a/Templates/Empty/game/core/art/skies/night/materials.cs +++ b/Templates/Full/game/art/skies/night/materials.cs @@ -30,6 +30,12 @@ singleton CubemapData( NightCubemap ) cubeFace[5] = "./skybox_6"; }; +singleton Material( NightSkyMat ) +{ + cubemap = NightCubemap; + materialTag0 = "Skies"; +}; + singleton Material( Moon_Glow_Mat ) { baseTex = "./moon_wglow.png"; diff --git a/Templates/Full/game/core/art/skies/night/moon_noglow.png b/Templates/Full/game/art/skies/night/moon_noglow.png similarity index 100% rename from Templates/Full/game/core/art/skies/night/moon_noglow.png rename to Templates/Full/game/art/skies/night/moon_noglow.png diff --git a/Templates/Full/game/core/art/skies/night/moon_wcorona.png b/Templates/Full/game/art/skies/night/moon_wcorona.png similarity index 100% rename from Templates/Full/game/core/art/skies/night/moon_wcorona.png rename to Templates/Full/game/art/skies/night/moon_wcorona.png diff --git a/Templates/Full/game/core/art/skies/night/moon_wglow.png b/Templates/Full/game/art/skies/night/moon_wglow.png similarity index 100% rename from Templates/Full/game/core/art/skies/night/moon_wglow.png rename to Templates/Full/game/art/skies/night/moon_wglow.png diff --git a/Templates/Full/game/core/art/skies/night/skybox_1.png b/Templates/Full/game/art/skies/night/skybox_1.png similarity index 100% rename from Templates/Full/game/core/art/skies/night/skybox_1.png rename to Templates/Full/game/art/skies/night/skybox_1.png diff --git a/Templates/Full/game/core/art/skies/night/skybox_2.png b/Templates/Full/game/art/skies/night/skybox_2.png similarity index 100% rename from Templates/Full/game/core/art/skies/night/skybox_2.png rename to Templates/Full/game/art/skies/night/skybox_2.png diff --git a/Templates/Full/game/core/art/skies/night/skybox_3.png b/Templates/Full/game/art/skies/night/skybox_3.png similarity index 100% rename from Templates/Full/game/core/art/skies/night/skybox_3.png rename to Templates/Full/game/art/skies/night/skybox_3.png diff --git a/Templates/Full/game/core/art/skies/night/skybox_4.png b/Templates/Full/game/art/skies/night/skybox_4.png similarity index 100% rename from Templates/Full/game/core/art/skies/night/skybox_4.png rename to Templates/Full/game/art/skies/night/skybox_4.png diff --git a/Templates/Full/game/core/art/skies/night/skybox_5.png b/Templates/Full/game/art/skies/night/skybox_5.png similarity index 100% rename from Templates/Full/game/core/art/skies/night/skybox_5.png rename to Templates/Full/game/art/skies/night/skybox_5.png diff --git a/Templates/Full/game/core/art/skies/night/skybox_6.png b/Templates/Full/game/art/skies/night/skybox_6.png similarity index 100% rename from Templates/Full/game/core/art/skies/night/skybox_6.png rename to Templates/Full/game/art/skies/night/skybox_6.png diff --git a/Templates/Full/game/core/art/skies/Black_sky/sky_skybox.dml b/Templates/Full/game/core/art/skies/Black_sky/sky_skybox.dml deleted file mode 100644 index 5ca0a1cb6..000000000 --- a/Templates/Full/game/core/art/skies/Black_sky/sky_skybox.dml +++ /dev/null @@ -1,7 +0,0 @@ -skybox_1 -skybox_2 -skybox_3 -skybox_4 -skybox_5 -skybox_6 -skybox_6 \ No newline at end of file diff --git a/Templates/Full/game/core/art/skies/Black_sky/skybox_2.jpg b/Templates/Full/game/core/art/skies/Black_sky/skybox_2.jpg deleted file mode 100644 index 5a81cd241..000000000 Binary files a/Templates/Full/game/core/art/skies/Black_sky/skybox_2.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Black_sky/skybox_3.jpg b/Templates/Full/game/core/art/skies/Black_sky/skybox_3.jpg deleted file mode 100644 index ed7d05fd6..000000000 Binary files a/Templates/Full/game/core/art/skies/Black_sky/skybox_3.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Black_sky/skybox_4.jpg b/Templates/Full/game/core/art/skies/Black_sky/skybox_4.jpg deleted file mode 100644 index f08164be2..000000000 Binary files a/Templates/Full/game/core/art/skies/Black_sky/skybox_4.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Black_sky/skybox_5.jpg b/Templates/Full/game/core/art/skies/Black_sky/skybox_5.jpg deleted file mode 100644 index aa987b79e..000000000 Binary files a/Templates/Full/game/core/art/skies/Black_sky/skybox_5.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Black_sky/skybox_6.jpg b/Templates/Full/game/core/art/skies/Black_sky/skybox_6.jpg deleted file mode 100644 index 3ebfb6e4f..000000000 Binary files a/Templates/Full/game/core/art/skies/Black_sky/skybox_6.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Blank_sky/materials.cs b/Templates/Full/game/core/art/skies/Blank_sky/materials.cs deleted file mode 100644 index 08e1c2b58..000000000 --- a/Templates/Full/game/core/art/skies/Blank_sky/materials.cs +++ /dev/null @@ -1,36 +0,0 @@ -//----------------------------------------------------------------------------- -// 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 CubemapData( BlankSkyCubemap ) -{ - cubeFace[0] = "./skybox_1"; - cubeFace[1] = "./skybox_2"; - cubeFace[2] = "./skybox_3"; - cubeFace[3] = "./skybox_4"; - cubeFace[4] = "./skybox_5"; - cubeFace[5] = "./skybox_6"; -}; - -singleton Material( BlankSkyMat ) -{ - cubemap = BlankSkyCubemap; -}; diff --git a/Templates/Full/game/core/art/skies/Blank_sky/sky_skybox.dml b/Templates/Full/game/core/art/skies/Blank_sky/sky_skybox.dml deleted file mode 100644 index 5ca0a1cb6..000000000 --- a/Templates/Full/game/core/art/skies/Blank_sky/sky_skybox.dml +++ /dev/null @@ -1,7 +0,0 @@ -skybox_1 -skybox_2 -skybox_3 -skybox_4 -skybox_5 -skybox_6 -skybox_6 \ No newline at end of file diff --git a/Templates/Full/game/core/art/skies/Blank_sky/skybox_1.jpg b/Templates/Full/game/core/art/skies/Blank_sky/skybox_1.jpg deleted file mode 100644 index 871322e94..000000000 Binary files a/Templates/Full/game/core/art/skies/Blank_sky/skybox_1.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Blank_sky/skybox_2.jpg b/Templates/Full/game/core/art/skies/Blank_sky/skybox_2.jpg deleted file mode 100644 index 3e2a810de..000000000 Binary files a/Templates/Full/game/core/art/skies/Blank_sky/skybox_2.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Blank_sky/skybox_3.jpg b/Templates/Full/game/core/art/skies/Blank_sky/skybox_3.jpg deleted file mode 100644 index 757f99b33..000000000 Binary files a/Templates/Full/game/core/art/skies/Blank_sky/skybox_3.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Blank_sky/skybox_4.jpg b/Templates/Full/game/core/art/skies/Blank_sky/skybox_4.jpg deleted file mode 100644 index 30eb1d2a3..000000000 Binary files a/Templates/Full/game/core/art/skies/Blank_sky/skybox_4.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Blank_sky/skybox_5.jpg b/Templates/Full/game/core/art/skies/Blank_sky/skybox_5.jpg deleted file mode 100644 index 10a24db73..000000000 Binary files a/Templates/Full/game/core/art/skies/Blank_sky/skybox_5.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_1.png b/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_1.png deleted file mode 100644 index 12e4a1119..000000000 Binary files a/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_1.png and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_2.png b/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_2.png deleted file mode 100644 index d75e4265d..000000000 Binary files a/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_2.png and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_3.png b/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_3.png deleted file mode 100644 index 5468975fb..000000000 Binary files a/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_3.png and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_4.png b/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_4.png deleted file mode 100644 index 6cf2b6e8d..000000000 Binary files a/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_4.png and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_5.png b/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_5.png deleted file mode 100644 index ec34b0f5f..000000000 Binary files a/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_5.png and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_6.png b/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_6.png deleted file mode 100644 index e8cebd131..000000000 Binary files a/Templates/Full/game/core/art/skies/Desert_Sky/cubemap/skybox_6.png and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Desert_Sky/sky_skybox.dml b/Templates/Full/game/core/art/skies/Desert_Sky/sky_skybox.dml deleted file mode 100644 index 5ca0a1cb6..000000000 --- a/Templates/Full/game/core/art/skies/Desert_Sky/sky_skybox.dml +++ /dev/null @@ -1,7 +0,0 @@ -skybox_1 -skybox_2 -skybox_3 -skybox_4 -skybox_5 -skybox_6 -skybox_6 \ No newline at end of file diff --git a/Templates/Full/game/core/art/skies/Grey_sky/materials.cs b/Templates/Full/game/core/art/skies/Grey_sky/materials.cs deleted file mode 100644 index ea9d7b0dd..000000000 --- a/Templates/Full/game/core/art/skies/Grey_sky/materials.cs +++ /dev/null @@ -1,32 +0,0 @@ -//----------------------------------------------------------------------------- -// 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 CubemapData( GreySkyCubemap ) -{ - cubeFace[0] = "./skybox_1"; - cubeFace[1] = "./skybox_2"; - cubeFace[2] = "./skybox_3"; - cubeFace[3] = "./skybox_4"; - cubeFace[4] = "./skybox_5"; - cubeFace[5] = "./skybox_6"; -}; - diff --git a/Templates/Full/game/core/art/skies/Grey_sky/sky_skybox.dml b/Templates/Full/game/core/art/skies/Grey_sky/sky_skybox.dml deleted file mode 100644 index 5ca0a1cb6..000000000 --- a/Templates/Full/game/core/art/skies/Grey_sky/sky_skybox.dml +++ /dev/null @@ -1,7 +0,0 @@ -skybox_1 -skybox_2 -skybox_3 -skybox_4 -skybox_5 -skybox_6 -skybox_6 \ No newline at end of file diff --git a/Templates/Full/game/core/art/skies/Grey_sky/skybox_1.jpg b/Templates/Full/game/core/art/skies/Grey_sky/skybox_1.jpg deleted file mode 100644 index d24d1e671..000000000 Binary files a/Templates/Full/game/core/art/skies/Grey_sky/skybox_1.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Grey_sky/skybox_2.jpg b/Templates/Full/game/core/art/skies/Grey_sky/skybox_2.jpg deleted file mode 100644 index fb799cbd1..000000000 Binary files a/Templates/Full/game/core/art/skies/Grey_sky/skybox_2.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Grey_sky/skybox_4.jpg b/Templates/Full/game/core/art/skies/Grey_sky/skybox_4.jpg deleted file mode 100644 index 32761aab3..000000000 Binary files a/Templates/Full/game/core/art/skies/Grey_sky/skybox_4.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Grey_sky/skybox_5.jpg b/Templates/Full/game/core/art/skies/Grey_sky/skybox_5.jpg deleted file mode 100644 index dfdf4aaf8..000000000 Binary files a/Templates/Full/game/core/art/skies/Grey_sky/skybox_5.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/Grey_sky/skybox_6.jpg b/Templates/Full/game/core/art/skies/Grey_sky/skybox_6.jpg deleted file mode 100644 index f1fc74d6e..000000000 Binary files a/Templates/Full/game/core/art/skies/Grey_sky/skybox_6.jpg and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_1.png b/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_1.png deleted file mode 100644 index 12e4a1119..000000000 Binary files a/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_1.png and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_2.png b/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_2.png deleted file mode 100644 index d75e4265d..000000000 Binary files a/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_2.png and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_3.png b/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_3.png deleted file mode 100644 index 5468975fb..000000000 Binary files a/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_3.png and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_4.png b/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_4.png deleted file mode 100644 index 6cf2b6e8d..000000000 Binary files a/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_4.png and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_5.png b/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_5.png deleted file mode 100644 index ec34b0f5f..000000000 Binary files a/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_5.png and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_6.png b/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_6.png deleted file mode 100644 index e8cebd131..000000000 Binary files a/Templates/Full/game/core/art/skies/NewLevel_sky/cubemap/skybox_6.png and /dev/null differ diff --git a/Templates/Full/game/core/art/skies/NewLevel_sky/materials.cs b/Templates/Full/game/core/art/skies/NewLevel_sky/materials.cs deleted file mode 100644 index df7cf4926..000000000 --- a/Templates/Full/game/core/art/skies/NewLevel_sky/materials.cs +++ /dev/null @@ -1,36 +0,0 @@ -//----------------------------------------------------------------------------- -// 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 CubemapData( NewLevelSkyCubemap ) -{ - cubeFace[0] = "./cubemap/skybox_1"; - cubeFace[1] = "./cubemap/skybox_2"; - cubeFace[2] = "./cubemap/skybox_3"; - cubeFace[3] = "./cubemap/skybox_4"; - cubeFace[4] = "./cubemap/skybox_5"; - cubeFace[5] = "./cubemap/skybox_6"; -}; - -singleton Material( NewLevelSkyMat ) -{ - cubemap = NewLevelSkyCubemap; -}; diff --git a/Templates/Full/game/core/art/skies/NewLevel_sky/sky_skybox.dml b/Templates/Full/game/core/art/skies/NewLevel_sky/sky_skybox.dml deleted file mode 100644 index 5ca0a1cb6..000000000 --- a/Templates/Full/game/core/art/skies/NewLevel_sky/sky_skybox.dml +++ /dev/null @@ -1,7 +0,0 @@ -skybox_1 -skybox_2 -skybox_3 -skybox_4 -skybox_5 -skybox_6 -skybox_6 \ No newline at end of file diff --git a/Templates/Full/game/core/art/skies/Black_sky/materials.cs b/Templates/Full/game/core/art/skies/blank/materials.cs similarity index 59% rename from Templates/Full/game/core/art/skies/Black_sky/materials.cs rename to Templates/Full/game/core/art/skies/blank/materials.cs index 8967025df..179eafcf2 100644 --- a/Templates/Full/game/core/art/skies/Black_sky/materials.cs +++ b/Templates/Full/game/core/art/skies/blank/materials.cs @@ -22,15 +22,48 @@ singleton CubemapData( BlackSkyCubemap ) { - cubeFace[0] = "./skybox_1"; - cubeFace[1] = "./skybox_2"; - cubeFace[2] = "./skybox_3"; - cubeFace[3] = "./skybox_4"; - cubeFace[4] = "./skybox_5"; - cubeFace[5] = "./skybox_6"; + cubeFace[0] = "./solidsky_black"; + cubeFace[1] = "./solidsky_black"; + cubeFace[2] = "./solidsky_black"; + cubeFace[3] = "./solidsky_black"; + cubeFace[4] = "./solidsky_black"; + cubeFace[5] = "./solidsky_black"; }; singleton Material( BlackSkyMat ) { cubemap = BlackSkyCubemap; + materialTag0 = "Skies"; +}; + +singleton CubemapData( BlueSkyCubemap ) +{ + cubeFace[0] = "./solidsky_blue"; + cubeFace[1] = "./solidsky_blue"; + cubeFace[2] = "./solidsky_blue"; + cubeFace[3] = "./solidsky_blue"; + cubeFace[4] = "./solidsky_blue"; + cubeFace[5] = "./solidsky_blue"; +}; + +singleton Material( BlueSkyMat ) +{ + cubemap = BlueSkyCubemap; + materialTag0 = "Skies"; +}; + +singleton CubemapData( GreySkyCubemap ) +{ + cubeFace[0] = "./solidsky_grey"; + cubeFace[1] = "./solidsky_grey"; + cubeFace[2] = "./solidsky_grey"; + cubeFace[3] = "./solidsky_grey"; + cubeFace[4] = "./solidsky_grey"; + cubeFace[5] = "./solidsky_grey"; +}; + +singleton Material( GreySkyMat ) +{ + cubemap = GreySkyCubemap; + materialTag0 = "Skies"; }; diff --git a/Templates/Full/game/core/art/skies/Black_sky/skybox_1.jpg b/Templates/Full/game/core/art/skies/blank/solidsky_black.jpg similarity index 100% rename from Templates/Full/game/core/art/skies/Black_sky/skybox_1.jpg rename to Templates/Full/game/core/art/skies/blank/solidsky_black.jpg diff --git a/Templates/Full/game/core/art/skies/Blank_sky/skybox_6.jpg b/Templates/Full/game/core/art/skies/blank/solidsky_blue.jpg similarity index 100% rename from Templates/Full/game/core/art/skies/Blank_sky/skybox_6.jpg rename to Templates/Full/game/core/art/skies/blank/solidsky_blue.jpg diff --git a/Templates/Full/game/core/art/skies/Grey_sky/skybox_3.jpg b/Templates/Full/game/core/art/skies/blank/solidsky_grey.jpg similarity index 100% rename from Templates/Full/game/core/art/skies/Grey_sky/skybox_3.jpg rename to Templates/Full/game/core/art/skies/blank/solidsky_grey.jpg diff --git a/Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui b/Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui index d510c7af0..84b8f44bb 100644 --- a/Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui +++ b/Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui @@ -672,7 +672,7 @@ function ObjectBuilderGui::buildCloudLayer(%this) { OBObjectName.setValue( "" ); %this.objectClassName = "CloudLayer"; - %this.addField( "texture", "TypeImageFilename", "Texture", "art/images/skies/clouds/clouds_normal_displacement" ); + %this.addField( "texture", "TypeImageFilename", "Texture", "art/skies/clouds/clouds_normal_displacement" ); %this.process(); } @@ -684,9 +684,9 @@ function ObjectBuilderGui::buildBasicClouds(%this) // This is a trick... any fields added after process won't show // up as controls, but will be applied to the created object. - %this.addField( "texture[0]", "TypeImageFilename", "Texture", "core/art/skies/clouds/cloud1" ); - %this.addField( "texture[1]", "TypeImageFilename", "Texture", "core/art/skies/clouds/cloud2" ); - %this.addField( "texture[2]", "TypeImageFilename", "Texture", "core/art/skies/clouds/cloud3" ); + %this.addField( "texture[0]", "TypeImageFilename", "Texture", "art/skies/clouds/cloud1" ); + %this.addField( "texture[1]", "TypeImageFilename", "Texture", "art/skies/clouds/cloud2" ); + %this.addField( "texture[2]", "TypeImageFilename", "Texture", "art/skies/clouds/cloud3" ); } function ObjectBuilderGui::checkExists( %this, %classname )