X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcached-converter.sh;fp=misc%2Ftools%2Fcached-converter.sh;h=ec976351921dcd0329a86710e2ea5a8f379a1f80;hp=9fbdf240eb3594fbd3b243fa9a1edf93606bdbdf;hb=382234971681efd4f91ac7211cc9bf40f39ba0dc;hpb=77974fa25f6bfa072bc97f8dfba615396db71b0b

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 9fbdf240..ec976351 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -396,25 +396,31 @@ for F in "$@"; do
 			;;
 	esac
 
-	# configure S2TC
+	# Specific hacks for normalmaps.
 	case "$f" in
 		./maps/*/lm_[0-9][0-9][0-9][13579]) # deluxemap
 			export S2TC_COLORDIST_MODE=NORMALMAP
 			export S2TC_RANDOM_COLORS=256
 			export S2TC_REFINE_COLORS=LOOP
 			export S2TC_DITHER_MODE=NONE
+			# Engine ignores alpha channel on these, so we can use the DXT1 black encoding.
+			export CRUNCH_TEXTYPEFLAGS='-gamma 1.0 -renormalize -rtopmip -uniformMetrics -usetransparentindicesforblack'
 			;;
 		*_norm)
 			export S2TC_COLORDIST_MODE=NORMALMAP
 			export S2TC_RANDOM_COLORS=256
 			export S2TC_REFINE_COLORS=LOOP
 			export S2TC_DITHER_MODE=NONE
+			# Alpha channel here means height.
+			export CRUNCH_TEXTYPEFLAGS='-gamma 1.0 -renormalize -rtopmip -uniformMetrics'
 			;;
 		*)
 			export S2TC_COLORDIST_MODE=SRGB_MIXED
 			export S2TC_RANDOM_COLORS=64
 			export S2TC_REFINE_COLORS=LOOP
 			export S2TC_DITHER_MODE=FLOYDSTEINBERG
+			# Color channel-like images - consider as sRGB.
+			export CRUNCH_TEXTYPEFLAGS='-gamma 2.2'
 			;;
 	esac