From c16c1206f5884614157b8f5049e601ff77478d7f Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 17 Mar 2017 18:35:54 +0100 Subject: Ray renamed and moved --- not/Ray.lua | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ not/World.lua | 2 +- ray.lua | 52 ---------------------------------------------------- 3 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 not/Ray.lua delete mode 100644 ray.lua diff --git a/not/Ray.lua b/not/Ray.lua new file mode 100644 index 0000000..bbe11c1 --- /dev/null +++ b/not/Ray.lua @@ -0,0 +1,52 @@ +-- `Ray` +-- That awesome effect that blinks when player dies! + +-- WHOLE CODE HAS FLAG OF "need a cleanup" + +Ray = { + naut = nil, + world = nil, + canvas = nil, + delay = 0.3 +} +function Ray:new(naut, world) + -- Meta + local o = {} + setmetatable(o, self) + self.__index = self + -- Init + o.naut = naut + o.world = world + -- Cavas, this is temporary, I believe. + local scale = o.world.camera.scale + local w, h = love.graphics.getWidth(), love.graphics.getHeight() + o.canvas = love.graphics.newCanvas(w/scale, h/scale) + return o +end +function Ray:update(dt) + self.delay = self.delay - dt + if self.delay < 0 then + return true -- delete + end + return false +end +function Ray:draw(offset_x, offset_y, scale) + love.graphics.setCanvas(self.canvas) + love.graphics.clear() + love.graphics.setColor(255, 247, 228, 247) + love.graphics.setLineStyle("rough") + love.graphics.setLineWidth(self.delay*160) + local x, y = self.naut:getPosition() + local m = self.world.map + local dy = m.height + if y > m.center_y then + dy = -dy + end + love.graphics.line(-x+offset_x,-y+offset_y-dy*0.7,x+offset_x,y+dy*0.7+offset_y) + -- reset + love.graphics.setCanvas() + love.graphics.setLineWidth(1) + love.graphics.setColor(255,255,255,255) + -- draw on screen + love.graphics.draw(self.canvas, 0, 0, 0, scale, scale) +end diff --git a/not/World.lua b/not/World.lua index 5afc5bf..6d81918 100644 --- a/not/World.lua +++ b/not/World.lua @@ -8,7 +8,7 @@ require "not.Hero" require "not.Cloud" require "not.Effect" require "not.Decoration" -require "ray" +require "not.Ray" -- Metatable of `World` -- nils initialized in constructor diff --git a/ray.lua b/ray.lua deleted file mode 100644 index bbe11c1..0000000 --- a/ray.lua +++ /dev/null @@ -1,52 +0,0 @@ --- `Ray` --- That awesome effect that blinks when player dies! - --- WHOLE CODE HAS FLAG OF "need a cleanup" - -Ray = { - naut = nil, - world = nil, - canvas = nil, - delay = 0.3 -} -function Ray:new(naut, world) - -- Meta - local o = {} - setmetatable(o, self) - self.__index = self - -- Init - o.naut = naut - o.world = world - -- Cavas, this is temporary, I believe. - local scale = o.world.camera.scale - local w, h = love.graphics.getWidth(), love.graphics.getHeight() - o.canvas = love.graphics.newCanvas(w/scale, h/scale) - return o -end -function Ray:update(dt) - self.delay = self.delay - dt - if self.delay < 0 then - return true -- delete - end - return false -end -function Ray:draw(offset_x, offset_y, scale) - love.graphics.setCanvas(self.canvas) - love.graphics.clear() - love.graphics.setColor(255, 247, 228, 247) - love.graphics.setLineStyle("rough") - love.graphics.setLineWidth(self.delay*160) - local x, y = self.naut:getPosition() - local m = self.world.map - local dy = m.height - if y > m.center_y then - dy = -dy - end - love.graphics.line(-x+offset_x,-y+offset_y-dy*0.7,x+offset_x,y+dy*0.7+offset_y) - -- reset - love.graphics.setCanvas() - love.graphics.setLineWidth(1) - love.graphics.setColor(255,255,255,255) - -- draw on screen - love.graphics.draw(self.canvas, 0, 0, 0, scale, scale) -end -- cgit v1.1