From 6a4a6003d118550001422317755126ee3b736d8c Mon Sep 17 00:00:00 2001 From: Junky-Josqu Date: Fri, 6 Apr 2018 17:27:58 +0200 Subject: [PATCH] replace deprecated functions --- windfield/init.lua | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/windfield/init.lua b/windfield/init.lua index 80f2e8d..ff7ce90 100644 --- a/windfield/init.lua +++ b/windfield/init.lua @@ -80,9 +80,9 @@ function World:draw(alpha) alpha = alpha or 255 -- Colliders debug love.graphics.setColor(222, 222, 222, alpha) - local bodies = self.box2d_world:getBodyList() + local bodies = self.box2d_world:getBodies() for _, body in ipairs(bodies) do - local fixtures = body:getFixtureList() + local fixtures = body:getFixtures() for _, fixture in ipairs(fixtures) do if fixture:getShape():type() == 'PolygonShape' then love.graphics.polygon('line', body:getWorldPoints(fixture:getShape():getPoints())) @@ -103,7 +103,7 @@ function World:draw(alpha) -- Joint debug love.graphics.setColor(222, 128, 64, alpha) - local joints = self.box2d_world:getJointList() + local joints = self.box2d_world:getJoints() for _, joint in ipairs(joints) do local x1, y1, x2, y2 = joint:getAnchors() if x1 and y1 then love.graphics.circle('line', x1, y1, 4) end @@ -204,9 +204,9 @@ function World:collisionClear() end function World:collisionEventsClear() - local bodies = self.box2d_world:getBodyList() + local bodies = self.box2d_world:getBodies() for _, body in ipairs(bodies) do - local collider = body:getFixtureList()[1]:getUserData() + local collider = body:getFixtures()[1]:getUserData() collider:collisionEventsClear() end end @@ -569,7 +569,7 @@ function World:queryCircleArea(x, y, radius, collision_class_names) local outs = {} for _, collider in ipairs(colliders) do if self:collisionClassInCollisionClassesList(collider.collision_class, collision_class_names) then - for _, fixture in ipairs(collider.body:getFixtureList()) do + for _, fixture in ipairs(collider.body:getFixtures()) do if self.wf.Math.polygon.getCircleIntersection(x, y, radius, {collider.body:getWorldPoints(fixture:getShape():getPoints())}) then table.insert(outs, collider) break @@ -588,7 +588,7 @@ function World:queryRectangleArea(x, y, w, h, collision_class_names) local outs = {} for _, collider in ipairs(colliders) do if self:collisionClassInCollisionClassesList(collider.collision_class, collision_class_names) then - for _, fixture in ipairs(collider.body:getFixtureList()) do + for _, fixture in ipairs(collider.body:getFixtures()) do if self.wf.Math.polygon.isPolygonInside({x, y, x+w, y, x+w, y+h, x, y+h}, {collider.body:getWorldPoints(fixture:getShape():getPoints())}) then table.insert(outs, collider) break @@ -613,7 +613,7 @@ function World:queryPolygonArea(vertices, collision_class_names) local outs = {} for _, collider in ipairs(colliders) do if self:collisionClassInCollisionClassesList(collider.collision_class, collision_class_names) then - for _, fixture in ipairs(collider.body:getFixtureList()) do + for _, fixture in ipairs(collider.body:getFixtures()) do if self.wf.Math.polygon.isPolygonInside(vertices, {collider.body:getWorldPoints(fixture:getShape():getPoints())}) then table.insert(outs, collider) break @@ -659,12 +659,12 @@ function World:removeJoint(joint) end function World:destroy() - local bodies = self.box2d_world:getBodyList() + local bodies = self.box2d_world:getBodies() for _, body in ipairs(bodies) do - local collider = body:getFixtureList()[1]:getUserData() + local collider = body:getFixtures()[1]:getUserData() collider:destroy() end - local joints = self.box2d_world:getJointList() + local joints = self.box2d_world:getJoints() for _, joint in ipairs(joints) do joint:destroy() end self.box2d_world:destroy() self.box2d_world = nil