mtcontrib/leaftest
1
0
Fork 1
mirror of https://github.com/est31/leaftest.git synced 2024-11-14 22:50:28 +01:00
Code Issues Projects Releases Wiki Activity

Parallel minetestmapper execution → a lot faster,

Browse Source 
fix geometry setting and
abort if minetestmapper isn't found to avoid spamming
This commit is contained in:
HybridDog 2016-01-17 14:14:44 +01:00
parent 3941527d18
commit 22016c4182
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mapper.sh
View File

@ -4,10 +4,19 @@ MAPDIR=$1
SPAWNPOS=$2
DIMENSIONS=$3
echo "map dir set to "$MAPDIR
if [ -z $MAPPERDIR ]; then
MAPPERDIR=.
fi
MAPPERDIR=$MAPPERDIR/minetestmapper
if [ ! -e $MAPPERDIR ]; then
echo "error, "$MAPPERDIR" doesn't exist."
exit
fi
scriptdir=`readlink -f $0`
scriptdir=`dirname $scriptdir`
@ -31,8 +40,17 @@ do
do
posx=$(($spawnx+$tilesize*($x-$tilenum/2)))
posy=$(($spawny+$tilesize*($tilenum/2-$y)))
$MAPPERDIR/minetestmapper ${MAPPERPARAMS} -i ${MAPDIR} --geometry ${posx},${posy}+${tilesize}+${tilesize} -o ${tiledir}/20/map_${x}_${y}.png
done
$MAPPERDIR ${MAPPERPARAMS} -i ${MAPDIR} --geometry ${posx}:${posy}+${tilesize}+${tilesize} -o ${tiledir}/20/map_${x}_${y}.png &
done &
done
delay=0
while [ $(ps -C minetestmapper | wc -l) != 1 ]
do
#minetestmappers are unfinished
sleep 1
delay=$(($delay+1))
echo $delay" seconds slept waiting for minetestmapper"
done
#join the images and make them smaller
@ -59,4 +77,4 @@ done
zoommin=$((20-$zoomlevelnum))
#write the resulting config into a json file
echo "{\"mapsize\":$DIMENSIONS, \"spawn\":{\"x\":$spawnx,\"y\":$spawny}, \"zoommin\":$zoommin}" > $scriptdir/www/conf.json
echo "{\"mapsize\":$DIMENSIONS, \"spawn\":{\"x\":$spawnx,\"y\":$spawny}, \"zoommin\":$zoommin}" > $scriptdir/www/conf.json