From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 22 Jul 2010 13:35:52 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/skyboxes
X-Git-Tag: xonotic-v0.1.0preview~141^2~8
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=d4d447f2fee0e9bf6e2be089dc0ba87652c8ef4e;hp=47d2837612ffa22acd0e52854a04287d1f5ccfb4

Merge branch 'master' into divVerent/skyboxes
---

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index dd371ac0..95ae9ae1 100644
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -14,7 +14,7 @@ forbidden_prefixes=
 textures_used=
 # $1 = shader
 # $2 = texture
-# $3 = self | map | animmap | editorimage
+# $3 = shader | map | animmap | editorimage | sky
 use_texture()
 {
 	# does texture exist?
@@ -24,7 +24,7 @@ use_texture()
 		[ -f "../$2.png" ]; then
 		:
 	else
-		if [ "$3" = "self" ]; then
+		if [ "$3" = "shader" ]; then
 			return
 		else
 			echo "(EE) shader $1 uses non-existing texture $2"
@@ -55,7 +55,28 @@ use_texture()
 		echo "(EE) shader $1 is not allowed in this shader file (allowed: $allowed_prefixes, forbidden: $forbidden_prefixes)"
 	fi
 
-	# TODO verify shader -> texture name
+	case "$3" in
+		sky)
+			case "$2" in
+				env/*)
+					;;
+				*)
+					echo "(EE) texture $2 of shader $1 is out of place, $3 textures must be in env/"
+					;;
+			esac
+			;;
+		*)
+			case "$2" in
+				env/*)
+					echo "(EE) texture $2 of shader $1 is out of place, $3 textures must not be in env/"
+					;;
+				*)
+					;;
+			esac
+			;;
+	esac
+
+	# verify shader -> texture name
 	case "$1" in
 		textures/*x/*-*)
 			pre=${1%%x/*}x
@@ -173,12 +194,15 @@ parse_shaderstage()
 
 parse_shader()
 {
-	use_texture "$parsing_shader" "$parsing_shader" self
+	use_texture "$parsing_shader" "$parsing_shader" shader
 	while read L A1; do
 		case "$L" in
 			qer_editorimage\ *)
 				use_texture "$parsing_shader" "$A1" editorimage
 				;;
+			skyparms\ *)
+				use_texture "$parsing_shader" "$A1" sky
+				;;
 			'{')
 				parse_shaderstage
 				;;