From 9bdda521aee49136de39ea53c2d15908e0e57c6a Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Wed, 29 Sep 2010 00:05:37 +0300 Subject: [PATCH] Change some skies a bit. Now to recompile the necessary maps... --- .../{newsky_asteroids => asteroids}/asteroids.tga | Bin .../asteroids_bk.tga | Bin .../asteroids_dn.tga | Bin .../asteroids_ft.tga | Bin .../asteroids_lf.tga | Bin .../asteroids_rt.tga | Bin .../asteroids_up.tga | Bin data/env/{newsky_nebulae => nebulae}/nebulae.tga | Bin .../{newsky_nebulae => nebulae}/nebulae_bk.tga | Bin .../{newsky_nebulae => nebulae}/nebulae_dn.tga | Bin .../{newsky_nebulae => nebulae}/nebulae_ft.tga | Bin .../{newsky_nebulae => nebulae}/nebulae_lf.tga | Bin .../{newsky_nebulae => nebulae}/nebulae_rt.tga | Bin .../{newsky_nebulae => nebulae}/nebulae_up.tga | Bin data/env/{newsky_planets => planets}/planets.tga | Bin .../{newsky_planets => planets}/planets_bk.tga | Bin .../{newsky_planets => planets}/planets_dn.tga | Bin .../{newsky_planets => planets}/planets_ft.tga | Bin .../{newsky_planets => planets}/planets_lf.tga | Bin .../{newsky_planets => planets}/planets_rt.tga | Bin .../{newsky_planets => planets}/planets_up.tga | Bin data/scripts/shaderlist.txt | 6 +++--- ...wsky_asteroids.shader => sky_asteroids.shader} | 6 +++--- data/scripts/sky_nebulae.shader | 14 ++++++++++++++ .../{newsky_nebulae.txt => sky_nebulae.txt} | 0 .../{newsky_planets.shader => sky_planets.shader} | 6 +++--- 26 files changed, 23 insertions(+), 9 deletions(-) rename data/env/{newsky_asteroids => asteroids}/asteroids.tga (100%) rename data/env/{newsky_asteroids => asteroids}/asteroids_bk.tga (100%) rename data/env/{newsky_asteroids => asteroids}/asteroids_dn.tga (100%) rename data/env/{newsky_asteroids => asteroids}/asteroids_ft.tga (100%) rename data/env/{newsky_asteroids => asteroids}/asteroids_lf.tga (100%) rename data/env/{newsky_asteroids => asteroids}/asteroids_rt.tga (100%) rename data/env/{newsky_asteroids => asteroids}/asteroids_up.tga (100%) rename data/env/{newsky_nebulae => nebulae}/nebulae.tga (100%) rename data/env/{newsky_nebulae => nebulae}/nebulae_bk.tga (100%) rename data/env/{newsky_nebulae => nebulae}/nebulae_dn.tga (100%) rename data/env/{newsky_nebulae => nebulae}/nebulae_ft.tga (100%) rename data/env/{newsky_nebulae => nebulae}/nebulae_lf.tga (100%) rename data/env/{newsky_nebulae => nebulae}/nebulae_rt.tga (100%) rename data/env/{newsky_nebulae => nebulae}/nebulae_up.tga (100%) rename data/env/{newsky_planets => planets}/planets.tga (100%) rename data/env/{newsky_planets => planets}/planets_bk.tga (100%) rename data/env/{newsky_planets => planets}/planets_dn.tga (100%) rename data/env/{newsky_planets => planets}/planets_ft.tga (100%) rename data/env/{newsky_planets => planets}/planets_lf.tga (100%) rename data/env/{newsky_planets => planets}/planets_rt.tga (100%) rename data/env/{newsky_planets => planets}/planets_up.tga (100%) rename data/scripts/{newsky_asteroids.shader => sky_asteroids.shader} (56%) create mode 100644 data/scripts/sky_nebulae.shader rename data/scripts/{newsky_nebulae.txt => sky_nebulae.txt} (100%) rename data/scripts/{newsky_planets.shader => sky_planets.shader} (58%) diff --git a/data/env/newsky_asteroids/asteroids.tga b/data/env/asteroids/asteroids.tga similarity index 100% rename from data/env/newsky_asteroids/asteroids.tga rename to data/env/asteroids/asteroids.tga diff --git a/data/env/newsky_asteroids/asteroids_bk.tga b/data/env/asteroids/asteroids_bk.tga similarity index 100% rename from data/env/newsky_asteroids/asteroids_bk.tga rename to data/env/asteroids/asteroids_bk.tga diff --git a/data/env/newsky_asteroids/asteroids_dn.tga b/data/env/asteroids/asteroids_dn.tga similarity index 100% rename from data/env/newsky_asteroids/asteroids_dn.tga rename to data/env/asteroids/asteroids_dn.tga diff --git a/data/env/newsky_asteroids/asteroids_ft.tga b/data/env/asteroids/asteroids_ft.tga similarity index 100% rename from data/env/newsky_asteroids/asteroids_ft.tga rename to data/env/asteroids/asteroids_ft.tga diff --git a/data/env/newsky_asteroids/asteroids_lf.tga b/data/env/asteroids/asteroids_lf.tga similarity index 100% rename from data/env/newsky_asteroids/asteroids_lf.tga rename to data/env/asteroids/asteroids_lf.tga diff --git a/data/env/newsky_asteroids/asteroids_rt.tga b/data/env/asteroids/asteroids_rt.tga similarity index 100% rename from data/env/newsky_asteroids/asteroids_rt.tga rename to data/env/asteroids/asteroids_rt.tga diff --git a/data/env/newsky_asteroids/asteroids_up.tga b/data/env/asteroids/asteroids_up.tga similarity index 100% rename from data/env/newsky_asteroids/asteroids_up.tga rename to data/env/asteroids/asteroids_up.tga diff --git a/data/env/newsky_nebulae/nebulae.tga b/data/env/nebulae/nebulae.tga similarity index 100% rename from data/env/newsky_nebulae/nebulae.tga rename to data/env/nebulae/nebulae.tga diff --git a/data/env/newsky_nebulae/nebulae_bk.tga b/data/env/nebulae/nebulae_bk.tga similarity index 100% rename from data/env/newsky_nebulae/nebulae_bk.tga rename to data/env/nebulae/nebulae_bk.tga diff --git a/data/env/newsky_nebulae/nebulae_dn.tga b/data/env/nebulae/nebulae_dn.tga similarity index 100% rename from data/env/newsky_nebulae/nebulae_dn.tga rename to data/env/nebulae/nebulae_dn.tga diff --git a/data/env/newsky_nebulae/nebulae_ft.tga b/data/env/nebulae/nebulae_ft.tga similarity index 100% rename from data/env/newsky_nebulae/nebulae_ft.tga rename to data/env/nebulae/nebulae_ft.tga diff --git a/data/env/newsky_nebulae/nebulae_lf.tga b/data/env/nebulae/nebulae_lf.tga similarity index 100% rename from data/env/newsky_nebulae/nebulae_lf.tga rename to data/env/nebulae/nebulae_lf.tga diff --git a/data/env/newsky_nebulae/nebulae_rt.tga b/data/env/nebulae/nebulae_rt.tga similarity index 100% rename from data/env/newsky_nebulae/nebulae_rt.tga rename to data/env/nebulae/nebulae_rt.tga diff --git a/data/env/newsky_nebulae/nebulae_up.tga b/data/env/nebulae/nebulae_up.tga similarity index 100% rename from data/env/newsky_nebulae/nebulae_up.tga rename to data/env/nebulae/nebulae_up.tga diff --git a/data/env/newsky_planets/planets.tga b/data/env/planets/planets.tga similarity index 100% rename from data/env/newsky_planets/planets.tga rename to data/env/planets/planets.tga diff --git a/data/env/newsky_planets/planets_bk.tga b/data/env/planets/planets_bk.tga similarity index 100% rename from data/env/newsky_planets/planets_bk.tga rename to data/env/planets/planets_bk.tga diff --git a/data/env/newsky_planets/planets_dn.tga b/data/env/planets/planets_dn.tga similarity index 100% rename from data/env/newsky_planets/planets_dn.tga rename to data/env/planets/planets_dn.tga diff --git a/data/env/newsky_planets/planets_ft.tga b/data/env/planets/planets_ft.tga similarity index 100% rename from data/env/newsky_planets/planets_ft.tga rename to data/env/planets/planets_ft.tga diff --git a/data/env/newsky_planets/planets_lf.tga b/data/env/planets/planets_lf.tga similarity index 100% rename from data/env/newsky_planets/planets_lf.tga rename to data/env/planets/planets_lf.tga diff --git a/data/env/newsky_planets/planets_rt.tga b/data/env/planets/planets_rt.tga similarity index 100% rename from data/env/newsky_planets/planets_rt.tga rename to data/env/planets/planets_rt.tga diff --git a/data/env/newsky_planets/planets_up.tga b/data/env/planets/planets_up.tga similarity index 100% rename from data/env/newsky_planets/planets_up.tga rename to data/env/planets/planets_up.tga 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/newsky_asteroids.shader b/data/scripts/sky_asteroids.shader similarity index 56% rename from data/scripts/newsky_asteroids.shader rename to data/scripts/sky_asteroids.shader index fe6ed96f..39116ba3 100644 --- a/data/scripts/newsky_asteroids.shader +++ b/data/scripts/sky_asteroids.shader @@ -1,12 +1,12 @@ -textures/newskies/asteroids +textures/skies/asteroids { - qer_editorimage env/newsky_asteroids/asteroids.tga + qer_editorimage env/asteroids/asteroids.tga surfaceparm sky surfaceparm nolightmap surfaceparm nodlight surfaceparm noimpact surfaceparm nomarks - skyparms env/newsky_asteroids/asteroids - - //farbox cloudheight nearbox + 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/newsky_nebulae.txt b/data/scripts/sky_nebulae.txt similarity index 100% rename from data/scripts/newsky_nebulae.txt rename to data/scripts/sky_nebulae.txt diff --git a/data/scripts/newsky_planets.shader b/data/scripts/sky_planets.shader similarity index 58% rename from data/scripts/newsky_planets.shader rename to data/scripts/sky_planets.shader index 5caab893..25d64738 100644 --- a/data/scripts/newsky_planets.shader +++ b/data/scripts/sky_planets.shader @@ -1,12 +1,12 @@ -textures/newskies/planets +textures/skies/planets { - qer_editorimage env/newsky_planets/planets.tga + qer_editorimage env/planets/planets.tga surfaceparm sky surfaceparm nolightmap surfaceparm nodlight surfaceparm noimpact surfaceparm nomarks - skyparms env/newsky_planets/planets - - //farbox cloudheight nearbox + 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 } -- 2.39.2