From c57f3726486b067ceedb4ba2bc7a4f9a27b446e7 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Thu, 27 Jun 2019 21:22:33 +0200 Subject: [PATCH] chore(world): improve separation between bodies and actors in code --- gamecore/modules/world/world2D.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gamecore/modules/world/world2D.lua b/gamecore/modules/world/world2D.lua index 4c5864e..a6c580f 100644 --- a/gamecore/modules/world/world2D.lua +++ b/gamecore/modules/world/world2D.lua @@ -47,8 +47,8 @@ function World2D:registerActor(actor) World2D.super.registerActor(self, actor) end -function World2D:registerBody(body) - return self.bodies:add(body, body.x, body.y, body.w, body.h) +function World2D:moveActor(actor, x, y, filter) + return self.bodies:move(actor.mainHitbox, x, y, filter) end function World2D:getActorsInRect(x, y, w, h) @@ -64,8 +64,12 @@ function World2D:getActorsInRect(x, y, w, h) return returnquery end --- ACTORS FUNCTIONS --- Wrappers around Bump2D functions +-- BODIES MANAGEMENT FUNCTIONS +-- Basic function to handle bodies. Wrappers around Bump2D functions + +function World2D:registerBody(body) + return self.bodies:add(body, body.x, body.y, body.w, body.h) +end function World2D:updateBody(body) return self.bodies:update(body, body.x, body.y, body.w, body.h) @@ -75,12 +79,8 @@ function World2D:removeBody(body) return self.bodies:remove(body) end -function World2D:moveActor(actor, x, y, filter) - return self.bodies:move(actor, x, y, filter) -end - -function World2D:checkCollision(actor, x, y, filter) - return self.bodies:check(actor, x, y, filter) +function World2D:checkCollision(body, x, y, filter) + return self.bodies:check(body, x, y, filter) end function World2D:getBodiesInRect(x, y, w, h)