From: Rudolf Polzer Date: Wed, 7 Mar 2012 11:30:47 +0000 (+0100) Subject: new skybox X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9ec98d61d0a1475c407f61bca8575ffb8cd89366;p=xonotic%2Fxonotic-maps.pk3dir.git new skybox --- diff --git a/env/map_augenkrebs/novasky.txt b/env/map_augenkrebs/novasky.txt new file mode 100644 index 00000000..43b4d8bb --- /dev/null +++ b/env/map_augenkrebs/novasky.txt @@ -0,0 +1,40 @@ +before exporting, flatten and run "make seamless" + +Use these commands to make _dn and _up images: + +convert novasky_bk.png \ + -fx " + bot = j / 1023; + top = 1 - bot; + lef = i / 1023; + rig = 1 - lef; + ptop = p{i, j}; + pbot = p{1023 - i, 1023 - j}; + prig = p{1023 - j, i}; + plef = p{j, 1023 - i}; + strength = 1.0 / (1.0001 - max(max(bot, top), max(lef, rig))); + xbot = pow(bot, strength); + xtop = pow(top, strength); + xlef = pow(lef, strength); + xrig = pow(rig, strength); + sum = xbot + xtop + xlef + xrig; + (ptop * xtop + pbot * xbot + plef * xlef + prig * xrig) / sum + " novasky_dn.png +convert novasky_bk.png \ + -fx " + top = j / 1023; + bot = 1 - top; + rig = i / 1023; + lef = 1 - rig; + ptop = p{i, j}; + pbot = p{1023 - i, 1023 - j}; + prig = p{1023 - j, i}; + plef = p{j, 1023 - i}; + strength = 1.0 / (1.0001 - max(max(bot, top), max(lef, rig))); + xbot = pow(bot, strength); + xtop = pow(top, strength); + xlef = pow(lef, strength); + xrig = pow(rig, strength); + sum = xbot + xtop + xlef + xrig; + (ptop * xtop + pbot * xbot + plef * xlef + prig * xrig) / sum + " novasky_up.png diff --git a/env/map_augenkrebs/novasky.xcf b/env/map_augenkrebs/novasky.xcf new file mode 100644 index 00000000..8d096b2b Binary files /dev/null and b/env/map_augenkrebs/novasky.xcf differ diff --git a/env/map_augenkrebs/novasky_bk.png b/env/map_augenkrebs/novasky_bk.png new file mode 100644 index 00000000..4b67078b Binary files /dev/null and b/env/map_augenkrebs/novasky_bk.png differ diff --git a/env/map_augenkrebs/novasky_dn.png b/env/map_augenkrebs/novasky_dn.png new file mode 100644 index 00000000..c13a9812 Binary files /dev/null and b/env/map_augenkrebs/novasky_dn.png differ diff --git a/env/map_augenkrebs/novasky_ft.png b/env/map_augenkrebs/novasky_ft.png new file mode 100644 index 00000000..4b67078b Binary files /dev/null and b/env/map_augenkrebs/novasky_ft.png differ diff --git a/env/map_augenkrebs/novasky_lf.png b/env/map_augenkrebs/novasky_lf.png new file mode 100644 index 00000000..4b67078b Binary files /dev/null and b/env/map_augenkrebs/novasky_lf.png differ diff --git a/env/map_augenkrebs/novasky_rt.png b/env/map_augenkrebs/novasky_rt.png new file mode 100644 index 00000000..4b67078b Binary files /dev/null and b/env/map_augenkrebs/novasky_rt.png differ diff --git a/env/map_augenkrebs/novasky_up.png b/env/map_augenkrebs/novasky_up.png new file mode 100644 index 00000000..ea2cc0ed Binary files /dev/null and b/env/map_augenkrebs/novasky_up.png differ diff --git a/env/mikeenova/mikeenova_bk.jpg b/env/mikeenova/mikeenova_bk.jpg deleted file mode 100644 index 5e998a6b..00000000 Binary files a/env/mikeenova/mikeenova_bk.jpg and /dev/null differ diff --git a/env/mikeenova/mikeenova_dn.jpg b/env/mikeenova/mikeenova_dn.jpg deleted file mode 100644 index bfd21a1d..00000000 Binary files a/env/mikeenova/mikeenova_dn.jpg and /dev/null differ diff --git a/env/mikeenova/mikeenova_ft.jpg b/env/mikeenova/mikeenova_ft.jpg deleted file mode 100644 index 5e998a6b..00000000 Binary files a/env/mikeenova/mikeenova_ft.jpg and /dev/null differ diff --git a/env/mikeenova/mikeenova_lf.jpg b/env/mikeenova/mikeenova_lf.jpg deleted file mode 100644 index 5e998a6b..00000000 Binary files a/env/mikeenova/mikeenova_lf.jpg and /dev/null differ diff --git a/env/mikeenova/mikeenova_rt.jpg b/env/mikeenova/mikeenova_rt.jpg deleted file mode 100644 index 5e998a6b..00000000 Binary files a/env/mikeenova/mikeenova_rt.jpg and /dev/null differ diff --git a/env/mikeenova/mikeenova_up.jpg b/env/mikeenova/mikeenova_up.jpg deleted file mode 100644 index 940d2dba..00000000 Binary files a/env/mikeenova/mikeenova_up.jpg and /dev/null differ diff --git a/maps/augenkrebs.map b/maps/augenkrebs.map index db1f9a7f..31697980 100644 --- a/maps/augenkrebs.map +++ b/maps/augenkrebs.map @@ -4,12 +4,12 @@ "_minLight" "62" "_minVertexLight" "62" { -( 2304 2048 2048 ) ( 2304 -2048 2048 ) ( -1792 2048 2048 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( 2048 1792 256 ) ( -2048 1792 256 ) ( 2048 1792 0 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( 1792 2048 256 ) ( 1792 2048 0 ) ( 1792 -2048 256 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( -2048 -1792 0 ) ( -2048 -1792 256 ) ( 2048 -1792 0 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( -1792 -2048 0 ) ( -1792 2048 0 ) ( -1792 -2048 256 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( -1792 2048 1792 ) ( 2304 -2048 1792 ) ( 2304 2048 1792 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 +( 2304 2048 2048 ) ( 2304 -2048 2048 ) ( -1792 2048 2048 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( 2048 1792 256 ) ( -2048 1792 256 ) ( 2048 1792 0 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( 1792 2048 256 ) ( 1792 2048 0 ) ( 1792 -2048 256 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( -2048 -1792 0 ) ( -2048 -1792 256 ) ( 2048 -1792 0 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( -1792 -2048 0 ) ( -1792 2048 0 ) ( -1792 -2048 256 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( -1792 2048 1792 ) ( 2304 -2048 1792 ) ( 2304 2048 1792 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 } { ( 2048 2048 256 ) ( -2048 2048 256 ) ( 2048 2048 0 ) map_augenkrebs/lines 0 0 90 0.5 0.5 0 0 0 @@ -203,35 +203,35 @@ ( 880 -1472 1600 ) ( 880 256 1600 ) ( 880 -1472 1664 ) map_augenkrebs/pgscroll 0 0 -90 0.5 0.5 0 0 0 } { -( 2304 2048 2048 ) ( 2304 -2048 2048 ) ( -1792 2048 2048 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( 2048 2048 256 ) ( -2048 2048 256 ) ( 2048 2048 0 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( 1792 2048 256 ) ( 1792 2048 0 ) ( 1792 -2048 256 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( -1792 1792 1280 ) ( -1792 2048 1280 ) ( -1792 2048 2048 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( 2048 1792 0 ) ( -2048 1792 256 ) ( 2048 1792 256 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 +( 2304 2048 2048 ) ( 2304 -2048 2048 ) ( -1792 2048 2048 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( 2048 2048 256 ) ( -2048 2048 256 ) ( 2048 2048 0 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( 1792 2048 256 ) ( 1792 2048 0 ) ( 1792 -2048 256 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( -1792 1792 1280 ) ( -1792 2048 1280 ) ( -1792 2048 2048 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( 2048 1792 0 ) ( -2048 1792 256 ) ( 2048 1792 256 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 ( -1792 2048 1280 ) ( -1792 1792 1280 ) ( 1792 1792 1024 ) map_augenkrebs/bw 0 0 0 0.5 0.5 0 0 0 } { -( 2304 2048 2048 ) ( 2304 -2048 2048 ) ( -1792 2048 2048 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( 2048 1792 256 ) ( -2048 1792 256 ) ( 2048 1792 0 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( 2048 1792 256 ) ( 2048 1792 0 ) ( 2048 -2304 256 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( 2048 -1792 1536 ) ( 1792 -1792 1536 ) ( 1792 -1792 2048 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( 1792 -2048 256 ) ( 1792 2048 0 ) ( 1792 2048 256 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 +( 2304 2048 2048 ) ( 2304 -2048 2048 ) ( -1792 2048 2048 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( 2048 1792 256 ) ( -2048 1792 256 ) ( 2048 1792 0 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( 2048 1792 256 ) ( 2048 1792 0 ) ( 2048 -2304 256 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( 2048 -1792 1536 ) ( 1792 -1792 1536 ) ( 1792 -1792 2048 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( 1792 -2048 256 ) ( 1792 2048 0 ) ( 1792 2048 256 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 ( 1792 -1792 1536 ) ( 2048 -1792 1536 ) ( 2048 1792 1024 ) map_augenkrebs/bw 0 0 0 0.5 0.5 0 0 0 } { -( 2304 2048 2048 ) ( 2304 -2048 2048 ) ( -1792 2048 2048 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( 1792 -1792 1536 ) ( 1792 -2048 1536 ) ( 1792 -2048 2048 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( -2048 -2048 0 ) ( -2048 -2048 256 ) ( 2048 -2048 0 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( -1792 -2048 768 ) ( -1792 -1792 768 ) ( -1792 -1792 2048 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( 2048 -1792 0 ) ( -2048 -1792 256 ) ( -2048 -1792 0 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 +( 2304 2048 2048 ) ( 2304 -2048 2048 ) ( -1792 2048 2048 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( 1792 -1792 1536 ) ( 1792 -2048 1536 ) ( 1792 -2048 2048 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( -2048 -2048 0 ) ( -2048 -2048 256 ) ( 2048 -2048 0 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( -1792 -2048 768 ) ( -1792 -1792 768 ) ( -1792 -1792 2048 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( 2048 -1792 0 ) ( -2048 -1792 256 ) ( -2048 -1792 0 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 ( -1792 -1792 768 ) ( -1792 -2048 768 ) ( 1792 -2048 1536 ) map_augenkrebs/bw 0 0 0 0.5 0.5 0 0 0 } { -( 2304 2048 2048 ) ( 2304 -2048 2048 ) ( -1792 2048 2048 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( -2048 1792 1280 ) ( -1792 1792 1280 ) ( -1792 1792 2048 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( -1792 -1792 768 ) ( -2048 -1792 768 ) ( -2048 -1792 2048 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( -2048 -2048 0 ) ( -2048 2048 0 ) ( -2048 -2048 256 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 -( -1792 -2048 256 ) ( -1792 2048 0 ) ( -1792 -2048 0 ) mikeenova_sky/mikeenova_sky 0 0 0 0.5 0.5 0 0 0 +( 2304 2048 2048 ) ( 2304 -2048 2048 ) ( -1792 2048 2048 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( -2048 1792 1280 ) ( -1792 1792 1280 ) ( -1792 1792 2048 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( -1792 -1792 768 ) ( -2048 -1792 768 ) ( -2048 -1792 2048 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( -2048 -2048 0 ) ( -2048 2048 0 ) ( -2048 -2048 256 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 +( -1792 -2048 256 ) ( -1792 2048 0 ) ( -1792 -2048 0 ) map_augenkrebs/novasky 0 0 0 0.5 0.5 0 0 0 ( -1792 1792 1280 ) ( -2048 1792 1280 ) ( -2048 -1792 768 ) map_augenkrebs/bw 0 0 0 0.5 0.5 0 0 0 } { diff --git a/scripts/mikeenova_sky.shader b/scripts/mikeenova_sky.shader index 70f008ff..9f6e16f1 100644 --- a/scripts/mikeenova_sky.shader +++ b/scripts/mikeenova_sky.shader @@ -1,14 +1,11 @@ -// nebula skybox -// ============= - -textures/mikeenova_sky/mikeenova_sky +textures/map_augenkrebs/novasky { - qer_editorimage env/mikeenova/mikeenova_up.png + qer_editorimage env/map_augenkrebs/novasky surfaceparm sky surfaceparm noimpact surfaceparm nolightmap surfaceparm nomarks q3map_surfacelight 0 q3map_sun 1 .98 .9 0 0 90 - skyparms env/mikeenova/mikeenova - - + skyparms env/map_augenkrebs/novasky - - }