Skip to content

Add frictionX and frictionY for each layer #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add frictionX and frictionY for each layer #317

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28f78a4
Add frictionX and frictionY for each layer
roy-mdr May 31, 2022
89a3ea6
Update parallax.js
roy-mdr May 31, 2022
5e41771
Update parallax.js
roy-mdr Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions src/parallax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ class Parallax {
this.enabled = false
this.depthsX = []
this.depthsY = []
this.frictionsX = []
this.frictionsY = []
this.raf = null

this.bounds = null
Expand All @@ -222,6 +224,9 @@ class Parallax {
this.velocityX = 0
this.velocityY = 0

this.velocitysX = []
this.velocitysY = []

this.onMouseMove = this.onMouseMove.bind(this)
this.onDeviceOrientation = this.onDeviceOrientation.bind(this)
this.onDeviceMotion = this.onDeviceMotion.bind(this)
Expand Down Expand Up @@ -294,6 +299,8 @@ class Parallax {

this.depthsX = []
this.depthsY = []
this.frictionsX = []
this.frictionsY = []

for (let index = 0; index < this.layers.length; index++) {
let layer = this.layers[index]
Expand All @@ -310,6 +317,15 @@ class Parallax {
let depth = helpers.data(layer, 'depth') || 0
this.depthsX.push(helpers.data(layer, 'depth-x') || depth)
this.depthsY.push(helpers.data(layer, 'depth-y') || depth)

let layerFriction = helpers.data(layer, 'friction') || false
let rawFrictionX = helpers.data(layer, 'friction-x') || (layerFriction || this.frictionX)
let rawFrictionY = helpers.data(layer, 'friction-y') || (layerFriction || this.frictionY)
this.frictionsX.push( rawFrictionX < 1 ? rawFrictionX : 1 )
this.frictionsY.push( rawFrictionX < 1 ? rawFrictionX : 1 )

this.velocitysX.push(0)
this.velocitysY.push(0)
}
}

Expand Down Expand Up @@ -484,11 +500,14 @@ class Parallax {
this.velocityX += (this.motionX - this.velocityX) * this.frictionX
this.velocityY += (this.motionY - this.velocityY) * this.frictionY
for (let index = 0; index < this.layers.length; index++) {
let layer = this.layers[index],
depthX = this.depthsX[index],
depthY = this.depthsY[index],
xOffset = this.velocityX * (depthX * (this.invertX ? -1 : 1)),
yOffset = this.velocityY * (depthY * (this.invertY ? -1 : 1))

this.velocitysX[index] += (this.motionX - this.velocitysX[index]) * this.frictionsX[index]
this.velocitysY[index] += (this.motionY - this.velocitysY[index]) * this.frictionsY[index]
let layer = this.layers[index],
depthX = this.depthsX[index],
depthY = this.depthsY[index],
xOffset = this.velocitysX[index] * (depthX * (this.invertX ? -1 : 1)),
yOffset = this.velocitysY[index] * (depthY * (this.invertY ? -1 : 1))
this.setPosition(layer, xOffset, yOffset)
}
this.raf = rqAnFr(this.onAnimationFrame)
Expand Down