Merge remote branch 'origin/savagex/g-23-relight'

diff --git a/maps/g-23.map b/maps/g-23.map
index 389a71dad8d5e97c532aa815da2f14a0710c5975..ea668ef198c218a02b83ef363f818f9e841142c2 100644 (file)
--- a/maps/g-23.map
+++ b/maps/g-23.map
@@ -5139,7 +5139,7 @@ exx/base-metal03
 }
 // brush 557
 {
-( 64 -960 -512 ) ( 192 -1088 -512 ) ( 64 -1088 -512 ) skies/extragalactic_planets 0 0 0 0.25 0.25 0 0 0
+( 64 -960 -512 ) ( 192 -1088 -512 ) ( 64 -1088 -512 ) skies/extragalactic_planets_intensity_196 0 0 0 0.25 0.25 0 0 0
 ( 64 -960 -512 ) ( 192 -960 -576 ) ( 192 -960 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 192 -960 -512 ) ( 192 -1088 -576 ) ( 192 -1088 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 192 -960 -576 ) ( 64 -1088 -576 ) ( 192 -1088 -576 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -9464,7 +9464,7 @@ exx/base-metal03
 {
 ( -1728 1152 320 ) ( -1664 -1152 320 ) ( -1728 -1152 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1664 1152 320 ) ( -1728 1152 -1408 ) ( -1664 1152 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1664 -1152 320 ) ( -1664 1152 -1408 ) ( -1664 -1152 -1408 ) skies/extragalactic_planets 0 0 0 0.25 0.25 0 0 0
+( -1664 -1152 320 ) ( -1664 1152 -1408 ) ( -1664 -1152 -1408 ) skies/extragalactic_planets_intensity_196 0 0 0 0.25 0.25 0 0 0
 ( -1728 -1152 -1408 ) ( -1664 -1152 -1408 ) ( -1664 1152 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1728 -1152 320 ) ( -1664 -1152 -1408 ) ( -1728 -1152 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1728 1152 320 ) ( -1728 -1152 -1408 ) ( -1728 1152 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -9473,7 +9473,7 @@ exx/base-metal03
 {
 ( -1664 -1152 -1472 ) ( -768 -1152 -1472 ) ( -768 1152 -1472 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1664 1152 -1408 ) ( -768 1152 -1472 ) ( -768 1152 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1664 -1152 -1408 ) ( -768 1152 -1408 ) ( -768 -1152 -1408 ) skies/extragalactic_planets 0 0 0 0.25 0.25 0 0 0
+( -1664 -1152 -1408 ) ( -768 1152 -1408 ) ( -768 -1152 -1408 ) skies/extragalactic_planets_intensity_196 0 0 0 0.25 0.25 0 0 0
 ( -1664 -1152 -1472 ) ( -768 -1152 -1408 ) ( -768 -1152 -1472 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1664 1152 -1472 ) ( -1664 1152 -1408 ) ( -1664 -1152 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -768 -1152 -1472 ) ( -768 -1152 -1408 ) ( -768 1152 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -9481,7 +9481,7 @@ exx/base-metal03
 // brush 954
 {
 ( -640 -512 -1472 ) ( -768 768 -1472 ) ( -768 -768 -1472 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -640 -512 -1408 ) ( -768 -768 -1408 ) ( -768 768 -1408 ) skies/extragalactic_planets 0 0 0 0.25 0.25 0 0 0
+( -640 -512 -1408 ) ( -768 -768 -1408 ) ( -768 768 -1408 ) skies/extragalactic_planets_intensity_196 0 0 0 0.25 0.25 0 0 0
 ( -768 -768 -1472 ) ( -768 768 -1408 ) ( -768 -768 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -640 -512 -1472 ) ( -640 -512 -1408 ) ( -640 512 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -768 -768 -1472 ) ( -768 -768 -1408 ) ( -640 -512 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -9752,13 +9752,13 @@ exx/base-metal03
 ( -1472 1216 320 ) ( -1664 1216 -1408 ) ( -1472 1216 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1472 1152 320 ) ( -1472 1216 -1408 ) ( -1472 1152 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1664 1152 -1408 ) ( -1472 1152 -1408 ) ( -1472 1216 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1664 1152 320 ) ( -1472 1152 -1408 ) ( -1664 1152 -1408 ) skies/extragalactic_planets 0 0 0 0.25 0.25 0 0 0
+( -1664 1152 320 ) ( -1472 1152 -1408 ) ( -1664 1152 -1408 ) skies/extragalactic_planets_intensity_196 0 0 0 0.25 0.25 0 0 0
 ( -1664 1216 320 ) ( -1664 1152 -1408 ) ( -1664 1216 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 // brush 985
 {
 ( -1664 -1152 320 ) ( -1472 -1216 320 ) ( -1664 -1216 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1472 -1152 320 ) ( -1664 -1152 -1408 ) ( -1472 -1152 -1408 ) skies/extragalactic_planets 0 0 0 0.25 0.25 0 0 0
+( -1472 -1152 320 ) ( -1664 -1152 -1408 ) ( -1472 -1152 -1408 ) skies/extragalactic_planets_intensity_196 0 0 0 0.25 0.25 0 0 0
 ( -1472 -1216 320 ) ( -1472 -1152 -1408 ) ( -1472 -1216 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1664 -1216 -1408 ) ( -1472 -1216 -1408 ) ( -1472 -1152 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1664 -1216 320 ) ( -1472 -1216 -1408 ) ( -1664 -1216 -1408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -10291,7 +10291,7 @@ exx/base-metal03
 // brush 1044
 {
 ( -1664 -512 384 ) ( -896 512 384 ) ( -896 -512 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1664 512 320 ) ( -896 -512 320 ) ( -896 512 320 ) skies/extragalactic_planets 0 0 0 0.25 0.25 0 0 0
+( -1664 512 320 ) ( -896 -512 320 ) ( -896 512 320 ) skies/extragalactic_planets_intensity_196 0 0 0 0.25 0.25 0 0 0
 ( -1664 -512 320 ) ( -1664 512 384 ) ( -1664 -512 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -896 512 320 ) ( -896 -512 384 ) ( -896 512 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1664 -512 320 ) ( -896 -512 384 ) ( -896 -512 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -10349,7 +10349,7 @@ exx/base-metal03
 // brush 1050
 {
 ( -896 -512 384 ) ( -768 -1152 384 ) ( -1664 -1152 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -896 -512 320 ) ( -1664 -1152 320 ) ( -768 -1152 320 ) skies/extragalactic_planets 0 0 0 0.25 0.25 0 0 0
+( -896 -512 320 ) ( -1664 -1152 320 ) ( -768 -1152 320 ) skies/extragalactic_planets_intensity_196 0 0 0 0.25 0.25 0 0 0
 ( -768 -1152 384 ) ( -1664 -1152 320 ) ( -1664 -1152 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1664 -512 384 ) ( -1664 -1152 384 ) ( -1664 -1152 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -768 -768 384 ) ( -768 -1152 320 ) ( -768 -1152 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -10359,7 +10359,7 @@ exx/base-metal03
 // brush 1051
 {
 ( -896 512 384 ) ( -1664 1152 384 ) ( -768 1152 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1664 512 320 ) ( -768 1152 320 ) ( -1664 1152 320 ) skies/extragalactic_planets 0 0 0 0.25 0.25 0 0 0
+( -1664 512 320 ) ( -768 1152 320 ) ( -1664 1152 320 ) skies/extragalactic_planets_intensity_196 0 0 0 0.25 0.25 0 0 0
 ( -1664 512 384 ) ( -1664 1152 320 ) ( -1664 1152 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -896 512 320 ) ( -896 512 384 ) ( -768 768 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1664 512 384 ) ( -896 512 384 ) ( -896 512 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -13781,7 +13781,7 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "origin" "-1056.000000 1176.000000 64.000000"
-"light" "1000"
+"light" "768"
 "_color" "1 0.927962 0.703319"
 }
 // entity 121
@@ -14017,7 +14017,7 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "origin" "-680.000000 -616.000000 64.000000"
-"light" "1000"
+"light" "768"
 "_color" "1 0.927962 0.703319"
 "angle" "63"
 }
@@ -14033,7 +14033,7 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "origin" "-1056.000000 -1176.000000 64.000000"
-"light" "1000"
+"light" "768"
 "_color" "1 0.927962 0.703319"
 }
 // entity 136
@@ -14055,7 +14055,7 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "origin" "-680.000000 616.000000 64.000000"
-"light" "1000"
+"light" "768"
 "_color" "1 0.927962 0.703319"
 }
 // entity 139

diff --git a/scripts/skies_extragalactic.shader b/scripts/skies_extragalactic.shader
index 895693ddb85235ef3ee7b920c6e39a0d0c5ec839..5d1bb67df375ce87152a356598b7a844d5ed4dab 100644 (file)
--- a/scripts/skies_extragalactic.shader
+++ b/scripts/skies_extragalactic.shader
@@ -40,3 +40,31 @@ textures/skies/extragalactic_planets
        q3map_sunExt 1 0.9 0.8 320 124 42 0 16 //rgb intensity degrees elevation deviance samples
        q3map_skylight 50 4
 }
+
+textures/skies/extragalactic_planets_intensity_256
+{
+       qer_editorimage textures/skies/extragalactic_planets.tga
+       surfaceparm sky
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm noimpact
+       surfaceparm nomarks
+
+       skyparms env/extragalactic/planets - - //farbox cloudheight nearbox
+       q3map_sunExt 1 0.9 0.8 256 124 42 0 16 //rgb intensity degrees elevation deviance samples
+       q3map_skylight 50 4
+}
+
+textures/skies/extragalactic_planets_intensity_196
+{
+       qer_editorimage textures/skies/extragalactic_planets.tga
+       surfaceparm sky
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm noimpact
+       surfaceparm nomarks
+
+       skyparms env/extragalactic/planets - - //farbox cloudheight nearbox
+       q3map_sunExt 1 0.9 0.8 196 124 42 0 16 //rgb intensity degrees elevation deviance samples
+       q3map_skylight 50 4
+}