X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fexx.shader;h=9c68a726435868889ada839029e3c43a6af5dbb5;hp=525529f8ab69db5628a9f36f61d73ab82ba9366e;hb=5baa6483bc1f5b96f96c9e4caa35ac22dc07f1e0;hpb=20b57cf8c5ce1090b3eb109ff1bfd0200cce3da8

diff --git a/scripts/exx.shader b/scripts/exx.shader
index 525529f8..9c68a726 100644
--- a/scripts/exx.shader
+++ b/scripts/exx.shader
@@ -4,8 +4,8 @@ textures/exx/base-crete01
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{
@@ -26,8 +26,8 @@ textures/exx/base-crete01blue
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{
@@ -48,8 +48,8 @@ textures/exx/base-crete01red
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{
@@ -70,8 +70,8 @@ textures/exx/base-crete02
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{
@@ -92,8 +92,8 @@ textures/exx/base-crete03
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{
@@ -322,8 +322,8 @@ textures/exx/floor-crete01
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{
@@ -344,8 +344,8 @@ textures/exx/floor-crete01-phoenix
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{
@@ -366,8 +366,8 @@ textures/exx/floor-crete01-phoenixb
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{
@@ -388,8 +388,8 @@ textures/exx/floor-crete01b
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{
@@ -504,6 +504,33 @@ textures/exx/floor-grate04
 		blendfunc filter
 	}
 }
+
+textures/exx/floor-grate04-cull
+{
+	qer_editorimage textures/exx/floor/floor_grate04.tga
+	surfaceparm trans
+	surfaceparm metalsteps
+	q3map_bounceScale  0.75
+	surfaceparm alphashadow
+	surfaceparm nomarks
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/exx/floor/floor_grate04.tga
+            alphaFunc GT0
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+
+
 textures/exx/floor-metal02
 {
 	qer_editorimage textures/exx/floor/floor_metal02.tga
@@ -709,6 +736,75 @@ textures/exx/floor-wrn01
 	}
 }
 
+textures/exx/floor-wrn01-blue
+{
+	qer_editorimage textures/exx/floor/floor_wrn01-blue.tga
+	
+	q3map_bounceScale  0.75
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/exx/floor/floor_wrn01-blue.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+
+textures/exx/floor-wrn01-red
+{
+	qer_editorimage textures/exx/floor/floor_wrn01-red.tga
+	
+	q3map_bounceScale  0.75
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/exx/floor/floor_wrn01-red.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+
+textures/exx/floor-wrn01-purple
+{
+	qer_editorimage textures/exx/floor/floor_wrn01-purple.tga
+	
+	q3map_bounceScale  0.75
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/exx/floor/floor_wrn01-purple.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+
 textures/exx/light-panel01
 {
 	qer_editorimage textures/exx/light/light_panel01.tga
@@ -718,7 +814,28 @@ textures/exx/light-panel01
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
-	q3map_surfacelight 3500
+	{
+		map textures/exx/light/light_panel01.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/exx/light-panel01-surfacelight
+{
+	qer_editorimage textures/exx/light/light_panel01.tga
+	
+	q3map_bounceScale  0.75
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+	q3map_surfacelight 2500
 
 	{
 		map textures/exx/light/light_panel01.tga
@@ -741,7 +858,28 @@ textures/exx/light-u201
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
-	q3map_surfacelight 3500
+	{
+		map textures/exx/light/light_u201.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/exx/light-u201-surfacelight
+{
+	qer_editorimage textures/exx/light/light_u201.tga
+	
+	q3map_bounceScale  0.75
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+	q3map_surfacelight 2500
 
 	{
 		map textures/exx/light/light_u201.tga
@@ -755,6 +893,35 @@ textures/exx/light-u201
 		blendfunc filter
 	}
 }
+textures/exx/panel-grate01
+{
+	qer_editorimage textures/exx/panel/panel_grate01.tga
+	
+	surfaceparm metalsteps
+	q3map_bounceScale  2
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+	surfaceparm nomarks
+	surfaceparm trans
+	surfaceparm alphashadow
+
+	cull none
+	nopicmip
+	nomipmaps
+	{
+		map textures/exx/panel/panel_grate01.tga
+		alphaFunc GT0
+		rgbgen vertex
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
 textures/exx/panel-metal01
 {
 	qer_editorimage textures/exx/panel/panel_metal01.tga
@@ -770,6 +937,29 @@ textures/exx/panel-metal01
 		map textures/exx/panel/panel_metal01.tga
 		
 
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/exx/panel-metal01b
+{
+	qer_editorimage textures/exx/panel/panel_metal01b.tga
+	
+	surfaceparm metalsteps
+	q3map_bounceScale  2
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/exx/panel/panel_metal01b.tga
+		
+
 	}
 	{
 		map $lightmap
@@ -1428,8 +1618,8 @@ textures/exx/wall-crete01
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{
@@ -1450,8 +1640,8 @@ textures/exx/wall-crete02
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{
@@ -1472,8 +1662,8 @@ textures/exx/wall-crete03
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{
@@ -1494,8 +1684,8 @@ textures/exx/wall-crete03b
 	
 	q3map_bounceScale  0.5
 	dpoffsetmapping - 2
-	dpglossintensitymod  3
-	dpglossexponentmod  4
+	dpglossintensitymod  1
+	dpglossexponentmod  1
 
 
 	{