From: Rudolf Polzer <divVerent@gmail.com>
Date: Wed, 17 Mar 2021 20:20:51 +0000 (-0700)
Subject: Generate deluxemap textures dds files in normalmap mode.
X-Git-Tag: xonotic-v0.8.5~73
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6353a657d96df7da5bb3aa5ff3985137c4fa534a;p=xonotic%2Fxonotic.git

Generate deluxemap textures dds files in normalmap mode.
---

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index c1063edd..2e4ede77 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -209,7 +209,7 @@ reduce_jpeg2_dds()
 {
 	i=$1; shift
 	ia=$1; shift
-	o=$1; shift; shift 
+	o=$1; shift; shift
 	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.tga" && \
 	pickdxta "$dds_tool" "$dds_sepalpha" "$tmpdir/x.tga" "$o" $1
 }
@@ -218,7 +218,7 @@ reduce_jpeg2_dds_premul()
 {
 	i=$1; shift
 	ia=$1; shift
-	o=$1; shift; shift 
+	o=$1; shift; shift
 	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.tga" && \
 	pickdxta "$dds_tool" "$dds_prealpha" "$tmpdir/x.tga" "$o" $1
 }
@@ -398,6 +398,11 @@ for F in "$@"; do
 
 	# configure S2TC
 	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
+			;;
 		*_norm)
 			export S2TC_COLORDIST_MODE=NORMALMAP
 			export S2TC_RANDOM_COLORS=256