mirror of
https://gitlab.com/xonotic/xonotic
synced 2025-02-20 20:46:52 +00:00
new, better, greater data converter script
This commit is contained in:
Rudolf Polzer
parent
019698126f
commit
b1235e18e3
48
all
48
all
@ -839,13 +839,32 @@ case "$cmd" in
|
||||
# version numnber and stuff like that
|
||||
;;
|
||||
release-buildpk3-transform-raw)
|
||||
dir=$1
|
||||
;;
|
||||
release-buildpk3-transform-normal)
|
||||
# texture: convert to jpeg
|
||||
dir=$1
|
||||
cd "$dir"
|
||||
# texture: convert to jpeg and dds
|
||||
export do_jpeg=true
|
||||
export jpeg_qual_rgb=95
|
||||
export jpeg_qual_a=99
|
||||
export do_dds=true
|
||||
export dds_flags=
|
||||
export do_ogg=false
|
||||
find textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
|
||||
;;
|
||||
release-buildpk3-transform-low)
|
||||
# texture: convert to jpeg and downscale
|
||||
dir=$1
|
||||
cd "$dir"
|
||||
# texture: convert to jpeg and dds
|
||||
# music: reduce bitrate
|
||||
export do_jpeg=true
|
||||
export jpeg_qual_rgb=95
|
||||
export jpeg_qual_a=99
|
||||
export do_dds=false
|
||||
export do_ogg=true
|
||||
export ogg_qual=1
|
||||
find textures sound/cdtracks -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
|
||||
;;
|
||||
release-buildpk3)
|
||||
src=$1
|
||||
@ -861,7 +880,9 @@ case "$cmd" in
|
||||
rm -rf Xonotic/temp
|
||||
rsync --exclude=.git -vaSHPAX "$src"/ "Xonotic/temp"
|
||||
"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
|
||||
7za a -tzip -mx=9 "$dst" .
|
||||
cd Xonotic/temp
|
||||
zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
|
||||
cd ../..
|
||||
rm -rf Xonotic/temp
|
||||
;;
|
||||
release-buildpk3s)
|
||||
@ -869,28 +890,23 @@ case "$cmd" in
|
||||
shift
|
||||
while [ "$#" -gt 1 ]; do
|
||||
"$SELF" release-buildpk3 "$src" "Xonotic/${src%.pk3dir}$2.pk3" "$1"
|
||||
shift
|
||||
shift
|
||||
done
|
||||
rm -rf "$src"
|
||||
;;
|
||||
release-pack)
|
||||
#"$SELF" release-buildpk3s data/font-dejavu.pk3dir raw ''
|
||||
#"$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low'
|
||||
#"$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low'
|
||||
#"$SELF" release-buildpk3s data/xonotic-music.pk3dir normal '' raw '-raw' low '-low'
|
||||
#"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low ''
|
||||
"$SELF" release-buildpk3s data/font-dejavu.pk3dir raw ''
|
||||
"$SELF" release-buildpk3s data/xonotic-data.pk3dir raw ''
|
||||
"$SELF" release-buildpk3s data/xonotic-maps.pk3dir raw ''
|
||||
"$SELF" release-buildpk3s data/xonotic-music.pk3dir raw ''
|
||||
"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir raw ''
|
||||
"$SELF" release-buildpk3s data/font-dejavu.pk3dir raw ''
|
||||
"$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low'
|
||||
"$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low'
|
||||
"$SELF" release-buildpk3s data/xonotic-music.pk3dir normal '' raw '-raw' low '-low'
|
||||
"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low ''
|
||||
;;
|
||||
release)
|
||||
"$SELF" release-prepare
|
||||
"$SELF" release-engine
|
||||
"$SELF" release-gamedata
|
||||
"$SELF" release-maps
|
||||
"$SELF" release-finish
|
||||
"$SELF" release-pack
|
||||
"$SELF" release-engine
|
||||
;;
|
||||
*)
|
||||
echo "Usage:"
|
||||
|
||||
142
misc/tools/cached-converter.sh
Normal file
142
misc/tools/cached-converter.sh
Normal file
@ -0,0 +1,142 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
: ${CACHEDIR:=$HOME/.xonotic-cached-converter}
|
||||
: ${do_jpeg:=true}
|
||||
: ${jpeg_qual_rgb:=95}
|
||||
: ${jpeg_qual_a:=99}
|
||||
: ${do_dds:=true}
|
||||
: ${dds_flags:=}
|
||||
: ${do_ogg:=false}
|
||||
: ${ogg_qual:=1}
|
||||
|
||||
tmpdir=`mktemp -d -t cached-converter.XXXXXX`
|
||||
trap 'exit 1' INT
|
||||
trap 'rm -rf "$tmpdir"' EXIT
|
||||
|
||||
cached()
|
||||
{
|
||||
method=$1; shift
|
||||
infile1=$1; shift
|
||||
infile2=$1; shift
|
||||
outfile1=$1; shift
|
||||
outfile2=$1; shift
|
||||
options=`echo "$*" | git hash-object --stdin`
|
||||
sum=`git hash-object "$infile1"`
|
||||
if [ -n "$infile2" ]; then
|
||||
sum=$sum`git hash-object "$infile2"`
|
||||
fi
|
||||
mkdir -p "$CACHEDIR/$method-$options"
|
||||
name1="$CACHEDIR/$method/$sum-1.${outfile1##*.}"
|
||||
[ -z "$outfile2" ] || name2="$CACHEDIR/$method/$sum-2.${outfile2##*.}"
|
||||
tempfile1="$name1.new"
|
||||
[ -z "$outfile2" ] || tempfile2="$name2.new"
|
||||
if "$method" "$infile1" "$infile2" "$tempfile1" "$tempfile2" "$@"; then
|
||||
mv "$tempfile1" "$name1"
|
||||
[ -z "$outfile2" ] || mv "$tempfile2" "$name2"
|
||||
ln "$name1" "$outfile1" 2>/dev/null || cp "$name1" "$outfile1"
|
||||
[ -z "$outfile2" ] || ln "$name2" "$outfile2" 2>/dev/null || cp "$name2" "$outfile2"
|
||||
else
|
||||
rm -f "$tempfile1"
|
||||
rm -f "$tempfile2"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
reduce_jpeg2_dds()
|
||||
{
|
||||
i=$1; shift
|
||||
ia=$1; shift
|
||||
o=$1; shift; shift
|
||||
convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.png" && \
|
||||
nvcompress -alpha -bc3 $1 "$tmpdir/x.png" "$o"
|
||||
}
|
||||
|
||||
reduce_jpeg2_jpeg2()
|
||||
{
|
||||
i=$1; shift
|
||||
ia=$1; shift
|
||||
o=$1; shift
|
||||
oa=$1; shift
|
||||
cp "$i" "$o" && jpegoptim --strip-all -m"$1" "$o" && \
|
||||
cp "$ia" "$oa" && jpegoptim --strip-all -m"$2" "$oa"
|
||||
}
|
||||
|
||||
reduce_jpeg2_jpeg2()
|
||||
{
|
||||
i=$1; shift; shift
|
||||
o=$1; shift; shift
|
||||
cp "$i" "$o" && jpegoptim --strip-all -m"$1" "$o"
|
||||
}
|
||||
|
||||
reduce_ogg()
|
||||
{
|
||||
i=$1; shift; shift
|
||||
o=$1; shift; shift
|
||||
oggdec -o "$tmpdir/x.wav" "$i" && \
|
||||
oggenc -q"$1" -o "$o" "$tmpdir/x.wav"
|
||||
}
|
||||
|
||||
reduce_rgba_dds()
|
||||
{
|
||||
i=$1; shift; shift
|
||||
o=$1; shift; shift
|
||||
nvcompress -alpha -bc3 $1 "$i" "$o"
|
||||
}
|
||||
|
||||
reduce_rgba_jpeg2()
|
||||
{
|
||||
i=$1; shift; shift
|
||||
o=$1; shift
|
||||
oa=$1; shift
|
||||
convert "$X" -alpha extract -quality 100 "$o" && \
|
||||
convert "$X" -alpha off -quality 100 "$oa" && \
|
||||
jpegoptim --strip-all -m"$1" "$o" && \
|
||||
jpegoptim --strip-all -m"$2" "$oa"
|
||||
}
|
||||
|
||||
reduce_rgb_dds()
|
||||
{
|
||||
i=$1; shift; shift
|
||||
o=$1; shift; shift
|
||||
nvcompress -bc1 $1 "$i" "$o"
|
||||
}
|
||||
|
||||
reduce_rgb_jpeg()
|
||||
{
|
||||
i=$1; shift; shift
|
||||
o=$1; shift; shift
|
||||
convert "$X" "$o" && \
|
||||
jpegoptim --strip-all -m"$1" "$o"
|
||||
}
|
||||
|
||||
|
||||
for F in "$@"; do
|
||||
case "$F" in
|
||||
*_alpha.jpg)
|
||||
# handle in *.jpg case
|
||||
;;
|
||||
*.jpg)
|
||||
if [ -f "${F%.jpg}_alpha.jpg" ]; then
|
||||
cached "$do_jpeg" reduce_jpeg2_jpeg2 "$F" "${F%.*}_alpha.jpg" "$F" "${F%.*}_alpha.jpg" "$jpeg_qual_rgb"
|
||||
cached "$do_jpeg" reduce_jpeg2_dds "$F" "${F%.*}_alpha.jpg" "$F" "${F%.*}_alpha.jpg" "$jpeg_qual_rgb"
|
||||
else
|
||||
cached "$do_jpeg" reduce_jpeg_jpeg "$F" "" "$F" "" "$jpeg_qual_rgb"
|
||||
cached "$do_dds" reduce_rgb_dds "$F" "" "dds/${F%.*}.dds" "" "$dds_flags"
|
||||
fi
|
||||
;;
|
||||
*.png|*.tga)
|
||||
if convert "$X" -depth 16 RGBA:- | perl -e 'while(read STDIN, $_, 8) { substr($_, 6, 2) eq "\xFF\xFF" or exit 1; ++$pix; } exit not $pix;'; then
|
||||
cached "$do_jpeg" reduce_rgb_jpeg "$F" "" "${F%.*}.jpg" "" "$jpeg_qual_rgb"
|
||||
cached "$do_dds" reduce_rgb_dds "$F" "" "dds/${F%.*}.dds" "" "$dds_flags"
|
||||
else
|
||||
cached "$do_jpeg" reduce_rgba_jpeg2 "$F" "" "${F%.*}.jpg" "${F%.*}_alpha.jpg" "$jpeg_qual_rgb" "$jpeg_qual_a"
|
||||
cached "$do_dds" reduce_rgba_dds "$F" "" "dds/${F%.*}.dds" "" "$dds_flags"
|
||||
fi
|
||||
;;
|
||||
*.ogg)
|
||||
cached "$do_ogg" reduce_ogg "$F" "" "$F" "" "$ogg_qual"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
@ -1,30 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
for X in "$@"; do
|
||||
case "$X" in
|
||||
*.jpg)
|
||||
if [ -n "$scaledown" ]; then
|
||||
mogrify -geometry "$scaledown" -quality 100 "$X"
|
||||
fi
|
||||
echo "$X has no alpha, converting"
|
||||
nvcompress -bc1 "$X" "${X%.*}.dds"
|
||||
rm -f "$X"
|
||||
;;
|
||||
*.png|*.tga)
|
||||
if [ -n "$scaledown" ]; then
|
||||
mogrify -geometry "$scaledown" -quality 100 "$X"
|
||||
fi
|
||||
if convert "$X" -depth 16 RGBA:- | perl -e 'while(read STDIN, $_, 8) { substr($_, 6, 2) eq "\xFF\xFF" or exit 1; ++$pix; } exit not $pix;'; then
|
||||
echo "$X has no alpha, converting"
|
||||
nvcompress -bc1 "$X" "${X%.*}.dds"
|
||||
rm -f "$X"
|
||||
else
|
||||
echo "$X has alpha, converting"
|
||||
nvcompress -alpha -bc3 "$X" "${X%.*}.dds"
|
||||
rm -f "$X"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
@ -1,29 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
: ${qual:=95}
|
||||
: ${qual_alpha:=99}
|
||||
|
||||
for X in "$@"; do
|
||||
case "$X" in
|
||||
*.jpg)
|
||||
jpegoptim --strip-all -m$qual "$X"
|
||||
;;
|
||||
*.png|*.tga)
|
||||
if convert "$X" -depth 16 RGBA:- | perl -e 'while(read STDIN, $_, 8) { substr($_, 6, 2) eq "\xFF\xFF" or exit 1; ++$pix; } exit not $pix;'; then
|
||||
echo "$X has no alpha, converting"
|
||||
convert "$X" -quality 100 "${X%.*}.jpg"
|
||||
jpegoptim --strip-all -m$qual "${X%.*}.jpg"
|
||||
rm -f "$X"
|
||||
else
|
||||
echo "$X has alpha, converting twice"
|
||||
convert "$X" -alpha extract -quality 100 "${X%.*}.jpg"
|
||||
convert "$X" -alpha off -quality 100 "${X%.*}_alpha.jpg"
|
||||
jpegoptim --strip-all -m$qual "${X%.*}.jpg"
|
||||
jpegoptim --strip-all -m$qual_alpha "${X%.*}_alpha.jpg"
|
||||
rm -f "$X"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
Loading…
Reference in New Issue
Block a user