Browse Source

switched to using numpy version always

since included copy of minetestmapper-numpy works with leveldb now
master
poikilos 9 years ago
committed by Jacob Gustafson
parent
commit
3cf96acea2
  1. 5
      chunkymap-regen.py
  2. 6
      singleimage.py

5
chunkymap-regen.py

@ -189,8 +189,9 @@ class MTChunks:
self.minetestmapper_fast_sqlite_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "minetestmapper-numpy.py") self.minetestmapper_fast_sqlite_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "minetestmapper-numpy.py")
self.minetestmapper_custom_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "minetestmapper-expertmm.py") self.minetestmapper_custom_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "minetestmapper-expertmm.py")
self.minetestmapper_py_path = self.minetestmapper_fast_sqlite_path self.minetestmapper_py_path = self.minetestmapper_fast_sqlite_path
if (self.backend_string!="sqlite3"): #if (self.backend_string!="sqlite3"):
self.minetestmapper_py_path = self.minetestmapper_custom_path # minetestmapper-numpy had trouble with leveldb but this fork has it fixed so use numpy always always instead of running the following line
#self.minetestmapper_py_path = self.minetestmapper_custom_path
print("Chose image generator script: "+self.minetestmapper_py_path) print("Chose image generator script: "+self.minetestmapper_py_path)
if not os.path.isfile(self.minetestmapper_py_path): if not os.path.isfile(self.minetestmapper_py_path):
print("ERROR: script does not exist, so exiting "+__file__+".") print("ERROR: script does not exist, so exiting "+__file__+".")

6
singleimage.py

@ -23,9 +23,9 @@ class ChunkymapOfflineRenderer:
self.minetestmapper_fast_sqlite_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "minetestmapper-numpy.py") self.minetestmapper_fast_sqlite_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "minetestmapper-numpy.py")
self.minetestmapper_custom_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "minetestmapper-expertmm.py") self.minetestmapper_custom_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "minetestmapper-expertmm.py")
self.minetestmapper_py_path = self.minetestmapper_fast_sqlite_path self.minetestmapper_py_path = self.minetestmapper_fast_sqlite_path
if (self.backend_string!="sqlite3"): #if (self.backend_string!="sqlite3"):
# Since minetestmapper-numpy has trouble with leveldb: # minetestmapper-numpy had trouble with leveldb but this fork has it fixed so use numpy always always instead of running the following line
self.minetestmapper_py_path = self.minetestmapper_custom_path # self.minetestmapper_py_path = self.minetestmapper_custom_path
print("Chose image generator script: "+self.minetestmapper_py_path) print("Chose image generator script: "+self.minetestmapper_py_path)
if not os.path.isfile(self.minetestmapper_py_path): if not os.path.isfile(self.minetestmapper_py_path):
print("ERROR: script does not exist, so exiting "+__file__+".") print("ERROR: script does not exist, so exiting "+__file__+".")

Loading…
Cancel
Save