big-refactor #106

Merged
kazhnuz merged 24 commits from big-refactor into master 2021-05-07 19:30:53 +02:00
3 changed files with 19 additions and 31 deletions
Showing only changes of commit 0421bd4954 - Show all commits

View file

@ -57,21 +57,10 @@ end
-- PHYSICS FUNCTIONS
-- Handle movement and collisions.
function Actor2D:autoMove(dt)
self:updateHitboxes()
self.onGround = false
self:applyGravity(dt)
function Actor2D:moveToFuturePosition(dt)
local dx, dy = self:getFuturePosition(dt)
local newx, newy, cols, colNumber = self:move(dx, dy)
-- apply after the movement the friction, until the player stop
-- note: the friction is applied according to the delta time,
-- thus the friction should be how much speed is substracted in 1 second
self:solveAllCollisions(cols)
self:applyFriction(dt)
local _, _, cols, colNumber = self:move(dx, dy)
return cols, colNumber
end
function Actor2D:changeSpeedToCollisionNormal(normal)

View file

@ -67,21 +67,10 @@ end
-- PHYSICS FUNCTIONS
-- Handle movement and collisions.
function Actor3D:autoMove(dt)
self:updateHitboxes()
self.onGround = false
self:applyGravity(dt)
function Actor3D:moveToFuturePosition(dt)
local dx, dy, dz = self:getFuturePosition(dt)
local newx, newy, newz, cols, colNumber = self:move(dx, dy, dz)
-- apply after the movement the friction, until the player stop
-- note: the friction is applied according to the delta time,
-- thus the friction should be how much speed is substracted in 1 second
self:solveAllCollisions(cols)
self:applyFriction(dt)
local _, _, _, cols, colNumber = self:move(dx, dy, dz)
return cols, colNumber
end
function Actor3D:changeSpeedToCollisionNormal(normal)

View file

@ -127,9 +127,19 @@ function PhysicalActor:checkGround()
end
function PhysicalActor:autoMove(dt)
-- The base actor don't have coordinate
-- so the autoMove is only usefull to its
-- 2D and 3D childrens
self:updateHitboxes()
self.onGround = false
self:applyGravity(dt)
local cols, colNumber = self:moveToFuturePosition(dt)
-- apply after the movement the friction, until the player stop
-- note: the friction is applied according to the delta time,
-- thus the friction should be how much speed is substracted in 1 second
self:solveAllCollisions(cols)
self:applyFriction(dt)
end
-- HITBOX FUNCTIONS