1
0
Fork 0

greatly boost the speed of horizontal flow

mineclone_compatibility
FaceDeer 2017-01-24 01:02:33 -07:00
parent 480139e2e1
commit 0a550c5c98
1 changed files with 47 additions and 18 deletions

View File

@ -36,17 +36,42 @@ if water then
minetest.register_node(":default:water_flowing", new_water_flowing_def) minetest.register_node(":default:water_flowing", new_water_flowing_def)
end end
local rand_dir = function() -- By making this giant table of all possible permutations of horizontal direction we can avoid
local dirs= { -- lots of redundant calculations.
{x=0,y=0,z=1}, local all_direction_permutations = {
{x=0,y=0,z=-1}, {{x=0,z=1},{x=0,z=-1},{x=1,z=0},{x=-1,z=0}},
{x=1,y=0,z=0}, {{x=0,z=1},{x=0,z=-1},{x=-1,z=0},{x=1,z=0}},
{x=-1,y=0,z=0}, {{x=0,z=1},{x=1,z=0},{x=0,z=-1},{x=-1,z=0}},
} {{x=0,z=1},{x=1,z=0},{x=-1,z=0},{x=0,z=-1}},
return dirs[math.random(4)] {{x=0,z=1},{x=-1,z=0},{x=0,z=-1},{x=1,z=0}},
end {{x=0,z=1},{x=-1,z=0},{x=1,z=0},{x=0,z=-1}},
{{x=0,z=-1},{x=0,z=1},{x=-1,z=0},{x=1,z=0}},
{{x=0,z=-1},{x=0,z=1},{x=1,z=0},{x=-1,z=0}},
{{x=0,z=-1},{x=1,z=0},{x=-1,z=0},{x=0,z=1}},
{{x=0,z=-1},{x=1,z=0},{x=0,z=1},{x=-1,z=0}},
{{x=0,z=-1},{x=-1,z=0},{x=1,z=0},{x=0,z=1}},
{{x=0,z=-1},{x=-1,z=0},{x=0,z=1},{x=1,z=0}},
{{x=1,z=0},{x=0,z=1},{x=0,z=-1},{x=-1,z=0}},
{{x=1,z=0},{x=0,z=1},{x=-1,z=0},{x=0,z=-1}},
{{x=1,z=0},{x=0,z=-1},{x=0,z=1},{x=-1,z=0}},
{{x=1,z=0},{x=0,z=-1},{x=-1,z=0},{x=0,z=1}},
{{x=1,z=0},{x=-1,z=0},{x=0,z=1},{x=0,z=-1}},
{{x=1,z=0},{x=-1,z=0},{x=0,z=-1},{x=0,z=1}},
{{x=-1,z=0},{x=0,z=1},{x=1,z=0},{x=0,z=-1}},
{{x=-1,z=0},{x=0,z=1},{x=0,z=-1},{x=1,z=0}},
{{x=-1,z=0},{x=0,z=-1},{x=1,z=0},{x=0,z=1}},
{{x=-1,z=0},{x=0,z=-1},{x=0,z=1},{x=1,z=0}},
{{x=-1,z=0},{x=1,z=0},{x=0,z=-1},{x=0,z=1}},
{{x=-1,z=0},{x=1,z=0},{x=0,z=1},{x=0,z=-1}},
}
local down = {x=0,y=-1,z=0} -- This method saves us one arithmetic operation over the standard vector.add
-- and doesn't allocate a new table for the output
local horiz_add = function(pos, dir, out)
out.x=pos.x + dir.x
out.y=pos.y
out.z=pos.z + dir.z
end
local liquid_abm = function(liquid, flowing_liquid, chance) local liquid_abm = function(liquid, flowing_liquid, chance)
minetest.register_abm({ minetest.register_abm({
@ -56,18 +81,22 @@ local liquid_abm = function(liquid, flowing_liquid, chance)
chance = chance or 1, chance = chance or 1,
catch_up = false, catch_up = false,
action = function(pos,node) action = function(pos,node)
local check_pos = vector.add(pos, down) local check_pos = {x=pos.x, y=pos.y-1, z=pos.z}
local check_node = minetest.get_node(check_pos) local check_node = minetest.get_node(check_pos)
if check_node.name == flowing_liquid then if check_node.name == flowing_liquid then
minetest.set_node(pos, check_node) minetest.set_node(pos, check_node)
minetest.set_node(check_pos, node) minetest.set_node(check_pos, node)
return return
end end
check_pos = vector.add(pos, rand_dir()) perm = all_direction_permutations[math.random(24)]
check_node = minetest.get_node(check_pos) for i=1,4 do
if check_node.name == flowing_liquid then horiz_add(pos, perm[i], check_pos)
minetest.set_node(pos, check_node) check_node = minetest.get_node(check_pos)
minetest.set_node(check_pos, node) if check_node.name == flowing_liquid then
minetest.set_node(pos, check_node)
minetest.set_node(check_pos, node)
break
end
end end
end end
}) })
@ -77,10 +106,10 @@ if lava then
liquid_abm("default:lava_source", "default:lava_flowing", lava_probability) liquid_abm("default:lava_source", "default:lava_flowing", lava_probability)
end end
if water then if water then
liquid_abm("default:water_source", "default:water_flowing", nil) liquid_abm("default:water_source", "default:water_flowing", 1)
end end
if river_water then if river_water then
liquid_abm("default:river_water_source", "default:river_water_flowing", nil) liquid_abm("default:river_water_source", "default:river_water_flowing", 1)
end end
-- register damp clay whether we're going to set the ABM or not, if the user disables this feature we don't want existing -- register damp clay whether we're going to set the ABM or not, if the user disables this feature we don't want existing