nalc/leaftest
1
0
Fork 0
forked from mtcontrib/leaftest
Code Issues Pull Requests Projects Releases Wiki Activity

Use filename based prefix for tilegen step and prefix shrink + montage too.

Browse Source
This commit is contained in:
est31 2016-01-17 20:53:20 +01:00
parent 9af5b355c1
commit ca44f93b13
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mapper.sh
View File

@ -75,7 +75,7 @@ do
# Execute sh -c "something" # Execute sh -c "something"
echo "-c" echo "-c"
echo "$prefix_pipefail ; $mapperpath ${MAPPERPARAMS} -i ${MAPDIR} --geometry ${posx},${posy}+${tilesize}+${tilesize} -o ${tiledir}/20/map_${x}_${y}.png \ echo "$prefix_pipefail ; $mapperpath ${MAPPERPARAMS} -i ${MAPDIR} --geometry ${posx},${posy}+${tilesize}+${tilesize} -o ${tiledir}/20/map_${x}_${y}.png \
2> >(>&2 prefix '[TILEGEN $x,$y ERR]: ') | prefix '[TILEGEN $x,$y]: ' \ 2> >(>&2 prefix '[TILEGEN 20/map_${x}_${y}.png ERR]: ') | prefix '[TILEGEN 20/map_${x}_${y}.png]: ' \
|| (>&2 echo 'minetesmapper for tile [${x},${y}] ended with non zero exit code'; exit 255)" || (>&2 echo 'minetesmapper for tile [${x},${y}] ended with non zero exit code'; exit 255)"
done done
done | xargs -n2 $jobparam -d '\n' bash # bash required because of "set -o pipefail" usage done | xargs -n2 $jobparam -d '\n' bash # bash required because of "set -o pipefail" usage
@ -96,6 +96,7 @@ do
tnum=$(($tilenum/$mult-1)) tnum=$(($tilenum/$mult-1))
zoomlevel=$((20-$s)) zoomlevel=$((20-$s))
zoomlevelbefore=$((20-$s+1)) zoomlevelbefore=$((20-$s+1))
zlv=$zoomlevel # shorter name
dir=$tiledir/$zoomlevel dir=$tiledir/$zoomlevel
dirb=$tiledir/$zoomlevelbefore dirb=$tiledir/$zoomlevelbefore
mkdir -p $dir mkdir -p $dir
@ -104,14 +105,16 @@ do
do do
for y in $(seq 0 $tnum) for y in $(seq 0 $tnum)
do do
montage $dirb/map_$(($x*2))_$((y*2)).png $dirb/map_$(($x*2+1))_$((y*2)).png $dirb/map_$(($x*2))_$((y*2+1)).png $dirb/map_$(($x*2+1))_$((y*2+1)).png -geometry +0+0 $dir/map_${x}_${y}.png montage $dirb/map_$(($x*2))_$((y*2)).png $dirb/map_$(($x*2+1))_$((y*2)).png $dirb/map_$(($x*2))_$((y*2+1)).png $dirb/map_$(($x*2+1))_$((y*2+1)).png -geometry +0+0 $dir/map_${x}_${y}.png \
if [ $? -ne 0 ]; then 2> >(>&2 prefix "[MONTAGE $zlv/map_${x}_${y}.png ERR]: ") | prefix "[MONTAGE $zlv/map_${x}_${y}.png]: "
if [ ${PIPESTATUS[0]} -ne 0 ]; then
echo "montage exited with non zero exit code, aborting." echo "montage exited with non zero exit code, aborting."
exit 1 exit 1
fi fi
convert $dir/map_${x}_${y}.png -resize 50% $dir/map_${x}_${y}.png convert $dir/map_${x}_${y}.png -resize 50% $dir/map_${x}_${y}.png \
if [ $? -ne 0 ]; then 2> >(>&2 prefix "[SHRINK $zlv/map_${x}_${y}.png ERR]: ") | prefix "[SHRINK $zlv/map_${x}_${y}.png]: "
echo "convert exited with non zero exit code, aborting." if [ ${PIPESTATUS[0]} -ne 0 ]; then
echo "shrinking exited with non zero exit code, aborting."
exit 1 exit 1
fi fi
done done