Merge remote-tracking branch 'technocat/master'

This commit is contained in:
Matthias Richter 2012-03-05 10:32:51 +01:00
commit 1fd4dff37e

View File

@ -197,6 +197,27 @@ function HC:update(dt)
self._colliding_last_frame = colliding self._colliding_last_frame = colliding
end end
-- Test point for collisions with active objects
function HC:testPoint(x, y)
-- collect colliding shapes
local point = newPointShape(x,y);
new_shape(self, point);
local colliding = {};
for _,shape in pairs(point:_getNeighbors()) do
if shape:collidesWith(point) then
table.insert(colliding, shape);
end
end
self:remove(point);
if #colliding == 0 then
return false;
end
return colliding;
end
-- remove shape from internal tables and the hash -- remove shape from internal tables and the hash
function HC:remove(shape, ...) function HC:remove(shape, ...)
if not shape then return end if not shape then return end