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

improved 

and reduced difference between minetest master minetestmapper.py and
forked minetestmapper-expertmm.py
master
poikilos 9 years ago
committed by Jacob Gustafson
parent
dd7dc31823
commit
a9b11375b5
2 changed files with 8 additions and 99 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 87
      chunkymap-regen.py
  2. 20
      minetestmapper-expertmm.py

87
chunkymap-regen.py
View File

@ -219,29 +219,6 @@ class MTChunk:
def save_yaml(self, yml_path): def save_yaml(self, yml_path):
save_conf_from_dict(yml_path, self.metadata, assignment_operator=":", save_nulls_enable=False) save_conf_from_dict(yml_path, self.metadata, assignment_operator=":", save_nulls_enable=False)
#try:
#outs = open(yml_path, 'w')
#outs.write("is_empty:"+str(self.is_empty)+"\n")
#outs.write("is_marked:"+str(self.is_marked)+"\n")
#if self.width is not None:
#outs.write("width:"+str(self.width)+"\n")
#if self.height is not None:
#outs.write("height:"+str(self.height)+"\n")
#if self.image_w is not None:
#outs.write("image_w:"+str(self.image_w)+"\n")
#if self.image_h is not None:
#outs.write("image_h:"+str(self.image_h)+"\n")
#if self.image_left is not None:
#outs.write("image_left:"+str(self.image_left)+"\n")
#if self.image_top is not None:
#outs.write("image_top:"+str(self.image_top)+"\n")
#if self.image_right is not None:
#outs.write("image_right:"+str(self.image_right)+"\n")
#if self.image_bottom is not None:
#outs.write("image_bottom:"+str(self.image_bottom)+"\n")
#outs.close()
#except:
#print("Could not finish saving chunk metadata to '"+str(yml_path)+"': "+str(traceback.format_exc()))
#requires output such as from minetestmapper-numpy.py #requires output such as from minetestmapper-numpy.py
def set_from_genresult(self, this_genresult_path): def set_from_genresult(self, this_genresult_path):
@ -577,28 +554,24 @@ class MTChunks:
if self.mapvars is not None: if self.mapvars is not None:
if "chunkx_min" in self.mapvars.keys(): if "chunkx_min" in self.mapvars.keys():
#self.chunkx_min = self.mapvars["chunkx_min"]
try: try:
self.mapvars["chunkx_min"] = int(self.mapvars["chunkx_min"]) self.mapvars["chunkx_min"] = int(self.mapvars["chunkx_min"])
except: except:
print("WARNING: chunkx_min was not int so set to 0") print("WARNING: chunkx_min was not int so set to 0")
self.mapvars["chunkx_min"] = 0 self.mapvars["chunkx_min"] = 0
if "chunkx_max" in self.mapvars.keys(): if "chunkx_max" in self.mapvars.keys():
#self.chunkx_max = self.mapvars["chunkx_max"]
try: try:
self.mapvars["chunkx_max"] = int(self.mapvars["chunkx_max"]) self.mapvars["chunkx_max"] = int(self.mapvars["chunkx_max"])
except: except:
print("WARNING: chunkx_max was not int so set to 0") print("WARNING: chunkx_max was not int so set to 0")
self.mapvars["chunkx_max"] = 0 self.mapvars["chunkx_max"] = 0
if "chunkz_min" in self.mapvars.keys(): if "chunkz_min" in self.mapvars.keys():
#self.chunkz_min = self.mapvars["chunkz_min"]
try: try:
self.mapvars["chunkz_min"] = int(self.mapvars["chunkz_min"]) self.mapvars["chunkz_min"] = int(self.mapvars["chunkz_min"])
except: except:
print("WARNING: chunkz_min was not int so set to 0") print("WARNING: chunkz_min was not int so set to 0")
self.mapvars["chunkz_min"] = 0 self.mapvars["chunkz_min"] = 0
if "chunkz_max" in self.mapvars.keys(): if "chunkz_max" in self.mapvars.keys():
#self.chunkz_max = self.mapvars["chunkz_max"]
try: try:
self.mapvars["chunkz_max"] = int(self.mapvars["chunkz_max"]) self.mapvars["chunkz_max"] = int(self.mapvars["chunkz_max"])
except: except:
@ -686,18 +659,6 @@ class MTChunks:
if "is_empty" in self.chunks[chunk_luid].metadata.keys(): if "is_empty" in self.chunks[chunk_luid].metadata.keys():
result = self.chunks[chunk_luid].metadata["is_empty"] result = self.chunks[chunk_luid].metadata["is_empty"]
#if os.path.isfile(yaml_path):
#ins = open(yaml_path, 'r')
#line = True
#while line:
#line = ins.readline()
#if line:
#line_strip = line.strip()
#prevalue_string="is_empty:"
#if line_strip[:len(prevalue_string)]==prevalue_string:
#result = bool(line_strip[len(prevalue_string):].strip())
#break
#ins.close()
return result return result
def remove_chunk_image(self, chunk_luid): def remove_chunk_image(self, chunk_luid):
@ -808,7 +769,8 @@ class MTChunks:
is_marked_before = False is_marked_before = False
if chunk_luid in self.chunks.keys(): if chunk_luid in self.chunks.keys():
is_marked_before = True is_marked_before = True
is_empty_before = self.chunks[chunk_luid].is_empty if (self.chunks[chunk_luid].metadata is not None) and ("is_empty" in self.chunks[chunk_luid].metadata):
is_empty_before = self.chunks[chunk_luid].metadata["is_empty"]
self.prepare_chunk_meta(chunk_luid) # DOES load existing yml if exists self.prepare_chunk_meta(chunk_luid) # DOES load existing yml if exists
this_chunk = self.chunks[chunk_luid] this_chunk = self.chunks[chunk_luid]
if os.path.isfile(tmp_png_path): if os.path.isfile(tmp_png_path):
@ -849,10 +811,6 @@ class MTChunks:
except: except:
pass pass
try: try:
#this_chunk = MTChunk()
#this_chunk.luid = chunk_luid
#is_empty_before = this_chunk.metadata["is_empty"]
this_chunk.set_from_genresult(genresult_path) this_chunk.set_from_genresult(genresult_path)
if is_marked_before: if is_marked_before:
if (not is_empty_before) and this_chunk.metadata["is_empty"]: if (not is_empty_before) and this_chunk.metadata["is_empty"]:
@ -1252,12 +1210,6 @@ class MTChunks:
print ("Removing ALL map data since from WORLD NAME is different (map '"+str(self.mapvars["world_name"])+"' is not '"+str(self.mapvars["world_name"])+"')...") print ("Removing ALL map data since from WORLD NAME is different (map '"+str(self.mapvars["world_name"])+"' is not '"+str(self.mapvars["world_name"])+"')...")
print("") print("")
for dirname, dirnames, filenames in os.walk(self.mapvars["chunkymap_data_path"]): for dirname, dirnames, filenames in os.walk(self.mapvars["chunkymap_data_path"]):
#index = 0
#for j in range(0,len(filenames)):
# i = len(filenames) - 0 - 1
# if filenames[i][0] == ".":
# print (" SKIPPING "+filenames[i])
# filenames.remove_at(i)
for filename in filenames: for filename in filenames:
if filename[0] != ".": if filename[0] != ".":
file_fullname = os.path.join(self.mapvars["chunkymap_data_path"],filename) file_fullname = os.path.join(self.mapvars["chunkymap_data_path"],filename)
@ -1269,12 +1221,6 @@ class MTChunks:
elif filename==self.yaml_name: elif filename==self.yaml_name:
os.remove(file_fullname) os.remove(file_fullname)
for dirname, dirnames, filenames in os.walk(os.path.join(self.mapvars["chunkymap_data_path"], "players")): for dirname, dirnames, filenames in os.walk(os.path.join(self.mapvars["chunkymap_data_path"], "players")):
#for j in range(0,len(filenames)):
# i = len(filenames) - 0 - 1
# if filenames[i][0] == ".":
# if self.verbose_enable:
# print (" SKIPPING "+filenames[i])
# filenames.remove_at(i)
for filename in filenames: for filename in filenames:
if filename[0] != ".": if filename[0] != ".":
file_fullname = os.path.join(self.mapvars["chunkymap_data_path"],filename) file_fullname = os.path.join(self.mapvars["chunkymap_data_path"],filename)
@ -1293,19 +1239,6 @@ class MTChunks:
def save_mapvars_if_changed(self): def save_mapvars_if_changed(self):
is_changed = False is_changed = False
#is_different_world = False #is_different_world = False
#new_map_dict = {}
#new_map_dict["world_name"]=str(self.world_name)
#new_map_dict["chunk_size"]=str(self.chunk_size)
#new_map_dict["pixelspernode"]=str(self.pixelspernode)
#new_map_dict["chunkx_min"]=str(self.chunkx_min)
#new_map_dict["chunkx_max"]=str(self.chunkx_max)
#new_map_dict["chunkz_min"]=str(self.chunkz_min)
#new_map_dict["chunkz_max"]=str(self.chunkz_max)
#new_map_dict["maxheight"]=str(self.maxheight)
#new_map_dict["minheight"]=str(self.minheight)
#new_map_dict["world_path"]=str(self.world_path)
#new_map_dict["chunkymap_data_path"]=str(self.chunkymap_data_path)
#new_map_dict["total_generated_count"]=str(self.total_generated_count)
if self.saved_mapvars is None: if self.saved_mapvars is None:
print ("SAVING '" + self.world_yaml_path + "' since nothing was loaded or it did not exist") print ("SAVING '" + self.world_yaml_path + "' since nothing was loaded or it did not exist")
is_changed = True is_changed = True
@ -1323,22 +1256,6 @@ class MTChunks:
if is_changed: if is_changed:
save_conf_from_dict(self.world_yaml_path,self.mapvars,":") save_conf_from_dict(self.world_yaml_path,self.mapvars,":")
self.saved_mapvars = get_dict_from_conf_file(self.world_yaml_path,":") self.saved_mapvars = get_dict_from_conf_file(self.world_yaml_path,":")
#outs = open(self.world_yaml_path, 'w')
#outs.write("world_name:"+str(self.world_name) + "\n")
#outs.write("chunk_size:"+str(self.chunk_size) + "\n")
#outs.write("pixelspernode:"+str(self.pixelspernode) + "\n")
#outs.write("chunkx_min:"+str(self.chunkx_min) + "\n")
#outs.write("chunkx_max:"+str(self.chunkx_max) + "\n")
#outs.write("chunkz_min:"+str(self.chunkz_min) + "\n")
#outs.write("chunkz_max:"+str(self.chunkz_max) + "\n")
##values for command arguments:
#outs.write("maxheight:"+str(self.maxheight) + "\n")
#outs.write("minheight:"+str(self.minheight) + "\n")
##ALSO save to YAML:
#outs.write("world_path:"+str(self.world_path) + "\n")
#outs.write("chunkymap_data_path:"+str(self.chunkymap_data_path) + "\n")
#outs.write("total_generated_count:"+str(self.total_generated_count) + "\n")
#outs.close()
#self.mapvars = get_dict_from_conf_file(self.world_yaml_path,":") #self.mapvars = get_dict_from_conf_file(self.world_yaml_path,":")
else: else:
if self.verbose_enable: if self.verbose_enable:

20
minetestmapper-expertmm.py
View File

@ -4,8 +4,8 @@
# This program is free software. It comes without any warranty, to # This program is free software. It comes without any warranty, to
# the extent permitted by applicable law. You can redistribute it # the extent permitted by applicable law. You can redistribute it
# and/or modify it under the terms of the DWTFYWT # and/or modify it under the terms of the Do What ... You Want To
# Public License, Version 2, as published by Sam Hocevar. See # To Public License, Version 2, as published by Sam Hocevar. See
# COPYING for more details. # COPYING for more details.
# Made by Jogge, modified by celeron55 # Made by Jogge, modified by celeron55
@ -132,7 +132,7 @@ usagetext = """minetestmapper.py [options]
--drawscale --drawscale
--drawplayers --drawplayers
--draworigin --draworigin
--region <xmin> <xmax> <zmin> <zmax> --region <xmin>:<xmax>,<zmin>:<zmax>
--geometry <xmin>:<zmin>+<width>+<height> --geometry <xmin>:<zmin>+<width>+<height>
--drawunderground --drawunderground
Color format: '#000000'""" Color format: '#000000'"""
@ -154,8 +154,8 @@ except getopt.GetoptError as err:
path = None path = None
output = "map.png" output = "map.png"
border = 0 border = 0
scalecolor = "black" scalecolor = "white"
bgcolor = "white" bgcolor = "black"
origincolor = "red" origincolor = "red"
playercolor = "red" playercolor = "red"
drawscale = False drawscale = False
@ -277,10 +277,8 @@ os_name="linux"
if (os.path.sep!="/"): if (os.path.sep!="/"):
os_name="windows" os_name="windows"
profiles_path = "/home"
profile_path = None profile_path = None
if os_name=="windows": if os_name=="windows":
profiles_path = "C:\\Users"
profile_path = os.environ['USERPROFILE'] profile_path = os.environ['USERPROFILE']
else: else:
profile_path = os.environ['HOME'] profile_path = os.environ['HOME']
@ -293,13 +291,7 @@ if not os.path.isfile(colors_path):
colors_path = abs_colors_path colors_path = abs_colors_path
if not os.path.isfile(colors_path): if not os.path.isfile(colors_path):
try: print("WARNING: could not find colors.txt is current path or '"+colors_path+"'")
outer_colors_folder_path = os.path.dirname(os.path.dirname(__file__))
outer_colors_path = os.path.join(outer_colors_folder_path, "colors.txt")
if os.path.isfile(outer_colors_path):
colors_path = outer_colors_path
except:
pass
try: try:
f = file(colors_path) f = file(colors_path)

Write Preview
Loading…
Cancel
Save