r2702 - branches/nexuiz-2.0/data/scripts trunk/data/scripts

[savagex at icculus.org]

Author: savagex
Date: 2007-05-27 07:33:07 -0400 (Sun, 27 May 2007)
New Revision: 2702

Modified:
   branches/nexuiz-2.0/data/scripts/morphed.shader
   trunk/data/scripts/morphed.shader
Log:
add warping _warp versions of Morphed's slime


Modified: branches/nexuiz-2.0/data/scripts/morphed.shader
===================================================================
--- branches/nexuiz-2.0/data/scripts/morphed.shader	2007-05-27 11:12:28 UTC (rev 2701)
+++ branches/nexuiz-2.0/data/scripts/morphed.shader	2007-05-27 11:33:07 UTC (rev 2702)
@@ -7,6 +7,24 @@
 	surfaceparm nonsolid
 	surfaceparm slime
 	q3map_surfacelight 250
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/morphed/slimem.tga
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+textures/morphed/slimem_warp
+{
+	qer_editorimage textures/morphed/slimem.tga
+	qer_trans 0.5
+	surfaceparm noimpact
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	q3map_surfacelight 250
 	deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
@@ -15,8 +33,8 @@
 		blendFunc add
 		rgbGen identity
 	}
-}
-
+}
+
 textures/morphed/gelslime
 {
 	qer_editorimage textures/morphed/gelslime.tga
@@ -27,7 +45,6 @@
 	surfaceparm nonsolid
 	surfaceparm slime
 	q3map_surfacelight 280
-	//deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
 	{
@@ -43,8 +60,37 @@
 		tcGen lightmap
 		depthFunc equal
 	}
+}
+
+textures/morphed/gelslime_warp
+{
+	qer_editorimage textures/morphed/gelslime.tga
+	q3map_lightimage textures/morphed/gelslime_glow.tga
+	qer_trans 0.75
+	surfaceparm noimpact
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	q3map_surfacelight 280
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/morphed/gelslime.tga
+		rgbGen identity
+		depthWrite
+		blendfunc blend
+	}
+	{
+		map $lightmap
+		blendfunc blend
+		rgbGen identity
+		tcGen lightmap
+		depthFunc equal
+	}
 }
-
+
+
 textures/morphed/gelslime_bright
 {
 	qer_editorimage textures/morphed/gelslime_bright.tga
@@ -54,7 +100,6 @@
 	surfaceparm nonsolid
 	surfaceparm slime
 	q3map_surfacelight 300
-	//deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
 	{
@@ -63,4 +108,24 @@
 		rgbGen identity
 	}
 }
+
 
+textures/morphed/gelslime_bright_warp
+{
+	qer_editorimage textures/morphed/gelslime_bright.tga
+	qer_trans 0.5
+	surfaceparm noimpact
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	q3map_surfacelight 300
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/morphed/gelslime_bright.tga
+		blendFunc add
+		rgbGen identity
+	}
+}
+

Modified: trunk/data/scripts/morphed.shader
===================================================================
--- trunk/data/scripts/morphed.shader	2007-05-27 11:12:28 UTC (rev 2701)
+++ trunk/data/scripts/morphed.shader	2007-05-27 11:33:07 UTC (rev 2702)
@@ -7,6 +7,24 @@
 	surfaceparm nonsolid
 	surfaceparm slime
 	q3map_surfacelight 250
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/morphed/slimem.tga
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+textures/morphed/slimem_warp
+{
+	qer_editorimage textures/morphed/slimem.tga
+	qer_trans 0.5
+	surfaceparm noimpact
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	q3map_surfacelight 250
 	deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
@@ -15,8 +33,8 @@
 		blendFunc add
 		rgbGen identity
 	}
-}
-
+}
+
 textures/morphed/gelslime
 {
 	qer_editorimage textures/morphed/gelslime.tga
@@ -27,7 +45,6 @@
 	surfaceparm nonsolid
 	surfaceparm slime
 	q3map_surfacelight 280
-	//deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
 	{
@@ -43,8 +60,37 @@
 		tcGen lightmap
 		depthFunc equal
 	}
+}
+
+textures/morphed/gelslime_warp
+{
+	qer_editorimage textures/morphed/gelslime.tga
+	q3map_lightimage textures/morphed/gelslime_glow.tga
+	qer_trans 0.75
+	surfaceparm noimpact
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	q3map_surfacelight 280
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/morphed/gelslime.tga
+		rgbGen identity
+		depthWrite
+		blendfunc blend
+	}
+	{
+		map $lightmap
+		blendfunc blend
+		rgbGen identity
+		tcGen lightmap
+		depthFunc equal
+	}
 }
-
+
+
 textures/morphed/gelslime_bright
 {
 	qer_editorimage textures/morphed/gelslime_bright.tga
@@ -54,7 +100,6 @@
 	surfaceparm nonsolid
 	surfaceparm slime
 	q3map_surfacelight 300
-	//deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
 	{
@@ -63,4 +108,24 @@
 		rgbGen identity
 	}
 }
+
 
+textures/morphed/gelslime_bright_warp
+{
+	qer_editorimage textures/morphed/gelslime_bright.tga
+	qer_trans 0.5
+	surfaceparm noimpact
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	q3map_surfacelight 300
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/morphed/gelslime_bright.tga
+		blendFunc add
+		rgbGen identity
+	}
+}
+