Merge pull request #2 from flamendless/master

Changed how lights are stored.

Dynamic pool of light is more efficient.

Author: halsten-dev

luven/luven.lua

@@ -267,16 +267,6 @@ luven.lightShapes = {}
 -- /// Luven utils local functions
 -- ///////////////////////////////////////////////
 
-local function getLastEnabledLightIndex()
-    for i = NUM_LIGHTS, 1, -1 do
-        if (currentLights[i].enabled) then
-            return i
-        end
-    end
-
-    return 0
-end
-
 local function drawLights()
     lg.setCanvas(lightMap)
     lg.setBlendMode("add")
@@ -286,9 +276,9 @@ local function drawLights()
     local oldR, oldG, oldB, oldA = lg.getColor()
 
     -- lastActiveLightIndex updated in luven.update()
-    for i = 1, lastActiveLightIndex do
-        if (currentLights[i].enabled) then
-            local light = currentLights[i]
+    for i = 1, #currentLights do
+        local light = currentLights[i]
+        if (light.enabled) then
             lgSetColor(light.color)
             lgDraw(light.shape.sprite, light.x, light.y, light.angle, light.scaleX * light.power, light.scaleY * light.power, light.shape.originX, light.shape.originY)
         end
@@ -300,17 +290,6 @@ local function drawLights()
     lg.setCanvas()
 end
 
-local function getNextId()
-    for i = 1, NUM_LIGHTS do
-        local light = currentLights[i]
-        if (light.enabled == false) then
-            return i
-        end
-    end
-
-    return 1 -- first index
-end
-
 local function randomFloat(min, max)
         return min + love.math.random() * (max - min)
 end
@@ -354,10 +333,6 @@ function luven.init(screenWidth, screenHeight, useCamera)
     luven.registerLightShape("cone", luvenPath .. "lights/cone.png", 0)
 
     lightMap = lg.newCanvas(screenWidth, screenHeight)
-
-    for i = 1, NUM_LIGHTS do
-        currentLights[i] = { enabled = false }
-    end
 end
 
 -- param : color = { r, g, b, a (1) } (Values between 0 - 1)
@@ -390,9 +365,7 @@ function luven.update(dt)
         cameraUpdate(dt)
     end
 
-    lastActiveLightIndex = getLastEnabledLightIndex()
-
-    for i = 1, lastActiveLightIndex do
+    for i = 1, #currentLights do
         local light = currentLights[i]
         if (light.enabled) then
             if (light.type == lightTypes.flickering) then
@@ -432,7 +405,7 @@ function luven.drawEnd()
 end
 
 function luven.removeAllLights()
-    for _, v in pairs(currentLights) do
+    for _, v in ipairs(currentLights) do
         if (v.enabled) then
             luven.removeLight(v.id)
         end
@@ -449,15 +422,7 @@ function luven.dispose()
 end
 
 function luven.getLightCount()
-    local count = 0
-
-    for i = 1, lastActiveLightIndex do
-        if (currentLights[i].enabled) then
-            count = count + 1
-        end
-    end
-
-    return count
+    return #currentLights
 end
 
 -- ///////////////////////////////////////////////
@@ -508,11 +473,10 @@ function luven.addNormalLight(x, y, color, power, lightShape, angle, sx, sy)
     assertPositiveNumber(functionName, "sx", sx)
     assertPositiveNumber(functionName, "sy", sy)
 
-    local id = getNextId()
+    local id = #currentLights + 1
+    currentLights[id] = {}
     local light = currentLights[id]
 
-    clearTable(light)
-
     light.id = id
     light.x = x
     light.y = y
@@ -556,11 +520,10 @@ function luven.addFlickeringLight(x, y, colorRange, powerRange, speedRange, ligh
     assertPositiveNumber(functionName, "sx", sx)
     assertPositiveNumber(functionName, "sy", sy)
 
-    local id = getNextId()
+    local id = #currentLights + 1
+    currentLights[id] = {}
     local light = currentLights[id]
 
-    clearTable(light)
-
     light.id = id
     light.x = x
     light.y = y
@@ -602,9 +565,9 @@ function luven.addFlashingLight(x, y, color, maxPower, speed, lightShape, angle,
     assertPositiveNumber(functionName, "sx", sx)
     assertPositiveNumber(functionName, "sy", sy)
 
-    local id = getNextId()
+    local id = #currentLights + 1
+    currentLights[id] = {}
     local light = currentLights[id]
-    clearTable(light)
 
     light.id = id
     light.x = x