demotc-race-record-extractor.sh: remove useless rc case (gametype name is always...

[xonotic/xonotic.git] / misc / tools / compress-texture

diff --git a/misc/tools/compress-texture b/misc/tools/compress-texture
index 5ee658c659322432dde564a7dab44e7f4bb3aaa0..9d4fcc135eea9150de0b91996a017a2490e4dd53 100755 (executable)
--- a/misc/tools/compress-texture
+++ b/misc/tools/compress-texture
@@ -17,8 +17,8 @@ f=
 
 fourcchack=
 case "$tool" in
-       compressonator-dxtc)
-               # we still have to preprocess the image to premultiply alpha, as it seems
+       compressonator-dxtc|crunch)
+               # We still have to preprocess the image to premultiply alpha, as it seems
                case "$format" in
                        dxt2)
                                fourcchack=DXT2
@@ -30,7 +30,8 @@ case "$tool" in
                                ;;
                esac
                ;;
-       *)
+       compressonator-atic|nvcompress|s2tc)
+               # These tools don't support DXT2/4 at all.
                case "$format" in
                        dxt2)
                                fourcchack=DXT2
@@ -42,11 +43,14 @@ case "$tool" in
                                ;;
                esac
                ;;
+       *)
+               echo >&2 "Please figure out the DXT2/DXT4 story for $tool."
+               ;;
 esac
 
 if [ -n "$fourcchack" ]; then
        fourcchack_dir=`mktemp -d`
-       convert "$src" -fx "u*u.a" "$fourcchack_dir/src.$ext"
+       convert "$src" -auto-orient -fx "u*u.a" -type TrueColorMatte "$fourcchack_dir/src.$ext"
        src="$fourcchack_dir/src.$ext"
 fi
 
@@ -93,6 +97,16 @@ case "$tool" in
                esac
                s2tc_compress $f "$@" -i "$src" -o "$dst"
                ;;
+       crunch)
+               case "$format" in
+                       dxt1) f="-DXT1" ;;
+                       dxt2) f="-DXT2" ;;
+                       dxt3) f="-DXT3" ;;
+                       dxt4) f="-DXT4" ;;
+                       dxt5) f="-DXT5" ;;
+               esac
+               crunch $f "$@" -noprogress -nostats -quality 255 -mipMode Generate -dxtQuality uber $CRUNCH_TEXTYPEFLAGS -file "$src" -out "$dst"
+               ;;
 esac
 
 if [ -n "$fourcchack" ]; then