Browse Source

fix indentation

master
poikilos 9 years ago
committed by Jacob Gustafson
parent
commit
6896ffeee7
  1. 10
      singleimage.py

10
singleimage.py

@ -53,11 +53,11 @@ class ChunkymapOfflineRenderer:
geometry_string = "-10000:-10000+20000+20000" geometry_string = "-10000:-10000+20000+20000"
#VERY BIG since singleimage mode (if no geometry param, minetestmapper-numpy reverts to its default which is -2000 2000 -2000 2000): #VERY BIG since singleimage mode (if no geometry param, minetestmapper-numpy reverts to its default which is -2000 2000 -2000 2000):
region_string = "-10000 10000 -10000 10000" region_string = "-10000 10000 -10000 10000"
#geometry_string = str(min_x)+":"+str(min_z)+"+"+str(int(max_x)-int(min_x)+1)+"+"+str(int(max_z)-int(min_z)+1) # +1 since max-min is exclusive and width must be inclusive for minetestmapper.py #geometry_string = str(min_x)+":"+str(min_z)+"+"+str(int(max_x)-int(min_x)+1)+"+"+str(int(max_z)-int(min_z)+1) # +1 since max-min is exclusive and width must be inclusive for minetestmapper.py
region_param = " --region "+region_string # minetestmapper-numpy.py --region xmin xmax zmin zmax region_param = " --region "+region_string # minetestmapper-numpy.py --region xmin xmax zmin zmax
geometry_param = " --geometry -10000:-10000+20000+20000" # minetestmapper-expertmm.py --geometry <xmin>:<zmin>+<width>+<height> geometry_param = " --geometry -10000:-10000+20000+20000" # minetestmapper-expertmm.py --geometry <xmin>:<zmin>+<width>+<height>
limit_param = geometry_param limit_param = geometry_param
#expertmm_region_string = str(min_x) + ":" + str(max_x) + "," + str(min_z) + ":" + str(max_z) #expertmm_region_string = str(min_x) + ":" + str(max_x) + "," + str(min_z) + ":" + str(max_z)
@ -70,7 +70,7 @@ class ChunkymapOfflineRenderer:
squote = "'" squote = "'"
io_string = " --input \""+self.world_path+"\" --output \""+tmp_png_path+"\"" io_string = " --input \""+self.world_path+"\" --output \""+tmp_png_path+"\""
if "numpy" in self.minetestmapper_py_path: if "numpy" in self.minetestmapper_py_path:
limit_param = region_param limit_param = region_param
io_string = " \""+self.world_path+"\" \""+tmp_png_path+"\"" io_string = " \""+self.world_path+"\" \""+tmp_png_path+"\""
#geometry_param = " --region " + str(min_x) + " " + str(max_x) + " " + str(min_z) + " " + str(max_z) #geometry_param = " --region " + str(min_x) + " " + str(max_x) + " " + str(min_z) + " " + str(max_z)
cmd_no_out_string = python_exe_path+" "+self.minetestmapper_py_path+" --bgcolor "+squote+FLAG_EMPTY_HEXCOLOR+squote+io_string+limit_param cmd_no_out_string = python_exe_path+" "+self.minetestmapper_py_path+" --bgcolor "+squote+FLAG_EMPTY_HEXCOLOR+squote+io_string+limit_param

Loading…
Cancel
Save