X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcached-converter.sh;h=84f3480db11917b8066c8ad603303a9195b2a3ed;hp=9a60928608bc0962f7e2b0d51f79d6f0e6991f1c;hb=bb0f2ecaa7abc56013cadb71ac7fb4f9db2cd7da;hpb=52b1105997b7bd6a4274eb517593b9ca358fbeee

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 9a609286..84f3480d 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -14,7 +14,7 @@ set -e
 : ${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}
@@ -251,8 +251,8 @@ reduce_jpeg2_webp()
 	ia=$1; shift
 	o=$1; shift; shift
 	# this one MUST run
-	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.tga" && \
-	cwebp $1 "$tmpdir/x.tga" -o "$o"
+	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.png" && \
+	cwebp $1 "$tmpdir/x.png" -o "$o"
 }
 
 reduce_jpeg_jpeg()
@@ -341,7 +341,8 @@ reduce_rgba_webp()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	cwebp $1 "$i" -o "$o"
+	convert "$i" "$tmpdir/x.png" && \
+	cwebp $1 "$tmpdir/x.png" -o "$o"
 }
 
 has_alpha()
@@ -379,10 +380,11 @@ for F in "$@"; do
 		esac
 	fi
 	case "$f" in
-		./sounds/misc/talk*.wav) will_ogg=false ;; # engine "feature"
+		./sound/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/*) ;;
@@ -462,13 +464,13 @@ 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"
-				eval wflags=\$webp_flags_${webp_mode}a
-				cached "$will_webp" reduce_jpeg2_webp   "$F" "${f}_alpha.jpg" "${f}.webp"    ""               "$wflags"
+				#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"
+				#eval wflags=\$webp_flags_${webp_mode}
+				#cached "$will_webp" reduce_rgba_webp    "$F" ""               "${f}.webp"    ""               "$wflags"
 			fi
 			;;
 		*.png|*.tga|*.webp)