uh yeah i keep forgetting ab pushing these. sorry.

This commit is contained in:
lustlion
2022-01-18 00:14:54 +01:00
parent dd2debc0bd
commit 5a266d6b3a
73 changed files with 405 additions and 274 deletions

View File

@@ -2,7 +2,7 @@ Lights = {}
LightTimer = 0
function CreateDarkness()
return love.graphics.newCanvas(game.width, game.height)
return love.graphics.newCanvas(game.width/game.scale, game.height/game.scale)
end
function CreateLight(x,y,range,lum,flicker)
@@ -13,10 +13,10 @@ function CreateLight(x,y,range,lum,flicker)
}
o.range = range
o.lum = lum or 1
o.flicker_value = flicker or 1
o.flicker_value = flicker or 2
o.flicker = 0
o.dim = 0
o.flicker_speed = flicker_speed or 10
o.flicker_speed = flicker_speed or 60/12
o.flicker_time = 0
table.insert(Lights,o)
return o
@@ -24,7 +24,7 @@ end
function SetDarkness()
love.graphics.setColor(0,0,0,1)
love.graphics.rectangle("fill",0,0,game.width,game.height)
love.graphics.rectangle("fill",0,0,game.width ,game.height)
end
function DoLights()
@@ -34,37 +34,30 @@ function DoLights()
if light.flicker_time >= light.flicker_speed then
light.flicker_time = light.flicker_time - light.flicker_speed
light.flicker = 0 + math.random(-1,1)
light.flicker = 0 + math.random(0,1)
light.flicker = math.min(math.max(light.flicker, -light.flicker_value),light.flicker_value)
end
end
--[[
-- first, border
love.graphics.setColor(1,1,1)
for _, light in pairs(Lights) do
love.graphics.circle(
"fill",
light.pos.x - Camera.pos.x,
light.pos.y - Camera.pos.y,
light.range + light.flicker + 1
)
end
]]
love.graphics.setBlendMode("replace")
for _, enty in pairs(LoadedEntities) do
end
local shades = 200
for i=1, shades do
for _, light in pairs(Lights) do
local luminosity = shades*light.lum/100
love.graphics.setColor(0,0,0,math.min(1,math.max(0,(shades-i-luminosity+1)/(shades-luminosity+1))))
love.graphics.setColor(1,1,1,1)
for _, light in pairs(Lights) do
if light.range ~= 0 then
love.graphics.circle(
"fill",
light.pos.x - Camera.pos.x,
light.pos.y - Camera.pos.y,
(light.range + light.flicker)*(shades-i+1)/shades
(light.pos.x - Camera.pos.x) / game.scale,
(light.pos.y - Camera.pos.y) / game.scale,
(light.range + light.flicker + 1) / game.scale
)
end
end
love.graphics.setColor(0,0,0,0)
for _, light in pairs(Lights) do
if light.range ~= 0 then
love.graphics.circle(
"fill",
(light.pos.x - Camera.pos.x) / game.scale,
(light.pos.y - Camera.pos.y) / game.scale,
(light.range + light.flicker) / game.scale
)
end
end
@@ -75,5 +68,5 @@ function DoBorder()
end
function DrawDarkness()
love.graphics.draw(Canvas.Darkness, 0, 0, 0, 0.5, 0.5)
love.graphics.draw(Canvas.Darkness, 0, 0, 0, 2/game.scale)
end