@needle-tools/engine 4.10.0-beta.1 → 4.10.0-beta.2

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

@@ -4,10 +4,11 @@ import { element } from "three/src/nodes/TSL.js";
 import { Context } from "../../engine/engine_context.js";
 import { Mathf } from "../../engine/engine_math.js";
 import { serializable } from "../../engine/engine_serialization.js";
-import { getBoundingBox } from "../../engine/engine_three_utils.js";
+import { getBoundingBox, setVisibleInCustomShadowRendering } from "../../engine/engine_three_utils.js";
 import { getParam } from "../../engine/engine_utils.js";
 import { Animation } from "../Animation.js";
 import { Animator } from "../Animator.js";
+import { MarkerTrackHandler } from "../api.js";
 import { AudioSource } from "../AudioSource.js";
 import { Behaviour } from "../Component.js";
 import { EventList } from "../EventList.js";
@@ -308,17 +309,17 @@ export class ScrollFollow extends Behaviour {
                 try {
                     marker.element = tryGetElementsForSelector(index, marker.name) as HTMLElement | null;
                     if (debug) console.debug("ScrollMarker found on page", marker.element, marker.name);
-                    // if (!marker.element) {
-                    //     marker.timeline = undefined;
-                    //     continue;
-                    // }
-                    // else {
-                    //     /** @ts-ignore */
-                    //     marker.timeline = new ViewTimeline({
-                    //         subject: marker.element,
-                    //         axis: 'block', // https://drafts.csswg.org/scroll-animations/#scroll-notation
-                    //     });
-                    // }
+                    if (!marker.element) {
+                        marker.timeline = undefined;
+                        continue;
+                    }
+                    else {
+                        /** @ts-ignore */
+                        marker.timeline = new ViewTimeline({
+                            subject: marker.element,
+                            axis: 'block', // https://drafts.csswg.org/scroll-animations/#scroll-notation
+                        });
+                    }
                 }
                 catch (error) {
                     marker.element = null;
@@ -349,57 +350,74 @@ export class ScrollFollow extends Behaviour {
 
         weightsArray.length = 0;
         let sum = 0;
+        const oneFrameTime = 1 / 60;
 
         // We keep a separate count here in case there are some markers that could not be resolved so point to *invalid* elements - the timeline should fallback to 0-1 scroll behaviour then
         let markerCount = 0;
-        for (const marker of markersArray) {
-
+        for (let i = 0; i < markersArray.length; i++) {
+            const marker = markersArray[i];
             if (!marker.element) continue;
+            const nextMarker = markersArray[i + 1];
+
+            const nextTime = nextMarker
+                ? (nextMarker.time - oneFrameTime)
+                : duration;
 
             markerCount += 1;
 
-            // const timeline = marker.timeline;
-            // if (timeline) {
-            //     const time01 = calculateTimelinePositionNormalized(timeline);
-            //     if (time01 > 0 && time01 <= 1) {
-            //         const overlap = calculateTimelinePositionNormalized(timeline!);
-            //         const weight = overlap;
-            //         // console.log(marker.element.className, time01)
-            //         weightsArray.push({ time: marker.time, weight: weight });
-            //         sum += weight;
-            //     }
-            // }
-            // continue;
+            const timeline = marker.timeline;
+            if (timeline) {
+                const time01 = calculateTimelinePositionNormalized(timeline);
+                // remap 0-1 to 0 - 1 - 0 (full weight at center)
+                const weight = 1 - Math.abs(time01 - 0.5) * 2;
+                if (time01 > 0 && time01 <= 1) {
+                    const lerpTime = marker.time + (nextTime - marker.time) * time01;
+                    weightsArray.push({ time: lerpTime, weight: weight });
+                    sum += weight;
+                }
+                // Before the first marker is reached
+                else if (i === 0 && time01 <= 0) {
+                    weightsArray.push({ time: 0, weight: 1 });
+                    sum += 1;
+                }
+                // After the last marker is reached
+                else if (i === markersArray.length - 1 && time01 >= 1) {
+                    weightsArray.push({ time: duration, weight: 1 });
+                    sum += 1;
+                }
+            }
+            continue;
             // if(this.context.time.frame % 10 === 0) console.log(marker.element?.className, timeline, calculateTimelinePositionNormalized(timeline!));
 
-            const top = marker.element.offsetTop;
-            const height = marker.element.offsetHeight;
-            const bottom = top + height;
-            let overlap = 0;
+            // const top = marker.element.offsetTop - this._scrollContainerHeight;
+            // const height = marker.element.offsetHeight + this._scrollContainerHeight;
+            // const bottom = top + height;
+            // let overlap = 0;
 
-            // TODO: if we have two marker sections where no HTML overlaps (vor example because some large section is between them) we probably want to still virtually interpolate between them slowly in that region
+            // // TODO: if we have two marker sections where no HTML overlaps (vor example because some large section is between them) we probably want to still virtually interpolate between them slowly in that region
 
-            if (bottom < currentTop) {
-                // marker is above scroll region
-                overlap = 0;
-            }
-            else if (top > currentBottom) {
-                // marker is below scroll region
-                overlap = 0;
-            }
-            else {
-                // calculate overlap in pixels
-                const overlapTop = Math.max(top, currentTop);
-                const overlapBottom = Math.min(bottom, currentBottom);
-                overlap = Math.max(0, overlapBottom - overlapTop);
-            }
+            // if (bottom < currentTop) {
+            //     // marker is above scroll region
+            //     overlap = 0;
+            // }
+            // else if (top > currentBottom) {
+            //     // marker is below scroll region
+            //     overlap = 0;
+            // }
+            // else {
+            //     // calculate overlap in pixels
+            //     const overlapTop = Math.max(top, currentTop);
+            //     const overlapBottom = Math.min(bottom, currentBottom);
+            //     const height = Math.max(1, currentBottom - currentTop);
+            //     overlap = Math.max(0, overlapBottom - overlapTop);
+            // }
 
-            markerCount += 1;
+            // // if(this.context.time.frame % 20 === 0) console.log(overlap)
 
-            if (overlap > 0) {
-                weightsArray.push({ time: marker.time, weight: overlap });
-                sum += overlap;
-            }
+            // if (overlap > 0) {
+            //     weightsArray.push({ time: marker.time, weight: overlap });
+            //     sum += overlap;
+            // }
         }
 
         if (weightsArray.length <= 0 && markerCount <= 0) {
@@ -407,19 +425,23 @@ export class ScrollFollow extends Behaviour {
         }
         else if (weightsArray.length > 0) {
             // normalize and calculate weighted time
-            let time = 0;
-            for (const entry of weightsArray) {
-                const weight = entry.weight / Math.max(0.00001, sum);
-                // console.log(weight.toFixed(2))
-                // lerp time based on weight
-                const diff = Math.abs(entry.time - time);
-                time += diff * weight;
+            let time = weightsArray[0].time; // fallback to first time
+            if (weightsArray.length > 1) {
+                for (const entry of weightsArray) {
+                    const weight = entry.weight / Math.max(0.00001, sum);
+                    // console.log(weight.toFixed(2))
+                    // lerp time based on weight
+                    const diff = Math.abs(entry.time - time);
+                    time += diff * weight;
+                }
             }
-            // console.log(time.toFixed(2), [...weightsArray])
-            if (this.damping <= 0)
+            if (debug && this.context.time.frame % 20 === 0) console.log(time.toFixed(3), [...weightsArray])
+            if (this.damping <= 0) {
                 director.time = time;
-            else
+            }
+            else {
                 director.time = Mathf.lerp(director.time, time, this.context.time.deltaTime / this.damping);
+            }
         }
     }
 
@@ -506,16 +528,6 @@ function calculateTimelinePositionNormalized(timeline: ViewTimeline) {
     const t01 = currentTime.unit === "seconds" ? (currentTime.value / durationValue) : (currentTime.value / 100);
     return t01;
 }
-function calculateNormalizedOverlap(timeline: ViewTimeline) {
-    if (!timeline.source) return 0;
-    const start = timeline.startOffset;
-    const end = timeline.endOffset;
-    const total = start.value + end.value;
-    if (total <= 0) return 1;
-    const startNorm = start.value / total;
-    const endNorm = end.value / total;
-    return 1 - (startNorm + endNorm);
-}
 
 
 declare global {

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

@@ -1,10 +1,12 @@
 import { Camera, PerspectiveCamera, Vector2, Vector3 } from "three";
+
+import { isDevEnvironment } from "../../engine/debug/debug.js";
+import { Gizmos } from "../../engine/engine_gizmos.js";
 import { serializable } from "../../engine/engine_serialization_decorator.js";
-import { registerType } from "../../engine/engine_typestore.js";
 import { getTempVector } from "../../engine/engine_three_utils.js";
-import { Behaviour } from "../Component.js";
-import { isDevEnvironment } from "../../engine/debug/debug.js";
+import { registerType } from "../../engine/engine_typestore.js";
 import { getParam } from "../../engine/engine_utils.js";
+import { Behaviour } from "../Component.js";
 
 const debugParam = getParam("debugviewbox");
 
@@ -38,7 +40,11 @@ export class ViewBox extends Behaviour {
     onBeforeRender() {
         if (this.context.isInXR) return;
         const isActive = ViewBox.instances[ViewBox.instances.length - 1] === this;
-        if (!isActive) return;
+        if (!isActive) {
+            if (debugParam || this.debug) Gizmos.DrawWireBox(this.gameObject.worldPosition, this.gameObject.worldScale, 0x333333);
+            return;
+        }
+        if (debugParam || this.debug) Gizmos.DrawWireBox(this.gameObject.worldPosition, this.gameObject.worldScale, 0xdddd00);
 
         // calculate box size to fit the camera frustrum size at the current position (just scale)
         const camera = this.context.mainCamera;
@@ -53,11 +59,8 @@ export class ViewBox extends Behaviour {
             return;
         }
 
-        const domRect = this.context.domElement.getBoundingClientRect();
-        const domX = domRect.x;
-        const domY = domRect.y;
-        const domWidth = domRect.width;
-        const domHeight = domRect.height;
+        const domWidth = this.context.domWidth;
+        const domHeight = this.context.domHeight;
 
         let rectPosX = 0;
         let rectPosY = 0;