From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Mon, 31 Aug 2015 12:22:15 +0000 (+0200)
Subject: space-elevator: sRGBify, add custom skybox shader
X-Git-Tag: xonotic-v0.8.2~181^2^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=063f51e3969d817606eca6dc0086fedf2643fb66;p=xonotic%2Fxonotic-maps.pk3dir.git

space-elevator: sRGBify, add custom skybox shader
---

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index 4b1cf3d6..4f13df6d 100644
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -331,12 +331,12 @@
 ( 64 -352 -64 ) ( -64 -352 -64 ) ( 64 -352 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -2944 -5376 2048 ) ( 2944 -5632 2048 ) ( -2944 -5632 2048 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 2944 -5376 2048 ) ( -2944 -5376 -4608 ) ( 2944 -5376 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 2944 -5632 2048 ) ( 2944 -5376 -4608 ) ( 2944 -5632 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 -5632 -4608 ) ( 2944 -5376 -4608 ) ( -2944 -5376 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 -5632 2048 ) ( 2944 -5632 -4608 ) ( -2944 -5632 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 -5376 2048 ) ( -2944 -5632 -4608 ) ( -2944 -5376 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 -5376 2048 ) ( 2944 -5632 2048 ) ( -2944 -5632 2048 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 2944 -5376 2048 ) ( -2944 -5376 -4608 ) ( 2944 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 2944 -5632 2048 ) ( 2944 -5376 -4608 ) ( 2944 -5632 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 -5632 -4608 ) ( 2944 -5376 -4608 ) ( -2944 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 -5632 2048 ) ( 2944 -5632 -4608 ) ( -2944 -5632 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 -5376 2048 ) ( -2944 -5632 -4608 ) ( -2944 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 112 -696 -192 ) ( 112 -728 -224 ) ( 112 -696 -224 ) proceduralx/wall-fruitconcrete 0 0 0 0.25 0.25 134217728 0 0
@@ -13396,12 +13396,12 @@ proceduralx/wall-fruitconcrete
 ( -64 352 -64 ) ( 64 352 -64 ) ( -64 352 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( -2944 5632 2048 ) ( 2944 5376 2048 ) ( -2944 5376 2048 ) skies/polluted_earth 256 -0 180 0.25 0.25 0 0 0
-( -2944 5376 2048 ) ( 2944 5376 -4608 ) ( -2944 5376 -4608 ) skies/polluted_earth 0 0 0 -0.25 0.25 0 0 0
-( -2944 5632 2048 ) ( -2944 5376 -4608 ) ( -2944 5632 -4608 ) skies/polluted_earth 0 0 0 -0.25 0.25 0 0 0
-( 2944 5632 -4608 ) ( -2944 5376 -4608 ) ( 2944 5376 -4608 ) skies/polluted_earth 256 -0 180 0.25 0.25 0 0 0
-( 2944 5632 2048 ) ( -2944 5632 -4608 ) ( 2944 5632 -4608 ) skies/polluted_earth 0 0 0 -0.25 0.25 0 0 0
-( 2944 5376 2048 ) ( 2944 5632 -4608 ) ( 2944 5376 -4608 ) skies/polluted_earth 0 0 0 -0.25 0.25 0 0 0
+( -2944 5632 2048 ) ( 2944 5376 2048 ) ( -2944 5376 2048 ) map_space-elevator/polluted_earth 256 -0 180 0.25 0.25 0 0 0
+( -2944 5376 2048 ) ( 2944 5376 -4608 ) ( -2944 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
+( -2944 5632 2048 ) ( -2944 5376 -4608 ) ( -2944 5632 -4608 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
+( 2944 5632 -4608 ) ( -2944 5376 -4608 ) ( 2944 5376 -4608 ) map_space-elevator/polluted_earth 256 -0 180 0.25 0.25 0 0 0
+( 2944 5632 2048 ) ( -2944 5632 -4608 ) ( 2944 5632 -4608 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
+( 2944 5376 2048 ) ( 2944 5632 -4608 ) ( 2944 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
 }
 {
 ( -112 696 -192 ) ( -112 728 -224 ) ( -112 696 -224 ) proceduralx/wall-fruitconcrete 0 0 0 -0.25 0.25 134217728 0 0
@@ -26186,36 +26186,36 @@ proceduralx/wall-fruitconcrete
 ( 64 64 -352 ) ( 64 64 -320 ) ( -64 64 -352 ) trak5x/trim-basictrim1b 0 0 90 0.25 -0.25 134217728 0 0
 }
 {
-( -3200 -5376 2048 ) ( -2944 5376 2048 ) ( -2944 -5376 2048 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -3200 -5376 2048 ) ( -3200 -5376 -4608 ) ( -3200 5376 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 -5376 -4608 ) ( -2944 5376 -4608 ) ( -3200 5376 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 -5376 2048 ) ( -2944 5376 -4608 ) ( -2944 -5376 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -3200 -5376 2048 ) ( -2944 -5376 -4608 ) ( -3200 -5376 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 5376 2048 ) ( -3200 5376 -4608 ) ( -2944 5376 -4608 ) skies/polluted_earth 0 0 0 -0.25 0.25 0 0 0
+( -3200 -5376 2048 ) ( -2944 5376 2048 ) ( -2944 -5376 2048 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -3200 -5376 2048 ) ( -3200 -5376 -4608 ) ( -3200 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 -5376 -4608 ) ( -2944 5376 -4608 ) ( -3200 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 -5376 2048 ) ( -2944 5376 -4608 ) ( -2944 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -3200 -5376 2048 ) ( -2944 -5376 -4608 ) ( -3200 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 5376 2048 ) ( -3200 5376 -4608 ) ( -2944 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( -2944 -5376 2304 ) ( 2944 5376 2304 ) ( 2944 -5376 2304 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 5376 2048 ) ( -2944 -5376 2304 ) ( -2944 -5376 2048 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 5376 2048 ) ( 2944 -5376 2048 ) ( 2944 5376 2048 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 2944 5376 2304 ) ( 2944 -5376 2048 ) ( 2944 -5376 2304 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 2944 -5376 2304 ) ( -2944 -5376 2048 ) ( -2944 -5376 2304 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 5376 2304 ) ( 2944 5376 2048 ) ( 2944 5376 2304 ) skies/polluted_earth 0 0 0 -0.25 0.25 0 0 0
+( -2944 -5376 2304 ) ( 2944 5376 2304 ) ( 2944 -5376 2304 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 5376 2048 ) ( -2944 -5376 2304 ) ( -2944 -5376 2048 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 5376 2048 ) ( 2944 -5376 2048 ) ( 2944 5376 2048 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 2944 5376 2304 ) ( 2944 -5376 2048 ) ( 2944 -5376 2304 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 2944 -5376 2304 ) ( -2944 -5376 2048 ) ( -2944 -5376 2304 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 5376 2304 ) ( 2944 5376 2048 ) ( 2944 5376 2304 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( 2944 -5376 2048 ) ( 3200 5376 2048 ) ( 3200 -5376 2048 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 2944 -5376 2048 ) ( 2944 -5376 -4608 ) ( 2944 5376 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 3200 -5376 -4608 ) ( 3200 5376 -4608 ) ( 2944 5376 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 3200 -5376 2048 ) ( 3200 5376 -4608 ) ( 3200 -5376 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 2944 -5376 2048 ) ( 3200 -5376 -4608 ) ( 2944 -5376 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 3200 5376 2048 ) ( 2944 5376 -4608 ) ( 3200 5376 -4608 ) skies/polluted_earth 0 0 0 -0.25 0.25 0 0 0
+( 2944 -5376 2048 ) ( 3200 5376 2048 ) ( 3200 -5376 2048 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 2944 -5376 2048 ) ( 2944 -5376 -4608 ) ( 2944 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 3200 -5376 -4608 ) ( 3200 5376 -4608 ) ( 2944 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 3200 -5376 2048 ) ( 3200 5376 -4608 ) ( 3200 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 2944 -5376 2048 ) ( 3200 -5376 -4608 ) ( 2944 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 3200 5376 2048 ) ( 2944 5376 -4608 ) ( 3200 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( 2944 -5376 -4608 ) ( -2944 5376 -4608 ) ( 2944 5376 -4608 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 -5376 -4608 ) ( -2944 -5376 -4864 ) ( -2944 5376 -4864 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 2944 -5376 -4864 ) ( 2944 5376 -4864 ) ( -2944 5376 -4864 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 2944 -5376 -4608 ) ( 2944 5376 -4864 ) ( 2944 -5376 -4864 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 -5376 -4608 ) ( 2944 -5376 -4864 ) ( -2944 -5376 -4864 ) skies/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 2944 5376 -4608 ) ( -2944 5376 -4864 ) ( 2944 5376 -4864 ) skies/polluted_earth 0 0 0 -0.25 0.25 0 0 0
+( 2944 -5376 -4608 ) ( -2944 5376 -4608 ) ( 2944 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 -5376 -4608 ) ( -2944 -5376 -4864 ) ( -2944 5376 -4864 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 2944 -5376 -4864 ) ( 2944 5376 -4864 ) ( -2944 5376 -4864 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 2944 -5376 -4608 ) ( 2944 5376 -4864 ) ( 2944 -5376 -4864 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 -5376 -4608 ) ( 2944 -5376 -4864 ) ( -2944 -5376 -4864 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 2944 5376 -4608 ) ( -2944 5376 -4864 ) ( 2944 5376 -4864 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
 }
 {
 ( 256 224 -512 ) ( 256 -256 -512 ) ( 224 224 -512 ) exx/base-metal04 0 0 0 0.25 0.25 134217728 0 0
@@ -28159,42 +28159,42 @@ effects_jumppad/jumppadfx1_a
 {
 "classname" "light"
 "origin" "448.000000 0.000000 552.000000"
-"light" "300"
+"light" "150"
 }
 {
 "classname" "light"
 "origin" "0.000000 0.000000 -208.000000"
-"light" "20"
+"light" "10"
 }
 {
 "classname" "light"
 "origin" "-448.000000 0.000000 256.000000"
-"light" "80"
+"light" "40"
 }
 {
 "classname" "light"
 "origin" "448.000000 0.000000 256.000000"
-"light" "80"
+"light" "40"
 }
 {
 "classname" "light"
 "origin" "0.000000 0.000000 424.000000"
-"light" "300"
+"light" "150"
 }
 {
 "classname" "light"
 "origin" "-448.000000 0.000000 552.000000"
-"light" "300"
+"light" "150"
 }
 {
 "classname" "light"
 "origin" "0.000000 -3136.000000 -32.000000"
-"light" "160"
+"light" "80"
 }
 {
 "classname" "light"
 "origin" "704.000000 0.000000 -96.000000"
-"light" "80"
+"light" "40"
 }
 {
 "classname" "func_door"
@@ -28645,7 +28645,7 @@ effects_jumppad/jumppadfx1_a
 {
 "classname" "light"
 "origin" "-704.000000 0.000000 -96.000000"
-"light" "80"
+"light" "40"
 }
 {
 "classname" "info_player_team1"
@@ -28660,7 +28660,7 @@ effects_jumppad/jumppadfx1_a
 {
 "classname" "light"
 "origin" "0.000000 -3360.000000 -32.000000"
-"light" "160"
+"light" "80"
 }
 {
 "classname" "item_health_medium"
@@ -28688,7 +28688,7 @@ effects_jumppad/jumppadfx1_a
 {
 "classname" "light"
 "origin" "0.000000 -192.000000 -384.000000"
-"light" "100"
+"light" "50"
 }
 {
 "classname" "item_armor_small"
@@ -29180,7 +29180,7 @@ effects_jumppad/jumppadfx1_a
 {
 "classname" "light"
 "origin" "0.000000 3136.000000 -32.000000"
-"light" "160"
+"light" "80"
 }
 {
 "classname" "func_door"
@@ -29637,7 +29637,7 @@ effects_jumppad/jumppadfx1_a
 {
 "classname" "light"
 "origin" "0.000000 3360.000000 -32.000000"
-"light" "160"
+"light" "80"
 }
 {
 "classname" "weapon_grenadelauncher"
@@ -29647,7 +29647,7 @@ effects_jumppad/jumppadfx1_a
 {
 "classname" "light"
 "origin" "0.000000 192.000000 -384.000000"
-"light" "100"
+"light" "50"
 }
 {
 "classname" "item_armor_small"
diff --git a/maps/space-elevator.map.options b/maps/space-elevator.map.options
index 03d9a6f8..9ecf5cb5 100644
--- a/maps/space-elevator.map.options
+++ b/maps/space-elevator.map.options
@@ -2,5 +2,5 @@
 -light +
 -vis +
 -minimap +
--nosRGB
-Version: 6
\ No newline at end of file
+-sRGB
+Version: 6
diff --git a/scripts/map_space-elevator.shader b/scripts/map_space-elevator.shader
index be97c6f3..64c9d23c 100644
--- a/scripts/map_space-elevator.shader
+++ b/scripts/map_space-elevator.shader
@@ -87,3 +87,22 @@ textures/map_space-elevator/solarmetal
 		blendfunc filter
 	}
 }
+
+textures/map_space-elevator/polluted_earth
+{
+	qer_editorimage textures/skies/polluted_earth.jpg
+	surfaceparm sky
+	surfaceparm noimpact
+	surfaceparm nolightmap
+	surfaceparm nomarks
+	q3map_globaltexture
+	q3map_surfacelight 20
+	surfaceparm sky
+
+        nopicmip
+        nomipmaps
+
+	q3map_sunExt 1 0.9 0.9 250 320 20
+	q3map_skylight 05 4
+	skyparms env/polluted_earth/polluted_earth - -
+}