X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fcompress-texture;h=418d8e5c40afa401ff93d9e42771008fd7708dd9;hb=0a66c777fc991c8a959ac3b054f1eb32a9e9115a;hp=5141b92d04a0da6ec0f1aff748190114e48a12ad;hpb=d44702bd4be320013f249cc62e8b0ed2161593e5;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/compress-texture b/misc/tools/compress-texture
index 5141b92d..418d8e5c 100755
--- 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" -fx "u*u.a" -type TrueColorMatte "$fourcchack_dir/src.$ext"
 	src="$fourcchack_dir/src.$ext"
 fi
 
@@ -91,7 +95,17 @@ case "$tool" in
 			dxt3) f="-t DXT3" ;;
 			dxt5) f="-t DXT5" ;;
 		esac
-		s2tc $f "$@" -i "$src" -o "$dst"
+		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