X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcached-converter.sh;h=516de008d704e3bd683aaaa541a180a54f91806b;hp=fda5cac0f8e4cb4d08720e97ec15c2a41e62c5bd;hb=c3c4edb8425a74f53140081959f12462771469b5;hpb=14fdc5e189af52e3719101ce583e3ad95c5bb263;ds=sidebyside

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index fda5cac0..516de008 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-dxtc}
 : ${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
@@ -36,9 +46,9 @@ cached()
 	[ -z "$outfile2" ] || name2="$CACHEDIR/$method-$options/$sum-2.${outfile2##*.}"
 	tempfile1="${name1%/*}/new-${name1##*/}"
 	[ -z "$outfile2" ] || tempfile2="${name2%/*}/new-${name2##*/}"
-	if [ -f "$name1" ]; then
-		ln "$name1" "$outfile1" 2>/dev/null || cp "$name1" "$outfile1"
-		[ -z "$outfile2" ] || ln "$name2" "$outfile2" 2>/dev/null || cp "$name2" "$outfile2"
+	if [ -f "$name1" ] && { [ -z "$outfile2" ] || [ -f "$name2" ]; }; then
+		case "$outfile1" in */*) mkdir -p "${outfile1%/*}"; esac && { ln "$name1" "$outfile1" 2>/dev/null || cp "$name1" "$outfile1"; }
+		[ -z "$outfile2" ] || { case "$outfile2" in */*) mkdir -p "${outfile2%/*}"; esac && { ln "$name2" "$outfile2" 2>/dev/null || cp "$name2" "$outfile2"; }; }
 	elif "$method" "$infile1" "$infile2" "$tempfile1" "$tempfile2" "$@"; then
 		mv "$tempfile1" "$name1"
 		[ -z "$outfile2" ] || mv "$tempfile2" "$name2"
@@ -47,7 +57,7 @@ cached()
 	else
 		rm -f "$tempfile1"
 		rm -f "$tempfile2"
-	exit 1
+		exit 1
 	fi
 }
 
@@ -56,8 +66,8 @@ reduce_jpeg2_dds()
 	i=$1; shift
 	ia=$1; shift
 	o=$1; shift; shift 
-	convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.png" && \
-	nvcompress -alpha -bc3 $1 "$tmpdir/x.png" "$o"
+	convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.tga" && \
+	"$meprefix"compress-texture "$dds_tool" dxt5 "$tmpdir/x.tga" "$o" $1
 }
 
 reduce_jpeg2_jpeg2()
@@ -89,7 +99,8 @@ reduce_rgba_dds()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	nvcompress -alpha -bc3 $1 "$i" "$o"
+	convert "$i" "$tmpdir/x.tga" && \
+	"$meprefix"compress-texture "$dds_tool" dxt5 "$tmpdir/x.tga" "$o" $1
 }
 
 reduce_rgba_jpeg2()
@@ -107,7 +118,8 @@ reduce_rgb_dds()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	nvcompress -bc1 $1 "$i" "$o"
+	convert "$i" "$tmpdir/x.tga" && \
+	"$meprefix"compress-texture "$dds_tool" dxt1 "$tmpdir/x.tga" "$o" $1
 }
 
 reduce_rgb_jpeg()
@@ -127,7 +139,7 @@ for F in "$@"; do
 	*.jpg)
 		if [ -f "${F%.jpg}_alpha.jpg" ]; then
 			cached "$do_dds"  reduce_jpeg2_dds   "$F" "${F%.*}_alpha.jpg" "dds/${F%.*}.dds" ""                  "$dds_flags"
-			cached "$do_jpeg" reduce_jpeg2_jpeg2 "$F" "${F%.*}_alpha.jpg" "$F"              "${F%.*}_alpha.jpg" "$jpeg_qual_rgb"
+			cached "$do_jpeg" reduce_jpeg2_jpeg2 "$F" "${F%.*}_alpha.jpg" "$F"              "${F%.*}_alpha.jpg" "$jpeg_qual_rgb" "$jpeg_qual_a"
 		else                                   
 			cached "$do_dds"  reduce_rgb_dds     "$F" ""                  "dds/${F%.*}.dds" ""                  "$dds_flags"
 			cached "$do_jpeg" reduce_jpeg_jpeg   "$F" ""                  "$F"              ""                  "$jpeg_qual_rgb"