@needle-tools/engine 4.10.0-beta.3 → 4.10.0-next.4f9d92a

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

@@ -4,11 +4,10 @@ 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, setVisibleInCustomShadowRendering } from "../../engine/engine_three_utils.js";
+import { getBoundingBox } 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";
@@ -309,17 +308,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;
@@ -350,74 +349,57 @@ 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 (let i = 0; i < markersArray.length; i++) {
-            const marker = markersArray[i];
-            if (!marker.element) continue;
-            const nextMarker = markersArray[i + 1];
+        for (const marker of markersArray) {
 
-            const nextTime = nextMarker
-                ? (nextMarker.time - oneFrameTime)
-                : duration;
+            if (!marker.element) continue;
 
             markerCount += 1;
 
-            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;
+            // 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;
             // if(this.context.time.frame % 10 === 0) console.log(marker.element?.className, timeline, calculateTimelinePositionNormalized(timeline!));
 
-            // const top = marker.element.offsetTop - this._scrollContainerHeight;
-            // const height = marker.element.offsetHeight + this._scrollContainerHeight;
-            // const bottom = top + height;
-            // let overlap = 0;
+            const top = marker.element.offsetTop;
+            const height = marker.element.offsetHeight;
+            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);
-            //     const height = Math.max(1, currentBottom - currentTop);
-            //     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);
+                overlap = Math.max(0, overlapBottom - overlapTop);
+            }
 
-            // // if(this.context.time.frame % 20 === 0) console.log(overlap)
+            markerCount += 1;
 
-            // 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) {
@@ -425,23 +407,19 @@ export class ScrollFollow extends Behaviour {
         }
         else if (weightsArray.length > 0) {
             // normalize and calculate weighted time
-            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;
-                }
+            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;
             }
-            if (debug && this.context.time.frame % 20 === 0) console.log(time.toFixed(3), [...weightsArray])
-            if (this.damping <= 0) {
+            // console.log(time.toFixed(2), [...weightsArray])
+            if (this.damping <= 0)
                 director.time = time;
-            }
-            else {
+            else
                 director.time = Mathf.lerp(director.time, time, this.context.time.deltaTime / this.damping);
-            }
         }
     }
 
@@ -528,6 +506,16 @@ 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

@@ -3,7 +3,7 @@ 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 { getTempQuaternion, getTempVector } from "../../engine/engine_three_utils.js";
+import { getTempVector } from "../../engine/engine_three_utils.js";
 import { registerType } from "../../engine/engine_typestore.js";
 import { getParam } from "../../engine/engine_utils.js";
 import { Behaviour } from "../Component.js";
@@ -21,24 +21,20 @@ export class ViewBox extends Behaviour {
     @serializable()
     debug: boolean = false;
 
-    // awake() {
-    //     // this.referenceFieldOfView = (this.context.mainCamera as PerspectiveCamera)?.fov || 60;
-    //     setInterval(()=>{
-    //         if(Math.random() > .5)
-    //         this.enabled = !this.enabled
-    //     }, 1000)
-    // }
-    
+    awake() {
+        // this.referenceFieldOfView = (this.context.mainCamera as PerspectiveCamera)?.fov || 60;
+        // setInterval(()=>{
+        //     this.enabled = !this.enabled
+        // }, 1000)
+    }
     onEnable(): void {
         if (debugParam || this.debug || isDevEnvironment()) console.debug("[ViewBox] Using camera fov:", this.referenceFieldOfView);
         ViewBox.instances.push(this);
     }
 
     onDisable(): void {
-        if (debugParam || this.debug) console.debug("[ViewBox] Disabled");
         const idx = ViewBox.instances.indexOf(this);
         if (idx !== -1) ViewBox.instances.splice(idx, 1);
-        this._projectedBoxElement?.remove();
     }
 
     onBeforeRender() {
@@ -84,80 +80,44 @@ export class ViewBox extends Behaviour {
             diffHeight = domHeight / rectHeight;
         }
 
-
+        // const view = camera.view;
         const view = camera.view;
         const zoom = camera.zoom;
         const aspect = camera.aspect;
         const fov = camera.fov;
         camera.view = null;
         camera.zoom = 1;
+        // camera.aspect = rectWidth / rectHeight;
         camera.fov = this.referenceFieldOfView;
         camera.updateProjectionMatrix();
 
         const boxPosition = this.gameObject.worldPosition;
         const boxScale = this.gameObject.worldScale;
 
-        const cameraPosition = camera.worldPosition;
-        const distance = cameraPosition.distanceTo(boxPosition);
-
-
-        // #region camera fixes
-        // If the camera is inside the box, move it out
-        const boxSizeMax = Math.max(boxScale.x, boxScale.y, boxScale.z);
-        const direction = getTempVector(cameraPosition).sub(boxPosition);
-        if (distance < boxSizeMax) {
-            // move camera out of bounds
-            if (this.debug || debugParam) console.warn("[ViewBox] Moving camera out of bounds", distance, "<", boxSizeMax);
-            const positionDirection = getTempVector(direction);
-            positionDirection.y *= .00000001; // stay on horizontal plane mostly
-            positionDirection.normalize();
-            const lengthToMove = (boxSizeMax - distance) * 10; // move a bit more than needed
-            const newPosition = cameraPosition.add(positionDirection.multiplyScalar(lengthToMove));
-            camera.worldPosition = newPosition.lerp(cameraPosition, 1 - this.context.time.deltaTime);
-        }
-
-        // Ensure the camera looks at the ViewBox
-        // TOOD: smooth lookat over multiple frames if we have multiple viewboxes
-        // const dot = direction.normalize().dot(camera.worldForward);
-        // if (dot < .9) {
-        //     console.log(dot);
-        //     const targetRotation = direction;
-        //     const rotation = getTempQuaternion();
-        //     rotation.setFromUnitVectors(camera.worldForward.multiplyScalar(-1), targetRotation);
-        //     camera.worldQuaternion = rotation;
-        //     camera.updateMatrixWorld();
-        // }
-        const boxPositionInCameraSpace = getTempVector(boxPosition);
-        camera.worldToLocal(boxPositionInCameraSpace);
-        camera.lookAt(boxPosition);
-        camera.updateMatrixWorld();
 
 
-        // #region calculate fit
+        // const fov = this.referenceFieldOfView
+        const distance = camera.worldPosition.distanceTo(boxPosition);
         const vFOV = this.referenceFieldOfView * Math.PI / 180; // convert vertical fov to radians
         const height = 2 * Math.tan(vFOV / 2) * distance; // visible height
         const width = height * camera.aspect; // visible width
 
-        const projectedBox = this.projectBoxIntoCamera(boxPosition, boxScale, camera, 1);
-        // return
+        const projectedBox = this.projectBoxIntoCamera(boxPosition, boxScale, camera, height * .5);
         const boxWidth = (projectedBox.maxX - projectedBox.minX);
         const boxHeight = (projectedBox.maxY - projectedBox.minY);
 
+        // TODO: take the rect size different into account
         const scale = this.fit(
             boxWidth * camera.aspect,
             boxHeight,
             width / diffWidth,
             height / diffHeight
         );
-        // console.log({ scale, width, height, boxWidth: boxWidth * camera.aspect, boxHeight, diffWidth, diffHeight, aspect: camera.aspect, distance })
-        // this.context.focusRectSettings.zoom = 1.39;
-        // if (!this.context.focusRect) this.context.setCameraFocusRect(this.context.domElement);
-        // return
         const vec = getTempVector(boxPosition);
         vec.project(camera);
         this.context.focusRectSettings.offsetX = vec.x;
         this.context.focusRectSettings.offsetY = vec.y;
-        this.context.focusRectSettings.zoom = scale / (height * .5);
+        this.context.focusRectSettings.zoom = scale;
         // if we don't have a focus rect yet, set it to the dom element
         if (!this.context.focusRect) this.context.setCameraFocusRect(this.context.domElement);
 
@@ -189,8 +149,9 @@ export class ViewBox extends Behaviour {
 
 
 
-    private projectBoxIntoCamera(position: Vector3, scale: Vector3, camera: Camera, _factor: number) {
-        const factor = .5 * _factor;
+    private projectBoxIntoCamera(position: Vector3, scale: Vector3, camera: Camera, diff: number) {
+
+        const factor = .5 * diff;
 
         const corners = [
             getTempVector(-scale.x * factor, -scale.y * factor, -scale.z * factor),
@@ -216,21 +177,18 @@ export class ViewBox extends Behaviour {
             if (c.y > maxY) maxY = c.y;
         }
 
-        if (debugParam) {
-            if (!this._projectedBoxElement) {
-                this._projectedBoxElement = document.createElement("div");
-            }
-            if (this._projectedBoxElement.parentElement !== this.context.domElement)
-                this.context.domElement.appendChild(this._projectedBoxElement);
-            this._projectedBoxElement.style.position = "fixed";
-            this._projectedBoxElement.style.outline = "5px dotted red";
-            this._projectedBoxElement.style.left = ((minX * .5 + .5) * this.context.domWidth) + "px";
-            this._projectedBoxElement.style.top = ((-maxY * .5 + .5) * this.context.domHeight) + "px";
-            this._projectedBoxElement.style.width = ((maxX - minX) * .5 * this.context.domWidth) + "px";
-            this._projectedBoxElement.style.height = ((maxY - minY) * .5 * this.context.domHeight) + "px";
-            this._projectedBoxElement.style.pointerEvents = "none";
-            this._projectedBoxElement.style.zIndex = "1000";
-        }
+        // if(!this._projectedBoxElement) {
+        //     this._projectedBoxElement = document.createElement("div");
+        // this.context.domElement.appendChild(this._projectedBoxElement);
+        // }
+        // this._projectedBoxElement.style.position = "fixed";
+        // this._projectedBoxElement.style.outline = "10px solid red";
+        // this._projectedBoxElement.style.left = ((minX * .5 + .5) * this.context.domWidth) + "px";
+        // this._projectedBoxElement.style.top = ((-maxY * .5 + .5) * this.context.domHeight) + "px";
+        // this._projectedBoxElement.style.width = ((maxX - minX) * .5 * this.context.domWidth) + "px";
+        // this._projectedBoxElement.style.height = ((maxY - minY) * .5 * this.context.domHeight) + "px";
+        // this._projectedBoxElement.style.pointerEvents = "none";
+        // this._projectedBoxElement.style.zIndex = "1000";
 
 
         return { minX, maxX, minY, maxY };