Merge branch 't0uYK8Ne/erbium' into 'master'

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

diff --git a/scripts/map_erbium.shader b/scripts/map_erbium.shader
index bfd7a5e19cbf036b71ca8c6e74ed23d6609a5861..900c2ab486cf7ce2fef22ad3518f9affcea2c63a 100644 (file)
--- a/scripts/map_erbium.shader
+++ b/scripts/map_erbium.shader
@@ -1,28 +1,30 @@
 textures/map_erbium/spawn_01
-
 {
        qer_editorimage textures/map_erbium/spawn_01.jpg
-       surfaceparm     nomarks   
-       surfaceparm     trans
-       surfaceparm     nonsolid
-       surfaceparm     pointlight
+
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm pointlight
        nopicmip
+
        {
                map textures/map_erbium/spawn_01.jpg
                rgbGen identity
                blendFunc add
        }
-       
 }
 
 textures/map_erbium/fightingzone
 {
        qer_editorimage textures/map_erbium/fightingzone.jpg
-       surfaceparm     nomarks   
-       surfaceparm     trans
-       surfaceparm     nonsolid
-       surfaceparm     pointlight
+
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm pointlight
        nopicmip
+
        {
                map textures/map_erbium/fightingzone.jpg
                rgbGen identity
@@ -33,17 +35,15 @@ textures/map_erbium/fightingzone
 textures/map_erbium/large-turbine
 {
        qer_editorimage textures/map_erbium/large-turbine.jpg
-       
-       surfaceparm metalsteps
-       q3map_bounceScale  1.5
+
+       q3map_bounceScale 1.5
        dpglossintensitymod 1.5
-       dpglossexponentmod  4
+       dpglossexponentmod 4
 
+       surfaceparm metalsteps
 
        {
                map textures/map_erbium/large-turbine.jpg
-               
-
        }
        {
                map $lightmap
@@ -56,17 +56,15 @@ textures/map_erbium/large-turbine
 textures/map_erbium/metalic
 {
        qer_editorimage textures/map_erbium/metalic.jpg
-       
-       surfaceparm metalsteps
-       q3map_bounceScale  1.5
+
+       q3map_bounceScale 1.5
        dpglossintensitymod 1.5
-       dpglossexponentmod  4
+       dpglossexponentmod 4
 
+       surfaceparm metalsteps
 
        {
                map textures/map_erbium/metalic.jpg
-               
-
        }
        {
                map $lightmap
@@ -76,21 +74,18 @@ textures/map_erbium/metalic
        }
 }
 
-
 textures/map_erbium/pickup
 {
        qer_editorimage textures/map_erbium/pickup.jpg
-       
-       surfaceparm metalsteps
-       q3map_bounceScale  1.5
+
+       q3map_bounceScale 1.5
        dpglossintensitymod 1.5
-       dpglossexponentmod  4
+       dpglossexponentmod 4
 
+       surfaceparm metalsteps
 
        {
                map textures/map_erbium/pickup.jpg
-               
-
        }
        {
                map $lightmap
@@ -103,17 +98,15 @@ textures/map_erbium/pickup
 textures/map_erbium/metal-tiles
 {
        qer_editorimage textures/map_erbium/metal-tiles.jpg
-       
-       surfaceparm metalsteps
-       q3map_bounceScale  1.5
+
+       q3map_bounceScale 1.5
        dpglossintensitymod 1.5
-       dpglossexponentmod  4
+       dpglossexponentmod 4
 
+       surfaceparm metalsteps
 
        {
                map textures/map_erbium/metal-tiles.jpg
-               
-
        }
        {
                map $lightmap
@@ -126,17 +119,15 @@ textures/map_erbium/metal-tiles
 textures/map_erbium/metal-rock-tiles
 {
        qer_editorimage textures/map_erbium/metal-rock-tiles.jpg
-       
-       surfaceparm metalsteps
-       q3map_bounceScale  1.5
+
+       q3map_bounceScale 1.5
        dpglossintensitymod 1.5
-       dpglossexponentmod  4
+       dpglossexponentmod 4
 
+       surfaceparm metalsteps
 
        {
                map textures/map_erbium/metal-rock-tiles.jpg
-               
-
        }
        {
                map $lightmap
@@ -146,21 +137,18 @@ textures/map_erbium/metal-rock-tiles
        }
 }
 
-
 textures/map_erbium/engine
 {
        qer_editorimage textures/map_erbium/engine.jpg
-       
-       surfaceparm metalsteps
-       q3map_bounceScale  1.5
+
+       q3map_bounceScale 1.5
        dpglossintensitymod 1.5
-       dpglossexponentmod  4
+       dpglossexponentmod 4
 
+       surfaceparm metalsteps
 
        {
                map textures/map_erbium/engine.jpg
-               
-
        }
        {
                map $lightmap
@@ -190,13 +178,14 @@ textures/map_erbium/decal1
        }
 }
 
-
 textures/map_erbium/tree-bark
 {
        qer_editorimage textures/map_erbium/tree-bark.jpg
+
        dpoffsetmapping none
        dpglossintensitymod 1.5
        dpglossexponentmod 4
+
        {
                map textures/map_erbium/tree-bark.jpg
        }
@@ -211,9 +200,11 @@ textures/map_erbium/tree-bark
 textures/map_erbium/branches
 {
        qer_editorimage textures/map_erbium/branches.jpg
+
        dpoffsetmapping none
        dpglossintensitymod 1.5
        dpglossexponentmod 4
+
        {
                map textures/map_erbium/branches.jpg
        }
@@ -228,40 +219,41 @@ textures/map_erbium/branches
 textures/map_erbium/waterfall
 {
        qer_editorimage textures/map_erbium/waterfall.jpg
+
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm nonsolid
        surfaceparm trans
        surfaceparm water
-       nopicmip        
+       nopicmip
+
        {
                map textures/map_erbium/waterfall.jpg
-               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+               blendFunc blend
                tcMod scroll 0 -1
        }
 }
 
 textures/map_erbium/rocktomoss
 {
+       qer_editorimage textures/map_erbium/rocktomoss.jpg
+
        dpoffsetmapping - 2 match8 184
        q3map_baseShader textures/map_erbium/rocktomoss
-       qer_editorimage textures/map_erbium/rocktomoss.jpg
 
        {
                map     textures/map_erbium/moss.jpg
-
-       } 
+       }
        {
                map     textures/map_erbium/rock-grey.jpg
-               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
+               blendFunc blend
                alphagen vertex
-       } 
+       }
        {
                map     $lightmap
-               blendfunc GL_DST_COLOR GL_ZERO
+               blendfunc filter
                rgbGen identity
-
-       } 
+       }
 }
 
 textures/map_erbium/fern
@@ -269,7 +261,7 @@ textures/map_erbium/fern
        qer_editorimage textures/map_erbium/fern
 
        dpglossintensitymod 1.5
-       dpglossexponentmod  4
+       dpglossexponentmod 4
        q3map_bouncescale 1.25
 
        surfaceparm trans
@@ -277,18 +269,26 @@ textures/map_erbium/fern
        polygonOffset
        cull none
        nopicmip
+
        {
-               map $lightmap
                map textures/map_erbium/fern
-               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+               blendFunc blend
                rgbgen identity
        }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
 }
 
 textures/map_erbium/ivy
 {
+       qer_editorimage textures/map_erbium/ivy
+
        dpglossintensitymod 1.5
-       dpglossexponentmod  4
+       dpglossexponentmod 4
        q3map_bouncescale 1.25
 
        surfaceparm trans
@@ -296,13 +296,20 @@ textures/map_erbium/ivy
        polygonOffset
        cull none
        nopicmip
+
        {
-               map $lightmap
                map textures/map_erbium/ivy
-               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+               blendFunc blend
                rgbgen identity
        }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
 }
+
 textures/map_erbium/leaves
 {
        qer_editorimage textures/map_erbium/leaves
@@ -312,58 +319,76 @@ textures/map_erbium/leaves
        polygonOffset
        cull none
        nopicmip
+
        {
-               map $lightmap
                map textures/map_erbium/leaves
-               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+               blendFunc blend
                rgbgen identity
        }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
 }
 
 textures/map_erbium/leaves2
 {
-    qer_editorimage textures/map_erbium/leaves2
+       qer_editorimage textures/map_erbium/leaves2
 
        surfaceparm trans
        surfaceparm nonsolid
        polygonOffset
        cull none
        nopicmip
-    {
-        map $lightmap
-        map textures/map_erbium/leaves2
-        blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
-        rgbgen identity
-    }
+
+       {
+               map textures/map_erbium/leaves2
+               blendFunc blend
+               rgbgen identity
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
 }
 
 textures/map_erbium/singular-leaf
 {
+       qer_editorimage textures/map_erbium/singular-leaf
 
        surfaceparm trans
        surfaceparm nonsolid
        cull none
        nopicmip
+
        {
-               map $lightmap
                map textures/map_erbium/singular-leaf
-               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+               blendFunc blend
                rgbgen identity
        }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
 }
 
 textures/map_erbium/black-tiles
 {
        qer_editorimage textures/map_erbium/black-tiles
+
        dpoffsetmapping - .09346482113770383774 match8 106.75988500000000000000
        dpglossintensitymod 0.5
        q3map_bouncescale 1.25
 
        {
                map textures/map_erbium/black-tiles
-                               
        }
-
        {
                map $lightmap
                rgbGen identity
@@ -375,17 +400,14 @@ textures/map_erbium/black-tiles
 textures/map_erbium/con-tiled
 {
        qer_editorimage textures/map_erbium/con-tiled.jpg
-       
-       q3map_bounceScale  0.5
+
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 233
        dpglossintensitymod 0.5
-       dpglossexponentmod  1
-
+       dpglossexponentmod 1
 
        {
                map textures/map_erbium/con-tiled.jpg
-               
-
        }
        {
                map $lightmap
@@ -395,21 +417,17 @@ textures/map_erbium/con-tiled
        }
 }
 
-
 textures/map_erbium/rock-grey
 {
        qer_editorimage textures/map_erbium/rock-grey.jpg
-       
-       q3map_bounceScale  0.5
+
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 233
        dpglossintensitymod 0.5
-       dpglossexponentmod  1
-
+       dpglossexponentmod 1
 
        {
                map textures/map_erbium/rock-grey.jpg
-               
-
        }
        {
                map $lightmap
@@ -422,18 +440,17 @@ textures/map_erbium/rock-grey
 textures/map_erbium/moss
 {
        qer_editorimage textures/map_erbium/moss
+
        dpoffsetmapping - .09346482113770383774 match8 106.75988500000000000000
        q3map_bouncescale 1.25
 
        {
                map textures/map_erbium/moss
-                               
        }
-
        {
                map $lightmap
                rgbGen identity
                tcGen lightmap
                blendfunc filter
        }
-}
\ No newline at end of file
+}