X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fshader-audit.sh;h=4e2a5aa7fdf3265278626e920eedfb7732d0cdb8;hp=c90a4e7509186ccb3908523410e2cb4ed19907b2;hb=9aed5e1eb47ab142a10261dfea1a95ca0d1959f3;hpb=3c07809535a4743e313a3b3ca727a5e469fd393f

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index c90a4e75..4e2a5aa7 100755
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -157,7 +157,7 @@ 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[/_]*)
@@ -187,7 +187,7 @@ use_texture()
 parsing_shader=
 parse_shaderstage()
 {
-	while read L A1 A2 Aother; do
+	while read L A1 Aother; do
 		case "$L" in
 			map)
 				case "$A1" in
@@ -199,7 +199,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,7 +215,7 @@ parse_shaderstage()
 parse_shader()
 {
 	use_texture "$parsing_shader" "$parsing_shader" shader
-	while read L A1 AREST; do
+	while read L A1 Aother; do
 		case "$L" in
 			qer_editorimage)
 				use_texture "$parsing_shader" "`normalize "$A1"`" editorimage
@@ -245,7 +245,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,21 +286,37 @@ strip_comments()
 	sed 's,//.*,,g; s,\r, ,g; s,\t, ,g; s,  *, ,g; s, $,,; s,^ ,,; /^$/ d'
 }
 
-for X in *.shader; do
-	strip_comments < "$X" | parse_shaderfile "${X%.shader}"
-done
+{
+	t=`mktemp || echo ".temp"`
+	for X in *.shader; do
+		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_used=`echo "${textures_used#$LF}" | 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
-	case "$L" in
-		textures/radiant/*)
-			;;
-		textures/map_*/*)
-			;;
-		*)
-			echo "(EE) texture $L is not referenced by any shader"
-			;;
-	esac
-done
+	echo "$textures_used$LF$textures_used$LF$textures_avail" | sort | uniq -u | while IFS= read -r L; do
+		case "$L" in
+			textures/radiant/*)
+				;;
+			textures/map_*/*)
+				;;
+			*)
+				echo "(EE) texture $L is not referenced by any shader"
+				;;
+		esac
+	done
+} | {
+	return=true
+	while IFS= read -r STATUS TEXT; do
+		case "$STATUS" in
+			'(EE)')
+				return=false
+				;;
+		esac
+		echo "$STATUS $TEXT"
+	done
+	$return
+}