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

Fix maze algorithm.

Browse source
This commit is contained in:
Duane Robertson 2016-05-26 10:10:36 -05:00
parent 660023553b
commit f5ed9d1cb2
2 changed files with 71 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

150
fortress.lua
View file

@ -1,125 +1,77 @@
fun_caves.fortress = function(node, data, area, minp, maxp, level) fun_caves.fortress = function(node, data, area, minp, maxp, level)
for z = minp.z, maxp.z do
for x = minp.x, maxp.x do
ivm = area:index(x, minp.y, z)
for y = minp.y, maxp.y do
if x == minp.x or x == maxp.x or z == minp.z or z == maxp.z then
data[ivm] = node('default:steelblock')
elseif (y - minp.y) % 5 == 0 then
data[ivm] = node('default:steelblock')
else
data[ivm] = node('air')
end
ivm = ivm + area.ystride
end
end
end
local n = 16 local n = 16
local walls = {} local walls = {}
local a, b, c, i, j, u, v, x, y, z, ivm, set, dox, doz
for y2 = 0, n-1 do for y2 = 0, n-1 do
for i = 1, 2 * n * n do --for y2 = 0, 0 do
-- walls is zero-based.
for i = 0, 2 * n * n - 1 do
walls[i] = i walls[i] = i
end end
table.shuffle(walls) table.shuffle(walls)
local set = unionfind(n * n) dox, doz = math.random(0, n-1), math.random(0, n-1)
local a, b, c, i, j, u, v for z = minp.z, maxp.z do
for y = minp.y + y2 * 5, minp.y + y2 * 5 + 4 do
ivm = area:index(minp.x, y, z)
for x = minp.x, maxp.x do
if (y - minp.y) % 5 == 0 then
if math.floor((z - minp.z) / 5) == doz and math.floor((x - minp.x) / 5) == dox and (z - minp.z) % 5 ~= 0 and (x - minp.x) % 5 ~= 0 and y ~= minp.y then
data[ivm] = node("air")
else
data[ivm] = node('default:steelblock')
end
elseif x == minp.x or z == minp.z or x == maxp.x or z == maxp.z then
data[ivm] = node('default:steelblock')
elseif (z - minp.z) % 5 == 0 or (x - minp.x) % 5 == 0 then
data[ivm] = node("default:sandstone")
else
data[ivm] = node("air")
end
ivm = ivm + 1
end
end
end
for m = 1, #walls do set = unionfind(n * n)
c = walls[m] - 1
for m = 0, #walls do
c = walls[m]
a = math.floor(c / 2) a = math.floor(c / 2)
i = a % n i = a % n
j = math.floor(a / n) j = math.floor(a / n)
u = c % 2 == 0 and 1 or 0 u = c % 2 == 0 and 1 or 0
v = c % 2 == 1 and 1 or 0 v = c % 2 == 1 and 1 or 0
b = a + u + n * v b = a + u + n * v
if i < n - u and j < n - v and set:find(a+1) ~= set:find(b+1) then if i < n - u and j < n - v and set:find(a) ~= set:find(b) then
set:union(a+1, b+1) set:union(a, b)
x = (i + u) * 5 + minp.x x = (i + u) * 5 + minp.x
y = minp.y + y2 * 5 y = minp.y + y2 * 5
z = (j + v) * 5 + minp.z z = (j + v) * 5 + minp.z
if y > minp.y and math.random(20) == 1 then --if y > minp.y and math.random(20) == 1 then
for z1 = z + 1, z + 4 do -- for z1 = z + 1, z + 4 do
ivm = area:index(x+1, y, z1) -- ivm = area:index(x+1, y, z1)
for x1 = x + 1, x + 4 do -- for x1 = x + 1, x + 4 do
data[ivm] = node("air") -- data[ivm] = node("air")
ivm = ivm + 1
end
end
end
for z1 = z, z + (1-v) * 5 do
for y1 = y + 1, y + 4 do
ivm = area:index(x, y1, z1)
for x1 = x, x + (1-u) * 5 do
data[ivm] = node("default:sandstone")
ivm = ivm + 1
end
end
end
end
end
end
--local n = 16
--local walls = {}
--for i = 1, 3 * n * n * n do
-- walls[i] = i
--end
--table.shuffle(walls)
--local set = unionfind(n * n * n)
--local a, b, c, i, j, k, u, v, w
--for m = 1, #walls do
-- c = walls[m] - 1
-- a = math.floor(c / 3)
-- i = a % n
-- j = math.floor(a / n) % n
-- k = math.floor(math.floor(a / n) / n)
-- u = c % 3 == 0 and 1 or 0
-- v = c % 3 == 1 and 1 or 0
-- w = c % 3 == 2 and 1 or 0
-- b = a + u + n * (v + n * w)
-- if i < n - u and j < n - v and k < n - w and set:find(a+1) ~= set:find(b+1) then
-- set:union(a+1, b+1)
-- x = (i + u) * 5 + minp.x
-- y = (j + v) * 5 + minp.y
-- z = (k + w) * 5 + minp.z
-- for z1 = z, z + (1-w) * 5 do
-- for y1 = y, y + (1-v) * 5 do
-- ivm = area:index(x, y1, z1)
-- for x1 = x, x + (1-u) * 5 do
-- data[ivm] = node("default:steelblock")
-- ivm = ivm + 1 -- ivm = ivm + 1
-- end -- end
-- end -- end
--end --end
-- end
--end
--local index = 0 for z1 = z + (1-v), z + (1-v) * 4 do
--local index3d = 0 for y1 = y + 1, y + 4 do
--for z = minp.z, maxp.z do ivm = area:index(x + (1-u), y1, z1)
-- for x = minp.x, maxp.x do for x1 = x + (1-u), x + (1-u) * 4 do
-- index = index + 1 if x1 < maxp.x and z1 < maxp.z and x1 > minp.x and z1 > minp.z then
-- --index3d = noise_area:index(x - minp.x, 0, z - minp.z) data[ivm] = node("air")
-- ivm = area:index(x, minp.y, z) end
-- for y = minp.y, maxp.y do ivm = ivm + 1
-- if x == minp.x or x == maxp.x or z == minp.z or z == maxp.z or y == minp.y or y == maxp.y then end
-- data[ivm] = node("default:steelblock") end
-- elseif (y - minp.y) % 5 == 0 then end
-- data[ivm] = node("default:stone") end
-- else end
-- data[ivm] = node("air") end
-- end
-- ivm = ivm + area.ystride
-- --index3d = index3d + csize.x
-- end
-- end
--end
end end

28
unionfind.lua
View file

@ -1,9 +1,12 @@
-- All arrays are zero-based.
function table.shuffle(self) function table.shuffle(self)
local j local j
local t = self local t = self
for i = #t, 2, -1 do for i = #t, 1, -1 do
j = math.random(i) j = math.random(0, i)
t[i], t[j] = t[j], t[i] t[i], t[j] = t[j], t[i]
end end
end end
@ -12,9 +15,9 @@ end
function unionfind(max) function unionfind(max)
local u = { _parent = {}, _rank = {} } local u = { _parent = {}, _rank = {} }
for i = 1, max do for i = 0, max-1 do
u._parent[i] = i u._parent[i] = i
u._rank[i] = 1 u._rank[i] = 0
end end
u.find = function(self, i) u.find = function(self, i)
@ -27,6 +30,8 @@ function unionfind(max)
end end
u.union = function(self, i, j) u.union = function(self, i, j)
i = i or 0
j = j or 0
local root1 = self:find(i) local root1 = self:find(i)
local root2 = self:find(j) local root2 = self:find(j)
@ -46,3 +51,18 @@ function unionfind(max)
return u return u
end end
--local u = unionfind(5)
--print(dump(u))
--u:union(1,2)
--print(dump(u))
--u:union(1,2)
--print(dump(u))
--u:union(3,4)
--print(dump(u))
--u:union(1,0)
--print(dump(u))
--u:union(1,3)
--print(dump(u))
--u:union(4)
--print(dump(u))