From 6353a657d96df7da5bb3aa5ff3985137c4fa534a Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 17 Mar 2021 13:20:51 -0700 Subject: [PATCH] Generate deluxemap textures dds files in normalmap mode. --- misc/tools/cached-converter.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 -- 2.39.2