Some more work on system-instance interaction

fluid/eventManager.lua

@@ -45,7 +45,9 @@ function EventManager:deregister(name, listener, callback)
             table.remove(listeners, index)
             listeners.count = listeners.count - 1
 
-            return
+            if callback then
+               break
+            end
          end
       end
    end

fluid/instance.lua

@@ -9,10 +9,9 @@ Instance.__index = Instance
 function Instance.new()
    local instance = setmetatable({
       entities     = List(),
+      systems      = List(),
+      systemCount  = {},
       eventManager = EventManager(),
-
-      systems      = {},
-      namedSystems = {},
    }, Instance)
 
    return instance
@@ -25,8 +24,8 @@ function Instance:addEntity(e)
 end
 
 function Instance:checkEntity(e)
-   for _, system in ipairs(self.systems) do
+   for i = 1, self.systems.size do
-      system:__checkEntity(e)
+      self.systems:get(i):__check(e)
    end
 end
 
@@ -34,16 +33,14 @@ function Instance:removeEntity(e)
    e.instances:remove(self)
    self.entities:remove(e)
 
-   for _, system in ipairs(self.systems) do
+   for i = 1, self.systems.size do
-      system:__remove(e)
+      self.systems:get(i):__remove(e)
    end
 end
 
 function Instance:addSystem(system, eventName, callback)
-   if not self.namedSystems[system] then
+   self.systemCount[system] = (self.systemCount[system] or 0) + 1
-      self.systems[#self.systems + 1] = system
+   self.systems:add(system)
-      self.namedSystems[system]       = system
-   end
 
    self.eventManager:register(eventName, system, callback)
 
@@ -51,16 +48,12 @@ function Instance:addSystem(system, eventName, callback)
 end
 
 function Instance:removeSystem(system, callback)
-   for index, other in ipairs(self.systems) do
+   self.systemCount[system] = self.systemCount[system] - 1
-      if system == other then
+   if self.systemCount[system] == 0 then
-         table.remove(self.systems, index)
+      self.systemCount[system] = nil
-      end
+      self.eventManager:deregister(eventName, system, callback)
    end
 
-   self.eventManager:deregister(eventName, system, callback)
-
-   self.namedSystems[system] = nil
-
    return self
 end
 

fluid/system.lua

@@ -8,8 +8,9 @@ System.mt    = {
    __index = System,
    __call  = function(systemProto, ...)
       local system = setmetatable({
-         __all   = {},
+         __all      = {},
-         __pools = {},
+         __pools    = {},
+         __instance = nil,
       }, systemProto)
 
       for _, filter in pairs(systemProto.__filter) do
@@ -39,6 +40,12 @@ end
 function System:init(...)
 end
 
+function System:destroy()
+   if self.instance then
+      self.instance:removeSystem(self)
+   end
+end
+
 function System:__buildPool(pool)
    local name   = "pool"
    local filter = {}
@@ -54,7 +61,7 @@ function System:__buildPool(pool)
    return Pool(name, filter)
 end
 
-function System:__checkEntity(e)
+function System:__check(e)
    local systemHas = self:__has(e)
 
    for _, pool in ipairs(self.__pools) do