shader audit: more strict

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index 6d74b354a593a22148bc4a66253a24035c274fc8..80dd7d20e2ab29e1b35bb29b317d3b9083b476ed 100755 (executable)
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -206,14 +206,14 @@ use_texture()
                        esac
                        ;;
                ## RULE: textures/map_FOO[_/]* must use textures/map_FOO[_/]*
-               textures/map_*/*)
+               textures/map_*/*|models/map_*/*)
                        pre=${1%%/map_*}
                        suf=${1#*/map_}
                        map=${suf%%[_/]*}
                        case "$2" in
                                "$pre"/map_$map[/_]*)
                                        ;;
-                               textures/map_*)
+                               textures/map_*|models/map_*)
                                        # protect one map's textures from the evil of other maps :P
                                        err "texture $2 of shader $1 is out of place, recommended file name is $pre/map_$map/*"
                                        ;;
@@ -451,7 +451,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`/ models/map_`echo "$1" | cut -d _ -f 2`_ models/map_`echo "$1" | cut -d _ -f 2`/"
                        forbidden_prefixes=
                        ;;
                ## RULE: skies_FOO.shader may define tetxures/skies/FOO and textures/skies/FOO_*
@@ -462,7 +462,7 @@ parse_shaderfile()
                ## RULE: model_*.shader may define models/*
                model_*)
                        allowed_prefixes="models/"
-                       forbidden_prefixes=
+                       forbidden_prefixes="models/map_"
                        ;;
                ## RULE: any other FOO.shader may define textures/FOO/*
                *)
@@ -499,13 +499,15 @@ for X in *.shader; do
 done
 rm -f "$t"
 
-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_avail=`( cd ..; find textures/ -type f -not -name '*.sh' -not -name '*_norm.*' -not -name '*_glow.*' -not -name '*_gloss.*' -not -name '*_reflect.*' -not -name '*.xcf' -not -name '*.txt' ) | 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/*)
                        ;;
+               models/map_*/*)
+                       ;;
                textures/map_*/*)
                        ;;
                *)