From: MirceaKitsune Date: Tue, 28 Sep 2010 21:05:37 +0000 (+0300) Subject: Change some skies a bit. Now to recompile the necessary maps... X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=9bdda521aee49136de39ea53c2d15908e0e57c6a Change some skies a bit. Now to recompile the necessary maps... --- diff --git a/data/env/asteroids/asteroids.tga b/data/env/asteroids/asteroids.tga new file mode 100644 index 00000000..f71bd833 Binary files /dev/null and b/data/env/asteroids/asteroids.tga differ diff --git a/data/env/asteroids/asteroids_bk.tga b/data/env/asteroids/asteroids_bk.tga new file mode 100644 index 00000000..e10a2ec1 Binary files /dev/null and b/data/env/asteroids/asteroids_bk.tga differ diff --git a/data/env/asteroids/asteroids_dn.tga b/data/env/asteroids/asteroids_dn.tga new file mode 100644 index 00000000..fd08d05a Binary files /dev/null and b/data/env/asteroids/asteroids_dn.tga differ diff --git a/data/env/asteroids/asteroids_ft.tga b/data/env/asteroids/asteroids_ft.tga new file mode 100644 index 00000000..c4ff4abf Binary files /dev/null and b/data/env/asteroids/asteroids_ft.tga differ diff --git a/data/env/asteroids/asteroids_lf.tga b/data/env/asteroids/asteroids_lf.tga new file mode 100644 index 00000000..cc0bc759 Binary files /dev/null and b/data/env/asteroids/asteroids_lf.tga differ diff --git a/data/env/asteroids/asteroids_rt.tga b/data/env/asteroids/asteroids_rt.tga new file mode 100644 index 00000000..47efce62 Binary files /dev/null and b/data/env/asteroids/asteroids_rt.tga differ diff --git a/data/env/asteroids/asteroids_up.tga b/data/env/asteroids/asteroids_up.tga new file mode 100644 index 00000000..02def090 Binary files /dev/null and b/data/env/asteroids/asteroids_up.tga differ diff --git a/data/env/nebulae/nebulae.tga b/data/env/nebulae/nebulae.tga new file mode 100644 index 00000000..279e8760 Binary files /dev/null and b/data/env/nebulae/nebulae.tga differ diff --git a/data/env/nebulae/nebulae_bk.tga b/data/env/nebulae/nebulae_bk.tga new file mode 100644 index 00000000..8a9e5ab0 Binary files /dev/null and b/data/env/nebulae/nebulae_bk.tga differ diff --git a/data/env/nebulae/nebulae_dn.tga b/data/env/nebulae/nebulae_dn.tga new file mode 100644 index 00000000..f93c0ddf Binary files /dev/null and b/data/env/nebulae/nebulae_dn.tga differ diff --git a/data/env/nebulae/nebulae_ft.tga b/data/env/nebulae/nebulae_ft.tga new file mode 100644 index 00000000..4a1cd69f Binary files /dev/null and b/data/env/nebulae/nebulae_ft.tga differ diff --git a/data/env/nebulae/nebulae_lf.tga b/data/env/nebulae/nebulae_lf.tga new file mode 100644 index 00000000..50019599 Binary files /dev/null and b/data/env/nebulae/nebulae_lf.tga differ diff --git a/data/env/nebulae/nebulae_rt.tga b/data/env/nebulae/nebulae_rt.tga new file mode 100644 index 00000000..44314dac Binary files /dev/null and b/data/env/nebulae/nebulae_rt.tga differ diff --git a/data/env/nebulae/nebulae_up.tga b/data/env/nebulae/nebulae_up.tga new file mode 100644 index 00000000..fe319748 Binary files /dev/null and b/data/env/nebulae/nebulae_up.tga differ diff --git a/data/env/newsky_asteroids/asteroids.tga b/data/env/newsky_asteroids/asteroids.tga deleted file mode 100644 index f71bd833..00000000 Binary files a/data/env/newsky_asteroids/asteroids.tga and /dev/null differ diff --git a/data/env/newsky_asteroids/asteroids_bk.tga b/data/env/newsky_asteroids/asteroids_bk.tga deleted file mode 100644 index e10a2ec1..00000000 Binary files a/data/env/newsky_asteroids/asteroids_bk.tga and /dev/null differ diff --git a/data/env/newsky_asteroids/asteroids_dn.tga b/data/env/newsky_asteroids/asteroids_dn.tga deleted file mode 100644 index fd08d05a..00000000 Binary files a/data/env/newsky_asteroids/asteroids_dn.tga and /dev/null differ diff --git a/data/env/newsky_asteroids/asteroids_ft.tga b/data/env/newsky_asteroids/asteroids_ft.tga deleted file mode 100644 index c4ff4abf..00000000 Binary files a/data/env/newsky_asteroids/asteroids_ft.tga and /dev/null differ diff --git a/data/env/newsky_asteroids/asteroids_lf.tga b/data/env/newsky_asteroids/asteroids_lf.tga deleted file mode 100644 index cc0bc759..00000000 Binary files a/data/env/newsky_asteroids/asteroids_lf.tga and /dev/null differ diff --git a/data/env/newsky_asteroids/asteroids_rt.tga b/data/env/newsky_asteroids/asteroids_rt.tga deleted file mode 100644 index 47efce62..00000000 Binary files a/data/env/newsky_asteroids/asteroids_rt.tga and /dev/null differ diff --git a/data/env/newsky_asteroids/asteroids_up.tga b/data/env/newsky_asteroids/asteroids_up.tga deleted file mode 100644 index 02def090..00000000 Binary files a/data/env/newsky_asteroids/asteroids_up.tga and /dev/null differ diff --git a/data/env/newsky_nebulae/nebulae.tga b/data/env/newsky_nebulae/nebulae.tga deleted file mode 100644 index 279e8760..00000000 Binary files a/data/env/newsky_nebulae/nebulae.tga and /dev/null differ diff --git a/data/env/newsky_nebulae/nebulae_bk.tga b/data/env/newsky_nebulae/nebulae_bk.tga deleted file mode 100644 index 8a9e5ab0..00000000 Binary files a/data/env/newsky_nebulae/nebulae_bk.tga and /dev/null differ diff --git a/data/env/newsky_nebulae/nebulae_dn.tga b/data/env/newsky_nebulae/nebulae_dn.tga deleted file mode 100644 index f93c0ddf..00000000 Binary files a/data/env/newsky_nebulae/nebulae_dn.tga and /dev/null differ diff --git a/data/env/newsky_nebulae/nebulae_ft.tga b/data/env/newsky_nebulae/nebulae_ft.tga deleted file mode 100644 index 4a1cd69f..00000000 Binary files a/data/env/newsky_nebulae/nebulae_ft.tga and /dev/null differ diff --git a/data/env/newsky_nebulae/nebulae_lf.tga b/data/env/newsky_nebulae/nebulae_lf.tga deleted file mode 100644 index 50019599..00000000 Binary files a/data/env/newsky_nebulae/nebulae_lf.tga and /dev/null differ diff --git a/data/env/newsky_nebulae/nebulae_rt.tga b/data/env/newsky_nebulae/nebulae_rt.tga deleted file mode 100644 index 44314dac..00000000 Binary files a/data/env/newsky_nebulae/nebulae_rt.tga and /dev/null differ diff --git a/data/env/newsky_nebulae/nebulae_up.tga b/data/env/newsky_nebulae/nebulae_up.tga deleted file mode 100644 index fe319748..00000000 Binary files a/data/env/newsky_nebulae/nebulae_up.tga and /dev/null differ diff --git a/data/env/newsky_planets/planets.tga b/data/env/newsky_planets/planets.tga deleted file mode 100644 index f629675b..00000000 Binary files a/data/env/newsky_planets/planets.tga and /dev/null differ diff --git a/data/env/newsky_planets/planets_bk.tga b/data/env/newsky_planets/planets_bk.tga deleted file mode 100644 index 0b2d8633..00000000 Binary files a/data/env/newsky_planets/planets_bk.tga and /dev/null differ diff --git a/data/env/newsky_planets/planets_dn.tga b/data/env/newsky_planets/planets_dn.tga deleted file mode 100644 index f223aecb..00000000 Binary files a/data/env/newsky_planets/planets_dn.tga and /dev/null differ diff --git a/data/env/newsky_planets/planets_ft.tga b/data/env/newsky_planets/planets_ft.tga deleted file mode 100644 index 3ba479dd..00000000 Binary files a/data/env/newsky_planets/planets_ft.tga and /dev/null differ diff --git a/data/env/newsky_planets/planets_lf.tga b/data/env/newsky_planets/planets_lf.tga deleted file mode 100644 index 8a8fad2d..00000000 Binary files a/data/env/newsky_planets/planets_lf.tga and /dev/null differ diff --git a/data/env/newsky_planets/planets_rt.tga b/data/env/newsky_planets/planets_rt.tga deleted file mode 100644 index 1edf5a05..00000000 Binary files a/data/env/newsky_planets/planets_rt.tga and /dev/null differ diff --git a/data/env/newsky_planets/planets_up.tga b/data/env/newsky_planets/planets_up.tga deleted file mode 100644 index 4df756bb..00000000 Binary files a/data/env/newsky_planets/planets_up.tga and /dev/null differ diff --git a/data/env/planets/planets.tga b/data/env/planets/planets.tga new file mode 100644 index 00000000..f629675b Binary files /dev/null and b/data/env/planets/planets.tga differ diff --git a/data/env/planets/planets_bk.tga b/data/env/planets/planets_bk.tga new file mode 100644 index 00000000..0b2d8633 Binary files /dev/null and b/data/env/planets/planets_bk.tga differ diff --git a/data/env/planets/planets_dn.tga b/data/env/planets/planets_dn.tga new file mode 100644 index 00000000..f223aecb Binary files /dev/null and b/data/env/planets/planets_dn.tga differ diff --git a/data/env/planets/planets_ft.tga b/data/env/planets/planets_ft.tga new file mode 100644 index 00000000..3ba479dd Binary files /dev/null and b/data/env/planets/planets_ft.tga differ diff --git a/data/env/planets/planets_lf.tga b/data/env/planets/planets_lf.tga new file mode 100644 index 00000000..8a8fad2d Binary files /dev/null and b/data/env/planets/planets_lf.tga differ diff --git a/data/env/planets/planets_rt.tga b/data/env/planets/planets_rt.tga new file mode 100644 index 00000000..1edf5a05 Binary files /dev/null and b/data/env/planets/planets_rt.tga differ diff --git a/data/env/planets/planets_up.tga b/data/env/planets/planets_up.tga new file mode 100644 index 00000000..4df756bb Binary files /dev/null and b/data/env/planets/planets_up.tga differ diff --git a/data/scripts/newsky_asteroids.shader b/data/scripts/newsky_asteroids.shader deleted file mode 100644 index fe6ed96f..00000000 --- a/data/scripts/newsky_asteroids.shader +++ /dev/null @@ -1,12 +0,0 @@ -textures/newskies/asteroids -{ - qer_editorimage env/newsky_asteroids/asteroids.tga - surfaceparm sky - surfaceparm nolightmap - surfaceparm nodlight - surfaceparm noimpact - surfaceparm nomarks - - skyparms env/newsky_asteroids/asteroids - - //farbox cloudheight nearbox - q3map_sunExt 1 0.75 0.5 320 27 42 0 16 //rgb intensity degrees elevation deviance samples -} diff --git a/data/scripts/newsky_nebulae.txt b/data/scripts/newsky_nebulae.txt deleted file mode 100644 index ebfe5f25..00000000 --- a/data/scripts/newsky_nebulae.txt +++ /dev/null @@ -1,49 +0,0 @@ -================================================================================ -NewSky - Nebulae -================================================================================ - -Version: 1.0 -Released: October 2009 -Author: Severin "sev" Meyer - -Created for Nexuiz and first released at - -================================================================================ -Blender and Gimp -================================================================================ - -To create the skybox images, I used the method explained here: - - -In short, the environment is projected onto a cube with an EnvMap material, -and after the rendering, the projection can be extracted with "Save EnvMap", -found in the Texture Panel. - -However, objects with manipulated normals are not rendered seamlessly, so -I rendered them seperately and then projected those renderings onto the cube. - -To cut the Envmap into 6 correctly named images, I wrote a script for Gimp, -you can find it in the /gimp/ folder. Put it in ~/.gimp*/scripts/ (Linux) - -================================================================================ -GNU General Public License -================================================================================ - -I release all the files that are part of this project under the terms of the -GNU General Public License as published by the Free Software Foundation, either -version 2 of the License, or any later version. - -All the files that are part of this project are distributed in the hope -that they will be useful, but WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -================================================================================ -Credits -================================================================================ - -The programs I used: Blender, Gimp, Inkscape, gedit, p7zip - -Though I didn't use any of them directly, I learned a lot by studying materials -from the Blender Open Material Repository , of which -I especially would like to mention "Sun" by walross and "Magmatic" by bohemix. - diff --git a/data/scripts/newsky_planets.shader b/data/scripts/newsky_planets.shader deleted file mode 100644 index 5caab893..00000000 --- a/data/scripts/newsky_planets.shader +++ /dev/null @@ -1,12 +0,0 @@ -textures/newskies/planets -{ - qer_editorimage env/newsky_planets/planets.tga - surfaceparm sky - surfaceparm nolightmap - surfaceparm nodlight - surfaceparm noimpact - surfaceparm nomarks - - skyparms env/newsky_planets/planets - - //farbox cloudheight nearbox - q3map_sunExt 1 0.9 0.8 320 124 42 0 16 //rgb intensity degrees elevation deviance samples -} diff --git a/data/scripts/shaderlist.txt b/data/scripts/shaderlist.txt index 56191900..d9110a66 100644 --- a/data/scripts/shaderlist.txt +++ b/data/scripts/shaderlist.txt @@ -30,9 +30,9 @@ liquids mandelbrotsky mflag morphed -newsky_asteroids -newsky_nebulae -newsky_planets +sky_asteroids +sky_nebulae +sky_planets nexdm18_rmx official_cmp1 onslaught diff --git a/data/scripts/sky_asteroids.shader b/data/scripts/sky_asteroids.shader new file mode 100644 index 00000000..39116ba3 --- /dev/null +++ b/data/scripts/sky_asteroids.shader @@ -0,0 +1,12 @@ +textures/skies/asteroids +{ + qer_editorimage env/asteroids/asteroids.tga + surfaceparm sky + surfaceparm nolightmap + surfaceparm nodlight + surfaceparm noimpact + surfaceparm nomarks + + skyparms env/asteroids/asteroids - - //farbox cloudheight nearbox + q3map_sunExt 1 0.75 0.5 320 27 42 0 16 //rgb intensity degrees elevation deviance samples +} diff --git a/data/scripts/sky_nebulae.shader b/data/scripts/sky_nebulae.shader new file mode 100644 index 00000000..78aff406 --- /dev/null +++ b/data/scripts/sky_nebulae.shader @@ -0,0 +1,14 @@ +textures/skies/nebulae +{ + qer_editorimage env/nebulae/nebulae.tga + surfaceparm sky + surfaceparm nolightmap + surfaceparm nodlight + surfaceparm noimpact + surfaceparm nomarks + + skyparms env/nebulae/nebulae - - //farbox cloudheight nearbox + q3map_skyLight 50 4 //amount iterations + q3map_sunExt 1 0.9 0.8 300 66 36 3 16 //rgb intensity degrees elevation deviance samples + q3map_skylight 50 4 +} \ No newline at end of file diff --git a/data/scripts/sky_nebulae.txt b/data/scripts/sky_nebulae.txt new file mode 100644 index 00000000..ebfe5f25 --- /dev/null +++ b/data/scripts/sky_nebulae.txt @@ -0,0 +1,49 @@ +================================================================================ +NewSky - Nebulae +================================================================================ + +Version: 1.0 +Released: October 2009 +Author: Severin "sev" Meyer + +Created for Nexuiz and first released at + +================================================================================ +Blender and Gimp +================================================================================ + +To create the skybox images, I used the method explained here: + + +In short, the environment is projected onto a cube with an EnvMap material, +and after the rendering, the projection can be extracted with "Save EnvMap", +found in the Texture Panel. + +However, objects with manipulated normals are not rendered seamlessly, so +I rendered them seperately and then projected those renderings onto the cube. + +To cut the Envmap into 6 correctly named images, I wrote a script for Gimp, +you can find it in the /gimp/ folder. Put it in ~/.gimp*/scripts/ (Linux) + +================================================================================ +GNU General Public License +================================================================================ + +I release all the files that are part of this project under the terms of the +GNU General Public License as published by the Free Software Foundation, either +version 2 of the License, or any later version. + +All the files that are part of this project are distributed in the hope +that they will be useful, but WITHOUT ANY WARRANTY; without even the +implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +================================================================================ +Credits +================================================================================ + +The programs I used: Blender, Gimp, Inkscape, gedit, p7zip + +Though I didn't use any of them directly, I learned a lot by studying materials +from the Blender Open Material Repository , of which +I especially would like to mention "Sun" by walross and "Magmatic" by bohemix. + diff --git a/data/scripts/sky_planets.shader b/data/scripts/sky_planets.shader new file mode 100644 index 00000000..25d64738 --- /dev/null +++ b/data/scripts/sky_planets.shader @@ -0,0 +1,12 @@ +textures/skies/planets +{ + qer_editorimage env/planets/planets.tga + surfaceparm sky + surfaceparm nolightmap + surfaceparm nodlight + surfaceparm noimpact + surfaceparm nomarks + + skyparms env/planets/planets - - //farbox cloudheight nearbox + q3map_sunExt 1 0.9 0.8 320 124 42 0 16 //rgb intensity degrees elevation deviance samples +}