X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcached-converter.sh;h=8827a50f9a5a3ae89b7ba51d43ea1785aa0424e3;hp=f6116a6571a71d55583a422fe0e63b6e3dea9872;hb=4fa626743180526627ffc054951fa09f10e9fa91;hpb=9a4a45b283f2df9c5dc0d4e351ac49ab8c19ece5

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index f6116a65..8827a50f 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -41,6 +41,7 @@ cached()
 	if ! $flag; then
 		return 0
 	fi
+	#sleep 0.25
 	if [ x"$infile1" = x"$outfile1" ]; then
 		keep=true
 	fi
@@ -98,15 +99,33 @@ reduce_jpeg2_jpeg2()
 	ia=$1; shift
 	o=$1; shift
 	oa=$1; shift
-	cp "$i" "$o" && jpegoptim --strip-all -m"$1" "$o" && \
-	cp "$ia" "$oa" && jpegoptim --strip-all -m"$2" "$oa"
+	if convert "$i" TGA:- | cjpeg -targa -quality "$1" -optimize -sample 1x1,1x1,1x1 > "$o"; then
+		if [ "`stat -c %s "$i"`" -lt "`stat -c %s "$o"`" ]; then
+			cp "$i" "$o"
+		fi
+	else
+		return 1
+	fi
+	if convert "$ia" TGA:- | cjpeg -targa -quality "$2" -optimize -sample 1x1,1x1,1x1 > "$oa"; then
+		if [ "`stat -c %s "$ia"`" -lt "`stat -c %s "$oa"`" ]; then
+			cp "$ia" "$oa"
+		fi
+	else
+		return 1
+	fi
 }
 
 reduce_jpeg_jpeg()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	cp "$i" "$o" && jpegoptim --strip-all -m"$1" "$o"
+	if convert "$i" TGA:- | cjpeg -targa -quality "$1" -optimize -sample 1x1,1x1,1x1 > "$o"; then
+		if [ "`stat -c %s "$i"`" -lt "`stat -c %s "$o"`" ]; then
+			cp "$i" "$o"
+		fi
+	else
+		return 1
+	fi
 }
 
 reduce_ogg_ogg()
@@ -139,10 +158,16 @@ reduce_rgba_jpeg2()
 	i=$1; shift; shift
 	o=$1; shift
 	oa=$1; shift
-	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"
+	if convert "$i" -alpha off TGA:- | cjpeg -targa -quality "$1" -optimize -sample 1x1,1x1,1x1 > "$o"; then
+		:
+	else
+		return 1
+	fi
+	if convert "$i" -alpha extract TGA:- | cjpeg -targa -quality "$2" -optimize -sample 1x1,1x1,1x1 > "$oa"; then
+		:
+	else
+		return 1
+	fi
 }
 
 reduce_rgb_dds()
@@ -157,15 +182,18 @@ reduce_rgb_jpeg()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	convert "$i" "$o" && \
-	jpegoptim --strip-all -m"$1" "$o"
+	if convert "$i" TGA:- | cjpeg -targa -quality "$1" -optimize -sample 1x1,1x1,1x1 > "$o"; then
+		:
+	else
+		return 1
+	fi
 }
 
 has_alpha()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	if convert "$F" -depth 16 RGBA:- | perl -e 'while(read STDIN, $_, 8) { substr($_, 6, 2) eq "\xFF\xFF" or exit 1; } exit 0;'; then
+	if convert "$i" -depth 16 RGBA:- | perl -e 'while(read STDIN, $_, 8) { substr($_, 6, 2) eq "\xFF\xFF" or exit 1; } exit 0;'; then
 		# no alpha
 		: > "$o"
 	else
@@ -181,6 +209,8 @@ for F in "$@"; do
 	echo >&2 "Handling $F..."
 	conv=false
 	keep=false
+	jqual_rgb=$jpeg_qual_rgb
+	jqual_a=$jpeg_qual_a
 
 	will_jpeg=$do_jpeg
 	will_dds=$do_dds
@@ -199,6 +229,21 @@ for F in "$@"; do
 			;;
 	esac
 
+	# for deluxemaps, lightmaps and normalmaps, enforce high jpeg quality (like on alpha channels)
+	if [ "$jqual_a" -gt "$jqual_rgb" ]; then
+		case "$f" in
+			./maps/*/lm_[0-9][0-9][0-9][13579]) # deluxemap
+				jqual_rgb=$jqual_a
+				;;
+			./maps/*/lm_[0-9][0-9][0-9][02468]) # lightmap
+				jqual_rgb=$jqual_a
+				;;
+			*_norm) # normalmap
+				jqual_rgb=$jqual_a
+				;;
+		esac
+	fi
+
 	if $do_jpeg_if_not_dds; then
 		if $will_dds; then
 			will_jpeg=false
@@ -220,10 +265,10 @@ for F in "$@"; do
 		*.jpg)
 			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"
+				cached "$will_jpeg" reduce_jpeg2_jpeg2 "$F" "${f}_alpha.jpg" "$F"           "${f}_alpha.jpg" "$jqual_rgb" "$jqual_a"
 			else                                   
 				cached "$will_dds"  reduce_rgb_dds     "$F" ""               "dds/${f}.dds" ""               "$dds_flags"
-				cached "$will_jpeg" reduce_jpeg_jpeg   "$F" ""               "$F"           ""               "$jpeg_qual_rgb"
+				cached "$will_jpeg" reduce_jpeg_jpeg   "$F" ""               "$F"           ""               "$jqual_rgb"
 			fi
 			;;
 		*.png|*.tga)
@@ -231,18 +276,21 @@ for F in "$@"; do
 			conv=false
 			if [ -s "$F.hasalpha" ]; then
 				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"
+				cached "$will_jpeg" reduce_rgba_jpeg2  "$F" ""               "${f}.jpg"     "${f}_alpha.jpg" "$jqual_rgb" "$jqual_a"
 			else                                                             
 				cached "$will_dds"  reduce_rgb_dds     "$F" ""               "dds/${f}.dds" ""               "$dds_flags"
-				cached "$will_jpeg" reduce_rgb_jpeg    "$F" ""               "${f}.jpg"     ""               "$jpeg_qual_rgb"
+				cached "$will_jpeg" reduce_rgb_jpeg    "$F" ""               "${f}.jpg"     ""               "$jqual_rgb"
 			fi
 			rm -f "$F.hasalpha"
 			;;
 		*.ogg)
 			cached "$do_ogg" reduce_ogg_ogg "$F" "" "$F" "" "$ogg_qual"
 			;;
+		./sound/misc/null.wav)
+			# never convert this one
+			;;
 		*.wav)
-			cached "$do_ogg" reduce_wav_ogg "$F" "" "$F" "" "$ogg_qual"
+			cached "$do_ogg" reduce_wav_ogg "$F" "" "${f}.ogg" "" "$ogg_qual"
 			;;
 	esac
 	if $del_src; then