fix more blendfunc use

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

diff --git a/scripts/terrain01x.shader b/scripts/terrain01x.shader
index af3e0d336026ab0c3ba87eab0095758a81c8d5fa..0e7ad244ca15e6e1b21c5830490e6f08c1b1e9fb 100644 (file)
--- a/scripts/terrain01x.shader
+++ b/scripts/terrain01x.shader
@@ -1,9 +1,38 @@
 textures/terrain01x/blends-mars-rock01-ground01
 {
        qer_editorimage textures/terrain01x/blends/mars-rock01-ground01.tga
+       
+       q3map_bounceScale  0.5
+       dpoffsetmapping - 2
+
+       q3map_lightmapSampleOffset 8
+       q3map_nonplanar
+       q3map_shadeangle 95
 
-       dpmeshcollisions
+       surfaceparm dust
+
+       q3map_alphaMod dotproduct2 ( 0 0 0.95 )
 
+       {
+               map textures/terrain01x/rock/mars01.tga // Primary
+       }
+
+       {
+               map textures/terrain01x/ground/mars01.tga       // Secondary
+               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA           
+               alphaGen vertex
+       }
+
+       {
+               map $lightmap
+               blendFunc GL_DST_COLOR GL_ZERO
+       }
+}
+
+textures/terrain01x/blends-mars-rock01-sand04
+{
+       qer_editorimage textures/terrain01x/blends/mars-rock01-sand04.tga
+       
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
 
@@ -20,7 +49,7 @@ textures/terrain01x/blends-mars-rock01-ground01
        }
 
        {
-               map textures/terrain01x/ground/mars01.tga       // Secondary
+               map textures/terrain01x/ground/sand04.tga       // Secondary
                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA           
                alphaGen vertex
        }
@@ -95,6 +124,38 @@ textures/terrain01x/blends-mars-rock01-ground01-projected
        }
 }
 
+textures/terrain01x/blends-mars-rock01-sand04-projected
+{
+       qer_editorimage textures/terrain01x/blends/mars-rock01-sand04.tga
+       
+       q3map_bounceScale  0.5
+       dpoffsetmapping - 2
+
+       q3map_lightmapSampleOffset 8
+       q3map_nonplanar
+       q3map_shadeangle 95
+
+       surfaceparm dust
+
+       q3map_alphaMod dotproduct2 ( 0 0 0.95 )
+       q3map_tcGen ivector ( 1024 0 0 ) ( 0 1024 0 )
+
+       {
+               map textures/terrain01x/rock/mars01.tga // Primary
+       }
+
+       {
+               map textures/terrain01x/ground/sand04.tga       // Secondary
+               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA           
+               alphaGen vertex
+       }
+
+       {
+               map $lightmap
+               blendFunc GL_DST_COLOR GL_ZERO
+       }
+}
+
 textures/terrain01x/blends-mars-rock02-ground01-projected
 {
        qer_editorimage textures/terrain01x/blends/mars-rock02-ground01.tga
@@ -294,26 +355,6 @@ textures/terrain01x/ground-ice01
                blendfunc filter
        }
 }
-textures/terrain01x/ground-ice02
-{
-       qer_editorimage textures/terrain01x/ground/ice01.tga
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  2
-       dpglossexponentmod  2
-       surfaceparm nolightmap
-        surfaceparm trans      
-
-       q3map_nonplanar
-       q3map_shadeangle 15
-
-       {
-               map textures/terrain01x/ground/ice01.tga
-               blendfunc filter                
-               rgbGen identity
-       }
-}
 textures/terrain01x/ground-mars01
 {
        qer_editorimage textures/terrain01x/ground/mars01.tga