diff --git a/.gitignore b/.gitignore index e43b0f9..8fba4ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .DS_Store +luanti diff --git a/common/dump.lua b/common/dump.lua index 4151734..c3d150b 100644 --- a/common/dump.lua +++ b/common/dump.lua @@ -23,12 +23,15 @@ local private = {} Returns: a string containing the pretty-printed version of the given object ]]-- -function private.dump(value, depth, indent, max_keys, seen) +function private.dump(value, depth, indent, max_keys, seen, current_indent) + current_indent = current_indent or "" depth = depth or 10 indent = indent or "" max_keys = max_keys or 100 seen = seen or {} + local newline = ((indent == "") and "") or "\n" + if depth == 0 then return "" end if seen[value] == true then return "" end @@ -36,19 +39,22 @@ function private.dump(value, depth, indent, max_keys, seen) local result = "" if type(value) == "table" then - result = result.."{\n" - local inner_indent = indent.." " + result = result.."{"..newline + local inner_indent = current_indent..indent local key_count = 0 for inner_key, inner_value in pairs(value) do - local inner_text = private.dump(inner_value, depth - 1, inner_indent, max_keys, seen) - result = result..inner_indent..inner_key.." = "..inner_text.."\n" - key_count = key_count + 1 if key_count >= max_keys then - result = result..inner_indent.."\n" + result = result..inner_indent..""..newline break end + + local inner_text = private.dump( + inner_value, depth - 1, indent, max_keys, seen, inner_indent + ) + result = result..inner_indent..inner_key.." = "..inner_text..", "..newline + key_count = key_count + 1 end - result = result..indent.."}" + result = result..current_indent.."}" else result = tostring(value) end diff --git a/common/region.lua b/common/region.lua index 1a78315..ef09720 100644 --- a/common/region.lua +++ b/common/region.lua @@ -163,7 +163,7 @@ function Region:iterate_columns(do_operation) self:iterate( self.fill_min.x, self.fill_max.x, - 0, 0, + self.fill_min.y, self.fill_min.y, -- we only want columns, so use a single y value self.fill_min.z, self.fill_max.z, function(x, y, z) do_operation(x, z) end ) @@ -263,7 +263,6 @@ function Region:set_meta(name, x, z, value) if not meta_data then meta_data = {} self._meta[name] = meta_data - core.debug("adding meta["..name.."]") end meta_data[self._emerged_area:index(x, 0, z)] = value @@ -282,8 +281,6 @@ function Region:read_voxels(voxels, fill_min, fill_max) check.is_type("fill_min", fill_min, "table") check.is_type("fill_max", fill_max, "table") - self:save_voxels() - self._voxels = voxels self.fill_min = fill_min self.fill_max = fill_max diff --git a/mods/jvmi_mapgen/mapenv.lua b/mods/jvmi_mapgen/mapenv.lua index 4dd5fd0..90f2114 100644 --- a/mods/jvmi_mapgen/mapenv.lua +++ b/mods/jvmi_mapgen/mapenv.lua @@ -54,6 +54,7 @@ function private.assign_altitudes(region) altitude = altitude + contribution end + altitude = math.floor(altitude) region:set_meta(Region.META.ALTITUDE, x, z, altitude) end) end @@ -230,6 +231,7 @@ end core.register_on_generated(function(voxels, fill_min, fill_max) local region = private.region + region:read_voxels(voxels, fill_min, fill_max) private.assign_terrain_meta(region)