nalc/mesecons
1
0
Fork 0
forked from minetest-mods/mesecons
Code Issues Pull Requests Projects Releases Wiki Activity

Fix conductor lighting when aliases are used (#582)

Browse Source
This commit is contained in:
Jude Melton-Houghton 2022-01-29 19:23:53 -05:00 committed by GitHub
parent 4eea0834b5
commit 4c5b13a347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mesecons/internal.lua
View File

@ -372,7 +372,6 @@ end
local light_update_conductors local light_update_conductors
-- Calculate the contents of the above set if they have not been calculated. -- Calculate the contents of the above set if they have not been calculated.
-- This must be called before get_update_light_conductor.
local function find_light_update_conductors() local function find_light_update_conductors()
-- The expensive calculation is only done the first time. -- The expensive calculation is only done the first time.
if light_update_conductors then return end if light_update_conductors then return end
@ -415,12 +414,6 @@ local function find_light_update_conductors()
end end
end end
-- This is the callback for swap_node_force in turnon and turnoff. It determines
-- whether a conductor node necessitates a lighting update.
local function get_update_light_conductor(pos, name)
return light_update_conductors[name] ~= nil
end
-- Turn off an equipotential section starting at `pos`, which outputs in the direction of `link`. -- Turn off an equipotential section starting at `pos`, which outputs in the direction of `link`.
-- Breadth-first search. Map is abstracted away in a voxelmanip. -- Breadth-first search. Map is abstracted away in a voxelmanip.
-- Follow all all conductor paths replacing conductors that were already -- Follow all all conductor paths replacing conductors that were already
@ -453,7 +446,7 @@ function mesecon.turnon(pos, link)
end end
end end
mesecon.swap_node_force(f.pos, mesecon.get_conductor_on(node, f.link), get_update_light_conductor) mesecon.swap_node_force(f.pos, mesecon.get_conductor_on(node, f.link), light_update_conductors[node.name] ~= nil)
end end
-- Only conductors with flat rules can be reliably skipped later -- Only conductors with flat rules can be reliably skipped later
@ -527,7 +520,7 @@ function mesecon.turnoff(pos, link)
end end
end end
mesecon.swap_node_force(f.pos, mesecon.get_conductor_off(node, f.link), get_update_light_conductor) mesecon.swap_node_force(f.pos, mesecon.get_conductor_off(node, f.link), light_update_conductors[node.name] ~= nil)
end end
-- Only conductors with flat rules can be reliably skipped later -- Only conductors with flat rules can be reliably skipped later

16
mesecons/util.lua
View File

@ -389,10 +389,10 @@ end
-- --
-- Existing param1, param2, and metadata are left alone. -- Existing param1, param2, and metadata are left alone.
-- --
-- See mesecon.swap_node_force for documentation about get_update_light. -- The swap will necessitate a light update unless update_light equals false.
function mesecon.vm_swap_node(pos, name, get_update_light) function mesecon.vm_swap_node(pos, name, update_light)
local tbl = vm_get_or_create_entry(pos) local tbl = vm_get_or_create_entry(pos)
tbl.update_light = tbl.update_light or (get_update_light == nil or get_update_light(pos, name)) tbl.update_light = update_light ~= false or tbl.update_light
local index = tbl.va:indexp(pos) local index = tbl.va:indexp(pos)
tbl.data[index] = minetest.get_content_id(name) tbl.data[index] = minetest.get_content_id(name)
tbl.dirty = true tbl.dirty = true
@ -426,15 +426,15 @@ end
-- Outside a VM transaction, if the mapblock is not loaded, it is pulled into -- Outside a VM transaction, if the mapblock is not loaded, it is pulled into
-- the server’s main map data cache and then accessed from there. -- the server’s main map data cache and then accessed from there.
-- --
-- Inside a VM transaction, the transaction’s VM cache is used. If a third -- Inside a VM transaction, the transaction’s VM cache is used.
-- argument is supplied, it may be called. If it returns false, the swap does
-- not necessitate a lighting update.
-- --
-- This function can only be used to change the node’s name, not its parameters -- This function can only be used to change the node’s name, not its parameters
-- or metadata. -- or metadata.
function mesecon.swap_node_force(pos, name, get_update_light) --
-- The swap will necessitate a light update unless update_light equals false.
function mesecon.swap_node_force(pos, name, update_light)
if vm_cache then if vm_cache then
return mesecon.vm_swap_node(pos, name, get_update_light) return mesecon.vm_swap_node(pos, name, update_light)
else else
-- This serves to both ensure the mapblock is loaded and also hand us -- This serves to both ensure the mapblock is loaded and also hand us
-- the old node table so we can preserve param2. -- the old node table so we can preserve param2.