X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fcached-converter.sh;h=4d52563ec279e3290e88b3b216a11b9368056946;hb=cfb1bdfa339a0bdc0192d7b6c5cc6849a58740ee;hp=f8281f90bbf1d4617d7ce922cedb1b14f973de67;hpb=b1235e18e32869d2037985e2d20571746b1ecf0b;p=xonotic%2Fxonotic.git diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh old mode 100644 new mode 100755 index f8281f90..4d52563e --- a/misc/tools/cached-converter.sh +++ b/misc/tools/cached-converter.sh @@ -7,40 +7,57 @@ 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 cached() { + flag=$1; shift method=$1; shift infile1=$1; shift infile2=$1; shift outfile1=$1; shift outfile2=$1; shift + if ! $flag; then + return 0 + fi options=`echo "$*" | git hash-object --stdin` sum=`git hash-object "$infile1"` if [ -n "$infile2" ]; then - sum=$sum`git hash-object "$infile2"` + sum=$sum`git hash-object "$infile2"` fi mkdir -p "$CACHEDIR/$method-$options" - name1="$CACHEDIR/$method/$sum-1.${outfile1##*.}" - [ -z "$outfile2" ] || name2="$CACHEDIR/$method/$sum-2.${outfile2##*.}" - tempfile1="$name1.new" - [ -z "$outfile2" ] || tempfile2="$name2.new" - if "$method" "$infile1" "$infile2" "$tempfile1" "$tempfile2" "$@"; then - mv "$tempfile1" "$name1" - [ -z "$outfile2" ] || mv "$tempfile2" "$name2" - ln "$name1" "$outfile1" 2>/dev/null || cp "$name1" "$outfile1" - [ -z "$outfile2" ] || ln "$name2" "$outfile2" 2>/dev/null || cp "$name2" "$outfile2" + name1="$CACHEDIR/$method-$options/$sum-1.${outfile1##*.}" + [ -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" + elif "$method" "$infile1" "$infile2" "$tempfile1" "$tempfile2" "$@"; then + mv "$tempfile1" "$name1" + [ -z "$outfile2" ] || mv "$tempfile2" "$name2" + 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"; }; } else - rm -f "$tempfile1" - rm -f "$tempfile2" - exit 1 + rm -f "$tempfile1" + rm -f "$tempfile2" + exit 1 fi } @@ -50,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() @@ -63,7 +80,7 @@ reduce_jpeg2_jpeg2() cp "$ia" "$oa" && jpegoptim --strip-all -m"$2" "$oa" } -reduce_jpeg2_jpeg2() +reduce_jpeg_jpeg() { i=$1; shift; shift o=$1; shift; shift @@ -82,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() @@ -90,8 +107,8 @@ reduce_rgba_jpeg2() i=$1; shift; shift o=$1; shift oa=$1; shift - convert "$X" -alpha extract -quality 100 "$o" && \ - convert "$X" -alpha off -quality 100 "$oa" && \ + convert "$i" -alpha extract -quality 100 "$o" && \ + convert "$i" -alpha off -quality 100 "$oa" && \ jpegoptim --strip-all -m"$1" "$o" && \ jpegoptim --strip-all -m"$2" "$oa" } @@ -100,14 +117,14 @@ 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() { i=$1; shift; shift o=$1; shift; shift - convert "$X" "$o" && \ + convert "$i" "$o" && \ jpegoptim --strip-all -m"$1" "$o" } @@ -119,20 +136,22 @@ 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_dds "$F" "${F%.*}_alpha.jpg" "$F" "${F%.*}_alpha.jpg" "$jpeg_qual_rgb" else - cached "$do_jpeg" reduce_jpeg_jpeg "$F" "" "$F" "" "$jpeg_qual_rgb" cached "$do_dds" reduce_rgb_dds "$F" "" "dds/${F%.*}.dds" "" "$dds_flags" + cached "$do_jpeg" reduce_jpeg_jpeg "$F" "" "$F" "" "$jpeg_qual_rgb" fi ;; *.png|*.tga) - if convert "$X" -depth 16 RGBA:- | perl -e 'while(read STDIN, $_, 8) { substr($_, 6, 2) eq "\xFF\xFF" or exit 1; ++$pix; } exit not $pix;'; then - cached "$do_jpeg" reduce_rgb_jpeg "$F" "" "${F%.*}.jpg" "" "$jpeg_qual_rgb" + if convert "$F" -depth 16 RGBA:- | perl -e 'while(read STDIN, $_, 8) { substr($_, 6, 2) eq "\xFF\xFF" or exit 1; } exit 0;'; then cached "$do_dds" reduce_rgb_dds "$F" "" "dds/${F%.*}.dds" "" "$dds_flags" + cached "$do_jpeg" reduce_rgb_jpeg "$F" "" "${F%.*}.jpg" "" "$jpeg_qual_rgb" + rm -f "$F" else - cached "$do_jpeg" reduce_rgba_jpeg2 "$F" "" "${F%.*}.jpg" "${F%.*}_alpha.jpg" "$jpeg_qual_rgb" "$jpeg_qual_a" cached "$do_dds" reduce_rgba_dds "$F" "" "dds/${F%.*}.dds" "" "$dds_flags" + cached "$do_jpeg" reduce_rgba_jpeg2 "$F" "" "${F%.*}.jpg" "${F%.*}_alpha.jpg" "$jpeg_qual_rgb" "$jpeg_qual_a" + rm -f "$F" fi ;; *.ogg)