From 46a5bdb76cf50ccacf6ee31ee33f6e510fbf43e0 Mon Sep 17 00:00:00 2001 From: hexagonhexagon Date: Mon, 22 Jun 2020 02:19:52 -0400 Subject: [PATCH] Make changes requested by tobspr. --- src/js/game/camera.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/js/game/camera.js b/src/js/game/camera.js index 65f87669..0364f695 100644 --- a/src/js/game/camera.js +++ b/src/js/game/camera.js @@ -722,7 +722,7 @@ export class Camera extends BasicSerializableObject { this.currentlyPinching = false; this.lastMovingPosition = null; this.lastMovingPositionLastTick = null; - this.numTicksStandingStill = null; + this.numTicksStandingStill = 0; this.lastPinchPositions = null; this.userInteraction.dispatch(USER_INTERACT_TOUCHEND); this.didMoveSinceTouchStart = false; @@ -822,12 +822,15 @@ export class Camera extends BasicSerializableObject { // Check if the camera is being dragged but standing still: if not, zero out `touchPostMoveVelocity`. if (this.currentlyMoving && this.desiredCenter === null) { - if (this.lastMovingPositionLastTick === this.lastMovingPosition) { - this.numTicksStandingStill += 1; + if ( + this.lastMovingPositionLastTick !== null && + this.lastMovingPositionLastTick.equalsEpsilon(this.lastMovingPosition) + ) { + this.numTicksStandingStill++; } else { this.numTicksStandingStill = 0; } - this.lastMovingPositionLastTick = this.lastMovingPosition; + this.lastMovingPositionLastTick = this.lastMovingPosition.copy(); if (this.numTicksStandingStill >= ticksBeforeErasingVelocity) { this.touchPostMoveVelocity.x = 0;