Update tiny-ecs to 1.1-2

src/entities/MainHud.lua

@@ -6,7 +6,7 @@ function MainHud:drawHud(dt)
 	local n = self.levelState.totalEnemiesToKill - self.levelState.enemiesKilled
 	local d = self.levelState.totalEnemiesToKill
 	love.graphics.setFont(assets.fnt_hud)
-	love.graphics.printf("Wave " .. self.levelState.wave, 20, 20, 300, "left")			
+	love.graphics.printf("Wave " .. self.levelState.wave, 20, 20, 300, "left")
 	love.graphics.setFont(assets.fnt_smallhud)
 	love.graphics.printf(n .. "/" .. d .. " Pigs Remaining", 20, 60, 500, "left")
 	love.graphics.printf("Total Pigs Killed: " .. self.levelState.score, love.graphics.getWidth() - 420, 20, 400, "right")

src/states/Intro.lua

@@ -26,8 +26,8 @@ function Intro:load()
         require ("src.systems.TileMapRenderSystem")(camera, tileMap),
         require ("src.systems.SpriteSystem")(camera, "bg"),
         require ("src.systems.SpriteSystem")(camera, "fg"),
-        require ("src.systems.HudSystem")(self, "hudBg"),
-        require ("src.systems.HudSystem")(self, "hudFg"),
+        require ("src.systems.HudSystem")("hudBg"),
+        require ("src.systems.HudSystem")("hudFg"),
         TransitionScreen(),
         ScreenSplash(0.5, 0.2, "Cammando Kibbles"),
         ScreenSplash(0, 0, "Created by bakpakin for Ludum Dare 32", 300, assets.fnt_reallysmallhud, "left", 20, 20),
@@ -41,8 +41,8 @@ end
 function Intro:update(dt)
 	self.time = self.time + dt
 	if love.keyboard.isDown(" ") and self.time > 0.55 then
-		world:add(TransitionScreen(true, Level("assets/lvl1"))) 
-	end	
+		world:add(TransitionScreen(true, Level("assets/lvl1")))
+	end
 end
 
 function Intro:draw()

src/states/Level.lua

@@ -63,8 +63,8 @@ function Level:load()
         require ("src.systems.SpriteSystem")(camera, "bg"),
         require ("src.systems.SpriteSystem")(camera, "fg"),
         require ("src.systems.LifetimeSystem")(),
-        require ("src.systems.HudSystem")(self, "hudBg"),
-        require ("src.systems.HudSystem")(self, "hudFg"),
+        require ("src.systems.HudSystem")("hudBg"),
+        require ("src.systems.HudSystem")("hudFg"),
         require ("src.systems.WaveSystem")(self),
         require ("src.systems.SpawnSystem")(self),
         require ("src.entities.MainHud")(self),

src/systems/DrawBackgroundSystem.lua

@@ -4,7 +4,7 @@ function DrawBackgroundSystem:init(r, g, b)
 	self.r, self.g, self.b = r, g, b
 end
 
-function DrawBackgroundSystem:update(entities, dt)
+function DrawBackgroundSystem:update(dt)
 	local r1, g1, b1, a = love.graphics.getColor()
 	love.graphics.setColor(self.r, self.g, self.b, 255)
 	love.graphics.rectangle("fill", 0, 0, love.graphics.getWidth(), love.graphics.getHeight())

src/systems/HudSystem.lua

@@ -1,12 +1,11 @@
 local HudSystem = tiny.processingSystem(class "HudSystem")
 
-function HudSystem:init(levelState, layerFlag)
-	self.levelState = levelState
+function HudSystem:init(layerFlag)
 	self.filter = tiny.requireAll("drawHud", layerFlag)
 end
 
 function HudSystem:process(e, dt)
 	e:drawHud(dt)
-end 
+end
 
 return HudSystem

src/systems/SpawnSystem.lua

@@ -9,7 +9,7 @@ function SpawnSystem:init(levelState)
 	self.time = 0
 end
 
-function SpawnSystem:update(entities, dt)
+function SpawnSystem:update(dt)
 	self.time = self.time + dt
 	local levelState = self.levelState
 	if levelState.isSpawning and levelState.enemiesSpawned < levelState.totalEnemiesToKill and self.time >= levelState.spawnInterval then

src/systems/SpriteSystem.lua

@@ -5,11 +5,11 @@ function SpriteSystem:init(camera, layerFlag)
     self.filter = tiny.requireAll("sprite", "pos", layerFlag)
 end
 
-function SpriteSystem:preProcess(entities, dt)
+function SpriteSystem:preProcess(dt)
     self.camera:apply()
 end
 
-function SpriteSystem:postProcess(entities, dt)
+function SpriteSystem:postProcess(dt)
     self.camera:remove()
     love.graphics.setColor(255, 255, 255, 255)
 end

src/systems/TileMapRenderSystem.lua

@@ -9,7 +9,7 @@ function TileMapRenderSystem:init(camera, tileMap)
     end
 end
 
-function TileMapRenderSystem:update(entities, dt)
+function TileMapRenderSystem:update(dt)
 	self.camera:draw(self.drawFn)
 end
 

src/systems/WaveSystem.lua

@@ -2,7 +2,7 @@ local TimerEvent = require "src.entities.TimerEvent"
 
 local WaveSystem = tiny.system(class "WaveSystem")
 
-WaveSystem.filter = tiny.requireOne("isEnemy")
+WaveSystem.filter = tiny.requireAll("isEnemy")
 
 function WaveSystem:init(levelState)
 	self.levelState = levelState
@@ -22,6 +22,4 @@ function WaveSystem:onRemove(e)
 	end
 end
 
-function WaveSystem:update(entities, dt) end
-
 return WaveSystem