separate noise manager, force 2d noise generator to regen when needed
This commit is contained in:
FaceDeer
parent
62858a74c0
commit
8909871b26
19
init.lua
19
init.lua
@ -11,6 +11,25 @@ dofile(MP.."/voxeldata.lua")
|
||||
dofile(MP.."/region_functions.lua")
|
||||
dofile(MP.."/lines.lua")
|
||||
dofile(MP.."/place_schematic.lua")
|
||||
dofile(MP.."/noise_manager.lua")
|
||||
|
||||
|
||||
local map_data = {}
|
||||
local map_param2_data = {}
|
||||
|
||||
mapgen_helper.mapgen_vm_data = function()
|
||||
local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
|
||||
vm:get_data(map_data)
|
||||
return vm, map_data, VoxelArea:new{MinEdge=emin, MaxEdge=emax}
|
||||
end
|
||||
|
||||
mapgen_helper.mapgen_vm_data_param2 = function()
|
||||
local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
|
||||
vm:get_data(map_data)
|
||||
vm:get_param2_data(map_param2_data)
|
||||
return vm, map_data, map_param2_data, VoxelArea:new{MinEdge=emin, MaxEdge=emax}
|
||||
end
|
||||
|
||||
|
||||
mapgen_helper.biome_defs = nil
|
||||
mapgen_helper.get_biome_def = function(biome_id) -- given an id from the biome map, returns a biome definition.
|
||||
|
||||
93
noise_manager.lua
Normal file
93
noise_manager.lua
Normal file
@ -0,0 +1,93 @@
|
||||
local perlin_buffers = {}
|
||||
|
||||
mapgen_helper.register_perlin = function(name, perlin_params)
|
||||
perlin_buffers[name] = perlin_buffers[name] or {}
|
||||
if perlin_buffers[name].perlin_params then
|
||||
minetest.log("error", "mapgen_helper.register_perlin3d called for " .. name .. " when perlin parameters were already registered.")
|
||||
return
|
||||
end
|
||||
perlin_buffers[name].perlin_params = perlin_params
|
||||
end
|
||||
|
||||
local get_buffer = function(name, sidelen, perlin_params)
|
||||
perlin_buffers[name] = perlin_buffers[name] or {}
|
||||
local buffer = perlin_buffers[name]
|
||||
|
||||
if buffer.sidelen ~= nil and buffer.sidelen ~= sidelen then
|
||||
buffer.nobj_perlin = nil -- parameter changed, force regenerate of object
|
||||
end
|
||||
buffer.sidelen = sidelen
|
||||
|
||||
if perlin_params then
|
||||
if buffer.perlin_params then
|
||||
for k, v in pairs(buffer.perlin_params) do
|
||||
if perlin_params[k] ~= v then
|
||||
buffer.nobj_perlin = nil -- parameter changed, force regenerate of object
|
||||
end
|
||||
end
|
||||
end
|
||||
buffer.perlin_params = perlin_params -- record provided parameters
|
||||
elseif buffer.perlin_params == nil then
|
||||
minetest.log("error", "mapgen_helper.register_perlin3d called for " .. name .. " with no registered or provided perlin parameters.")
|
||||
return
|
||||
else
|
||||
perlin_params = buffer.perlin_params -- retrieve recorded parameters
|
||||
end
|
||||
|
||||
return buffer
|
||||
end
|
||||
|
||||
mapgen_helper.perlin3d = function(name, minp, maxp, perlin_params)
|
||||
local minx = minp.x
|
||||
local minz = minp.z
|
||||
local sidelen = maxp.x - minp.x + 1 --length of a mapblock
|
||||
local chunk_lengths = {x = sidelen, y = sidelen, z = sidelen} --table of chunk edges
|
||||
|
||||
local buffer = get_buffer(name, sidelen, perlin_params)
|
||||
|
||||
buffer.nvals_perlin_buffer = buffer.nvals_perlin_buffer or {}
|
||||
buffer.nobj_perlin = buffer.nobj_perlin or minetest.get_perlin_map(perlin_params, chunk_lengths)
|
||||
local nvals_perlin = buffer.nobj_perlin:get_3d_map_flat(minp, buffer.nvals_perlin_buffer)
|
||||
return nvals_perlin, VoxelArea:new{MinEdge=minp, MaxEdge=maxp}
|
||||
end
|
||||
|
||||
mapgen_helper.perlin2d = function(name, minp, maxp, perlin_params)
|
||||
local minx = minp.x
|
||||
local minz = minp.z
|
||||
local sidelen = maxp.x - minp.x + 1 --length of a mapblock
|
||||
local chunk_lengths = {x = sidelen, y = sidelen, z = sidelen} --table of chunk edges
|
||||
|
||||
local buffer = get_buffer(name, sidelen, perlin_params)
|
||||
|
||||
perlin_buffers[name].nvals_perlin_buffer = perlin_buffers[name].nvals_perlin_buffer or {}
|
||||
perlin_buffers[name].nobj_perlin = perlin_buffers[name].nobj_perlin or minetest.get_perlin_map(perlin_params, chunk_lengths)
|
||||
local nvals_perlin = perlin_buffers[name].nobj_perlin:get_2d_map_flat({x=minp.x, y=minp.z}, perlin_buffers[name].nvals_perlin_buffer)
|
||||
|
||||
return nvals_perlin
|
||||
end
|
||||
|
||||
mapgen_helper.index2d = function(minp, maxp, x, z)
|
||||
return x - minp.x +
|
||||
(maxp.x - minp.x + 1) -- sidelen
|
||||
*(z - minp.z)
|
||||
+ 1
|
||||
end
|
||||
|
||||
mapgen_helper.index2dp = function(minp, maxp, pos)
|
||||
return mapgen_helper.index2d(minp, maxp, pos.x, pos.z)
|
||||
end
|
||||
|
||||
-- Takes an index into a 3D area and returns the corresponding 2D index
|
||||
-- assumes equal edge lengths
|
||||
mapgen_helper.index2di = function(minp, maxp, area, vi)
|
||||
local MinEdge = area.MinEdge
|
||||
local zstride = area.zstride
|
||||
local minpx = minp.x
|
||||
local i = vi - 1
|
||||
local z = math.floor(i / zstride) + MinEdge.z
|
||||
local x = math.floor((i % zstride) % area.ystride) + MinEdge.x
|
||||
return x - minpx +
|
||||
(maxp.x - minpx + 1) -- sidelen
|
||||
*(z - minp.z)
|
||||
+ 1
|
||||
end
|
||||
104
voxeldata.lua
104
voxeldata.lua
@ -1,80 +1,3 @@
|
||||
local map_data = {}
|
||||
local map_param2_data = {}
|
||||
local perlin_buffers = {}
|
||||
|
||||
mapgen_helper.mapgen_vm_data = function()
|
||||
local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
|
||||
vm:get_data(map_data)
|
||||
return vm, map_data, VoxelArea:new{MinEdge=emin, MaxEdge=emax}
|
||||
end
|
||||
|
||||
mapgen_helper.mapgen_vm_data_param2 = function()
|
||||
local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
|
||||
vm:get_data(map_data)
|
||||
vm:get_param2_data(map_param2_data)
|
||||
return vm, map_data, map_param2_data, VoxelArea:new{MinEdge=emin, MaxEdge=emax}
|
||||
end
|
||||
|
||||
mapgen_helper.register_perlin3d = function(name, perlin_params)
|
||||
perlin_buffers[name] = perlin_buffers[name] or {}
|
||||
if perlin_buffers[name].perlin_params then
|
||||
minetest.log("error", "mapgen_helper.register_perlin3d called for " .. name .. " when perlin parameters were already registered.")
|
||||
return
|
||||
end
|
||||
perlin_buffers[name].perlin_params = perlin_params
|
||||
end
|
||||
|
||||
mapgen_helper.perlin3d = function(name, minp, maxp, perlin_params)
|
||||
local minx = minp.x
|
||||
local minz = minp.z
|
||||
local sidelen = maxp.x - minp.x + 1 --length of a mapblock
|
||||
local chunk_lengths = {x = sidelen, y = sidelen, z = sidelen} --table of chunk edges
|
||||
|
||||
perlin_buffers[name] = perlin_buffers[name] or {}
|
||||
local buffer = perlin_buffers[name]
|
||||
|
||||
if buffer.sidelen ~= nil and buffer.sidelen ~= sidelen then
|
||||
buffer.nobj_perlin = nil -- parameter changed, force regenerate of object
|
||||
end
|
||||
buffer.sidelen = sidelen
|
||||
|
||||
if perlin_params then
|
||||
if buffer.perlin_params then
|
||||
for k, v in pairs(buffer.perlin_params) do
|
||||
if perlin_params[k] ~= v then
|
||||
buffer.nobj_perlin = nil -- parameter changed, force regenerate of object
|
||||
end
|
||||
end
|
||||
end
|
||||
buffer.perlin_params = perlin_params -- record provided parameters
|
||||
elseif buffer.perlin_params == nil then
|
||||
minetest.log("error", "mapgen_helper.register_perlin3d called for " .. name .. " with no registered or provided perlin parameters.")
|
||||
return
|
||||
else
|
||||
perlin_params = buffer.perlin_params -- retrieve recorded parameters
|
||||
end
|
||||
|
||||
buffer.nvals_perlin_buffer = buffer.nvals_perlin_buffer or {}
|
||||
buffer.nobj_perlin = buffer.nobj_perlin or minetest.get_perlin_map(perlin_params, chunk_lengths)
|
||||
local nvals_perlin = buffer.nobj_perlin:get_3d_map_flat(minp, buffer.nvals_perlin_buffer)
|
||||
return nvals_perlin, VoxelArea:new{MinEdge=minp, MaxEdge=maxp}
|
||||
end
|
||||
|
||||
mapgen_helper.perlin2d = function(name, minp, maxp, perlin_params)
|
||||
local minx = minp.x
|
||||
local minz = minp.z
|
||||
local sidelen = maxp.x - minp.x + 1 --length of a mapblock
|
||||
local chunk_lengths = {x = sidelen, y = sidelen, z = sidelen} --table of chunk edges
|
||||
|
||||
perlin_buffers[name] = perlin_buffers[name] or {}
|
||||
perlin_buffers[name].nvals_perlin_buffer = perlin_buffers[name].nvals_perlin_buffer or {}
|
||||
|
||||
perlin_buffers[name].nobj_perlin = perlin_buffers[name].nobj_perlin or minetest.get_perlin_map(perlin_params, chunk_lengths)
|
||||
local nvals_perlin = perlin_buffers[name].nobj_perlin:get_2d_map_flat({x=minp.x, y=minp.z}, perlin_buffers[name].nvals_perlin_buffer)
|
||||
|
||||
return nvals_perlin
|
||||
end
|
||||
|
||||
-- similar to iter_xyz, but iterates first along the y axis. Useful in mapgens that want to detect a vertical transition (eg, finding ground level)
|
||||
function VoxelArea:iter_yxz(minx, miny, minz, maxx, maxy, maxz)
|
||||
local i = self:index(minx, miny, minz) - self.ystride
|
||||
@ -141,31 +64,4 @@ function VoxelArea:transform(area, vi)
|
||||
return self:index(x,y,z)
|
||||
end
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
mapgen_helper.index2d = function(minp, maxp, x, z)
|
||||
return x - minp.x +
|
||||
(maxp.x - minp.x + 1) -- sidelen
|
||||
*(z - minp.z)
|
||||
+ 1
|
||||
end
|
||||
|
||||
mapgen_helper.index2dp = function(minp, maxp, pos)
|
||||
return mapgen_helper.index2d(minp, maxp, pos.x, pos.z)
|
||||
end
|
||||
|
||||
-- Takes an index into a 3D area and returns the corresponding 2D index
|
||||
-- assumes equal edge lengths
|
||||
mapgen_helper.index2di = function(minp, maxp, area, vi)
|
||||
local MinEdge = area.MinEdge
|
||||
local zstride = area.zstride
|
||||
local minpx = minp.x
|
||||
local i = vi - 1
|
||||
local z = math.floor(i / zstride) + MinEdge.z
|
||||
local x = math.floor((i % zstride) % area.ystride) + MinEdge.x
|
||||
return x - minpx +
|
||||
(maxp.x - minpx + 1) -- sidelen
|
||||
*(z - minp.z)
|
||||
+ 1
|
||||
end
|
||||
Loading…
x
Reference in New Issue
Block a user