make sim use proper OOP

sim/compile.lua

@@ -9,15 +9,15 @@ ffi.cdef([[
 ]])
 
 function Simulation.compile(sim)
-	-- assemble a list of all groups
+	-- assemble a list of all nets
-	local groups = {}
+	local all_nets = {}
 	for wire_idx, wire in pairs(sim.wires) do
-		local group = Wire.getgroup(wire)
+		local net = Wire.getgroup(wire)
-		groups[group] = group
+		all_nets[net] = net
 	end
-	local num_groups = 0
+	local num_nets = 0
-	for group_id, group in pairs(groups) do
+	for net_id, net in pairs(all_nets) do
-		num_groups = num_groups+1
+		num_nets = num_nets+1
 	end
 	
 	-- construct each gate into an array

sim/gate.lua

@@ -38,18 +38,22 @@ function Gate.getportisrising(self, index)
 	return Port.isrising(self.ports[index])
 end
 
-function Gate:getportisfalling(index)
+function Gate.getportisfalling(self, index)
 	return Port.isfalling(self.ports[index])
 end
 
 function Gate.cb(gate, ...)
-	Simulation.queuecallback(gate.sim, gate, ...)
+	Simulation.queuecallback(Gate.getsim(gate), gate, ...)
 end
 
-function Gate.queue(self, delay)
+function Gate.queue(gate, delay)
-	Simulation.queuegatelater(self.sim, self, delay)
+	Simulation.queuegatelater(Gate.getsim(gate), gate, delay)
 end
 
 function Gate.gettick(gate)
-	return gate.sim.currenttick
+	return Gate.getsim(gate).currenttick
+end
+
+function Gate.getsim(gate)
+	return gate.sim
 end

sim/gatedef.lua

@@ -84,7 +84,7 @@ function GateDefinition.constructgate(self, objref, position, rotation, sim)
 			pos[2] = x
 		end
 
-		Gate.addport(gate, Port.new(Port, type, dir, {position[1]+pos[1], position[2]+pos[2], position[3]+pos[3]}, portd.causeupdate, gate.sim))
+		Gate.addport(gate, Port.new(Port, type, dir, {position[1]+pos[1], position[2]+pos[2], position[3]+pos[3]}, portd.causeupdate, Gate.getsim(gate)))
 	end
 
 	return gate

sim/group.lua

@@ -35,7 +35,7 @@ function Group.addwire(self, wire)
 			
 			Wire.setgroup(wire, self)
 			Wire.update(wire)
-			Simulation.queuegroup(self.sim, self)
+			Simulation.queuegroup(Group.getsim(self), self)
 		end
 	end
 end
@@ -43,35 +43,37 @@ end
 function Group.removewire(self, wire)
 	Wire.setgroup(wire, nil)
 	self.wires[wire] = nil
-
+	
+	local sim = Group.getsim(self)
+	
 	for k, wire in pairs(self.wires) do
 		Wire.setgroup(wire, nil)
 	end
-
+	
 	for k, port in pairs(self.out_ports) do
 		Port.setgroup(port, nil)
 	end
-
+	
 	for k, port in pairs(self.in_ports) do
 		Port.setgroup(port, nil)
 	end
-
+	
 	for k, wire in pairs(self.wires) do
-		Simulation.connectwire(self.sim, wire)
+		Simulation.connectwire(sim. wire)
 	end
-
+	
 	for k, port in pairs(self.out_ports) do
-		Simulation.connectport(self.sim, port)
+		Simulation.connectport(sim, port)
 	end
-
+	
 	for k, port in pairs(self.in_ports) do
-		Simulation.connectport(self.sim, port)
+		Simulation.connectport(sim, port)
 	end
-
+	
 	self.wires = {}
 	self.out_ports = {}
 	self.in_ports = {}
-
+	
 	self.nwires = 0
 	self.nout_ports = 0
 	self.nin_ports = 0
@@ -83,7 +85,7 @@ function Group.addport(self, port)
 	if port.type == PortTypes.output then
 		self.out_ports[port] = port
 		self.nout_ports = self.nout_ports + 1
-		self.sim:queuegroup(self)
+		Simulation.queuegroup(Group.getsim(self), self)
 	elseif port.type == PortTypes.input then
 		self.in_ports[port] = port
 		self.nin_ports = self.nin_ports + 1
@@ -100,11 +102,11 @@ function Group.removeport(self, port)
 		self.nin_ports = self.nin_ports - 1
 	end
 
-	Simulation.queuegroup(self.sim, self)
+	Simulation.queuegroup(Group.getsim(self), self)
 end
 
 function Group.mergewith(self, group)
-	if self:getsize() >= group:getsize() then
+	if Group.getsize(self) >= Group.getsize(group) then
 		Group.mergeinto(group, self)
 		return self
 	else
@@ -139,12 +141,16 @@ end
 function Group.setstate(self, state)
 	if state ~= self.state then
 		self.state = state
-		self.updatetick = self.sim.currenttick
+		self.updatetick = Group.getsim(self).currenttick
 		
 		for k, port in pairs(self.in_ports) do
 			Port.setinputstate(port, state)
 		end
 		
-		Simulation.queuegroupfx(self.sim, self)
+		Simulation.queuegroupfx(Group.getsim(self), self)
 	end
 end
+
+function Group.getsim(group)
+	return group.sim
+end

sim/main.lua

@@ -48,7 +48,7 @@ local lastfxtime = 0
 local avgticks = {}
 local totalticks = 0
 
-local sim = Simulation:new()
+local sim = Simulation.new(Simulation)
 
 local units = {
 	"uHz",
@@ -322,12 +322,12 @@ while 1 do
 			
 			if OPT_TICK_TIME==0 then
 				for i = 1, OPT_TICK_INF do
-					sim:tick()
+					Simulation.tick(sim)
 				end
 				ticks = ticks+OPT_TICK_INF
 			else
 				for i = 1, OPT_TICK_MULT do
-					sim:tick()
+					Simulation.tick(sim)
 					ticks = ticks+1
 					
 					local elapsed = os.clock()-time

sim/port.lua

@@ -36,7 +36,7 @@ end
 function Port.setstate(port, state)
 	if state ~= port.state then
 		port.state = state
-		Simulation.queuegroup(port.sim, port.group)
+		Simulation.queuegroup(Port.getsim(port), port.group)
 	end
 end
 
@@ -44,46 +44,50 @@ function Port.setinputstate(port, state)
 	if state ~= port.state then
 		port.state = state
 		if port.causeupdate then
-			Simulation.queuegate(port.sim, port.gate)
+			Simulation.queuegate(Port.getsim(port), port.gate)
 		end
 	end
 end
 
-function Port.getconnectionposition(self)
+function Port.getconnectionposition(port)
-	local offset = PortDirections[self.direction]
+	local offset = PortDirections[port.direction]
-	return {self.position[1]+offset[1], self.position[2]+offset[2], self.position[3]+offset[3]}
+	return {port.position[1]+offset[1], port.position[2]+offset[2], port.position[3]+offset[3]}
 end
 
-function Port.isrising(self)
+function Port.isrising(port)
-	if self.group == nil then
+	if port.group == nil then
 		return false
 	end
-	return self.group.state and (self.group.updatetick == self.sim.currenttick)
+	return port.group.state and (port.group.updatetick == Port.getsim(port).currenttick)
 end
 
-function Port.isfalling(self)
+function Port.isfalling(port)
-	if self.group == nil then
+	if port.group == nil then
 		return false
 	end
-	return self.group.state == false and (self.group.updatetick == self.sim.currenttick)
+	return port.group.state == false and (port.updatetick == Port.getsim(port).currenttick)
 end
 
-function Port.setgate(self, gate)
+function Port.setgate(port, gate)
-	self.gate = gate
+	port.gate = gate
 end
 
-function Port.setgroup(self, group)
+function Port.setgroup(port, group)
-	self.group = group
+	port.group = group
 end
 
-function Port.getgroup(self)
+function Port.getgroup(port)
-	return self.group
+	return port.group
 end
 
-function Port.gettype(self)
+function Port.gettype(port)
-	return self.type
+	return port.type
 end
 
-function Port.getstate(self)
+function Port.getstate(port)
-	return self.state
+	return port.state
+end
+
+function Port.getsim(port)
+	return port.sim
 end

sim/simulation.lua

@@ -213,7 +213,7 @@ end
 
 function Simulation.connectport(self, port)
 	local connpos = Port.getconnectionposition(port)
-	local objs = self:getfromworld(connpos[1], connpos[2], connpos[3])
+	local objs = Simulation.getfromworld(self, connpos[1], connpos[2], connpos[3])
 	for k, obj in pairs(objs) do
 		if obj ~= port and obj.group ~= nil then
 			Group.addport(obj.group, port)

sim/wire.lua

@@ -21,7 +21,7 @@ function Wire.setlayer(self, layer)
 		Group.removewire(self.group, self)
 	end
 	self.layer = layer
-	Simulation.connectwire(self.sim, self)
+	Simulation.connectwire(Wire.getsim(self), self)
 end
 
 function Wire.update(self)
@@ -47,3 +47,7 @@ end
 function Wire.getbounds(self)
 	return self.bounds
 end
+
+function Wire.getsim(wire)
+	return wire.sim
+end