X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=scripts%2Flogos.shader;h=a43ed83aae94c0cb03e3e8fb39975a8540956920;hb=b8472a2af3f8c974f5fd486f88c3603c0dedbb99;hp=6f61b24710c5e11a62bf37996c10bbe6c5c2af56;hpb=5c51d526330ebebf20d9bb08e716b70383073f90;p=xonotic%2Fxonotic-maps.pk3dir.git

diff --git a/scripts/logos.shader b/scripts/logos.shader
index 6f61b247..a43ed83a 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,58 @@ textures/logos/phoenix01_blue_glow
 	cull none
 
 	{
-		map textures/logos/logo01_blueg.tga
+		map textures/logos/logo01/logo01_blueg.tga
+		blendFunc add
+		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/logo01_red_glowy
+{
+	qer_editorimage textures/logos/logo01/logo01_redg.tga
+
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nodlight
+	surfaceparm nolightmap
+
+	polygonOffset
+	sort 6
+	cull none
+
+	{
+		map textures/logos/logo01/logo01_redg.tga
+		blendFunc add
+		alphaFunc GT0
 		rgbgen identity
 	}
 }
 
-textures/logos/phoenix01_red
+textures/logos/logo01_green
 {
-	qer_editorimage textures/logos/logo01_red.tga
+	qer_editorimage textures/logos/logo01/logo01_green.tga
 
 	surfaceparm trans
 	surfaceparm nonsolid
@@ -52,15 +96,16 @@ textures/logos/phoenix01_red
 	cull none
 
 	{
-		map textures/logos/logo01_red.tga
+		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 add
+		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 add
+		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 add
+		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 add
+		alphaFunc GT0
 		rgbgen identity
 	}
 }
 
-textures/logos/phoenix01_yelow
+textures/logos/logo02_green
 {
-	qer_editorimage textures/logos/logo01_yelow.tga
+	qer_editorimage textures/logos/logo02/logo02_green.tga
 
 	surfaceparm trans
 	surfaceparm nonsolid
@@ -132,15 +264,16 @@ textures/logos/phoenix01_yelow
 	cull none
 
 	{
-		map textures/logos/logo01_yelow.tga
+		map textures/logos/logo02/logo02_green.tga
 		blendFunc filter
+		alphaFunc GT0
 		rgbgen identity
 	}
 }
 
-textures/logos/phoenix01_yelow_glow
+textures/logos/logo02_green_glowy
 {
-	qer_editorimage textures/logos/logo01_yelowg.tga
+	qer_editorimage textures/logos/logo02/logo02_greeng.tga
 
 	surfaceparm trans
 	surfaceparm nonsolid
@@ -152,8 +285,51 @@ textures/logos/phoenix01_yelow_glow
 	cull none
 
 	{
-		map textures/logos/logo01_yelowg.tga
+		map textures/logos/logo02/logo02_greeng.tga
+		blendFunc add
+		alphaFunc GT0
+		rgbgen identity
+	}
+}
+
+textures/logos/logo02_yellow
+{
+	qer_editorimage textures/logos/logo02/logo02_yellow.tga
+
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nodlight
+	surfaceparm nolightmap
+
+	polygonOffset
+	sort 6
+	cull none
+
+	{
+		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 add
+		alphaFunc GT0
 		rgbgen identity
 	}
 }
\ No newline at end of file