Shader fixes.

4 files changed, 52 insertions, 11 deletions

diff --git a/maps/p10_nexus.map b/maps/p10_nexus.map
index ebab2b3..179a610 100644
--- a/maps/p10_nexus.map
+++ b/maps/p10_nexus.map
@@ -3992,12 +3992,12 @@
 }
 // brush 441
 {
-( 1280 1048 -256 ) ( 1728 960 -256 ) ( 1728 1048 -256 ) analmango/acid 0 0 0 0.5 0.5 134217728 0 0
-( 1280 1048 -128 ) ( 1728 1048 -256 ) ( 1728 1048 -128 ) analmango/acid 0 0 0 0.5 0.5 134217728 0 0
+( 1280 1048 -256 ) ( 1728 960 -256 ) ( 1728 1048 -256 ) analmango/acid2 0 0 0 0.5 0.5 134217728 0 0
+( 1280 1048 -128 ) ( 1728 1048 -256 ) ( 1728 1048 -128 ) analmango/acid2 0 0 0 0.5 0.5 134217728 0 0
 ( 1728 1048 -128 ) ( 1728 960 -256 ) ( 1728 960 -128 ) common/nodraw 0 0 0 0.5 0.5 134217728 0 0
-( 1280 1048 -128 ) ( 1728 1048 -128 ) ( 1728 960 -128 ) analmango/acid 0 0 0 0.5 0.5 134217728 0 0
-( 1280 1048 -128 ) ( 1280 960 -256 ) ( 1280 1048 -256 ) analmango/acid 0 0 0 0.5 0.5 134217728 0 0
-( 1280 960 -128 ) ( 1728 960 -128 ) ( 1728 960 -256 ) analmango/acid 0 0 0 0.5 0.5 134217728 0 0
+( 1280 1048 -128 ) ( 1728 1048 -128 ) ( 1728 960 -128 ) analmango/acid2 0 0 0 0.5 0.5 134217728 0 0
+( 1280 1048 -128 ) ( 1280 960 -256 ) ( 1280 1048 -256 ) analmango/acid2 0 0 0 0.5 0.5 134217728 0 0
+( 1280 960 -128 ) ( 1728 960 -128 ) ( 1728 960 -256 ) analmango/acid2 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 442
 {
@@ -4694,11 +4694,11 @@ nexus6/pipe02_64
 }
 // brush 508
 {
-( 1816 960 -128 ) ( 1728 1344 -128 ) ( 1816 1344 -128 ) analmango/acid 0 0 0 0.5 0.5 134217728 0 0
-( 1728 1344 -128 ) ( 1816 1344 -256 ) ( 1816 1344 -128 ) analmango/acid 0 0 0 0.5 0.5 134217728 0 0
-( 1816 960 -256 ) ( 1816 1344 -128 ) ( 1816 1344 -256 ) analmango/acid 0 0 0 0.5 0.5 134217728 0 0
-( 1728 960 -256 ) ( 1816 1344 -256 ) ( 1728 1344 -256 ) analmango/acid 0 0 0 0.5 0.5 134217728 0 0
-( 1728 960 -256 ) ( 1728 960 -128 ) ( 1816 960 -256 ) analmango/acid 0 0 0 0.5 0.5 134217728 0 0
+( 1816 960 -128 ) ( 1728 1344 -128 ) ( 1816 1344 -128 ) analmango/acid2 0 0 0 0.5 0.5 134217728 0 0
+( 1728 1344 -128 ) ( 1816 1344 -256 ) ( 1816 1344 -128 ) analmango/acid2 0 0 0 0.5 0.5 134217728 0 0
+( 1816 960 -256 ) ( 1816 1344 -128 ) ( 1816 1344 -256 ) analmango/acid2 0 0 0 0.5 0.5 134217728 0 0
+( 1728 960 -256 ) ( 1816 1344 -256 ) ( 1728 1344 -256 ) analmango/acid2 0 0 0 0.5 0.5 134217728 0 0
+( 1728 960 -256 ) ( 1728 960 -128 ) ( 1816 960 -256 ) analmango/acid2 0 0 0 0.5 0.5 134217728 0 0
 ( 1728 960 -128 ) ( 1728 1344 -256 ) ( 1728 1344 -128 ) common/nodraw 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 509
diff --git a/scripts/analmango.shader b/scripts/analmango.shader
index 600d8dd..3939885 100644
--- a/scripts/analmango.shader
+++ b/scripts/analmango.shader
@@ -502,7 +502,6 @@ textures/analmango/outdoor_window
 textures/analmango/acid
 {
 	qer_trans .5
-	q3map_surfaceLight 300
 	q3map_globaltexture
 
 	surfaceparm noimpact
@@ -519,6 +518,33 @@ textures/analmango/acid
 
 	{
 		map textures/analmango/acid.jpg
+		rgbGen const ( 0.5 0.5 0.5 )
+		blendfunc filter
+		tcMod turb .3 .2 1 .05
+		tcMod scroll .01 .01
+	}
+}
+
+textures/analmango/acid2
+{
+	qer_trans .5
+	q3map_surfaceLight 300
+	q3map_globaltexture
+
+	surfaceparm noimpact
+	surfaceparm slime
+	surfaceparm nolightmap
+	surfaceparm trans
+
+	tessSize 32
+	cull disable
+
+	sort 8
+
+	deformVertexes wave 100 sin 0 1 .5 .5
+
+	{
+		map textures/analmango/acid2.jpg
 		rgbGen const ( 1 1 1 )
 		blendfunc add
 		tcMod turb .3 .2 1 .05
@@ -1045,6 +1071,21 @@ textures/analmango/poster_dresden
 	}
 }
 
+textures/analmango/poster_lagranger
+{
+	surfaceparm nonsolid
+	surfaceparm trans
+	polygonOffset
+
+	{
+		map textures/analmango/poster_lagranger.jpg
+	}
+	{
+		map $lightmap
+		blendFunc filter
+	}
+}
+
 textures/analmango/zittrigmann
 {
 	surfaceparm nonsolid
diff --git a/textures/analmango/acid.jpg b/textures/analmango/acid.jpg
index 2c8354f..345fc90 100644
--- a/textures/analmango/acid.jpg
+++ b/textures/analmango/acid.jpg
diff --git a/textures/analmango/acid2.jpg b/textures/analmango/acid2.jpg
new file mode 100644
index 0000000..2c8354f
--- /dev/null
+++ b/textures/analmango/acid2.jpg