@needle-tools/engine 4.11.0-next.cc37c71 → 4.11.1

package/src/engine-components/web/ScrollFollow.ts

@@ -125,12 +125,19 @@ export class ScrollFollow extends Behaviour {
     private _current_value: number = 0;
     private _target_value: number = 0;
     private _appliedValue: number = -1;
+    private _needsUpdate = false;
+    private _firstUpdate = false;
+
+    awake() {
+        this._firstUpdate = true;
+    }
 
 
     /** @internal */
     onEnable() {
         window.addEventListener("wheel", this.updateCurrentScrollValue, { passive: true });
         this._appliedValue = -1;
+        this._needsUpdate = true;
     }
 
     /** @internal */
@@ -144,7 +151,7 @@ export class ScrollFollow extends Behaviour {
         this.updateCurrentScrollValue();
 
         if (this._target_value >= 0) {
-            if (this.damping > 0) { // apply damping
+            if (this.damping > 0 && !this._firstUpdate) { // apply damping
                 this._current_value = Mathf.lerp(this._current_value, this._target_value, this.context.time.deltaTime / this.damping);
                 if (Math.abs(this._current_value - this._target_value) < 0.001) {
                     this._current_value = this._target_value;
@@ -155,8 +162,10 @@ export class ScrollFollow extends Behaviour {
             }
         }
 
-        if (this._current_value !== this._appliedValue) {
+        if (this._needsUpdate || this._current_value !== this._appliedValue) 
+        {
             this._appliedValue = this._current_value;
+            this._needsUpdate = false;
 
             let defaultPrevented = false;
             if (this.changed.listenerCount > 0) {
@@ -189,6 +198,8 @@ export class ScrollFollow extends Behaviour {
                     console.debug(`[ScrollFollow] ${this._current_value.toFixed(5)} — ${(this._target_value * 100).toFixed(0)}%, targets [${Array.isArray(this.target) ? this.target.length : 1}]`);
                 }
             }
+
+            this._firstUpdate = false;
         }
     }
 
@@ -404,13 +415,18 @@ export class ScrollFollow extends Behaviour {
                     time += diff * weight;
                 }
             }
-            if (this.damping <= 0) {
+            if (this.damping <= 0 || this._firstUpdate) {
                 director.time = time;
             }
             else {
                 director.time = Mathf.lerp(director.time, time, this.context.time.deltaTime / this.damping);
             }
 
+            const delta = Math.abs(director.time - time);
+            if (delta > .001) { // if the time is > 1/100th of a second off we need another update
+                this._needsUpdate = true;
+            }
+
             if (debug && this.context.time.frame % 30 === 0) {
                 console.log(`[ScrollFollow ] Timeline ${director.name}: ${time.toFixed(3)}`, weightsArray.map(w => `[${w.name} ${(w.weight * 100).toFixed(0)}%]`).join(", "));
             }