library-mirrors/light_world.lua
1
0
Fork 0
mirror of https://github.com/tanema/light_world.lua.git synced 2024-12-24 20:24:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed body range testing

Browse Source
This commit is contained in:
Tim Anema 2014-12-03 20:39:33 -05:00
parent 8d40785844
commit 7d5ae45a9c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/body.lua
View File

@ -441,13 +441,12 @@ function body:setShadowType(type, ...)
end end
end end
function body:isInLightRange(light, l, t, w, h, s) function body:isInLightRange(light)
local distance
if self.type == 'circle' then if self.type == 'circle' then
return light.range > math.sqrt(math.pow(light.x - self.x, 2) + math.pow(light.y - self.y, 2)) return light.range > math.sqrt(math.pow(light.x - self.x, 2) + math.pow(light.y - self.y, 2))
else else
local cx, cy = self.x + (self.width * 0.5), self.y + (self.height * 0.5) local cx, cy = self.x + (self.width * 0.5), self.y + (self.height * 0.5)
distance = math.sqrt(math.pow(light.x - cx, 2) + math.pow(light.y - cy, 2)) local distance = math.sqrt(math.pow(light.x - cx, 2) + math.pow(light.y - cy, 2))
return distance <= light.range + (self.width > self.height and self.width or self.height) return distance <= light.range + (self.width > self.height and self.width or self.height)
end end
end end
@ -455,11 +454,11 @@ end
function body:isInRange(l, t, w, h, s) function body:isInRange(l, t, w, h, s)
local bx, by, bw, bh local bx, by, bw, bh
if self.type == 'circle' then if self.type == 'circle' then
bx, by, bw, bh = (self.x + l/s) * s, (self.y + t/s) * s, self.radius/s, self.radius/s bx, by, bw, bh = self.x - self.radius, self.y - self.radius, self.radius * 2, self.radius * 2
else else
bx, by, bw, bh = (self.x + l/s) * s, (self.y + t/s) * s, self.width/s, self.height/s bx, by, bw, bh = self.x, self.y, self.width, self.height
end end
return self.visible and (bx + bw) > 0 and (bx - bw) < w/s and (by + bh) > 0 and (by - bh) < h/s return self.visible and (bx+bw) > (-l/s) and bx < (-l+w)/s and (by+bh) > (-t/s) and by < (-t+h)/s
end end
function body:drawNormal() function body:drawNormal()