epervier/epervier-old
1
0
Fork 0
Code Issues 30 Pull requests Releases Wiki Activity

chore: initialize the hitbox with the physics

Browse source
This commit is contained in:
Kazhnuz 2020-11-26 20:18:26 +01:00
parent 9993221e0d
commit f30fc6346d
3 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
birb/modules/world/actors/actor2D.lua
View file

@ -43,7 +43,6 @@ local Hitbox = require("birb.modules.world.actors.utils.hitbox2D")
function Actor2D:new(world, type, x, y, w, h, isSolid) function Actor2D:new(world, type, x, y, w, h, isSolid)
self:init(world, type) self:init(world, type)
self:initPhysics(x, y, 0, w, h, 0, isSolid) self:initPhysics(x, y, 0, w, h, 0, isSolid)
self:initHitboxes()
self:initTimers() self:initTimers()
self:initSprite() self:initSprite()
self:initKeys() self:initKeys()

1
birb/modules/world/actors/actor3D.lua
View file

@ -45,7 +45,6 @@ local Boxes = require(cwd .. "utils.boxes")
function Actor3D:new(world, type, x, y, z, w, h, d, isSolid) function Actor3D:new(world, type, x, y, z, w, h, d, isSolid)
self:init(world, type) self:init(world, type)
self:initPhysics(x, y, z, w, h, d, isSolid) self:initPhysics(x, y, z, w, h, d, isSolid)
self:initHitboxes()
self:initTimers() self:initTimers()
self:initSprite() self:initSprite()
self.world:registerShape(self) self.world:registerShape(self)

1
birb/modules/world/actors/mixins/physics.lua
View file

@ -21,6 +21,7 @@ function PhysicalActor:initPhysics(x, y, z, w, h, d, isSolid)
self.zfrc = 0 self.zfrc = 0
self:initGravity() self:initGravity()
self:initHitboxes()
self:setBounceFactor() self:setBounceFactor()
self:setFilter() self:setFilter()