Luanti/fun_caves
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Localize floor.

Browse source
This commit is contained in:
Duane Robertson 2016-05-28 09:16:28 -05:00
parent bde0274123
commit b5088cbffb
1 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

31
mapgen.lua
View file

@ -1,5 +1,8 @@
local DEBUG = false local DEBUG = false
local floor = math.floor
local ceil = math.ceil
local cave_noise_1 = {offset = 0, scale = 1, seed = 3901, spread = {x = 40, y = 10, z = 40}, octaves = 3, persist = 1, lacunarity = 2} local cave_noise_1 = {offset = 0, scale = 1, seed = 3901, spread = {x = 40, y = 10, z = 40}, octaves = 3, persist = 1, lacunarity = 2}
local cave_noise_2 = {offset = 0, scale = 1, seed = -8402, spread = {x = 40, y = 20, z = 40}, octaves = 3, persist = 1, lacunarity = 2} local cave_noise_2 = {offset = 0, scale = 1, seed = -8402, spread = {x = 40, y = 20, z = 40}, octaves = 3, persist = 1, lacunarity = 2}
local cave_noise_3 = {offset = 15, scale = 10, seed = 3721, spread = {x = 40, y = 40, z = 40}, octaves = 3, persist = 1, lacunarity = 2} local cave_noise_3 = {offset = 15, scale = 10, seed = 3721, spread = {x = 40, y = 40, z = 40}, octaves = 3, persist = 1, lacunarity = 2}
@ -46,8 +49,8 @@ end
-- end -- end
-- --
-- if center then -- if center then
-- pos.x = pos.x - math.floor(schem.size.x / 2) -- pos.x = pos.x - floor(schem.size.x / 2)
-- pos.z = pos.z - math.floor(schem.size.z / 2) -- pos.z = pos.z - floor(schem.size.z / 2)
-- end -- end
-- --
-- for z1 = 0, schem.size.z - 1 do -- for z1 = 0, schem.size.z - 1 do
@ -103,25 +106,21 @@ end
-- end -- end
--end --end
fun_caves.is_fortress = function(pos, csize) fun_caves.is_fortress = function(pos, cs)
local cs = csize
if not cs then
-- Fix this to get csize, somehow. -- Fix this to get csize, somehow.
cs = {x=80, y=80, z=80} local cs = cs or {x=80, y=80, z=80}
end
local x = math.floor((pos.x + 33) / cs.x) local y = floor((pos.y + 33) / cs.y)
local y = math.floor((pos.y + 33) / cs.y)
local z = math.floor((pos.z + 33) / cs.z)
if y > -3 or (pos.y + 33) % cs.y > cs.y - 5 then if y > -3 or (pos.y + 33) % cs.y > cs.y - 5 then
return false return false
end end
local n = minetest.get_perlin(fortress_noise):get3d({x=x, y=y, z=z}) local x = floor((pos.x + 33) / cs.x)
n = (n * 10000) % 20 local z = floor((pos.z + 33) / cs.z)
if n == 1 or DEBUG then local n = minetest.get_perlin(fortress_noise):get3d({x=x, y=y, z=z})
if floor((n * 10000) % 20) == 1 or DEBUG then
return true return true
end end
@ -147,7 +146,7 @@ local function generate(p_minp, p_maxp, seed)
local fortress = maxp.y / 3100 local fortress = maxp.y / 3100
if fun_caves.is_fortress(minp, csize) then if fun_caves.is_fortress(minp, csize) then
fun_caves.fortress(node, data, area, minp, maxp, math.ceil(maxp.y / 3100)) fun_caves.fortress(node, data, area, minp, maxp, ceil(maxp.y / 3100))
write = true write = true
else else
local cave_1 = minetest.get_perlin_map(cave_noise_1, csize):get3dMap_flat(minp) local cave_1 = minetest.get_perlin_map(cave_noise_1, csize):get3dMap_flat(minp)
@ -250,10 +249,12 @@ local function generate(p_minp, p_maxp, seed)
end end
-- Deal with memory issues. This, of course, is supposed to be automatic. -- Deal with memory issues. This, of course, is supposed to be automatic.
if math.floor(collectgarbage("count")/1024) > 400 then minetest.after(0, function()
if floor(collectgarbage("count")/1024) > 400 then
print("Fun Caves: Manually collecting garbage...") print("Fun Caves: Manually collecting garbage...")
collectgarbage("collect") collectgarbage("collect")
end end
end)
end end