X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcached-converter.sh;h=b4fafee88ca1d7dc23e6f1ea26ec649ddeb86e7e;hp=642edb108062a356c0986532e48246cd92337b05;hb=c6b9c744e52329d5f21d4afc47ef50cc12460648;hpb=ed483a565b82d35595fc4f44d38cf61f66875400

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 642edb10..b4fafee8 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -7,15 +7,22 @@ set -e
 : ${do_jpeg_if_not_dds:=false}
 : ${jpeg_qual_rgb:=95}
 : ${jpeg_qual_a:=99}
+: ${do_webp:=false}
+: ${do_webp_if_not_dds:=false}
+: ${webp_flags_lq:=-lossless -q 100}
+: ${webp_flags_hq:=-lossless -q 100}
+: ${webp_flags_alq:=-lossless -q 100 -q_alpha 100}
+: ${webp_flags_ahq:=-lossless -q 100 -q_alpha 100}
 : ${do_dds:=true}
 : ${dds_tool:=compressonator-dxtc}
 : ${do_ogg:=false}
-: ${ogg_qual:=1}
+: ${ogg_ogg:=true}
+: ${ogg_qual:=2}
 : ${del_src:=false}
 : ${git_src_repo:=}
 : ${dds_noalpha:=dxt1}
-: ${dds_prealpha:=dxt4}
-: ${dds_sepalpha:=dxt5}
+: ${dds_prealpha:=dxt2 dxt4}
+: ${dds_sepalpha:=dxt3 dxt5}
 
 selfprofile_t0=`date +%s`
 selfprofile_step=init
@@ -66,14 +73,44 @@ use_magnet_to_acquire_checksum_faster()
 	if [ -n "$magnet" ]; then
 		magnet=${magnet#* }
 		magnet=${magnet%% *}
-		sum=$sum$magnet
+		echo "$magnet"
 	else
-		sum=$sum`git hash-object "$1"`
+		git hash-object "$1"
 	fi
 }
 
 lastinfiles=
 lastinfileshash=
+acquire_checksum()
+{
+	if [ x"$1/../$2" = x"$lastinfiles" ]; then
+		_a_s=$lastinfileshash
+	else
+		_a_e=false
+		for _a_f in "$1" "$2"; do
+			case "$_a_f" in
+				*/background_l2.tga|*/background_ingame_l2.tga)
+					_a_e=true
+					;;
+			esac
+		done
+		if [ -n "$git_src_repo" ] && ! $_a_e; then
+			_a_s=`use_magnet_to_acquire_checksum_faster "${1#./}"`
+			if [ -n "$2" ]; then
+				_a_s=$_a_s`use_magnet_to_acquire_checksum_faster "${2#./}"`
+			fi
+		else
+			_a_s=`git hash-object "$1"`
+			if [ -n "$2" ]; then
+				_a_s=$_a_s`git hash-object "$2"`
+			fi
+		fi
+		lastinfileshash=$_a_s
+		lastinfiles="$1/../$2"
+	fi
+	echo "$_a_s"
+}
+
 cached()
 {
 	flag=$1; shift
@@ -91,31 +128,7 @@ cached()
 	fi
 	options=`echo "$*" | git hash-object --stdin`
 	selfprofile convert_findchecksum
-	if [ x"$infile1/../$infile2" = x"$lastinfiles" ]; then
-		sum=$lastinfileshash
-	else
-		evil=false
-		for infile in "$infile1" "$infile2"; do
-			case "$infile" in
-				*/background_l2.tga|*/background_ingame_l2.tga)
-					evil=true
-					;;
-			esac
-		done
-		if [ -n "$git_src_repo" ] && ! $evil; then
-			sum=
-			use_magnet_to_acquire_checksum_faster "${infile1#./}"
-			if [ -n "$infile2" ]; then
-				use_magnet_to_acquire_checksum_faster "${infile2#./}"
-			fi
-		else
-			sum=`git hash-object "$infile1"`
-			if [ -n "$infile2" ]; then
-				sum=$sum`git hash-object "$infile2"`
-			fi
-		fi
-		lastinfileshash=$sum
-	fi
+	sum=`acquire_checksum "$infile1" "$infile2"`
 	selfprofile convert_makecachedir
 	mkdir -p "$CACHEDIR/$method-$options"
 	name1="$CACHEDIR/$method-$options/$sum-1.${outfile1##*.}"
@@ -143,13 +156,62 @@ cached()
 	selfprofile convert_finished
 }
 
+pickdxta()
+{
+	pd_t=$1; shift
+	pd_d=$1; shift
+	pd_i=$1; shift
+	pd_o=$1; shift
+	for pd_dd in $pd_d; do
+		if [ -f "$pd_o" ]; then
+			"$meprefix"compress-texture "$pd_t" "$pd_dd" "$pd_i" "$pd_o".tmp.dds "$@"
+			pd_psnr_tmp=`compare -channel alpha -metric PSNR "$pd_i" "$pd_o".tmp.dds NULL: 2>&1`
+			case "$pd_psnr_tmp" in
+				[0-9.]*)
+					;;
+				*)
+					pd_psnr_tmp=999.9
+					;;
+			esac
+			echo >&2 "$pd_dd: $pd_psnr_tmp dB"
+			pd_psnr_diff=`echo "($pd_psnr_tmp) - ($pd_psnr)" | bc -l`
+			case "$pd_psnr_diff" in
+				-*|0)
+					# tmp is smaller or equal
+					# smaller PSNR is worse
+					# no action
+					;;
+				*)
+					# tmp is larger
+					# larger PSNR is better
+					pd_psnr=$pd_psnr_tmp
+					mv "$pd_o".tmp.dds "$pd_o"
+					echo >&2 "PICKED (better)"
+					;;
+			esac
+		else
+			"$meprefix"compress-texture "$pd_t" "$pd_dd" "$pd_i" "$pd_o" "$@"
+			pd_psnr=`compare -channel alpha -metric PSNR "$pd_i" "$pd_o" NULL: 2>&1`
+			case "$pd_psnr" in
+				[0-9.]*)
+					;;
+				*)
+					pd_psnr=999.9
+					;;
+			esac
+			echo >&2 "$pd_dd: $pd_psnr dB"
+			echo >&2 "PICKED (first)"
+		fi
+	done
+}
+
 reduce_jpeg2_dds()
 {
 	i=$1; shift
 	ia=$1; shift
 	o=$1; shift; shift 
-	convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.tga" && \
-	"$meprefix"compress-texture "$dds_tool" "$dds_sepalpha" "$tmpdir/x.tga" "$o" $1
+	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.tga" && \
+	pickdxta "$dds_tool" "$dds_sepalpha" "$tmpdir/x.tga" "$o" $1
 }
 
 reduce_jpeg2_dds_premul()
@@ -157,8 +219,8 @@ reduce_jpeg2_dds_premul()
 	i=$1; shift
 	ia=$1; shift
 	o=$1; shift; shift 
-	convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.tga" && \
-	"$meprefix"compress-texture "$dds_tool" "$dds_prealpha" "$tmpdir/x.tga" "$o" $1
+	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.tga" && \
+	pickdxta "$dds_tool" "$dds_prealpha" "$tmpdir/x.tga" "$o" $1
 }
 
 reduce_jpeg2_jpeg2()
@@ -183,6 +245,16 @@ reduce_jpeg2_jpeg2()
 	fi
 }
 
+reduce_jpeg2_webp()
+{
+	i=$1; shift
+	ia=$1; shift
+	o=$1; shift; shift
+	# this one MUST run
+	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.png" && \
+	cwebp $1 "$tmpdir/x.png" -o "$o"
+}
+
 reduce_jpeg_jpeg()
 {
 	i=$1; shift; shift
@@ -217,16 +289,16 @@ reduce_rgba_dds()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	convert "$i" "$tmpdir/x.tga" && \
-	"$meprefix"compress-texture "$dds_tool" "$dds_sepalpha" "$tmpdir/x.tga" "$o" $1
+	convert "$i" -type TrueColorMatte "$tmpdir/x.tga" && \
+	pickdxta "$dds_tool" "$dds_sepalpha" "$tmpdir/x.tga" "$o" $1
 }
 
 reduce_rgba_dds_premul()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	convert "$i" "$tmpdir/x.tga" && \
-	"$meprefix"compress-texture "$dds_tool" "$dds_prealpha" "$tmpdir/x.tga" "$o" $1
+	convert "$i" -type TrueColorMatte "$tmpdir/x.tga" && \
+	pickdxta "$dds_tool" "$dds_prealpha" "$tmpdir/x.tga" "$o" $1
 }
 
 reduce_rgba_jpeg2()
@@ -250,7 +322,7 @@ reduce_rgb_dds()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	convert "$i" "$tmpdir/x.tga" && \
+	convert "$i" -type TrueColor "$tmpdir/x.tga" && \
 	"$meprefix"compress-texture "$dds_tool" "$dds_noalpha" "$tmpdir/x.tga" "$o" $1
 }
 
@@ -265,6 +337,14 @@ reduce_rgb_jpeg()
 	fi
 }
 
+reduce_rgba_webp()
+{
+	i=$1; shift; shift
+	o=$1; shift; shift
+	convert "$i" "$tmpdir/x.png" && \
+	cwebp $1 "$tmpdir/x.png" -o "$o"
+}
+
 has_alpha()
 {
 	i=$1; shift; shift
@@ -288,15 +368,23 @@ for F in "$@"; do
 	keep=false
 	jqual_rgb=$jpeg_qual_rgb
 	jqual_a=$jpeg_qual_a
+	webp_mode=lq
 
 	will_jpeg=$do_jpeg
+	will_webp=$do_webp
 	will_dds=$do_dds
 	will_ogg=$do_ogg
+	if ! $ogg_ogg; then
+		case "$f" in
+			*.ogg) will_ogg=false ;;
+		esac
+	fi
 	case "$f" in
 		./sounds/misc/talk*.wav) will_ogg=false ;; # engine "feature"
 		*_bump) will_dds=false ;;
 		./models/player/*) will_dds=false ;;
 		./models/sprites/*) will_dds=false ;;
+		./models/*) ;;
 		./textures/*) ;;
 		./models/*) ;;
 		./particles/*) ;;
@@ -327,12 +415,15 @@ for F in "$@"; do
 		case "$f" in
 			./maps/*/lm_[0-9][0-9][0-9][13579]) # deluxemap
 				jqual_rgb=$jqual_a
+				webp_mode=hq
 				;;
 			./maps/*/lm_[0-9][0-9][0-9][02468]) # lightmap
 				jqual_rgb=$jqual_a
+				webp_mode=hq
 				;;
 			*_norm) # normalmap
 				jqual_rgb=$jqual_a
+				webp_mode=hq
 				;;
 		esac
 	fi
@@ -351,13 +442,20 @@ for F in "$@"; do
 			will_jpeg=true
 		fi
 	fi
+	if $do_webp_if_not_dds; then
+		if $will_dds; then
+			will_webp=false
+		else
+			will_webp=true
+		fi
+	fi
 	selfprofile startconvert
 	case "$F" in
 		*_alpha.jpg)
 			# handle in *.jpg case
 
 			# they always got converted, I assume
-			if $will_dds || $will_jpeg; then
+			if $will_dds || $will_jpeg || $will_webp; then
 				conv=true
 			fi
 			keep=$will_jpeg
@@ -366,20 +464,28 @@ for F in "$@"; do
 			if [ -f "${f}_alpha.jpg" ]; then
 				cached "$will_dds"  reduce_jpeg2_dds$pm "$F" "${f}_alpha.jpg" "dds/${f}.dds" ""               "$dds_flags"
 				cached "$will_jpeg" reduce_jpeg2_jpeg2  "$F" "${f}_alpha.jpg" "$F"           "${f}_alpha.jpg" "$jqual_rgb" "$jqual_a"
-			else                                   
+				#eval wflags=\$webp_flags_${webp_mode}a
+				#cached "$will_webp" reduce_jpeg2_webp   "$F" "${f}_alpha.jpg" "${f}.webp"    ""               "$wflags"
+			else
 				cached "$will_dds"  reduce_rgb_dds      "$F" ""               "dds/${f}.dds" ""               "$dds_flags"
 				cached "$will_jpeg" reduce_jpeg_jpeg    "$F" ""               "$F"           ""               "$jqual_rgb"
+				#eval wflags=\$webp_flags_${webp_mode}
+				#cached "$will_webp" reduce_rgba_webp    "$F" ""               "${f}.webp"    ""               "$wflags"
 			fi
 			;;
-		*.png|*.tga)
+		*.png|*.tga|*.webp)
 			cached true has_alpha "$F" "" "$F.hasalpha" ""
 			conv=false
 			if [ -s "$F.hasalpha" ]; then
 				cached "$will_dds"  reduce_rgba_dds$pm  "$F" ""               "dds/${f}.dds" ""               "$dds_flags"
 				cached "$will_jpeg" reduce_rgba_jpeg2   "$F" ""               "${f}.jpg"     "${f}_alpha.jpg" "$jqual_rgb" "$jqual_a"
-			else                                                             
+				eval wflags=\$webp_flags_${webp_mode}a
+				cached "$will_webp" reduce_rgba_webp    "$F" ""               "${f}.webp"    ""               "$wflags"
+			else
 				cached "$will_dds"  reduce_rgb_dds      "$F" ""               "dds/${f}.dds" ""               "$dds_flags"
 				cached "$will_jpeg" reduce_rgb_jpeg     "$F" ""               "${f}.jpg"     ""               "$jqual_rgb"
+				eval wflags=\$webp_flags_${webp_mode}
+				cached "$will_webp" reduce_rgba_webp    "$F" ""               "${f}.webp"    ""               "$wflags"
 			fi
 			rm -f "$F.hasalpha"
 			;;