Revert to the common camera shader. Seems the screen doesn't care about the nolightma...

diff --git a/maps/lab610.map b/maps/lab610.map
index ca27644d191ad4269beaa79a716455dd8d0ddb4e..4f22ca654b7586f6118301c3c9161e0a30d85457 100644 (file)
--- a/maps/lab610.map
+++ b/maps/lab610.map
@@ -32986,7 +32986,7 @@ trak5x/base-pipe1a
 "target" "camera1"\r
 // brush 0\r
 {\r
-( -792 -4832 768 ) ( -1104 -4520 1024 ) ( -1104 -4520 768 ) lab610/camera_fullbright 124.7180175781 0 0 1.21875 1 0 0 0\r
+( -792 -4832 768 ) ( -1104 -4520 1024 ) ( -1104 -4520 768 ) common/camera 124.7180175781 0 0 1.21875 1 0 0 0\r
 ( -808 -4840 1024 ) ( -1104 -4544 768 ) ( -1104 -4544 1024 ) exx/wall-panel05 -0 398.22265625 90 1 0.5625 0 0 0\r
 ( -792 -4832 1024 ) ( -1104 -4536 1024 ) ( -1104 -4520 1024 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -792 -4832 768 ) ( -1104 -4520 768 ) ( -1104 -4536 768 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
@@ -33550,7 +33550,7 @@ exx/trim-baseboard03
 "target" "camera2"\r
 // brush 0\r
 {\r
-( 1104 -4520 768 ) ( 1104 -4520 1024 ) ( 792 -4832 768 ) lab610/camera_fullbright 124.7180175781 0 0 1.21875 1 0 0 0\r
+( 1104 -4520 768 ) ( 1104 -4520 1024 ) ( 792 -4832 768 ) common/camera 124.7180175781 0 0 1.21875 1 0 0 0\r
 ( 1104 -4544 1024 ) ( 1104 -4544 768 ) ( 808 -4840 1024 ) exx/wall-panel05 -0 398.22265625 90 1 0.5625 0 0 0\r
 ( 1104 -4520 1024 ) ( 1104 -4536 1024 ) ( 792 -4832 1024 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 1104 -4536 768 ) ( 1104 -4520 768 ) ( 792 -4832 768 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
@@ -34091,7 +34091,7 @@ exx/trim-baseboard03
 // brush 0\r
 {\r
 ( -256 768 224 ) ( -336 768 224 ) ( -256 768 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
-( -336 764 0 ) ( -336 764 224 ) ( -256 764 0 ) lab610/camera_fullbright 219.4285888672 64 0 0.4374999702 0.25 134217728 0 0\r
+( -336 764 0 ) ( -336 764 224 ) ( -256 764 0 ) common/camera 219.4285888672 64 0 0.4374999702 0.25 134217728 0 0\r
 ( -320 64 144 ) ( -304 64 144 ) ( -320 -64 144 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
 ( -320 -64 80 ) ( -304 64 80 ) ( -320 64 80 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
 ( -320 -64 144 ) ( -320 64 128 ) ( -320 64 144 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
@@ -34145,7 +34145,7 @@ exx/trim-baseboard03
 // brush 0\r
 {\r
 ( 256 -768 224 ) ( 336 -768 224 ) ( 256 -768 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
-( 336 -764 0 ) ( 336 -764 224 ) ( 256 -764 0 ) lab610/camera_fullbright 36.5714111328 64 0 0.4374999702 0.25 134217728 0 0\r
+( 336 -764 0 ) ( 336 -764 224 ) ( 256 -764 0 ) common/camera 36.5714111328 64 0 0.4374999702 0.25 134217728 0 0\r
 ( 320 -64 144 ) ( 304 -64 144 ) ( 320 64 144 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
 ( 320 64 80 ) ( 304 -64 80 ) ( 320 -64 80 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
 ( 320 64 144 ) ( 320 -64 128 ) ( 320 -64 144 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r

diff --git a/scripts/lab610.shader b/scripts/lab610.shader
index 8b5da278083d05f7ae38e70ad53e7e6a02f9c629..3150d9297325130537eca5b8ddf4eff78b324923 100644 (file)
--- a/scripts/lab610.shader
+++ b/scripts/lab610.shader
@@ -17,14 +17,3 @@ textures/lab610/env1
                tcgen lightmap
        }*/
 }
-
-textures/lab610/camera_fullbright
-{
-       qer_editorimage textures/common/camera.tga
-       surfaceparm nolightmap
-       {
-               map textures/common/warpzone/trans.tga // fully transparent
-               blendfunc blend
-       }
-       dp_camera
-}