X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcached-converter.sh;h=191e208660af9c9fef55f3b9c2fa8b7ba3fe82dd;hp=ff69cbb5b96a4707d66efdf890e1e2314c96ba37;hb=a6584ad54d36700179ca5396fd3b383392731215;hpb=5d17502aa2abb8221c3440b16b4501691792e55a

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index ff69cbb5..191e2086 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -7,8 +7,14 @@ 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}
+: ${dds_tool:=s2tc}
 : ${do_ogg:=false}
 : ${ogg_ogg:=true}
 : ${ogg_qual:=2}
@@ -204,7 +210,7 @@ reduce_jpeg2_dds()
 	i=$1; shift
 	ia=$1; shift
 	o=$1; shift; shift 
-	convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.tga" && \
+	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.tga" && \
 	pickdxta "$dds_tool" "$dds_sepalpha" "$tmpdir/x.tga" "$o" $1
 }
 
@@ -213,7 +219,7 @@ reduce_jpeg2_dds_premul()
 	i=$1; shift
 	ia=$1; shift
 	o=$1; shift; shift 
-	convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.tga" && \
+	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.tga" && \
 	pickdxta "$dds_tool" "$dds_prealpha" "$tmpdir/x.tga" "$o" $1
 }
 
@@ -239,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
@@ -273,7 +289,7 @@ reduce_rgba_dds()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	convert "$i" "$tmpdir/x.tga" && \
+	convert "$i" -type TrueColorMatte "$tmpdir/x.tga" && \
 	pickdxta "$dds_tool" "$dds_sepalpha" "$tmpdir/x.tga" "$o" $1
 }
 
@@ -281,7 +297,7 @@ reduce_rgba_dds_premul()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	convert "$i" "$tmpdir/x.tga" && \
+	convert "$i" -type TrueColorMatte "$tmpdir/x.tga" && \
 	pickdxta "$dds_tool" "$dds_prealpha" "$tmpdir/x.tga" "$o" $1
 }
 
@@ -306,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
 }
 
@@ -321,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
@@ -344,8 +368,10 @@ 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
@@ -358,6 +384,7 @@ for F in "$@"; do
 		*_bump) will_dds=false ;;
 		./models/player/*) will_dds=false ;;
 		./models/sprites/*) will_dds=false ;;
+		./models/*) ;;
 		./textures/*) ;;
 		./models/*) ;;
 		./particles/*) ;;
@@ -388,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
@@ -412,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
@@ -427,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"
 			;;