Merge branch 'master' into morphed/narmorx

[xonotic/xonotic-maps.pk3dir.git] / scripts / exx.shader

diff --git a/scripts/exx.shader b/scripts/exx.shader
index 88e81617305d67a8dafb61929dedfec667ef7c2e..035a9bd032c405bc44051f9fca27105600f00af3 100644 (file)
--- 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
 
 
        {
@@ -722,6 +722,29 @@ textures/exx/light-panel01
                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
+               
+
        }
        {
                map $lightmap
@@ -743,6 +766,29 @@ textures/exx/light-u201
                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
+               
+
        }
        {
                map $lightmap
@@ -766,6 +812,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
@@ -1424,8 +1493,8 @@ textures/exx/wall-crete01
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -1446,8 +1515,8 @@ textures/exx/wall-crete02
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -1468,8 +1537,8 @@ textures/exx/wall-crete03
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {
@@ -1490,8 +1559,8 @@ textures/exx/wall-crete03b
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod  1
+       dpglossexponentmod  1
 
 
        {