mtcontrib/mapgen_rivers
1
0
Fork 0
mirror of https://gitlab.com/gaelysam/mapgen_rivers.git synced 2024-12-28 20:00:41 +01:00
Code Issues Projects Releases Wiki Activity

terrainlib/rivermapper.lua: Move checks out of the nested function

Browse Source
This commit is contained in:
Gaël C 2024-01-21 22:34:53 +01:00
parent fe6e281130
commit c723b28ec6
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
terrainlib_lua/rivermapper.lua
View File

@ -98,30 +98,20 @@ local function flow_routing(dem, dirs, lakes) -- 'dirs' and 'lakes' are optional
-- i1, i2: coordinates of two nodes -- i1, i2: coordinates of two nodes
-- b1: basin that contains i1 -- b1: basin that contains i1
-- isY: whether the link is in Y direction -- isY: whether the link is in Y direction
local b2
-- Note that basin number #0 represents the outside of the map; or if the coordinate is inside the map, means that the basin number is uninitialized. -- Note that basin number #0 represents the outside of the map; or if the coordinate is inside the map, means that the basin number is uninitialized.
if i2 == 0 then -- If outside the map local b2 = i2 == 0 and 0 or basin_id[i2]
b2 = 0 local elev = i2 == 0 and dem[i1] or mmax(dem[i1], dem[i2]) -- Elevation of the highest of the two sides of the link (or only i1 if b2 is map outside)
else local l2 = basin_links[b2]
b2 = basin_id[i2] if not l2 then
if b2 == 0 then -- If basin of i2 is not already computed, skip l2 = {}
return basin_links[b2] = l2
end
end end
if b2 ~= b1 then -- If these two nodes don't belong to the same basin, we have found a link between two adjacent basins if not l2.elev or l2.elev > elev then -- If this link is lower than the lowest registered link between these two basins, register it as the new lowest pass
local elev = i2 == 0 and dem[i1] or mmax(dem[i1], dem[i2]) -- Elevation of the highest of the two sides of the link (or only i1 if b2 is map outside) l2.elev = elev
local l2 = basin_links[b2] l2.i = mmax(i1,i2)
if not l2 then l2.is_y = isY
l2 = {} l2[1] = b2
basin_links[b2] = l2 l2[2] = b1
end
if not l2.elev or l2.elev > elev then -- If this link is lower than the lowest registered link between these two basins, register it as the new lowest pass
l2.elev = elev
l2.i = mmax(i1,i2)
l2.is_y = isY
l2[1] = b2
l2[2] = b1
end
end end
end end
@ -149,7 +139,9 @@ local function flow_routing(dem, dirs, lakes) -- 'dirs' and 'lakes' are optional
singular[cur] = i+1 singular[cur] = i+1
-- If no river is coming from the East, we might be at the limit of two basins, thus we need to test adjacency. -- If no river is coming from the East, we might be at the limit of two basins, thus we need to test adjacency.
elseif i%X > 0 then elseif i%X > 0 then
add_link(i, i+1, ib, false) if basin_id[i+1] ~= ib and basin_id[i+1] ~= 0 then
add_link(i, i+1, ib, false)
end
else -- If the eastern neighbour is outside the map else -- If the eastern neighbour is outside the map
add_link(i, 0, ib, false) add_link(i, 0, ib, false)
end end
@ -159,7 +151,9 @@ local function flow_routing(dem, dirs, lakes) -- 'dirs' and 'lakes' are optional
cur = cur + 1 cur = cur + 1
singular[cur] = i+X singular[cur] = i+X
elseif i <= X*(Y-1) then elseif i <= X*(Y-1) then
add_link(i, i+X, ib, true) if basin_id[i+X] ~= ib and basin_id[i+X] ~= 0 then
add_link(i, i+X, ib, true)
end
else else
add_link(i, 0, ib, true) add_link(i, 0, ib, true)
end end
@ -169,7 +163,9 @@ local function flow_routing(dem, dirs, lakes) -- 'dirs' and 'lakes' are optional
cur = cur + 1 cur = cur + 1
singular[cur] = i-1 singular[cur] = i-1
elseif i%X ~= 1 then elseif i%X ~= 1 then
add_link(i, i-1, ib, false) if basin_id[i-1] ~= ib and basin_id[i-1] ~= 0 then
add_link(i, i-1, ib, false)
end
else else
add_link(i, 0, ib, false) add_link(i, 0, ib, false)
end end
@ -178,7 +174,9 @@ local function flow_routing(dem, dirs, lakes) -- 'dirs' and 'lakes' are optional
cur = cur + 1 cur = cur + 1
singular[cur] = i-X singular[cur] = i-X
elseif i > X then elseif i > X then
add_link(i, i-X, ib, true) if basin_id[i-X] ~= ib and basin_id[i-X] ~= 0 then
add_link(i, i-X, ib, true)
end
else else
add_link(i, 0, ib, true) add_link(i, 0, ib, true)
end end