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

Use blendFunc filter in shader (aparently it works now)

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

diff --git a/textures/decals/scorch02.tga b/textures/decals/scorch02.tga
index f7d2aedff0cf8cca8ead7458f700e4cc7cd6aad4..26e735631abe94df2645234746e69aa09f22a450 100644 (file)
Binary files a/textures/decals/scorch02.tga and b/textures/decals/scorch02.tga differ

diff --git a/textures/decals/splatter01.tga b/textures/decals/splatter01.tga
index 1b6fcfb8e1ff6aad3a1232e62866468b4005e0ab..9c272d83b4e402ff0b99c03ddfb580126b8a2c6d 100644 (file)
Binary files a/textures/decals/splatter01.tga and b/textures/decals/splatter01.tga differ

diff --git a/textures/decals/splatter02.tga b/textures/decals/splatter02.tga
index 14f0a2c096f0e32c3b096472c6cf186e42cc931b..4be06e5d2cd1062ac64e735f481abc4e574a30ea 100644 (file)
Binary files a/textures/decals/splatter02.tga and b/textures/decals/splatter02.tga differ

diff --git a/textures/decals/splatter03.tga b/textures/decals/splatter03.tga
index c600c362daa28c48b292c1274b9564cb54a5e317..793ef6919312721223ed084d99ea0c8d1f97e3eb 100644 (file)
Binary files a/textures/decals/splatter03.tga and b/textures/decals/splatter03.tga differ

diff --git a/textures/decals/splatter04.tga b/textures/decals/splatter04.tga
index fd58eba216ae0e765ee94f2b95034b2a6cfdbfb5..2a27f52485d36aa295f4407e9e76a6ec55dea47d 100644 (file)
Binary files a/textures/decals/splatter04.tga and b/textures/decals/splatter04.tga differ

diff --git a/textures/decals/splatter05.tga b/textures/decals/splatter05.tga
index 022a492eca862da6f62e7b6bc27a9f2eebad36a0..a1766f61657bce15f68ee3e689fee0d7d0234fff 100644 (file)
Binary files a/textures/decals/splatter05.tga and b/textures/decals/splatter05.tga differ