X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcached-converter.sh;h=ccbe0bb862a507b41b0b85d1cf905b0e5408d636;hp=71709e5fe1b1f43b2e81f97c18f63a8fb97e3d09;hb=b28f4b26d4a58308f988b838bb10621e1cc48a0b;hpb=f51b93c9f4f82d89cbad3d0d63569e44eea217b9;ds=sidebyside

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 71709e5f..ccbe0bb8 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -4,6 +4,7 @@ set -e
 
 : ${CACHEDIR:=$HOME/.xonotic-cached-converter}
 : ${do_jpeg:=true}
+: ${do_jpeg_if_not_dds:=false}
 : ${jpeg_qual_rgb:=95}
 : ${jpeg_qual_a:=99}
 : ${do_dds:=true}
@@ -26,6 +27,8 @@ tmpdir=`mktemp -d -t cached-converter.XXXXXX`
 trap 'exit 1' INT
 trap 'rm -rf "$tmpdir"' EXIT
 
+lastinfiles=
+lastinfileshash=
 cached()
 {
 	flag=$1; shift
@@ -41,9 +44,14 @@ cached()
 		keep=true
 	fi
 	options=`echo "$*" | git hash-object --stdin`
-	sum=`git hash-object "$infile1"`
-	if [ -n "$infile2" ]; then
-		sum=$sum`git hash-object "$infile2"`
+	if [ x"$infile1/../$infile2" = x"$lastinfiles" ]; then
+		sum=$lastinfileshash
+	else
+		sum=`git hash-object "$infile1"`
+		if [ -n "$infile2" ]; then
+			sum=$sum`git hash-object "$infile2"`
+		fi
+		lastinfileshash=$sum
 	fi
 	mkdir -p "$CACHEDIR/$method-$options"
 	name1="$CACHEDIR/$method-$options/$sum-1.${outfile1##*.}"
@@ -93,7 +101,7 @@ reduce_jpeg_jpeg()
 	cp "$i" "$o" && jpegoptim --strip-all -m"$1" "$o"
 }
 
-reduce_ogg()
+reduce_ogg_ogg()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
@@ -101,6 +109,13 @@ reduce_ogg()
 	oggenc -q"$1" -o "$o" "$tmpdir/x.wav"
 }
 
+reduce_wav_ogg()
+{
+	i=$1; shift; shift
+	o=$1; shift; shift
+	oggenc -q"$1" -o "$o" "$i"
+}
+
 reduce_rgba_dds()
 {
 	i=$1; shift; shift
@@ -114,8 +129,8 @@ reduce_rgba_jpeg2()
 	i=$1; shift; shift
 	o=$1; shift
 	oa=$1; shift
-	convert "$i" -alpha extract -quality 100 "$o" && \
-	convert "$i" -alpha off     -quality 100 "$oa" && \
+	convert "$i" -alpha off     -quality 100 "$o" && \
+	convert "$i" -alpha extract -quality 100 "$oa" && \
 	jpegoptim --strip-all -m"$1" "$o" && \
 	jpegoptim --strip-all -m"$2" "$oa"
 }
@@ -149,49 +164,92 @@ has_alpha()
 	fi
 }
 
+to_delete=
 for F in "$@"; do
+	f=${F%.*}
+
 	echo >&2 "Handling $F..."
 	conv=false
 	keep=false
+
+	will_jpeg=$do_jpeg
+	will_dds=$do_dds
+	case "$f" in
+		./models/player/*) will_dds=false ;;
+		./textures/*) ;;
+		./models/*) ;;
+		./particles/*) ;;
+		./progs/*) ;;
+		*)
+			# we can't DDS compress the 2D textures, sorry
+			# but JPEG is still fine
+			will_dds=false
+			;;
+	esac
+
+	if $do_jpeg_if_not_dds; then
+		if $will_dds; then
+			will_jpeg=false
+		else
+			will_jpeg=true
+		fi
+	fi
+
 	case "$F" in
 		*_alpha.jpg)
 			# handle in *.jpg case
 
 			# they always got converted, I assume
-			conv=true
-			keep=$do_jpeg
+			if $will_dds || $will_jpeg; then
+				conv=true
+			fi
+			keep=$will_jpeg
 			;;
 		*.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" "$jpeg_qual_a"
+			if [ -f "${f}_alpha.jpg" ]; then
+				cached "$will_dds"  reduce_jpeg2_dds   "$F" "${f}_alpha.jpg" "dds/${f}.dds" ""               "$dds_flags"
+				cached "$will_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"
+				cached "$will_dds"  reduce_rgb_dds     "$F" ""               "dds/${f}.dds" ""               "$dds_flags"
+				cached "$will_jpeg" reduce_jpeg_jpeg   "$F" ""               "$F"           ""               "$jpeg_qual_rgb"
 			fi
 			;;
 		*.png|*.tga)
 			cached true has_alpha "$F" "" "$F.hasalpha" ""
+			conv=false
 			if [ -s "$F.hasalpha" ]; then
-				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" # TGA becomes useless after JPEGging
+				cached "$will_dds"  reduce_rgba_dds    "$F" ""               "dds/${f}.dds" ""               "$dds_flags"
+				cached "$will_jpeg" reduce_rgba_jpeg2  "$F" ""               "${f}.jpg"     "${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_rgb_jpeg    "$F" ""                  "${F%.*}.jpg"     ""                  "$jpeg_qual_rgb"
-				rm -f "$F" # TGA becomes useless after JPEGging
+				cached "$will_dds"  reduce_rgb_dds     "$F" ""               "dds/${f}.dds" ""               "$dds_flags"
+				cached "$will_jpeg" reduce_rgb_jpeg    "$F" ""               "${f}.jpg"     ""               "$jpeg_qual_rgb"
 			fi
 			rm -f "$F.hasalpha"
 			;;
 		*.ogg)
-			cached "$do_ogg" reduce_ogg "$F" "" "$F" "" "$ogg_qual"
+			cached "$do_ogg" reduce_ogg_ogg "$F" "" "$F" "" "$ogg_qual"
+			;;
+		*.wav)
+			cached "$do_ogg" reduce_wav_ogg "$F" "" "$F" "" "$ogg_qual"
 			;;
 	esac
 	if $del_src; then
 		if $conv; then
 			if ! $keep; then
-				rm -f "$F"
+				# FIXME can't have spaces in filenames that way
+				to_delete="$to_delete $F"
 			fi
 		fi
 	fi
+	# fix up DDS paths by a symbolic link
+	if [ -f "dds/${f}.dds" ]; then
+		if [ -z "${f##./textures/*}" ]; then
+			if [ -n "${f##./textures/*/*}" ]; then
+				ln -snf "textures/${f#./textures/}.dds" "dds/${f#./textures/}.dds"
+			fi
+		fi
+	fi
+done
+for F in $to_delete; do
+	rm -f "$F"
 done