mtcontrib/leaftest
1
0
Fork 1
mirror of https://github.com/est31/leaftest.git synced 2025-06-28 14:46:02 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

merge into: mtcontrib:master
Branches Tags
mtcontrib:master nalc:master
...
pull from: nalc:master
Branches Tags
nalc:master mtcontrib:master

2 Commits
master ... master

Author SHA1 Message Date
sys4
6a0c90ac70 Fix map display 2021-09-02 18:05:43 +02:00
sys4
7940c600c8 Fix things 2021-08-27 19:16:44 +02:00
2 changed files with 3 additions and 3 deletions
Expand all files Collapse all files

4
mapper.sh
View File

@ -94,7 +94,7 @@ do
posy=$(($spawny+$tilesize*($tilenum/2-$y)))
# Execute sh -c "something"
printf "%s\x00" "-c"
printf "$prefix_pipefail ; $mapperpath ${MAPPERPARAMS} -i ${MAPDIR} --geometry ${posx},${posy}+${tilesize}+${tilesize} -o ${tiledir}/20/map_${x}_${y}.png \
printf "$prefix_pipefail ; $mapperpath -i ${MAPDIR} -o ${tiledir}/20/map_${x}_${y}.png ${MAPPERPARAMS} --geometry ${posx}:${posy}+${tilesize}+${tilesize} \
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)\x00"
done
@ -133,7 +133,7 @@ do
echo "montage exited with non zero exit code, aborting."
exit 1
fi
downscale $dir/map_${x}_${y}.png \
convert $dir/map_${x}_${y}.png -resize 50% $dir/map_${x}_${y}.png #downscale $dir/map_${x}_${y}.png \
2> >(>&2 prefix "[SHRINK $zlv/map_${x}_${y}.png ERR]: ") | prefix "[SHRINK $zlv/map_${x}_${y}.png]: "
if [ ${PIPESTATUS[0]} -ne 0 ]; then
echo "shrinking exited with non zero exit code, aborting."

2
www/map.html
View File

@ -5,7 +5,6 @@
<link rel="stylesheet" href="leaflet-custom.css" />
<script src="leaflet.js"></script>
<script src="leaflet-hash.js"></script>
<script src="map.js"></script>
</head>
<body>
<div id="mapcontainer">
@ -15,5 +14,6 @@
<div id="map">
</div>
</div>
<script src="map.js"></script>
</body>
</html>