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

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index c90a4e75..d11c1a46 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="
 "
 
@@ -17,6 +25,41 @@ normalize()
 allowed_prefixes=
 forbidden_prefixes=
 
+getstats_e()
+{
+	identify -verbose -alpha extract -depth 8 "$1" | {
+		pix=0
+		while read -r L V R; do
+			case "$L" in
+				Geometry:)
+					V=${V%%[-+]*}
+					pix=$(( (${V%%x*} * ${V#*x}) / 2 ))
+					;;
+				min:)
+					min=$V
+					;;
+				max:)
+					max=$V
+					;;
+				[0-9]*:)
+					pix=$(( $pix - ${L%:} ))
+					if [ $pix -le 0 ]; then
+						median=`echo "$V $R" | cut -d , -f 1 | tr -cd 0-9`
+						break
+					fi
+			esac
+		done
+		cat >/dev/null
+		echo "min=$min"
+		echo "max=$max"
+		echo "median=$median"
+	}
+}
+getstats()
+{
+	eval `getstats_e "$1"`
+}
+
 textures_used=
 # $1 = shader
 # $2 = texture
@@ -33,11 +76,45 @@ 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"
 
+	if [ x"$3" = x"map" ]; then
+		lasttex=$2
+		if [ -n "$AUDIT_OFFSETMAPPING" ]; then
+			if [ -f "../${2}_norm.tga" ]; then
+				case "$offsetmapping_match8" in
+					'') # no dpoffsetmapping keyword
+						getstats "../${2}_norm.tga"
+						if [ "$min" -eq "$max" ]; then
+							echo "(EE) shader $1 uses broken normalmap ${2}_norm.tga (add dpoffsetmapping none)"; seterror
+						else
+							echo "(EE) shader $1 uses ${2}_norm.tga but lacks median (add dpoffsetmapping - 1 match8 $median)"; seterror
+						fi
+						;;
+					none) # offsetmapping turned off explicitly
+						;;
+					default) # offsetmapping keyword without bias
+						getstats "../${2}_norm.tga"
+						if [ "$min" -eq "$max" ]; then
+							echo "(EE) shader $1 uses broken normalmap ${2}_norm.tga, maybe use dpoffsetmapping none?"; seterror
+						else
+							echo "(EE) shader $1 uses ${2}_norm.tga but lacks median (add to dpoffsetmapping: match8 $median)"; seterror
+						fi
+						;;
+					*) # offsetmapping keyword with bias
+						;;
+				esac
+			else
+				if [ -n "$offsetmapping_match8" ]; then
+					echo "(EE) shader $1 specifies offsetmapping, but texture $2 does not have a normalmap"
+				fi
+			fi
+		fi
+	fi
+
 	if [ -n "$allowed_prefixes" ]; then
 		ok=false
 		for p in $allowed_prefixes; do
@@ -58,7 +135,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 +145,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 +153,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 +172,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 +184,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 +198,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 +213,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 +234,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 +251,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,9 +264,9 @@ use_texture()
 parsing_shader=
 parse_shaderstage()
 {
-	while read L A1 A2 Aother; do
-		case "$L" in
-			map)
+	while read L A1 Aother; do
+		case "`echo "$L" | tr A-Z a-z`" in
+			map|clampmap)
 				case "$A1" in
 					'$lightmap')
 						;;
@@ -199,10 +276,13 @@ parse_shaderstage()
 				esac
 				;;
 			animmap)
-				for X in $A2 $Aother; do
+				for X in $Aother; do
 					use_texture "$parsing_shader" "`normalize "$X"`" animmap
 				done
 				;;
+			'{')
+				echo "(EE) brace nesting error in $parsing_shader"; seterror
+				;;
 			'}')
 				break
 				;;
@@ -215,8 +295,29 @@ parse_shaderstage()
 parse_shader()
 {
 	use_texture "$parsing_shader" "$parsing_shader" shader
-	while read L A1 AREST; do
-		case "$L" in
+	offsetmapping_match8=
+	while read L A1 Aother; do
+		case "`echo "$L" | tr A-Z a-z`" in
+			dpoffsetmapping)
+				set -- $Aother
+				if [ x"$A1" = x"none" ]; then
+					offsetmapping_match8=none
+				elif [ x"$A1" = x"off" ]; then
+					offsetmapping_match8=none
+				elif [ x"$A1" = x"disabled" ]; then
+					offsetmapping_match8=none
+				elif [ x"$2" = x"match8" ]; then
+					offsetmapping_match8=`echo "($3 + 0.5) / 1" | bc`
+				elif [ x"$2" = x"match16" ]; then
+					offsetmapping_match8=`echo "($3 / 257 + 0.5) / 1" | bc`
+				elif [ x"$2" = x"match" ]; then
+					offsetmapping_match8=`echo "($3 * 255 + 0.5) / 1" | bc`
+				elif [ x"$2" = x"bias" ]; then
+					offsetmapping_match8=`echo "((1 - $3) * 255 + 0.5) / 1" | bc`
+				else
+					offsetmapping_match8=default
+				fi
+				;;
 			qer_editorimage)
 				use_texture "$parsing_shader" "`normalize "$A1"`" editorimage
 				;;
@@ -245,7 +346,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 +387,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 '*.sh' -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 +404,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