poikilos
/
EnlivenMinetest
mirror of https://github.com/poikilos/EnlivenMinetest
1
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity
Browse Source

display backend and mapper_path being used 

and improve PEP8 compliance of minetestmapper fork (already submitted
pull request from github.com/expertmm/minetest)
master
poikilos 8 years ago
committed by Jacob Gustafson
parent
72e84669cb
commit
269852a4f0
2 changed files with 113 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 129
      minetestmapper-expertmm.py
  2. 2
      singleimage.py

129
minetestmapper-expertmm.py
View File

@ -1,13 +1,7 @@
#!/usr/bin/env python2
# -*- coding: utf-8 -*-
# This program is free software. It comes without any warranty, to
# the extent permitted by applicable law. You can redistribute it
# and/or modify it under the terms of the WTFPL
# Public License, Version 2, as published by Sam Hocevar. See
# COPYING for more details.
# Made by Jogge, modified by celeron55
# Made by Jogge, modified by: celeron55, expertmm
# 2011-05-29: j0gge: initial release
# 2011-05-30: celeron55: simultaneous support for sectors/sectors2, removed
# 2011-06-02: j0gge: command line parameters, coordinates, players, ...
@ -16,6 +10,9 @@
# 2011-07-30: WF: Support for content types extension, refactoring
# 2011-07-30: erlehmann: PEP 8 compliance.
# 2016-03-08: expertmm: geometry and region params
# 2017-03-17: expertmm: removed license from this file (this file should fall
# under the license of minetest)
# 2017-04-12: expertmm: PEP8 compliance
# Requires Python Imaging Library: http://www.pythonware.com/products/pil/
@ -89,12 +86,14 @@ def int_to_hex4(i):
def getBlockAsInteger(p):
return p[2]*16777216 + p[1]*4096 + p[0]
def unsignedToSigned(i, max_positive):
if i < max_positive:
return i
else:
return i - 2*max_positive
def getIntegerAsBlock(i):
x = unsignedToSigned(i % 4096, 2048)
i = int((i - x) / 4096)
@ -103,6 +102,7 @@ def getIntegerAsBlock(i):
z = unsignedToSigned(i % 4096, 2048)
return x, y, z
def limit(i, l, h):
if(i > h):
i = h
@ -110,17 +110,24 @@ def limit(i, l, h):
i = l
return i
def readU8(f):
return ord(f.read(1))
def readU16(f):
return ord(f.read(1))*256 + ord(f.read(1))
def readU32(f):
return ord(f.read(1))*256*256*256 + ord(f.read(1))*256*256 + ord(f.read(1))*256 + ord(f.read(1))
return ord(f.read(1))*256*256*256 + ord(f.read(1))*256*256 + \
ord(f.read(1))*256 + ord(f.read(1))
def readS32(f):
return unsignedToSigned(ord(f.read(1))*256*256*256 + ord(f.read(1))*256*256 + ord(f.read(1))*256 + ord(f.read(1)), 2**31)
return unsignedToSigned(ord(f.read(1))*256*256*256 +
ord(f.read(1))*256*256 + ord(f.read(1))*256 +
ord(f.read(1)), 2**31)
usagetext = """minetestmapper.py [options]
-i/--input <world_path>
@ -226,24 +233,24 @@ if geometry_string is not None:
nonchunky_xmax = nonchunky_xmin + this_width - 1 # inclusive rect
nonchunky_zmin = z
nonchunky_zmax = nonchunky_zmin + this_height - 1 # inclusive rect
print("#geometry:")
print("# x:" + str(x))
print("# z:" + str(z))
print("# width:" + str(this_width))
print("# height:" + str(this_height))
print("region:")
print(" xmin:" + str(nonchunky_xmin))
print(" xmax:" + str(nonchunky_xmax))
print(" zmin:" + str(nonchunky_zmin))
print(" zmax:" + str(nonchunky_zmax))
print("#geometry:" + "\n" +
"# x:" + str(x) + "\n" +
"# z:" + str(z) + "\n" +
"# width:" + str(this_width) + "\n" +
"# height:" + str(this_height) + "\n" +
"region:" + "\n" +
" xmin:" + str(nonchunky_xmin) + "\n" +
" xmax:" + str(nonchunky_xmax) + "\n" +
" zmin:" + str(nonchunky_zmin) + "\n" +
" zmax:" + str(nonchunky_zmax))
else:
print("ERROR: Missing coordinates in '" + geometry_string +
"' for geometry (must be in the form: x:z+width+height)")
usage()
sys.exit(2)
else:
print("ERROR: Incorrect value '" + geometry_string +
"' for geometry (must be in the form: x:z+width+height)")
print("ERROR: Incorrect geometry syntax '" + geometry_string +
"' (must be in the form: x:z+width+height)")
usage()
sys.exit(2)
elif region_string is not None:
@ -258,11 +265,11 @@ elif region_string is not None:
nonchunky_xmax = int(xmax_string)
nonchunky_zmin = int(zmin_string)
nonchunky_zmax = int(zmax_string)
print("region:")
print(" xmin:" + str(nonchunky_xmin))
print(" xmax:" + str(nonchunky_xmax))
print(" zmin:" + str(nonchunky_zmin))
print(" zmax:" + str(nonchunky_zmax))
print("region:" + "\n" +
" xmin:" + str(nonchunky_xmin) + "\n" +
" xmax:" + str(nonchunky_xmax) + "\n" +
" zmin:" + str(nonchunky_zmin) + "\n" +
" zmax:" + str(nonchunky_zmax))
else:
print("ERROR: Incorrect value '" + region_string +
"' for region (must be in the form: xmin:xmax,zmin:zmax)")
@ -411,8 +418,8 @@ maxz = max(zlist)
w = (maxx - minx) * 16 + 16
h = (maxz - minz) * 16 + 16
print("Result image (w=" + str(w) + " h=" + str(h) + ") will be written to "
+ output)
print("Result image (w=" + str(w) + " h=" + str(h) + ") will be written to " +
output)
im = Image.new("RGB", (w + border, h + border), bgcolor)
draw = ImageDraw.Draw(im)
@ -427,15 +434,19 @@ starttime = time.time()
CONTENT_WATER = 2
def content_is_ignore(d):
return d in [0, "ignore"]
def content_is_water(d):
return d in [2, 9]
def content_is_air(d):
return d in [126, 127, 254, "air"]
def read_content(mapdata, version, datapos):
if version >= 24:
return (mapdata[datapos*2] << 8) | (mapdata[datapos*2 + 1])
@ -450,13 +461,14 @@ def read_content(mapdata, version, datapos):
raise Exception("Unsupported map format: " + str(version))
def read_mapdata(mapdata, version, pixellist, water, day_night_differs, id_to_name):
def read_mapdata(mapdata, version, pixellist, water, day_night_differs,
id_to_name):
global stuff # oh my :-)
global unknown_node_names
global unknown_node_ids
if(len(mapdata) < 4096):
print("bad: " + xhex + "/" + zhex + "/" + yhex + " " + \
print("bad: " + xhex + "/" + zhex + "/" + yhex + " " +
str(len(mapdata)))
else:
chunkxpos = xpos * 16
@ -481,25 +493,31 @@ def read_mapdata(mapdata, version, pixellist, water, day_night_differs, id_to_na
elif content_is_water(content):
water[(x, z)] += 1
# Add dummy stuff for drawing sea without seabed
stuff[(chunkxpos + x, chunkzpos + z)] = (
chunkypos + y, content, water[(x, z)], day_night_differs)
stuff[(chunkxpos + x, chunkzpos + z)] = (chunkypos + y,
content,
water[(x, z)],
day_night_differs)
elif content in colors:
# Memorize information on the type and height of
# the block and for drawing the picture.
stuff[(chunkxpos + x, chunkzpos + z)] = (
chunkypos + y, content, water[(x, z)], day_night_differs)
stuff[(chunkxpos + x, chunkzpos + z)] = (chunkypos + y,
content,
water[(x, z)],
day_night_differs)
pixellist.remove((x, z))
break
else:
if type(content) == str:
if content not in unknown_node_names:
unknown_node_names.append(content)
#print("unknown node: %s/%s/%s x: %d y: %d z: %d block name: %s"
# print("unknown node: %s/%s/%s x: %d y: %d z: %d" +
# " block name: %s"
# % (xhex, zhex, yhex, x, y, z, content))
else:
if content not in unknown_node_ids:
unknown_node_ids.append(content)
#print("unknown node: %s/%s/%s x: %d y: %d z: %d block id: %x"
# print("unknown node: %s/%s/%s x: %d y: %d z: %d" +
# " block id: %x"
# % (xhex, zhex, yhex, x, y, z, content))
@ -520,10 +538,10 @@ for n in range(len(xlist)):
remaining_s = time_guess - dtime
remaining_minutes = int(remaining_s / 60)
remaining_s -= remaining_minutes * 60
print("Processing sector " + str(n) + " of " + str(len(xlist))
+ " (" + str(round(100.0 * n / len(xlist), 1)) + "%)"
+ " (ETA: " + str(remaining_minutes) + "m "
+ str(int(remaining_s)) + "s)")
print("Processing sector " + str(n) + " of " + str(len(xlist)) +
" (" + str(round(100.0 * n / len(xlist), 1)) + "%)" +
" (ETA: " + str(remaining_minutes) + "m " +
str(int(remaining_s)) + "s)")
xpos = xlist[n]
zpos = zlist[n]
@ -543,7 +561,9 @@ for n in range(len(xlist)):
if cur:
psmin = getBlockAsInteger((xpos, -2048, zpos))
psmax = getBlockAsInteger((xpos, 2047, zpos))
cur.execute("SELECT `pos` FROM `blocks` WHERE `pos`>=? AND `pos`<=? AND (`pos` - ?) % 4096 = 0", (psmin, psmax, psmin))
cur.execute("SELECT `pos` FROM `blocks` WHERE `pos`>=?"
" AND `pos`<=? AND (`pos` - ?) % 4096 = 0",
(psmin, psmax, psmin))
while True:
r = cur.fetchone()
if not r:
@ -596,7 +616,8 @@ for n in range(len(xlist)):
if sectortype == "sqlite":
ps = getBlockAsInteger((xpos, ypos, zpos))
cur.execute("SELECT `data` FROM `blocks` WHERE `pos`==? LIMIT 1", (ps,))
cur.execute("SELECT `data` FROM `blocks`"
" WHERE `pos`==? LIMIT 1", (ps,))
r = cur.fetchone()
if not r:
continue
@ -605,7 +626,8 @@ for n in range(len(xlist)):
if sectortype == "old":
filename = path + "sectors/" + sector1 + "/" + yhex.lower()
else:
filename = path + "sectors2/" + sector2 + "/" + yhex.lower()
filename = path + "sectors2/" + sector2 + "/" + \
yhex.lower()
f = file(filename, "rb")
# Let's just memorize these even though it's not really necessary.
@ -638,7 +660,7 @@ for n in range(len(xlist)):
mapdata = []
# Reuse the unused tail of the file
f.close();
f.close()
f = cStringIO.StringIO(dec_o.unused_data)
# print("unused data: "+repr(dec_o.unused_data))
@ -651,7 +673,7 @@ for n in range(len(xlist)):
metaliststr = []
# Reuse the unused tail of the file
f.close();
f.close()
f = cStringIO.StringIO(dec_o.unused_data)
# print("* dec_o.unused_data: "+repr(dec_o.unused_data))
data_after_node_metadata = dec_o.unused_data
@ -711,14 +733,16 @@ for n in range(len(xlist)):
readS32(f)
readS32(f)
read_mapdata(mapdata, version, pixellist, water, day_night_differs, id_to_name)
read_mapdata(mapdata, version, pixellist, water, day_night_differs,
id_to_name)
# After finding all the pixels in the sector, we can move on to
# the next sector without having to continue the Y axis.
if(len(pixellist) == 0):
break
except Exception as e:
print("Error at ("+str(xpos)+","+str(ypos)+","+str(zpos)+"): "+str(e))
print("Error at (" + str(xpos) + "," + str(ypos) + "," +
str(zpos) + "): " + str(e))
sys.stdout.write("Block data: ")
for c in r[0]:
sys.stdout.write("%2.2x " % ord(c))
@ -748,10 +772,10 @@ for (x, z) in stuff.iterkeys():
remaining_s = time_guess - dtime
remaining_minutes = int(remaining_s / 60)
remaining_s -= remaining_minutes * 60
print("Drawing pixel " + str(n) + " of " + str(listlen)
+ " (" + str(round(100.0 * n / listlen, 1)) + "%)"
+ " (ETA: " + str(remaining_minutes) + "m "
+ str(int(remaining_s)) + "s)")
print("Drawing pixel " + str(n) + " of " + str(listlen) +
" (" + str(round(100.0 * n / listlen, 1)) + "%)" +
" (ETA: " + str(remaining_minutes) + "m " +
str(int(remaining_s)) + "s)")
n += 1
(r, g, b) = colors[stuff[(x, z)][1]]
@ -842,7 +866,8 @@ if drawplayers:
x = (int(float(position[0]) / 10 - minx * 16))
z = int(h - (float(position[2]) / 10 - minz * 16))
draw.ellipse((x - 2 + border, z - 2 + border,
x + 2 + border, z + 2 + border), outline=playercolor)
x + 2 + border, z + 2 + border),
outline=playercolor)
draw.text((x + 2 + border, z + 2 + border), name,
font=font, fill=playercolor)
f.close()

2
singleimage.py
View File

@ -115,6 +115,8 @@ class ChunkymapOfflineRenderer:
print("")
print("Running")
print(" "+cmd_string)
print(" mapper_path: " + self.minetestmapper_py_path)
print(" backend: " + self.backend_string)
print(" # (this may take a while...)")
if os.path.isfile(tmp_png_path):
os.remove(tmp_png_path)

Write Preview
Loading…
Cancel
Save