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

chore(actor2D): group gravity functions together

Browse source
This commit is contained in:
Kazhnuz 2019-06-27 21:05:23 +02:00
parent e916c28630
commit 0a66082e99
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gamecore/modules/world/actors/actor2D.lua
View file

@ -98,19 +98,6 @@ function Actor2D:changeSpeedToCollisionNormal(nx, ny)
self.xsp, self.ysp = xsp, ysp self.xsp, self.ysp = xsp, ysp
end end
function Actor2D:checkGround()
local dx, dy = self.x, self.y + utils.math.sign(self.grav)
local newx, newy, cols, colNumber = self:checkCollision(dx, dy)
for i, col in ipairs(cols) do
if (col.type == "touch") or (col.type == "bounce") or (col.type == "slide") then
if not (self.grav == 0) then
if col.normal.y ~= utils.math.sign(self.grav) then self.onGround = true end
end
end
end
end
function Actor2D:move(dx, dy) function Actor2D:move(dx, dy)
local cols, colNumber = {}, 0 local cols, colNumber = {}, 0
if (self.isDestroyed == false) then if (self.isDestroyed == false) then
@ -138,6 +125,9 @@ function Actor2D:initGravity()
self.onGround = false self.onGround = false
end end
-- GRAVITY SYSTEM FUNCTIONS
-- All functions related to gravity
function Actor2D:setGravity(grav) function Actor2D:setGravity(grav)
-- It's basically now a function with two roles at once : -- It's basically now a function with two roles at once :
-- - activate the gravity -- - activate the gravity
@ -154,6 +144,19 @@ function Actor2D:applyGravity(dt)
end end
end end
function Actor2D:checkGround()
local dx, dy = self.x, self.y + utils.math.sign(self.grav)
local newx, newy, cols, colNumber = self:checkCollision(dx, dy)
for i, col in ipairs(cols) do
if (col.type == "touch") or (col.type == "bounce") or (col.type == "slide") then
if not (self.grav == 0) then
if col.normal.y ~= utils.math.sign(self.grav) then self.onGround = true end
end
end
end
end
-- HITBOXES FUNCTIONS -- HITBOXES FUNCTIONS
-- Functions related to actor hitboxes -- Functions related to actor hitboxes