game-projects
/
project-witchy
1
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

scenes/levels: don't access directly to the bump world

This commit is contained in:
Kazhnuz 2019-03-03 12:22:36 +01:00
parent a5d4dd9b8f
commit 3467b68b7d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imperium-porcorum.love/scenes/levels/entities/parent.lua
View File

@ -9,7 +9,7 @@ end
function Entity:initPhysics(level, collType, x, y, w, h)
self.level = level
self.world = level.world
self.world = level
self.collType = collType
self.gacc = 500
@ -43,11 +43,11 @@ function Entity:update(dt)
end
function Entity:register() -- On enregistre la hitbox dans le monde, pour l'instant les deux parties du programmes sont séparé (génération et enregistrement, peut-être qu'elles seront fusionnées)
self.world:add(self, self.x, self.y, self.w, self.h)
self.world:addEntity(self, self.x, self.y, self.w, self.h)
end
function Entity:destroy()
self.world:remove(self)
self.world:removeEntity(self)
end
function Entity:canBounce(bounce)
@ -102,7 +102,7 @@ function Entity:getCenter()
end
function Entity:purge()
self.world:remove(self)
self.world:removeEntity(self)
end
function Entity:setFilter()
@ -120,7 +120,7 @@ end
function Entity:move(dt)
self.onGround = false
local xsp, ysp = self.xsp * dt, self.ysp * dt
self.x, self.y, cols, cols_len = self.world:move(self, self.x + xsp, self.y + ysp, self.filter)
self.x, self.y, cols, cols_len = self.world:moveEntity(self, self.x + xsp, self.y + ysp, self.filter)
for i=1, cols_len do
local col = cols[i]