X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=scripts%2Flogos.shader;h=8028e04c33b583c066364f5b4eeed6dbc03e625a;hb=756459c0057e38ae54eaa0735cef945c621defd6;hp=821b240b0bdab81392a497be8f880bedf738c1a5;hpb=ee84bdc40e96a16f5b7af3a4e5a0414fcb6af96c;p=xonotic%2Fxonotic-maps.pk3dir.git

diff --git a/scripts/logos.shader b/scripts/logos.shader
index 821b240b..8028e04c 100644
--- a/scripts/logos.shader
+++ b/scripts/logos.shader
@@ -1,6 +1,6 @@
-textures/logos/phoenix01_blue
+textures/logos/logo01_blue
 {
-	qer_editorimage textures/logos/logo01_blue.tga
+	qer_editorimage textures/logos/logo01/logo01_blue.tga
 
 	surfaceparm trans
 	surfaceparm nonsolid
@@ -12,15 +12,16 @@ textures/logos/phoenix01_blue
 	cull none
 
 	{
-		map textures/logos/logo01_blue.tga
+		map textures/logos/logo01/logo01_blue.tga
 		blendFunc filter
+		alphaFunc GT0
 		rgbgen identity
 	}
 }
 
-textures/logos/phoenix01_blue_glow
+textures/logos/logo01_blue_glowy
 {
-	qer_editorimage textures/logos/logo01_blueg.tga
+	qer_editorimage textures/logos/logo01/logo01_blueg.tga
 
 	surfaceparm trans
 	surfaceparm nonsolid
@@ -32,15 +33,37 @@ textures/logos/phoenix01_blue_glow
 	cull none
 
 	{
-		map textures/logos/logo01_blueg.tga
+		map textures/logos/logo01/logo01_blueg.tga
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaFunc GT0
+		rgbgen identity
+	}
+}
+
+textures/logos/logo01_red
+{
+	qer_editorimage textures/logos/logo01/logo01_red.tga
+
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nodlight
+	surfaceparm nolightmap
+
+	polygonOffset
+	sort 6
+	cull none
+
+	{
+		map textures/logos/logo01/logo01_red.tga
 		blendFunc filter
+		alphaFunc GT0
 		rgbgen identity
 	}
 }
 
-textures/logos/phoenix01_red
+textures/logos/logo01_red_glowy
 {
-	qer_editorimage textures/logos/logo01_red.tga
+	qer_editorimage textures/logos/logo01/logo01_redg.tga
 
 	surfaceparm trans
 	surfaceparm nonsolid
@@ -52,15 +75,37 @@ textures/logos/phoenix01_red
 	cull none
 
 	{
-		map textures/logos/logo01_red.tga
+		map textures/logos/logo01/logo01_redg.tga
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaFunc GT0
+		rgbgen identity
+	}
+}
+
+textures/logos/logo01_green
+{
+	qer_editorimage textures/logos/logo01/logo01_green.tga
+
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nodlight
+	surfaceparm nolightmap
+
+	polygonOffset
+	sort 6
+	cull none
+
+	{
+		map textures/logos/logo01/logo01_green.tga
 		blendFunc filter
+		alphaFunc GT0
 		rgbgen identity
 	}
 }
 
-textures/logos/phoenix01_red_glow
+textures/logos/logo01_green_glowy
 {
-	qer_editorimage textures/logos/logo01_redg.tga
+	qer_editorimage textures/logos/logo01/logo01_greeng.tga
 
 	surfaceparm trans
 	surfaceparm nonsolid
@@ -72,15 +117,58 @@ textures/logos/phoenix01_red_glow
 	cull none
 
 	{
-		map textures/logos/logo01_redg.tga
+		map textures/logos/logo01/logo01_greeng.tga
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaFunc GT0
+		rgbgen identity
+	}
+}
+
+textures/logos/logo01_yellow
+{
+	qer_editorimage textures/logos/logo01/logo01_yellow.tga
+
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nodlight
+	surfaceparm nolightmap
+
+	polygonOffset
+	sort 6
+	cull none
+
+	{
+		map textures/logos/logo01/logo01_yellow.tga
 		blendFunc filter
+		alphaFunc GT0
+		rgbgen identity
+	}
+}
+
+textures/logos/logo01_yellow_glowy
+{
+	qer_editorimage textures/logos/logo01/logo01_yellowg.tga
+
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nodlight
+	surfaceparm nolightmap
+
+	polygonOffset
+	sort 6
+	cull none
+
+	{
+		map textures/logos/logo01/logo01_yellowg.tga
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaFunc GT0
 		rgbgen identity
 	}
 }
 
-textures/logos/phoenix01_green
+textures/logos/logo02_red
 {
-	qer_editorimage textures/logos/logo01_green.tga
+	qer_editorimage textures/logos/logo02/logo02_red.tga
 
 	surfaceparm trans
 	surfaceparm nonsolid
@@ -92,15 +180,16 @@ textures/logos/phoenix01_green
 	cull none
 
 	{
-		map textures/logos/logo01_green.tga
+		map textures/logos/logo02/logo02_red.tga
 		blendFunc filter
+		alphaFunc GT0
 		rgbgen identity
 	}
 }
 
-textures/logos/phoenix01_green_glow
+textures/logos/logo02_red_glowy
 {
-	qer_editorimage textures/logos/logo01_greeng.tga
+	qer_editorimage textures/logos/logo02/logo02_redg.tga
 
 	surfaceparm trans
 	surfaceparm nonsolid
@@ -112,15 +201,58 @@ textures/logos/phoenix01_green_glow
 	cull none
 
 	{
-		map textures/logos/logo01_greeng.tga
+		map textures/logos/logo02/logo02_redg.tga
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaFunc GT0
+		rgbgen identity
+	}
+}
+
+textures/logos/logo02_blue
+{
+	qer_editorimage textures/logos/logo02/logo02_blue.tga
+
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nodlight
+	surfaceparm nolightmap
+
+	polygonOffset
+	sort 6
+	cull none
+
+	{
+		map textures/logos/logo02/logo02_blue.tga
 		blendFunc filter
+		alphaFunc GT0
+		rgbgen identity
+	}
+}
+
+textures/logos/logo02_blue_glowy
+{
+	qer_editorimage textures/logos/logo02/logo02_blueg.tga
+
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nodlight
+	surfaceparm nolightmap
+
+	polygonOffset
+	sort 6
+	cull none
+
+	{
+		map textures/logos/logo02/logo02_blueg.tga
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaFunc GT0
 		rgbgen identity
 	}
 }
 
-textures/logos/phoenix01_yellow
+textures/logos/logo02_green
 {
-	qer_editorimage textures/logos/logo01_yellow.tga
+	qer_editorimage textures/logos/logo02/logo02_green.tga
 
 	surfaceparm trans
 	surfaceparm nonsolid
@@ -132,15 +264,37 @@ textures/logos/phoenix01_yellow
 	cull none
 
 	{
-		map textures/logos/logo01_yellow.tga
+		map textures/logos/logo02/logo02_green.tga
 		blendFunc filter
+		alphaFunc GT0
+		rgbgen identity
+	}
+}
+
+textures/logos/logo02_green_glowy
+{
+	qer_editorimage textures/logos/logo02/logo02_greeng.tga
+
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nodlight
+	surfaceparm nolightmap
+
+	polygonOffset
+	sort 6
+	cull none
+
+	{
+		map textures/logos/logo02/logo02_greeng.tga
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaFunc GT0
 		rgbgen identity
 	}
 }
 
-textures/logos/phoenix01_yellow_glow
+textures/logos/logo02_yellow
 {
-	qer_editorimage textures/logos/logo01_yellowg.tga
+	qer_editorimage textures/logos/logo02/logo02_yellow.tga
 
 	surfaceparm trans
 	surfaceparm nonsolid
@@ -152,8 +306,30 @@ textures/logos/phoenix01_yellow_glow
 	cull none
 
 	{
-		map textures/logos/logo01_yellowg.tga
+		map textures/logos/logo02/logo02_yellow.tga
 		blendFunc filter
+		alphaFunc GT0
+		rgbgen identity
+	}
+}
+
+textures/logos/logo02_yellow_glowy
+{
+	qer_editorimage textures/logos/logo02/logo02_yellowg.tga
+
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nodlight
+	surfaceparm nolightmap
+
+	polygonOffset
+	sort 6
+	cull none
+
+	{
+		map textures/logos/logo02/logo02_yellowg.tga
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaFunc GT0
 		rgbgen identity
 	}
-}
\ No newline at end of file
+}