Squashed commit of the following:

[xonotic/xonotic-maps.pk3dir.git] / scripts / shader-audit.sh

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index 46164c49f9625f9c468e5ff5841f70790be0f492..07a3c2bff9fcd78f1b055aa5e6f7edd55093d5bc 100755 (executable)
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -148,8 +148,8 @@ use_texture()
                                        ;;
                        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/*|textures/effects_*)
+               ## 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"/*)
@@ -196,7 +196,7 @@ parsing_shader=
 parse_shaderstage()
 {
        while read L A1 Aother; do
-               case "$L" in
+               case "`echo "$L" | tr A-Z a-z`" in
                        map)
                                case "$A1" in
                                        '$lightmap')
@@ -224,7 +224,7 @@ parse_shader()
 {
        use_texture "$parsing_shader" "$parsing_shader" shader
        while read L A1 Aother; do
-               case "$L" in
+               case "`echo "$L" | tr A-Z a-z`" in
                        qer_editorimage)
                                use_texture "$parsing_shader" "`normalize "$A1"`" editorimage
                                ;;