From f68e300019104060091dac4f6fa5056753777a5b Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Thu, 27 Jun 2019 21:15:57 +0200 Subject: [PATCH] feat(hitbox): add a way to advertise an hitbox as main hitbox --- gamecore/modules/world/actors/actor2D.lua | 1 + gamecore/modules/world/actors/utils/hitbox2D.lua | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/gamecore/modules/world/actors/actor2D.lua b/gamecore/modules/world/actors/actor2D.lua index a201ea4..9c0e9b4 100644 --- a/gamecore/modules/world/actors/actor2D.lua +++ b/gamecore/modules/world/actors/actor2D.lua @@ -243,6 +243,7 @@ end function Actor2D:initMainHitbox() self.mainHitbox = Hitbox(self, self.type, 0, 0, self.w, self.h, self.isSolid) + self.mainHitbox:advertiseAsMainHitbox() end function Actor2D:addHitbox(name, type, ox, oy, w, h, isSolid) diff --git a/gamecore/modules/world/actors/utils/hitbox2D.lua b/gamecore/modules/world/actors/utils/hitbox2D.lua index a29a7a5..6728908 100644 --- a/gamecore/modules/world/actors/utils/hitbox2D.lua +++ b/gamecore/modules/world/actors/utils/hitbox2D.lua @@ -39,10 +39,16 @@ function Hitbox2D:new(owner, type, ox, oy, w, h, isSolid) self.h = h self.isSolid = isSolid + self.isMainHitBox = false + self:setDebugColor(0,0,0) self:register() end +function Hitbox2D:advertiseAsMainHitbox() + self.isMainHitBox = true +end + function Hitbox2D:modify(ox, oy, w, h) self.ox = ox self.oy = oy