Switch to s2tc for now - fix the crap later.

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

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 9a60928608bc0962f7e2b0d51f79d6f0e6991f1c..191e208660af9c9fef55f3b9c2fa8b7ba3fe82dd 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()
@@ -383,6 +384,7 @@ for F in "$@"; do
                *_bump) will_dds=false ;;
                ./models/player/*) will_dds=false ;;
                ./models/sprites/*) will_dds=false ;;
+               ./models/*) ;;
                ./textures/*) ;;
                ./models/*) ;;
                ./particles/*) ;;
@@ -462,13 +464,13 @@ for F in "$@"; do
                        if [ -f "${f}_alpha.jpg" ]; then
                                cached "$will_dds"  reduce_jpeg2_dds$pm "$F" "${f}_alpha.jpg" "dds/${f}.dds" ""               "$dds_flags"
                                cached "$will_jpeg" reduce_jpeg2_jpeg2  "$F" "${f}_alpha.jpg" "$F"           "${f}_alpha.jpg" "$jqual_rgb" "$jqual_a"
-                               eval wflags=\$webp_flags_${webp_mode}a
-                               cached "$will_webp" reduce_jpeg2_webp   "$F" "${f}_alpha.jpg" "${f}.webp"    ""               "$wflags"
+                               #eval wflags=\$webp_flags_${webp_mode}a
+                               #cached "$will_webp" reduce_jpeg2_webp   "$F" "${f}_alpha.jpg" "${f}.webp"    ""               "$wflags"
                        else
                                cached "$will_dds"  reduce_rgb_dds      "$F" ""               "dds/${f}.dds" ""               "$dds_flags"
                                cached "$will_jpeg" reduce_jpeg_jpeg    "$F" ""               "$F"           ""               "$jqual_rgb"
-                               eval wflags=\$webp_flags_${webp_mode}
-                               cached "$will_webp" reduce_rgba_webp    "$F" ""               "${f}.webp"    ""               "$wflags"
+                               #eval wflags=\$webp_flags_${webp_mode}
+                               #cached "$will_webp" reduce_rgba_webp    "$F" ""               "${f}.webp"    ""               "$wflags"
                        fi
                        ;;
                *.png|*.tga|*.webp)