X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fshader-audit.sh;h=07a3c2bff9fcd78f1b055aa5e6f7edd55093d5bc;hp=c90a4e7509186ccb3908523410e2cb4ed19907b2;hb=3fdeff0fc4ab67a00e6425d00f25734a22975dff;hpb=3c07809535a4743e313a3b3ca727a5e469fd393f

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index c90a4e75..07a3c2bf 100755
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -6,6 +6,14 @@ case "$0" in
 		;;
 esac
 
+pid=$$
+status=true
+trap 'status=false' USR1
+seterror()
+{
+	kill -USR1 "$pid"
+}
+
 LF="
 "
 
@@ -33,7 +41,7 @@ use_texture()
 		if [ "$3" = "shader" ]; then
 			return
 		else
-			echo "(EE) shader $1 uses non-existing texture $2"
+			echo "(EE) shader $1 uses non-existing texture $2"; seterror
 		fi
 	fi
 	textures_used="$textures_used$LF$2"
@@ -58,7 +66,7 @@ use_texture()
 		esac
 	done
 	if ! $ok; then
-		echo "(EE) shader $1 is not allowed in this shader file (allowed: $allowed_prefixes, forbidden: $forbidden_prefixes)"
+		echo "(EE) shader $1 is not allowed in this shader file (allowed: $allowed_prefixes, forbidden: $forbidden_prefixes)"; seterror
 	fi
 
 	case "$3" in
@@ -68,7 +76,7 @@ use_texture()
 				env/*)
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, $3 textures must be in env/"
+					echo "(EE) texture $2 of shader $1 is out of place, $3 textures must be in env/"; seterror
 					;;
 			esac
 			;;
@@ -76,7 +84,7 @@ use_texture()
 		*)
 			case "$2" in
 				env/*)
-					echo "(EE) texture $2 of shader $1 is out of place, $3 textures must not be in env/"
+					echo "(EE) texture $2 of shader $1 is out of place, $3 textures must not be in env/"; seterror
 					;;
 				*)
 					;;
@@ -95,7 +103,7 @@ use_texture()
 				"$pre"/*/*)
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/$suf"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/$suf"; seterror
 					;;
 			esac
 			;;
@@ -107,7 +115,7 @@ use_texture()
 				"$pre"/*/*)
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/base/$suf"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/base/$suf"; seterror
 					;;
 			esac
 			;;
@@ -121,7 +129,7 @@ use_texture()
 					;;
 				textures/map_*)
 					# protect one map's textures from the evil of other maps :P
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/map_$map/*"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/map_$map/*"; seterror
 					;;
 				*)
 					# using outside stuff is permitted
@@ -136,19 +144,19 @@ use_texture()
 				textures/common/*/*)
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1 or textures/common/*/*"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1 or textures/common/*/*"; seterror
 					;;
 			esac
 			;;
-		## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava, warpzone
-		textures/decals/*|textures/liquids_water/*|textures/liquids_slime/*|textures/liquids_lava/*|textures/warpzone/*)
-			pre=${1%/*}
+		## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava
+		textures/decals/*|textures/liquids_*/*|textures/effects_*/*|textures/screens/*|textures/logos/*)
+			pre=`echo "$1" | cut -d / -f 1-2`
 			case "$2" in
 				"$pre"/*)
 					# I _suppose_ this is fine, as tZork committed this pack
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1"; seterror
 					;;
 			esac
 			;;
@@ -157,14 +165,14 @@ use_texture()
 			sky=${1#textures/skies/}
 			sky=${sky%%_*}
 			case "$2" in
-				"$1")
+				textures/skies/$sky|textures/skies/$sky[_]*)
 					# typical place for preview image
 					;;
 				env/$sky[/_]*)
 					# typical place for skybox
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1"; seterror
 					;;
 			esac
 			;;
@@ -174,12 +182,12 @@ use_texture()
 				models/*)
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1 or models/*"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1 or models/*"; seterror
 					;;
 			esac
 			;;
 		*)
-			echo "(EE) no shader name pattern for $1"
+			echo "(EE) no shader name pattern for $1"; seterror
 			;;
 	esac
 }
@@ -187,8 +195,8 @@ use_texture()
 parsing_shader=
 parse_shaderstage()
 {
-	while read L A1 A2 Aother; do
-		case "$L" in
+	while read L A1 Aother; do
+		case "`echo "$L" | tr A-Z a-z`" in
 			map)
 				case "$A1" in
 					'$lightmap')
@@ -199,7 +207,7 @@ parse_shaderstage()
 				esac
 				;;
 			animmap)
-				for X in $A2 $Aother; do
+				for X in $Aother; do
 					use_texture "$parsing_shader" "`normalize "$X"`" animmap
 				done
 				;;
@@ -215,8 +223,8 @@ parse_shaderstage()
 parse_shader()
 {
 	use_texture "$parsing_shader" "$parsing_shader" shader
-	while read L A1 AREST; do
-		case "$L" in
+	while read L A1 Aother; do
+		case "`echo "$L" | tr A-Z a-z`" in
 			qer_editorimage)
 				use_texture "$parsing_shader" "`normalize "$A1"`" editorimage
 				;;
@@ -245,7 +253,7 @@ parse_shaderfile()
 	case "$1" in
 		## RULE: map_FOO.shader may define tetxures/map_FOO_* and textures/map_FOO/*
 		map_*)
-			allowed_prefixes="textures/map_`echo "$1" | cut -d _ -f 2`_ textures/map_`echo "$1" | cut -d - -f 2`/"
+			allowed_prefixes="textures/map_`echo "$1" | cut -d _ -f 2`_ textures/map_`echo "$1" | cut -d _ -f 2`/"
 			forbidden_prefixes=
 			;;
 		## RULE: skies_FOO.shader may define tetxures/skies/FOO and textures/skies/FOO_*
@@ -286,11 +294,14 @@ strip_comments()
 	sed 's,//.*,,g; s,\r, ,g; s,\t, ,g; s,  *, ,g; s, $,,; s,^ ,,; /^$/ d'
 }
 
+t=`mktemp || echo ".temp"`
 for X in *.shader; do
-	strip_comments < "$X" | parse_shaderfile "${X%.shader}"
+	strip_comments < "$X" > "$t"
+	parse_shaderfile "${X%.shader}" < "$t"
 done
+rm -f "$t"
 
-textures_avail=`( cd ..; find textures/ -type f -not -name '*_norm.*' -not -name '*_glow.*' -not -name '*_gloss.*' -not -name '*.xcf' ) | while IFS= read -r T; do normalize "$T"; done | sort -u`
+textures_avail=`( cd ..; find textures/ -type f -not -name '*_norm.*' -not -name '*_glow.*' -not -name '*_gloss.*' -not -name '*_reflect.*' -not -name '*.xcf' ) | while IFS= read -r T; do normalize "$T"; done | sort -u`
 textures_used=`echo "${textures_used#$LF}" | sort -u`
 
 echo "$textures_used$LF$textures_used$LF$textures_avail" | sort | uniq -u | while IFS= read -r L; do
@@ -300,7 +311,9 @@ echo "$textures_used$LF$textures_used$LF$textures_avail" | sort | uniq -u | whil
 		textures/map_*/*)
 			;;
 		*)
-			echo "(EE) texture $L is not referenced by any shader"
+			echo "(EE) texture $L is not referenced by any shader"; seterror
 			;;
 	esac
 done
+
+$status