fix Geom:combine when sizeof rect is zero

pull/167/head
chrox 11 years ago
parent ad4468aa4e
commit 2b29c70250

@ -74,6 +74,17 @@ function Geom:transformByScale(zx, zy)
self:scaleBy(zx, zy)
end
--[[
return size of geom
]]--
function Geom:sizeof()
if not self.w or not self.h then
return 0
else
return self.w * self.h
end
end
--[[
enlarges or shrinks dimensions or rectangles
@ -91,7 +102,8 @@ return the outer rectangle that contains both us and a given rectangle
works for rectangles, dimensions and points
]]--
function Geom:combine(rect_b)
local combined = Geom:new(self)
local combined = self:copy()
if not rect_b or rect_b:sizeof() == 0 then return combined end
if combined.x > rect_b.x then
combined.x = rect_b.x
end

Loading…
Cancel
Save