Commit 0f76a171 authored by SilentMike's avatar SilentMike

Merge pull request #300 from thecelloman/moveskies

Relocating sky related assets.
parents 0e63ca10 a371fc58
......@@ -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";
......
skybox_1
skybox_2
skybox_3
skybox_4
skybox_5
skybox_6
skybox_6
\ No newline at end of file
//-----------------------------------------------------------------------------
// 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;
};
skybox_1
skybox_2
skybox_3
skybox_4
skybox_5
skybox_6
skybox_6
\ No newline at end of file
//-----------------------------------------------------------------------------
// 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;
};
skybox_1
skybox_2
skybox_3
skybox_4
skybox_5
skybox_6
skybox_6
\ No newline at end of file
//-----------------------------------------------------------------------------
// 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";
};
skybox_1
skybox_2
skybox_3
skybox_4
skybox_5
skybox_6
skybox_6
\ No newline at end of file
//-----------------------------------------------------------------------------
// 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;
};
skybox_1
skybox_2
skybox_3
skybox_4
skybox_5
skybox_6
skybox_6
\ No newline at end of file
......@@ -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";
};
......@@ -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 )
......
......@@ -33,4 +33,5 @@ singleton CubemapData( DesertSkyCubemap )
singleton Material( DesertSkyMat )
{
cubemap = DesertSkyCubemap;
materialTag0 = "Skies";
};
......@@ -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";
......
skybox_1
skybox_2
skybox_3
skybox_4
skybox_5
skybox_6
skybox_6
\ No newline at end of file
//-----------------------------------------------------------------------------
// 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;
};
skybox_1
skybox_2
skybox_3
skybox_4
skybox_5
skybox_6
skybox_6
\ No newline at end of file
skybox_1
skybox_2
skybox_3
skybox_4
skybox_5
skybox_6
skybox_6
\ No newline at end of file
//-----------------------------------------------------------------------------
// 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";
};
skybox_1
skybox_2
skybox_3
skybox_4
skybox_5
skybox_6
skybox_6
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment