Platform: Update test_lightwarmth.bsp/map

2021-06-29 22:27:25 +02:00 · 2021-06-29 22:27:25 +02:00 · 3a69435a6b
parent 334f880462
commit 3a69435a6b
13 changed files with 28 additions and 46 deletions
--- a/platform/test_maps.pk3dir/maps/test_lightwarmth.bsp
+++ b/platform/test_maps.pk3dir/maps/test_lightwarmth.bsp
--- a/platform/test_maps.pk3dir/maps/test_lightwarmth.map
+++ b/platform/test_maps.pk3dir/maps/test_lightwarmth.map
@ -139,15 +139,6 @@
 }
 // brush 15
 {
-( 452 -506 48 ) ( 452 -530 48 ) ( 428 -506 48 ) lights/k_1000 [ 1 0 0 8 ] [ -0 -1 -0 12 ] -0 0.5 0.5 0 0 0
-( 456 -510 52 ) ( 432 -510 52 ) ( 456 -510 44 ) lights/k_1000 [ 1 0 0 0 ] [ -0 -0 -1 8 ] -0 0.5 0.5 0 0 0
-( 440 -490 48 ) ( 440 -490 40 ) ( 440 -514 48 ) lights/k_1000 [ 0 1 0 4 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
-( 428 -534 44 ) ( 452 -534 44 ) ( 428 -510 44 ) lights/k_1000 [ 1 0 0 8 ] [ -0 -1 -0 4 ] -0 0.5 0.5 0 0 0
-( 424 -514 40 ) ( 424 -514 48 ) ( 448 -514 40 ) lights/k_1000 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
-( 432 -530 40 ) ( 432 -506 40 ) ( 432 -530 48 ) lights/k_1000 [ 0 1 0 4 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
-}
-// brush 16
-{
 ( -384 -608 -64 ) ( -512 128 -64 ) ( -384 128 -64 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0
 ( -384 128 -128 ) ( -512 128 -64 ) ( -512 128 -128 ) common/caulk [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
 ( -384 -608 -128 ) ( -384 128 -64 ) ( -384 128 -128 ) common/caulk [ 0 1 0 -0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
@ -155,7 +146,7 @@
 ( -448 -608 -128 ) ( -448 -608 192 ) ( -352 -608 -128 ) common/caulk [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
 ( -512 -608 -64 ) ( -512 128 -128 ) ( -512 128 -64 ) common/caulk [ 0 1 0 -0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
 }
-// brush 17
+// brush 16
 {
 ( -512 -608 128 ) ( -544 128 128 ) ( -512 128 128 ) common/caulk [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0
 ( -544 128 128 ) ( -512 128 -64 ) ( -512 128 128 ) common/caulk [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
@ -164,7 +155,7 @@
 ( -544 -608 -64 ) ( -544 -608 128 ) ( -512 -608 -64 ) common/caulk [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
 ( -544 -608 128 ) ( -544 128 -64 ) ( -544 128 128 ) common/caulk [ 0 1 0 -0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
 }
-// brush 18
+// brush 17
 {
 ( -384 96 128 ) ( -512 96 128 ) ( -512 128 128 ) common/caulk [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0
 ( -384 128 -64 ) ( -512 128 128 ) ( -512 128 -64 ) common/caulk [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
@ -173,7 +164,7 @@
 ( -384 96 128 ) ( -512 96 -64 ) ( -512 96 128 ) measure/wall128gr [ 0 1 0 -0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
 ( -512 128 -64 ) ( -512 96 128 ) ( -512 96 -64 ) common/caulk [ 0 1 0 -0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
 }
-// brush 19
+// brush 18
 {
 ( -384 -608 128 ) ( -384 -640 128 ) ( -512 -608 128 ) common/caulk [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0
 ( -384 -608 128 ) ( -512 -608 128 ) ( -384 -608 -64 ) measure/wall128gr [ 0 1 0 -0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
@ -182,7 +173,7 @@
 ( -512 -640 -64 ) ( -512 -640 128 ) ( -384 -640 -64 ) common/caulk [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
 ( -512 -640 -64 ) ( -512 -608 -64 ) ( -512 -640 128 ) common/caulk [ 0 1 0 -0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
 }
-// brush 20
+// brush 19
 {
 ( -384 -640 192 ) ( -512 96 192 ) ( -384 96 192 ) common/caulk [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0
 ( -384 96 128 ) ( -512 96 192 ) ( -512 96 128 ) common/caulk [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
@ -678,84 +669,85 @@
 }
 // entity 48
 {
-"classname" "func_detail_illusionary"
-// brush 0
-{
-( 128 -496 116 ) ( 128 -528 116 ) ( 64 -496 116 ) common/caulk [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0
-( 128 -496 432 ) ( 64 -496 432 ) ( 128 -496 112 ) common/caulk [ 1 0 0 0 ] [ -0 -0 -1 32 ] -0 0.5 0.5 0 0 0
-( 128 -496 192 ) ( 128 -496 -128 ) ( 128 -528 192 ) common/caulk [ 0 1 0 -0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
-( 64 -528 112 ) ( 128 -528 112 ) ( 64 -496 112 ) lights/k_6000 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0
-( 64 -528 -128 ) ( 64 -528 192 ) ( 128 -528 -128 ) common/caulk [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
-( 64 -528 -128 ) ( 64 -496 -128 ) ( 64 -528 192 ) common/caulk [ 0 1 0 -0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0
-}
-}
-// entity 49
-{
 "classname" "light"
 "origin" "-192.000000 -340.000000 64.000000"
 "_color255" "250 187 37"
 "light" "50"
 }
-// entity 50
+// entity 49
 {
 "classname" "light"
 "origin" "-192.000000 -688.000000 64.000000"
 "_color255" "254 232 126"
 "light" "50"
 }
-// entity 51
+// entity 50
 {
 "classname" "light"
 "origin" "-64.000000 -340.000000 64.000000"
 "_color255" "253 245 198"
 "light" "50"
 }
-// entity 52
+// entity 51
 {
 "classname" "light"
 "origin" "-64.000000 -688.000000 64.000000"
 "_color255" "249 244 235"
 "light" "50"
 }
-// entity 53
+// entity 52
 {
 "classname" "light"
 "origin" "64.000000 -340.000000 64.000000"
 "_color255" "252 251 247"
 "light" "50"
 }
-// entity 54
+// entity 53
 {
 "classname" "light"
 "origin" "64.000000 -688.000000 64.000000"
 "_color255" "246 250 252"
 "light" "50"
 }
-// entity 55
+// entity 54
 {
 "classname" "light"
 "origin" "192.000000 -340.000000 64.000000"
 "_color255" "226 248 255"
 "light" "50"
 }
-// entity 56
+// entity 55
 {
 "classname" "light"
 "origin" "192.000000 -688.000000 64.000000"
 "_color255" "215 249 255"
 "light" "50"
 }
-// entity 57
+// entity 56
 {
 "classname" "light"
 "origin" "320.000000 -340.000000 64.000000"
 "_color255" "202 252 255"
 "light" "50"
 }
-// entity 58
+// entity 57
 {
 "classname" "light"
 "origin" "320.000000 -688.000000 64.000000"
 "_color255" "186 240 255"
 "light" "50"
 }
+// entity 58
+{
+"classname" "light"
+"origin" "96.000000 -512.000000 112.000000"
+"_color255" "246 250 252"
+"light" "25"
+}
+// entity 59
+{
+"classname" "light"
+"origin" "436.000000 -512.000000 46.000000"
+"_color255" "250 187 37"
+"light" "25"
+}
--- a/platform/vmap_tex.pk3dir/textures/lights/k_1000.mat
+++ b/platform/vmap_tex.pk3dir/textures/lights/k_1000.mat
@ -5,7 +5,6 @@

 	nomipmaps
 	surfaceParm nodraw2
-	surfaceParm trans
 	surfaceParm nonsolid
 	surfaceParm nomarks 
 	surfaceParm nolightmap
--- a/platform/vmap_tex.pk3dir/textures/lights/k_10000.mat
+++ b/platform/vmap_tex.pk3dir/textures/lights/k_10000.mat
@ -5,7 +5,6 @@

 	nomipmaps
 	surfaceParm nodraw2
-	surfaceParm trans
 	surfaceParm nonsolid
 	surfaceParm nomarks 
 	surfaceParm nolightmap
--- a/platform/vmap_tex.pk3dir/textures/lights/k_2000.mat
+++ b/platform/vmap_tex.pk3dir/textures/lights/k_2000.mat
@ -5,7 +5,6 @@

 	nomipmaps
 	surfaceParm nodraw2
-	surfaceParm trans
 	surfaceParm nonsolid
 	surfaceParm nomarks 
 	surfaceParm nolightmap
--- a/platform/vmap_tex.pk3dir/textures/lights/k_3000.mat
+++ b/platform/vmap_tex.pk3dir/textures/lights/k_3000.mat
@ -5,7 +5,6 @@

 	nomipmaps
 	surfaceParm nodraw2
-	surfaceParm trans
 	surfaceParm nonsolid
 	surfaceParm nomarks 
 	surfaceParm nolightmap
--- a/platform/vmap_tex.pk3dir/textures/lights/k_4000.mat
+++ b/platform/vmap_tex.pk3dir/textures/lights/k_4000.mat
@ -5,7 +5,6 @@

 	nomipmaps
 	surfaceParm nodraw2
-	surfaceParm trans
 	surfaceParm nonsolid
 	surfaceParm nomarks 
 	surfaceParm nolightmap
--- a/platform/vmap_tex.pk3dir/textures/lights/k_5000.mat
+++ b/platform/vmap_tex.pk3dir/textures/lights/k_5000.mat
@ -5,7 +5,6 @@

 	nomipmaps
 	surfaceParm nodraw2
-	surfaceParm trans
 	surfaceParm nonsolid
 	surfaceParm nomarks 
 	surfaceParm nolightmap
--- a/platform/vmap_tex.pk3dir/textures/lights/k_6000.mat
+++ b/platform/vmap_tex.pk3dir/textures/lights/k_6000.mat
@ -5,7 +5,6 @@

 	nomipmaps
 	surfaceParm nodraw2
-	surfaceParm trans
 	surfaceParm nonsolid
 	surfaceParm nomarks 
 	surfaceParm nolightmap
--- a/platform/vmap_tex.pk3dir/textures/lights/k_7000.mat
+++ b/platform/vmap_tex.pk3dir/textures/lights/k_7000.mat
@ -5,7 +5,6 @@

 	nomipmaps
 	surfaceParm nodraw2
-	surfaceParm trans
 	surfaceParm nonsolid
 	surfaceParm nomarks 
 	surfaceParm nolightmap
--- a/platform/vmap_tex.pk3dir/textures/lights/k_8000.mat
+++ b/platform/vmap_tex.pk3dir/textures/lights/k_8000.mat
@ -5,7 +5,6 @@

 	nomipmaps
 	surfaceParm nodraw2
-	surfaceParm trans
 	surfaceParm nonsolid
 	surfaceParm nomarks 
 	surfaceParm nolightmap
--- a/platform/vmap_tex.pk3dir/textures/lights/k_9000.mat
+++ b/platform/vmap_tex.pk3dir/textures/lights/k_9000.mat
@ -5,7 +5,6 @@

 	nomipmaps
 	surfaceParm nodraw2
-	surfaceParm trans
 	surfaceParm nonsolid
 	surfaceParm nomarks 
 	surfaceParm nolightmap
--- a/src/gs-entbase/server/light.qc
+++ b/src/gs-entbase/server/light.qc
@ -25,7 +25,7 @@
 "fade"          Sets the fade-distance of a light when LFL_LINEAR is set
 "_anglescale"   Sets the light angle scale of non-linear lights
 "_deviance"     Sets the deviance, jitter effect for each light sample.
-"_samples"      Number of light samples. This also needs to be set > 1 for deviance to work.
+"_samples"      Number of light samples. This also needs to be set > 0.0 for deviance to work.
 "_filter"       Setting to blur the light/shadows resulting from this light.
 "start_active"  Set to either 0 or 1 to tell the light in what mode to start in.