X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcached-converter.sh;h=e9a214b758880f0efb381cbd67c6997744d2de7c;hp=fda5cac0f8e4cb4d08720e97ec15c2a41e62c5bd;hb=0e1fbbc2bf03b525cefeb1dbd78deaa458c354b6;hpb=a8107a6553508c297ccdd8f0f701cf2b541370ce

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index fda5cac0..e9a214b7 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -7,10 +7,20 @@ set -e
 : ${jpeg_qual_rgb:=95}
 : ${jpeg_qual_a:=99}
 : ${do_dds:=true}
-: ${dds_flags:=}
+: ${dds_tool:=compressonator}
 : ${do_ogg:=false}
 : ${ogg_qual:=1}
 
+me=$0
+case "$me" in
+	*/*)
+		meprefix=${me%/*}/
+		;;
+	*)
+		meprefix=
+		;;
+esac
+
 tmpdir=`mktemp -d -t cached-converter.XXXXXX`
 trap 'exit 1' INT
 trap 'rm -rf "$tmpdir"' EXIT
@@ -47,7 +57,7 @@ cached()
 	else
 		rm -f "$tempfile1"
 		rm -f "$tempfile2"
-	exit 1
+		exit 1
 	fi
 }
 
@@ -57,7 +67,7 @@ reduce_jpeg2_dds()
 	ia=$1; shift
 	o=$1; shift; shift 
 	convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.png" && \
-	nvcompress -alpha -bc3 $1 "$tmpdir/x.png" "$o"
+	"$meprefix"compress-texture "$dds_tool" dxt5 "$tmpdir/x.png" "$o" $1
 }
 
 reduce_jpeg2_jpeg2()
@@ -89,7 +99,7 @@ reduce_rgba_dds()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	nvcompress -alpha -bc3 $1 "$i" "$o"
+	"$meprefix"compress-texture "$dds_tool" dxt5 "$i" "$o" $1
 }
 
 reduce_rgba_jpeg2()
@@ -107,7 +117,7 @@ reduce_rgb_dds()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	nvcompress -bc1 $1 "$i" "$o"
+	"$meprefix"compress-texture "$dds_tool" dxt1 "$i" "$o" $1
 }
 
 reduce_rgb_jpeg()