From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 25 May 2010 14:10:41 +0000 (+0200)
Subject: Add alpha channeles to decals (avoids teh mysterios rtlight gloss)
X-Git-Tag: xonotic-v0.1.0preview~170^2~5
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=2561a6283e6c08352f4d5ba4d6344f6f1d95c32f;p=xonotic%2Fxonotic-maps.pk3dir.git

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 ce600a06..1bcc797b 100644
--- a/scripts/decals.shader
+++ b/scripts/decals.shader
@@ -2,50 +2,42 @@ textures/decals/scorch01
 {
 	qer_editorimage textures/decals/scorch01
 
-	noPicMip
-	noMipMaps
 	surfaceparm trans
 	surfaceparm nonsolid
 	surfaceparm nodlight
+	surfaceparm nolightmap
+
 	polygonOffset
 	sort 6
 	cull none
 
 	{
 		map textures/decals/scorch01
-		blendFunc GL_DST_COLOR GL_SRC_COLOR
+		blendFunc filter
 		rgbgen identity
 	}
-
-	{
-		map $lightmap
-		blendFunc GL_ZERO GL_ONE
-	}
 }
 
 textures/decals/scorch02
 {
 	qer_editorimage textures/decals/scorch02
 
-	noPicMip
-	noMipMaps
 	surfaceparm trans
 	surfaceparm nonsolid
 	surfaceparm nodlight
+	surfaceparm nolightmap
+
 	polygonOffset
 	sort 6
 	cull none
 
+
 	{
 		map textures/decals/scorch02
-		blendFunc GL_DST_COLOR GL_SRC_COLOR
+		blendFunc filter
 		rgbgen identity
 	}
 
-	{
-		map $lightmap
-		blendFunc GL_ZERO GL_ONE
-	}
 }
 
 
@@ -54,16 +46,18 @@ textures/decals/splatter01
 	qer_editorimage textures/decals/splatter01
 
 	surfaceparm trans
-	surfaceparm nolightmap
 	surfaceparm nonsolid
 	surfaceparm nodlight
+	surfaceparm nolightmap
+
 	polygonOffset
 	sort 6
 	cull none
 
+
 	{
 		map textures/decals/splatter01
-		blendFunc GL_DST_COLOR GL_SRC_COLOR
+		blendFunc filter
 		rgbgen identity
 	}
 }
@@ -73,16 +67,18 @@ textures/decals/splatter02
 	qer_editorimage textures/decals/splatter02
 
 	surfaceparm trans
-	surfaceparm nolightmap
 	surfaceparm nonsolid
 	surfaceparm nodlight
+	surfaceparm nolightmap
+
 	polygonOffset
 	sort 6
 	cull none
 
+
 	{
 		map textures/decals/splatter02
-		blendFunc GL_DST_COLOR GL_SRC_COLOR
+		blendFunc filter
 		rgbgen identity
 	}
 }
@@ -91,16 +87,19 @@ textures/decals/splatter03
 	qer_editorimage textures/decals/splatter03
 
 	surfaceparm trans
-	surfaceparm nolightmap
 	surfaceparm nonsolid
 	surfaceparm nodlight
+	surfaceparm nolightmap
+
 	polygonOffset
 	sort 6
 	cull none
 
+
+
 	{
 		map textures/decals/splatter03
-		blendFunc GL_DST_COLOR GL_SRC_COLOR
+		blendFunc filter
 		rgbgen identity
 	}
 }
@@ -110,16 +109,18 @@ textures/decals/splatter04
 	qer_editorimage textures/decals/splatter04
 
 	surfaceparm trans
-	surfaceparm nolightmap
 	surfaceparm nonsolid
 	surfaceparm nodlight
+	surfaceparm nolightmap
+
 	polygonOffset
 	sort 6
 	cull none
 
+
 	{
 		map textures/decals/splatter04
-		blendFunc GL_DST_COLOR GL_SRC_COLOR
+		blendFunc filter
 		rgbgen identity
 	}
 }
@@ -129,16 +130,18 @@ textures/decals/splatter05
 	qer_editorimage textures/decals/splatter05
 
 	surfaceparm trans
-	surfaceparm nolightmap
 	surfaceparm nonsolid
 	surfaceparm nodlight
+	surfaceparm nolightmap
+
 	polygonOffset
 	sort 6
 	cull none
 
+
 	{
 		map textures/decals/splatter05
-		blendFunc GL_DST_COLOR GL_SRC_COLOR
+		blendFunc filter
 		rgbgen identity
 	}
 }
diff --git a/textures/decals/scorch02.tga b/textures/decals/scorch02.tga
index f7d2aedf..26e73563 100644
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 1b6fcfb8..9c272d83 100644
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 14f0a2c0..4be06e5d 100644
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 c600c362..793ef691 100644
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 fd58eba2..2a27f524 100644
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 022a492e..a1766f61 100644
Binary files a/textures/decals/splatter05.tga and b/textures/decals/splatter05.tga differ