redo/lua-logic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wire function arguments

Browse Source
This commit is contained in:
Redo 2021-05-10 19:26:38 -05:00
parent bb353118ac
commit ec2a7cc53f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sim/main.lua
View File

@ -151,7 +151,7 @@ while 1 do
local position = vectotable(data[i+3]) local position = vectotable(data[i+3])
local rotation = tonumber(data[i+4]) local rotation = tonumber(data[i+4])
local gate = GateDefitinion.constructgate(definition, objref, position, rotation) local gate = GateDefinition.constructgate(definition, objref, position, rotation)
Simulation.addgate(sim, gate) Simulation.addgate(sim, gate)
--print(gate.objref) --print(gate.objref)
@ -192,7 +192,7 @@ while 1 do
if not portd.direction then print(line) end if not portd.direction then print(line) end
end end
local definition = GateDefinition.new(GateDefitinion, objref, name, desc, init, logic, input, global, ports) local definition = GateDefinition.new(GateDefinition, objref, name, desc, init, logic, input, global, ports)
Simulation.addgatedefinition(sim, definition) Simulation.addgatedefinition(sim, definition)
i = i + 8 + numports*5 i = i + 8 + numports*5
@ -251,11 +251,11 @@ while 1 do
local info = "" local info = ""
if obj.logictype == 0 then if obj.logictype == 0 then
local numportsi = 0; for k, wire in pairs(obj.group.in_ports ) do numportsi = numportsi+1 end local numportsi = 0; for k, wire in pairs(Wire.getgroup(obj).in_ports ) do numportsi = numportsi+1 end
local numportso = 0; for k, wire in pairs(obj.group.out_ports) do numportso = numportso+1 end local numportso = 0; for k, wire in pairs(Wire.getgroup(obj).out_ports) do numportso = numportso+1 end
local numwires = 0; for k, wire in pairs(obj.group.wires ) do numwires = numwires +1 end local numwires = 0; for k, wire in pairs(Wire.getgroup(obj).wires ) do numwires = numwires +1 end
info = "\\c5Net " .. tostring(obj.group):match("table: 0x(.+)"):upper() .. "\n" .. (obj.group.state and "\\c2On" or "\\c0Off") .. "\n" .. info = "\\c5Net " .. tostring(obj.group):match("table: 0x(.+)"):upper() .. "\n" .. (Wire.getgroup(obj).state and "\\c2On" or "\\c0Off") .. "\n" ..
"Wires: "..numwires.."\n".. "Wires: "..numwires.."\n"..
"In Ports: " ..numportsi.."\n".. "In Ports: " ..numportsi.."\n"..
"Out Ports: "..numportso "Out Ports: "..numportso

4
sim/wire.lua
View File

@ -39,10 +39,10 @@ function Wire.getobjref(self)
return self.objref return self.objref
end end
function Wire.getlayer() function Wire.getlayer(self)
return self.layer return self.layer
end end
function Wire.getbounds(wire) function Wire.getbounds(self)
return self.bounds return self.bounds
end end