X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fshader-audit.sh;h=34ac1bc58c129b15e525f36e08f1321ae37f6ae9;hp=4c318dc42456bd1e489055a42e10351b4e1c5775;hb=2fabdeb047b12be759cfdb61f8856ee2588d0e8c;hpb=f1ec13cb1c15a62b4969593afb7d2eacadbf0f3f

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index 4c318dc4..34ac1bc5 100755
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -27,7 +27,7 @@ forbidden_prefixes=
 
 getstats_e()
 {
-	identify -verbose -alpha extract -depth 8 "$1" | {
+	identify -verbose -depth 8 -alpha set -alpha extract "$1" | {
 		pix=0
 		while read -r L V R; do
 			case "$L" in
@@ -53,10 +53,16 @@ getstats_e()
 		echo "min=$min"
 		echo "max=$max"
 		echo "median=$median"
+		echo "error=false"
 	}
 }
 getstats()
 {
+	min=255
+	max=255
+	median=255
+	error=true
+	[ -f "$1" ] || return 1
 	eval `getstats_e "$1"`
 }
 
@@ -83,13 +89,13 @@ use_texture()
 
 	if [ x"$3" = x"map" ]; then
 		lasttex=$2
-		if [ -n "$AUDIT_OFFSETMAPPING" ]; then
-			if [ -f "../${2}_norm.tga" ]; then
+		if [ -n "$AUDIT_ALPHACHANNELS" ] && [ x"$offsetmapping_match8" != x"firststagedone" ]; then
+			if [ -f "../${2}_norm.tga" ] || [ -f "../${2}_norm.png" ] || [ -f "../${2}_norm.jpg" ]; then
 				case "$offsetmapping_match8" in
 					'') # no dpoffsetmapping keyword
-						getstats "../${2}_norm.tga"
+						getstats "../${2}_norm.tga" || getstats "../${2}_norm.png" || getstats "../${2}_norm.jpg"
 						if [ "$min" -eq "$max" ]; then
-							echo "(EE) shader $1 uses broken normalmap ${2}_norm.tga (add dpoffsetmapping none)"; seterror
+							echo "(WW) shader $1 uses broken normalmap ${2}_norm.tga (add dpoffsetmapping none)"
 						else
 							echo "(EE) shader $1 uses ${2}_norm.tga but lacks median (add dpoffsetmapping - 1 match8 $median)"; seterror
 						fi
@@ -99,7 +105,7 @@ use_texture()
 					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
+							echo "(WW) shader $1 uses broken normalmap ${2}_norm.tga, maybe use dpoffsetmapping none?"
 						else
 							echo "(EE) shader $1 uses ${2}_norm.tga but lacks median (add to dpoffsetmapping: match8 $median)"; seterror
 						fi
@@ -109,7 +115,7 @@ use_texture()
 				esac
 			else
 				if [ -n "$offsetmapping_match8" ]; then
-					echo "(EE) shader $1 specifies offsetmapping, but texture $2 does not have a normalmap"
+					echo "(WW) shader $1 specifies offsetmapping, but texture $2 does not have a normalmap"
 				fi
 			fi
 		fi
@@ -264,14 +270,29 @@ use_texture()
 parsing_shader=
 parse_shaderstage()
 {
+	ss_blendfunc=none
+	ss_alphafunc=none
+	ss_alphagen=none
+	ss_map=
 	while read L A1 Aother; do
 		case "`echo "$L" | tr A-Z a-z`" in
+			blendfunc)
+				ss_blendfunc=`echo $A1 $Aother | tr A-Z a-z`
+				;;
+			alphafunc)
+				ss_alphafunc=`echo $A1 | tr A-Z a-z`
+				;;
+			alphagen)
+				ss_alphagen=`echo $A1 | tr A-Z a-z`
+				;;
 			map|clampmap)
 				case "$A1" in
 					'$lightmap')
 						;;
 					*)
 						use_texture "$parsing_shader" "`normalize "$A1"`" map
+						ss_map="`normalize "$A1"`"
+						offsetmapping_match8=firststagedone
 						;;
 				esac
 				;;
@@ -279,6 +300,10 @@ parse_shaderstage()
 				for X in $Aother; do
 					use_texture "$parsing_shader" "`normalize "$X"`" animmap
 				done
+				for X in $Aother; do
+					ss_map="`normalize "$X"`"
+					break
+				done
 				;;
 			'{')
 				echo "(EE) brace nesting error in $parsing_shader"; seterror
@@ -290,12 +315,36 @@ parse_shaderstage()
 				;;
 		esac
 	done
+
+	if [ -n "$ss_map" ]; then
+		if [ -z "$maintexture" ]; then
+			maintexture=$ss_map
+			mainblendfunc=$ss_blendfunc
+			mainalphafunc=$ss_alphafunc
+			mainalphagen=$ss_alphagen
+		elif [ x"$ss_alphagen" = x"vertex" ] && ! $textureblending; then
+			case "$mainblendfunc:$mainalphafunc:$ss_blendfunc:$ss_alphafunc" in
+				none:none:"gl_src_alpha gl_one_minus_src_alpha":none) textureblending=true ;;
+				none:none:filter:none) textureblending=true ;;
+				none:none:none:g*) textureblending=true ;;
+				"gl_one gl_zero":none:filter:none) textureblending=true ;;
+				"gl_one gl_zero":none:none:g*) textureblending=true ;;
+				*)
+					echo "(EE) texture blending requires first stage to have no blendfunc/alphatest, and requires second stage to be blendfunc filter"; seterror
+					;;
+			esac
+		else
+			echo "(EE) multistage shader without alphagen vertex, or using more than 2 stages, is not supported by DarkPlaces"; seterror
+		fi
+	fi
 }
 
 parse_shader()
 {
 	use_texture "$parsing_shader" "$parsing_shader" shader
 	offsetmapping_match8=
+	textureblending=false
+	maintexture=
 	while read L A1 Aother; do
 		case "`echo "$L" | tr A-Z a-z`" in
 			dpoffsetmapping)
@@ -339,6 +388,47 @@ parse_shader()
 				;;
 		esac
 	done
+	if [ -n "$AUDIT_ALPHACHANNELS" ] && [ -n "$maintexture" ] && ! $textureblending; then
+		getstats "../$maintexture.tga" || getstats "../$maintexture.png" || getstats "../$maintexture.jpg"
+		case "$mainblendfunc" in
+			*src_alpha*|*blend*)
+				# texture must have alpha
+				if [ x"$mainalphagen" = x"none" -a $min -eq 255 ]; then
+					echo "(EE) $parsing_shader uses alpha-less texture $maintexture with blendfunc $mainblendfunc and alphagen $mainalphagen"; seterror
+				fi
+				;;
+			add|"gl_one gl_one")
+				# texture must not have alpha (engine bug)
+				if [ x"$mainalphagen" != x"none" -o $min -lt 255 ]; then
+					echo "(EE) $parsing_shader uses alpha-using texture $maintexture with blendfunc $mainblendfunc and alphagen $mainalphagen"; seterror
+				fi
+				;;
+			*)
+				case "$mainalphafunc" in
+					g*)
+						# texture must have alpha
+						if [ x"$mainalphagen" = x"none" -a $min -eq 255 ]; then
+							echo "(EE) $parsing_shader uses alpha-less texture $maintexture with alphafunc $mainalphafunc and alphagen $mainalphagen"; seterror
+						fi
+						;;
+					*)
+						# texture should not have alpha (no bug if not)
+						case "$mainalphagen" in
+							none)
+								if [ $min -lt 255 ]; then
+									echo "(WW) $parsing_shader uses alpha-using texture $maintexture with blendfunc $mainblendfunc and alphafunc $mainalphafunc and alphagen $mainalphagen"
+								fi
+								;;
+							*)
+								# alphagen is set, but blendfunc has no use for it
+								echo "(EE) $parsing_shader uses alpha-using texture $maintexture with blendfunc $mainblendfunc and alphafunc $mainalphafunc and alphagen $mainalphagen"; seterror
+								;;
+						esac
+						;;
+				esac
+				;;
+		esac
+	fi
 }
 
 parse_shaderfile()
@@ -394,7 +484,7 @@ for X in *.shader; do
 done
 rm -f "$t"
 
-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_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