From: Maik Merten <maikmerten@googlemail>
Date: Sat, 30 Oct 2010 11:32:53 +0000 (+0200)
Subject: define a new shader for warpzone backdrops. This is displayed if the warpzones don... 
X-Git-Tag: xonotic-v0.1.0preview~69^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8de822604ba6fb45ddade6024db5fa780cf8a1d8;p=xonotic%2Fxonotic-maps.pk3dir.git

define a new shader for warpzone backdrops. This is displayed if the warpzones don't render (no GLSL or r_water disabled). Use this shader on glowplant warpzones.
---

diff --git a/maps/glowplant.map b/maps/glowplant.map
index 58063af4..d88456c7 100644
--- a/maps/glowplant.map
+++ b/maps/glowplant.map
@@ -12906,7 +12906,7 @@ exx/wall-bigrib02
 ( 672 -1248 96 ) ( 1120 -1248 96 ) ( 1088 -1216 128 ) common/caulk -0 0 0 0.25 0.25 0 4 0
 ( 1120 -1248 288 ) ( 672 -1248 288 ) ( 704 -1216 256 ) common/caulk -0 0 0 0.25 0.25 0 4 0
 ( 672 -1248 288 ) ( 1120 -1248 288 ) ( 1120 -1248 96 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1088 -1216 256 ) ( 704 -1216 256 ) ( 704 -1216 128 ) exx/wall-des01 0 0 0 0.25 0.25 0 4 0
+( 1088 -1216 256 ) ( 704 -1216 256 ) ( 704 -1216 128 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 4 0
 ( 960 -1216 96 ) ( 992 -1248 96 ) ( 960 -1216 288 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( 800 -1248 96 ) ( 832 -1216 96 ) ( 832 -1216 288 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }
@@ -14145,7 +14145,7 @@ map_glowplant/biolumi2_blue-lowlight
 {
 ( -784 -144 -208 ) ( -784 144 -48 ) ( -784 -144 -48 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -784 144 -48 ) ( -768 128 -192 ) ( -768 128 -64 ) common/caulk -0 0 0 0.25 0.25 0 4 0
-( -768 128 -192 ) ( -768 -128 -64 ) ( -768 128 -64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -768 128 -192 ) ( -768 -128 -64 ) ( -768 128 -64 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -784 -144 -48 ) ( -768 -128 -64 ) ( -768 -128 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -784 -144 -48 ) ( -768 128 -64 ) ( -768 -128 -64 ) common/caulk 64 0 0 0.25 0.25 0 4 0
 ( -784 -144 -208 ) ( -768 -128 -192 ) ( -768 128 -192 ) common/caulk 64 0 0 0.25 0.25 0 4 0
@@ -18313,7 +18313,7 @@ trak5x/base-pipe1c
 ( 1120 968 416 ) ( 1120 968 288 ) ( 1120 840 416 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1088 840 288 ) ( 1120 840 288 ) ( 1088 968 288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1088 832 288 ) ( 1088 832 416 ) ( 1120 832 288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1088 840 288 ) ( 1088 968 288 ) ( 1088 840 416 ) exx/base-metal03 64 0 0 0.25 0.25 0 0 0
+( 1088 840 288 ) ( 1088 968 288 ) ( 1088 840 416 ) effects_warpzone/warpzone_backdrop 64 0 0 0.25 0.25 0 0 0
 }
 {
 ( 352 1016 256 ) ( 288 1016 256 ) ( 288 824 256 ) common/caulk 128 32 0 0.25 0.25 0 4 0
@@ -25995,7 +25995,7 @@ exx/trim-baseboard02
 {
 ( -64 -320 640 ) ( -64 -448 640 ) ( -128 -320 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -320 640 ) ( -128 -320 640 ) ( -64 -320 512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -64 -320 640 ) ( -64 -320 512 ) ( -64 -448 640 ) exx/wall-des01 0 0 0 0.25 0.25 0 0 0
+( -64 -320 640 ) ( -64 -320 512 ) ( -64 -448 640 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -128 -448 512 ) ( -64 -448 512 ) ( -128 -320 512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -128 -448 512 ) ( -128 -448 640 ) ( -64 -448 512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -128 -448 512 ) ( -128 -320 512 ) ( -128 -448 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
diff --git a/scripts/effects_warpzone.shader b/scripts/effects_warpzone.shader
index ed896e1e..17c8d785 100644
--- a/scripts/effects_warpzone.shader
+++ b/scripts/effects_warpzone.shader
@@ -36,3 +36,13 @@ textures/effects_warpzone/rededge
 		blendfunc add
 	}
 }
+
+textures/effects_warpzone/warpzone_backdrop
+{
+	surfaceparm nomarks
+	nolightmap
+	{
+		tcMod turb 0 0.4 0 0.08
+		map textures/effects_warpzone/warpzone_backdrop
+	}
+}
diff --git a/textures/effects_warpzone/warpzone_backdrop.tga b/textures/effects_warpzone/warpzone_backdrop.tga
new file mode 100644
index 00000000..aea67453
Binary files /dev/null and b/textures/effects_warpzone/warpzone_backdrop.tga differ