thallada/proximity-structures
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Smooth out pull animation with cycle adjustments

Browse Source
This commit is contained in:
Tyler Hallada 2017-08-01 13:18:04 -04:00
parent 288547d690
commit 32f3166f52
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/field.js
View File

@ -292,7 +292,7 @@ function shiftPoints (points, maxShiftAmt, counter, tweeningFns) {
return points; return points;
} }
function pullPoints (points, clickPos, pullRate, maxDist) { function pullPoints (points, clickPos, pullRate, maxDist, counter) {
var xDist, yDist; var xDist, yDist;
for (var i = 0; i < points.target.length; i++) { for (var i = 0; i < points.target.length; i++) {
xDist = clickPos.x - points.target[i][0]; xDist = clickPos.x - points.target[i][0];
@ -302,6 +302,11 @@ function pullPoints (points, clickPos, pullRate, maxDist) {
points.target[i][1] += Math.round(yDist * pullRate); points.target[i][1] += Math.round(yDist * pullRate);
points.target[i][3] = shiftColor(points.original[i][3], disconnectedColorShiftAmt * 3); points.target[i][3] = shiftColor(points.original[i][3], disconnectedColorShiftAmt * 3);
} }
// TODO: define these magic numbers somewhere
// If this point's cycle is near it's end, bump it up some ticks to make the animation smoother
if (relativeCounter(points.target[i][2]) > cycleDuration - 10) {
points.target[i][2] = (points.target[i][2] + Math.round(cycleDuration / 2)) % cycleDuration;
}
} }
} }
@ -375,7 +380,7 @@ function loop () {
clickPullRate *= clickEndRebount; clickPullRate *= clickEndRebount;
} }
// a pointer event is occuring and needs to affect the points // a pointer event is occuring and needs to affect the points
pullPoints(polygonPoints, click, clickPullRate, clickMaxDist); pullPoints(polygonPoints, click, clickPullRate, clickMaxDist, counter);
// slightly increase effect amount for next loop if click is still occuring // slightly increase effect amount for next loop if click is still occuring
if (clickMaxDist <= clickMaxDistMax) { if (clickMaxDist <= clickMaxDistMax) {