X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fshader-audit.sh;h=d125784a38b2ed4820e186be9de489f451a5dd9e;hp=95ae9ae18851f454aac3700f010192cf8e4b8274;hb=7d22b3576fcdf11ff2371ecacf83fc03bbf3ccef;hpb=d4d447f2fee0e9bf6e2be089dc0ba87652c8ef4e

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
old mode 100644
new mode 100755
index 95ae9ae1..d125784a
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -1,5 +1,19 @@
 #!/bin/sh
 
+case "$0" in
+	*/*)
+		cd "${0%/*}"
+		;;
+esac
+
+pid=$$
+status=true
+trap 'status=false' USR1
+seterror()
+{
+	kill -USR1 "$pid"
+}
+
 LF="
 "
 
@@ -27,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"
@@ -52,23 +66,25 @@ 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
+		## RULE: skyboxes must lie in env/
 		sky)
 			case "$2" in
 				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
 			;;
+		## RULE: non-skyboxes must not lie in env/
 		*)
 			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
 					;;
 				*)
 					;;
@@ -78,19 +94,20 @@ use_texture()
 
 	# verify shader -> texture name
 	case "$1" in
+		## RULE: textures/FOOx/BAR-BAZ must use textures/FOOx/*/*, recommended textures/FOOx/BAR/BAZ
 		textures/*x/*-*)
 			pre=${1%%x/*}x
 			suf=${1#*x/}
-			# rule: in suffix part, change each - to /
 			suf="`echo "$suf" | sed 's,-,/,g'`"
 			case "$2" in
 				"$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
 			;;
+		## RULE: textures/FOOx/BAR must use textures/FOOx/*/*, recommended textures/FOOx/base/BAR
 		textures/*x/*)
 			pre=${1%%x/*}x
 			suf=${1#*x/}
@@ -98,10 +115,11 @@ 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
 			;;
+		## RULE: textures/map_FOO[_/]* must use textures/map_FOO[_/]*
 		textures/map_*/*)
 			pre=${1%%/map_*}
 			suf=${1#*/map_}
@@ -109,11 +127,16 @@ use_texture()
 			case "$2" in
 				"$pre"/map_$map[/_]*)
 					;;
+				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/*"; seterror
+					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/map_$map/*"
+					# using outside stuff is permitted
 					;;
 			esac
 			;;
+		## RULE: textures/common/FOO must use textures/common/FOO or textures/common/*/*
 		textures/common/*)
 			case "$2" in
 				"$1")
@@ -121,45 +144,50 @@ 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
 			;;
-		textures/decals/*)
+		## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava, warpzone
+		textures/decals/*|textures/liquids_*/*|textures/warpzone/*|textures/effects_*/*)
+			pre=`echo "$1" | cut -d / -f 1-2`
 			case "$2" in
-				"$1")
+				"$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
 			;;
+		## RULE: textures/skies/FOO or textures/skies/FOO_BAR must use textures/skies/FOO respective textures/skies/FOO_BAR as preview image, and env/FOO[_/]* as skybox
 		textures/skies/*)
 			sky=${1#textures/skies/}
+			sky=${sky%%_*}
 			case "$2" in
-				"$1")
+				textures/skies/$sky|textures/skies/$sky[_]*)
 					# typical place for preview image
 					;;
-				env/"${1#textures/skies/}")
+				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
 			;;
+		## RULE: models/* must use models/*
 		models/*)
 			case "$2" in
 				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
 }
@@ -167,7 +195,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
@@ -179,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
 				;;
@@ -195,13 +223,18 @@ parse_shaderstage()
 parse_shader()
 {
 	use_texture "$parsing_shader" "$parsing_shader" shader
-	while read L A1; do
+	while read L A1 Aother; do
 		case "$L" in
-			qer_editorimage\ *)
-				use_texture "$parsing_shader" "$A1" editorimage
+			qer_editorimage)
+				use_texture "$parsing_shader" "`normalize "$A1"`" editorimage
 				;;
-			skyparms\ *)
-				use_texture "$parsing_shader" "$A1" sky
+			skyparms)
+				use_texture "$parsing_shader" "${A1}_lf" sky
+				use_texture "$parsing_shader" "${A1}_rt" sky
+				use_texture "$parsing_shader" "${A1}_up" sky
+				use_texture "$parsing_shader" "${A1}_dn" sky
+				use_texture "$parsing_shader" "${A1}_ft" sky
+				use_texture "$parsing_shader" "${A1}_bk" sky
 				;;
 			'{')
 				parse_shaderstage
@@ -218,17 +251,25 @@ parse_shader()
 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_*
 		skies_*)
 			allowed_prefixes="textures/skies/`echo "$1" | cut -d _ -f 2`: textures/skies/`echo "$1" | cut -d _ -f 2`_"
 			forbidden_prefixes=
 			;;
+		## RULE: model_*.shader may define models/*
+		model_*)
+			allowed_prefixes="models/"
+			forbidden_prefixes=
+			;;
+		## RULE: any other FOO.shader may define textures/FOO/*
 		*)
-			allowed_prefixes=
-			forbidden_prefixes="textures/skies/ textures/map_"
+			allowed_prefixes="textures/$1/"
+			forbidden_prefixes="textures/skies/ textures/map_ models/"
 			;;
 	esac
 	while read L; do
@@ -253,14 +294,14 @@ strip_comments()
 	sed 's,//.*,,g; s,\r, ,g; s,\t, ,g; s,  *, ,g; s, $,,; s,^ ,,; /^$/ d'
 }
 
-t=`mktemp`
+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.*' ) | 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
@@ -270,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