Add alpha channeles to decals (avoids teh mysterios rtlight gloss)

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

diff --git a/scripts/decals.shader b/scripts/decals.shader
index ce600a061d6e505cb63eecb254883290744851b1..1bcc797b97d41a863b9c11bb8e8084ebdf1d8665 100644 (file)
--- a/scripts/decals.shader
+++ b/scripts/decals.shader
@@ -2,50 +2,42 @@ textures/decals/scorch01
 {\r
        qer_editorimage textures/decals/scorch01\r
 \r
-       noPicMip\r
-       noMipMaps\r
        surfaceparm trans\r
        surfaceparm nonsolid\r
        surfaceparm nodlight\r
+       surfaceparm nolightmap\r
+\r
        polygonOffset\r
        sort 6\r
        cull none\r
 \r
        {\r
                map textures/decals/scorch01\r
-               blendFunc GL_DST_COLOR GL_SRC_COLOR\r
+               blendFunc filter\r
                rgbgen identity\r
        }\r
-\r
-       {\r
-               map $lightmap\r
-               blendFunc GL_ZERO GL_ONE\r
-       }\r
 }\r
 \r
 textures/decals/scorch02\r
 {\r
        qer_editorimage textures/decals/scorch02\r
 \r
-       noPicMip\r
-       noMipMaps\r
        surfaceparm trans\r
        surfaceparm nonsolid\r
        surfaceparm nodlight\r
+       surfaceparm nolightmap\r
+\r
        polygonOffset\r
        sort 6\r
        cull none\r
 \r
+\r
        {\r
                map textures/decals/scorch02\r
-               blendFunc GL_DST_COLOR GL_SRC_COLOR\r
+               blendFunc filter\r
                rgbgen identity\r
        }\r
 \r
-       {\r
-               map $lightmap\r
-               blendFunc GL_ZERO GL_ONE\r
-       }\r
 }\r
 \r
 \r
@@ -54,16 +46,18 @@ textures/decals/splatter01
        qer_editorimage textures/decals/splatter01\r
 \r
        surfaceparm trans\r
-       surfaceparm nolightmap\r
        surfaceparm nonsolid\r
        surfaceparm nodlight\r
+       surfaceparm nolightmap\r
+\r
        polygonOffset\r
        sort 6\r
        cull none\r
 \r
+\r
        {\r
                map textures/decals/splatter01\r
-               blendFunc GL_DST_COLOR GL_SRC_COLOR\r
+               blendFunc filter\r
                rgbgen identity\r
        }\r
 }\r
@@ -73,16 +67,18 @@ textures/decals/splatter02
        qer_editorimage textures/decals/splatter02\r
 \r
        surfaceparm trans\r
-       surfaceparm nolightmap\r
        surfaceparm nonsolid\r
        surfaceparm nodlight\r
+       surfaceparm nolightmap\r
+\r
        polygonOffset\r
        sort 6\r
        cull none\r
 \r
+\r
        {\r
                map textures/decals/splatter02\r
-               blendFunc GL_DST_COLOR GL_SRC_COLOR\r
+               blendFunc filter\r
                rgbgen identity\r
        }\r
 }\r
@@ -91,16 +87,19 @@ textures/decals/splatter03
        qer_editorimage textures/decals/splatter03\r
 \r
        surfaceparm trans\r
-       surfaceparm nolightmap\r
        surfaceparm nonsolid\r
        surfaceparm nodlight\r
+       surfaceparm nolightmap\r
+\r
        polygonOffset\r
        sort 6\r
        cull none\r
 \r
+\r
+\r
        {\r
                map textures/decals/splatter03\r
-               blendFunc GL_DST_COLOR GL_SRC_COLOR\r
+               blendFunc filter\r
                rgbgen identity\r
        }\r
 }\r
@@ -110,16 +109,18 @@ textures/decals/splatter04
        qer_editorimage textures/decals/splatter04\r
 \r
        surfaceparm trans\r
-       surfaceparm nolightmap\r
        surfaceparm nonsolid\r
        surfaceparm nodlight\r
+       surfaceparm nolightmap\r
+\r
        polygonOffset\r
        sort 6\r
        cull none\r
 \r
+\r
        {\r
                map textures/decals/splatter04\r
-               blendFunc GL_DST_COLOR GL_SRC_COLOR\r
+               blendFunc filter\r
                rgbgen identity\r
        }\r
 }\r
@@ -129,16 +130,18 @@ textures/decals/splatter05
        qer_editorimage textures/decals/splatter05\r
 \r
        surfaceparm trans\r
-       surfaceparm nolightmap\r
        surfaceparm nonsolid\r
        surfaceparm nodlight\r
+       surfaceparm nolightmap\r
+\r
        polygonOffset\r
        sort 6\r
        cull none\r
 \r
+\r
        {\r
                map textures/decals/splatter05\r
-               blendFunc GL_DST_COLOR GL_SRC_COLOR\r
+               blendFunc filter\r
                rgbgen identity\r
        }\r
 }\r