Skip to content

Commit ddcdc74

Browse files
UberiUberi
committedJun 2, 2013
Merge pull request #103 from Novatux/globalstep
Change mesecons signals so that they update effectors only after a globalstep
2 parents fa0cf15 + 62a8ae2 commit ddcdc74

File tree

4 files changed

+116
-14
lines changed

4 files changed

+116
-14
lines changed
 

‎mesecons/init.lua

+16-2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ mesecon.receptors={} -- saves all information about receptors | DEPRECATED
4949
mesecon.effectors={} -- saves all information about effectors | DEPRECATED
5050
mesecon.conductors={} -- saves all information about conductors | DEPRECATED
5151

52+
53+
mesecon.to_update = {}
54+
mesecon.r_to_update = {}
55+
5256
-- Settings
5357
dofile(minetest.get_modpath("mesecons").."/settings.lua")
5458

@@ -76,7 +80,7 @@ dofile(minetest.get_modpath("mesecons").."/legacy.lua");
7680
-- API
7781
-- these are the only functions you need to remember
7882

79-
function mesecon:receptor_on(pos, rules)
83+
function mesecon:receptor_on_i(pos, rules)
8084
rules = rules or mesecon.rules.default
8185

8286
for _, rule in ipairs(rules) do
@@ -88,7 +92,12 @@ function mesecon:receptor_on(pos, rules)
8892
end
8993
end
9094

91-
function mesecon:receptor_off(pos, rules)
95+
function mesecon:receptor_on(pos, rules)
96+
rules = rules or mesecon.rules.default
97+
mesecon.r_to_update[#mesecon.r_to_update+1]={pos=pos, rules=rules, action="on"}
98+
end
99+
100+
function mesecon:receptor_off_i(pos, rules)
92101
rules = rules or mesecon.rules.default
93102

94103
for _, rule in ipairs(rules) do
@@ -104,6 +113,11 @@ function mesecon:receptor_off(pos, rules)
104113
end
105114
end
106115

116+
function mesecon:receptor_off(pos, rules)
117+
rules = rules or mesecon.rules.default
118+
mesecon.r_to_update[#mesecon.r_to_update+1]={pos=pos, rules=rules, action="off"}
119+
end
120+
107121

108122
print("[OK] Mesecons")
109123

‎mesecons/internal.lua

+96-9
Original file line numberDiff line numberDiff line change
@@ -180,24 +180,111 @@ end
180180
--Signals
181181

182182
function mesecon:activate(pos, node, rulename)
183-
local effector = mesecon:get_effector(node.name)
184-
if effector and effector.action_on then
185-
effector.action_on (pos, node, rulename)
183+
if rulename == nil then
184+
for _,rule in ipairs(mesecon:effector_get_rules(node)) do
185+
mesecon:activate(pos, node, rule)
186+
end
187+
return
188+
end
189+
if MESECONS_GLOBALSTEP then
190+
add_action(pos, "on", rulename)
191+
else
192+
local effector = mesecon:get_effector(node.name)
193+
if effector and effector.action_on then
194+
effector.action_on (pos, node, rulename)
195+
end
186196
end
187197
end
188198

189199
function mesecon:deactivate(pos, node, rulename)
190-
local effector = mesecon:get_effector(node.name)
191-
if effector and effector.action_off then
192-
effector.action_off (pos, node, rulename)
200+
if rulename == nil then
201+
for _,rule in ipairs(mesecon:effector_get_rules(node)) do
202+
mesecon:deactivate(pos, node, rule)
203+
end
204+
return
205+
end
206+
if MESECONS_GLOBALSTEP then
207+
add_action(pos, "off", rulename)
208+
else
209+
local effector = mesecon:get_effector(node.name)
210+
if effector and effector.action_off then
211+
effector.action_off (pos, node, rulename)
212+
end
193213
end
194214
end
195215

196216
function mesecon:changesignal(pos, node, rulename, newstate)
197-
local effector = mesecon:get_effector(node.name)
198-
if effector and effector.action_change then
199-
effector.action_change (pos, node, rulename, newstate)
217+
218+
newstate = newstate or "on"
219+
--rulename = rulename or mesecon.rules.default
220+
if rulename == nil then
221+
for _,rule in ipairs(mesecon:effector_get_rules(node)) do
222+
mesecon:changesignal(pos, node, rule, newstate)
223+
end
224+
return
225+
end
226+
if MESECONS_GLOBALSTEP then
227+
add_action(pos, "c"..newstate, rulename)
228+
else
229+
local effector = mesecon:get_effector(node.name)
230+
if effector and effector.action_change then
231+
effector.action_change (pos, node, rulename, newstate)
232+
end
233+
end
234+
end
235+
236+
function execute_actions(dtime)
237+
local nactions = mesecon.to_update
238+
mesecon.to_update = {}
239+
for _,i in ipairs(nactions) do
240+
node = minetest.env:get_node(i.pos)
241+
effector = mesecon:get_effector(node.name)
242+
if i.action == "on" then
243+
if effector and effector.action_on then
244+
effector.action_on(i.pos, node, i.rname)
245+
end
246+
elseif i.action == "off" then
247+
if effector and effector.action_off then
248+
effector.action_off(i.pos, node, i.rname)
249+
end
250+
elseif i.action == "con" then
251+
if effector and effector.action_change then
252+
effector.action_change(i.pos, node, i.rname, "on")
253+
end
254+
elseif i.action == "coff" then
255+
if effector and effector.action_change then
256+
effector.action_change(i.pos, node, i.rname, "off")
257+
end
258+
end
259+
end
260+
local nactions = mesecon.r_to_update
261+
mesecon.r_to_update = {}
262+
for _,i in ipairs(nactions) do
263+
if i.action == "on" then
264+
mesecon:receptor_on_i(i.pos, i.rules)
265+
else
266+
mesecon:receptor_off_i(i.pos,i.rules)
267+
end
268+
end
269+
end
270+
271+
minetest.register_globalstep(execute_actions)
272+
273+
function add_action(pos, action, rname)
274+
for _,i in ipairs(mesecon.to_update) do
275+
if i.pos.x == pos.x and i.pos.y == pos.y and i.pos.z == pos.z and i.rname.x == rname.x and i.rname.y == rname.y and i.rname.z == rname.z then
276+
if (i.action == "on" and action == "on") or (i.action == "off" and action == "off") then
277+
--nothing
278+
elseif i.action == "coff" and action == "on" then i.action = "on"
279+
elseif i.action == "con" and action == "off" then i.action = "off"
280+
else
281+
if action == "on" or action == "con" then i.action = "con" end
282+
if action == "off" or action == "coff" then i.action = "coff" end
283+
end
284+
break
285+
end
200286
end
287+
mesecon.to_update[#mesecon.to_update+1] = {pos = pos, action = action, rname = rname}
201288
end
202289

203290
--Rules

‎mesecons/services.lua

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
mesecon.on_placenode = function (pos)
2-
local node = minetest.env:get_node(pos)
1+
mesecon.on_placenode = function (pos, node)
32
if mesecon:is_receptor_on(node.name) then
43
mesecon:receptor_on(pos, mesecon:receptor_get_rules(node))
54
elseif mesecon:is_powered(pos) then
65
if mesecon:is_conductor(node.name) then
76
mesecon:turnon (pos)
87
mesecon:receptor_on (pos, mesecon:conductor_get_rules(node))
98
else
10-
mesecon:changesignal(pos, node)
9+
mesecon:changesignal(pos, node, mesecon:effector_get_rules(node), "on")
1110
mesecon:activate(pos, node)
1211
end
1312
elseif mesecon:is_conductor_on(node.name) then

‎mesecons/settings.lua

+2
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ PRESSURE_PLATE_INTERVAL = 0.1
55
OBJECT_DETECTOR_RADIUS = 6
66
PISTON_MAXIMUM_PUSH = 15
77
MOVESTONE_MAXIMUM_PUSH = 100
8+
MESECONS_GLOBALSTE = true -- true = receptors/effectors won't be updated
9+
-- until next globalstep, decreases server load

0 commit comments

Comments
 (0)
Please sign in to comment.