Improve serverbench command WRT #273 (fix)

[xonotic/xonotic.git] / misc / tools / cached-converter.sh

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 413e148d32e3e4cd849b9fe6a1eb946fd72b0301..c1063eddbe8816293ce80b70aa4a9195c26bee77 100755 (executable)
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -14,7 +14,7 @@ set -e
 : ${webp_flags_alq:=-lossless -q 100 -q_alpha 100}
 : ${webp_flags_ahq:=-lossless -q 100 -q_alpha 100}
 : ${do_dds:=true}
-: ${dds_tool:=compressonator-dxtc}
+: ${dds_tool:=s2tc}
 : ${do_ogg:=false}
 : ${ogg_ogg:=true}
 : ${ogg_qual:=2}
@@ -251,8 +251,8 @@ reduce_jpeg2_webp()
        ia=$1; shift
        o=$1; shift; shift
        # this one MUST run
-       convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.tga" && \
-       cwebp $1 "$tmpdir/x.tga" -o "$o"
+       convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.png" && \
+       cwebp $1 "$tmpdir/x.png" -o "$o"
 }
 
 reduce_jpeg_jpeg()
@@ -341,7 +341,8 @@ reduce_rgba_webp()
 {
        i=$1; shift; shift
        o=$1; shift; shift
-       cwebp $1 "$i" -o "$o"
+       convert "$i" "$tmpdir/x.png" && \
+       cwebp $1 "$tmpdir/x.png" -o "$o"
 }
 
 has_alpha()
@@ -374,15 +375,16 @@ for F in "$@"; do
        will_dds=$do_dds
        will_ogg=$do_ogg
        if ! $ogg_ogg; then
-               case "$f" in
+               case "$F" in
                        *.ogg) will_ogg=false ;;
                esac
        fi
-       case "$f" in
-               ./sounds/misc/talk*.wav) will_ogg=false ;; # engine "feature"
-               *_bump) will_dds=false ;;
+       case "$F" in
+               ./sound/misc/talk*.wav) will_ogg=false ;; # engine "feature"
+               *_bump.*) will_dds=false ;;
                ./models/player/*) will_dds=false ;;
                ./models/sprites/*) will_dds=false ;;
+               ./models/*) ;;
                ./textures/*) ;;
                ./models/*) ;;
                ./particles/*) ;;