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

package/lib/engine-components/web/ViewBox.js

@@ -0,0 +1,186 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var ViewBox_1;
+import { PerspectiveCamera } 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 { 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";
+const debugParam = getParam("debugviewbox");
+let ViewBox = ViewBox_1 = class ViewBox extends Behaviour {
+    static instances = [];
+    referenceFieldOfView = 60;
+    debug = false;
+    awake() {
+        // this.referenceFieldOfView = (this.context.mainCamera as PerspectiveCamera)?.fov || 60;
+        // setInterval(()=>{
+        //     this.enabled = !this.enabled
+        // }, 1000)
+    }
+    onEnable() {
+        if (debugParam || this.debug || isDevEnvironment())
+            console.debug("[ViewBox] Using camera fov:", this.referenceFieldOfView);
+        ViewBox_1.instances.push(this);
+    }
+    onDisable() {
+        const idx = ViewBox_1.instances.indexOf(this);
+        if (idx !== -1)
+            ViewBox_1.instances.splice(idx, 1);
+    }
+    onBeforeRender() {
+        if (this.context.isInXR)
+            return;
+        const isActive = ViewBox_1.instances[ViewBox_1.instances.length - 1] === this;
+        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;
+        if (!camera)
+            return;
+        if (!(camera instanceof PerspectiveCamera)) {
+            // TODO: support orthographic camera
+            return;
+        }
+        if (this.referenceFieldOfView === undefined || this.referenceFieldOfView <= 0) {
+            if (debugParam || this.debug)
+                console.warn("[ViewBox] No valid referenceFieldOfView set, cannot adjust box size:", this.referenceFieldOfView);
+            return;
+        }
+        const domWidth = this.context.domWidth;
+        const domHeight = this.context.domHeight;
+        let rectPosX = 0;
+        let rectPosY = 0;
+        let rectWidth = domWidth;
+        let rectHeight = domHeight;
+        let diffWidth = 1;
+        let diffHeight = 1;
+        // use focus rect if available
+        const focusRectSize = this.context.focusRectSize;
+        if (focusRectSize) {
+            // console.log(focusRectSize)
+            rectPosX = focusRectSize.x;
+            rectPosY = focusRectSize.y;
+            rectWidth = focusRectSize.width;
+            rectHeight = focusRectSize.height;
+            diffWidth = domWidth / rectWidth;
+            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 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, 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);
+        const vec = getTempVector(boxPosition);
+        vec.project(camera);
+        this.context.focusRectSettings.offsetX = vec.x;
+        this.context.focusRectSettings.offsetY = vec.y;
+        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);
+        // Reset values
+        camera.view = view;
+        camera.zoom = zoom;
+        camera.aspect = aspect;
+        camera.fov = fov;
+        // camera.updateProjectionMatrix();
+        // BACKLOG: some code for box scale of an object (different component)
+        // this.gameObject.worldScale = getTempVector(width, height, worldscale.z);
+        // this.gameObject.scale.multiplyScalar(.98)
+        // const minscale = Math.min(width, height);
+        // console.log(width, height);
+        // this.gameObject.worldScale = getTempVector(scale, scale, scale);
+    }
+    /**
+     * Cover fit
+     */
+    fit(width1, height1, width2, height2) {
+        const scaleX = width2 / width1;
+        const scaleY = height2 / height1;
+        return Math.min(scaleX, scaleY);
+    }
+    projectBoxIntoCamera(position, scale, camera, diff) {
+        const factor = .5 * diff;
+        const corners = [
+            getTempVector(-scale.x * factor, -scale.y * factor, -scale.z * factor),
+            getTempVector(scale.x * factor, -scale.y * factor, -scale.z * factor),
+            getTempVector(-scale.x * factor, scale.y * factor, -scale.z * factor),
+            getTempVector(scale.x * factor, scale.y * factor, -scale.z * factor),
+            getTempVector(-scale.x * factor, -scale.y * factor, scale.z * factor),
+            getTempVector(scale.x * factor, -scale.y * factor, scale.z * factor),
+            getTempVector(-scale.x * factor, scale.y * factor, scale.z * factor),
+            getTempVector(scale.x * factor, scale.y * factor, scale.z * factor),
+        ];
+        let minX = Number.POSITIVE_INFINITY;
+        let maxX = Number.NEGATIVE_INFINITY;
+        let minY = Number.POSITIVE_INFINITY;
+        let maxY = Number.NEGATIVE_INFINITY;
+        for (let i = 0; i < corners.length; i++) {
+            const c = corners[i];
+            c.add(position);
+            c.project(camera);
+            if (c.x < minX)
+                minX = c.x;
+            if (c.x > maxX)
+                maxX = c.x;
+            if (c.y < minY)
+                minY = c.y;
+            if (c.y > maxY)
+                maxY = c.y;
+        }
+        // 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 };
+    }
+    _projectedBoxElement = null;
+};
+__decorate([
+    serializable()
+], ViewBox.prototype, "referenceFieldOfView", void 0);
+__decorate([
+    serializable()
+], ViewBox.prototype, "debug", void 0);
+ViewBox = ViewBox_1 = __decorate([
+    registerType
+], ViewBox);
+export { ViewBox };
+//# sourceMappingURL=ViewBox.js.map

package/lib/engine-components/web/ViewBox.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ViewBox.js","sourceRoot":"","sources":["../../../src/engine-components/web/ViewBox.ts"],"names":[],"mappings":"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"}

package/lib/engine-components/web/index.d.ts

@@ -2,3 +2,4 @@ export * from "./Clickthrough.js";
 export * from "./CursorFollow.js";
 export * from "./HoverAnimation.js";
 export * from "./ScrollFollow.js";
+export * from "./ViewBox.js";

package/lib/engine-components/web/index.js

@@ -2,4 +2,5 @@ export * from "./Clickthrough.js";
 export * from "./CursorFollow.js";
 export * from "./HoverAnimation.js";
 export * from "./ScrollFollow.js";
+export * from "./ViewBox.js";
 //# sourceMappingURL=index.js.map

package/lib/engine-components/web/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/engine-components/web/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/engine-components/web/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/engine",
-  "version": "4.10.0-beta",
+  "version": "4.10.0-beta.2",
   "description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development with great integrations into editors like Unity or Blender - and can be deployed onto any device! It is flexible, extensible and networking and XR are built-in.",
   "main": "dist/needle-engine.min.js",
   "exports": {

package/src/engine/codegen/register_types.ts

@@ -142,6 +142,7 @@ import { ClickThrough } from "../../engine-components/web/Clickthrough.js";
 import { CursorFollow } from "../../engine-components/web/CursorFollow.js";
 import { HoverAnimation } from "../../engine-components/web/HoverAnimation.js";
 import { ScrollFollow } from "../../engine-components/web/ScrollFollow.js";
+import { ViewBox } from "../../engine-components/web/ViewBox.js";
 import { Avatar } from "../../engine-components/webxr/Avatar.js";
 import { XRControllerFollow } from "../../engine-components/webxr/controllers/XRControllerFollow.js";
 import { XRControllerModel } from "../../engine-components/webxr/controllers/XRControllerModel.js";
@@ -300,6 +301,7 @@ TypeStore.add("ClickThrough", ClickThrough);
 TypeStore.add("CursorFollow", CursorFollow);
 TypeStore.add("HoverAnimation", HoverAnimation);
 TypeStore.add("ScrollFollow", ScrollFollow);
+TypeStore.add("ViewBox", ViewBox);
 TypeStore.add("Avatar", Avatar);
 TypeStore.add("XRControllerFollow", XRControllerFollow);
 TypeStore.add("XRControllerModel", XRControllerModel);

package/src/engine/engine_camera.fit.ts

@@ -87,7 +87,7 @@ export type FitCameraReturnType = {
 }
 
 
-export function fitCamera(objectsOrOptions?: Object3D | Array<Object3D> | FitCameraOptions, options?: FitCameraOptions): null | FitCameraReturnType {
+export function fitCamera(options?: FitCameraOptions): null | FitCameraReturnType {
 
     if (NeedleXRSession.active) {
         // camera fitting in XR is not supported
@@ -102,37 +102,6 @@ export function fitCamera(objectsOrOptions?: Object3D | Array<Object3D> | FitCam
     }
     const camera = options?.camera || context.mainCamera;
 
-    let objects: Object3D | Array<Object3D> | undefined = undefined;
-    // If the user passed in an array as first argument
-    if (Array.isArray(objectsOrOptions)) {
-        objects = objectsOrOptions;
-    }
-    // If the user passed in an object as first argument
-    else if (objectsOrOptions && "type" in objectsOrOptions) {
-        objects = objectsOrOptions;
-    }
-    // If the user passed in an object as first argument and options as second argument
-    else if (objectsOrOptions && typeof objectsOrOptions === "object") {
-        if (!(objectsOrOptions instanceof Object3D) && !Array.isArray(objectsOrOptions)) {
-            options = objectsOrOptions;
-            objects = options.objects;
-        }
-    }
-    // Ensure objects are setup correctly
-    if (objects && !Array.isArray(objects)) {
-        objects = [objects];
-    }
-    if (!Array.isArray(objects) || objects && objects.length <= 0) {
-        objects = context.scene.children;
-    }
-
-    // Make sure there's anything to fit to
-    if (!Array.isArray(objects) || objects.length <= 0) {
-        console.warn("No objects to fit camera to...");
-        return null;
-    }
-
-
     // const controls = this._controls as ThreeOrbitControls | null;
 
     if (!camera) {
@@ -155,6 +124,7 @@ export function fitCamera(objectsOrOptions?: Object3D | Array<Object3D> | FitCam
     const size = new Vector3();
     const center = new Vector3();
     const aspect = camera instanceof PerspectiveCamera ? camera.aspect : 1;
+    const objects = options.objects || context.scene;
     // TODO would be much better to calculate the bounds in camera space instead of world space - 
     // we would get proper view-dependant fit.
     // Right now it's independent from where the camera is actually looking from,

package/src/engine/engine_camera.ts

@@ -52,15 +52,23 @@ export type FocusRectSettings = {
     /** Lower values will result in faster alignment with the rect (value ~= seconds to reach target) 
      * Minimum value is 0.
      */
-    damping: number
+    damping: number,
+
+    /** X offset in camera coordinates. Used by ViewBox component */
+    offsetX: number,
+    /** Y offset in camera coordinates. Used by ViewBox component */
+    offsetY: number,
+    /** Zoom factor. Used by ViewBox component */
+    zoom: number,
 }
 export type FocusRect = DOMRect | Element | { x: number, y: number, width: number, height: number };
 
 let rendererRect: DOMRect | undefined = undefined;
 const overlapRect = { x: 0, y: 0, width: 0, height: 0 };
+const _testTime = 1;
 
 /** Used internally by the Needle Engine context via 'setFocusRect(<rect>)'  */
-export function updateCameraFocusRect(focusRect: FocusRect, dt: number, camera: PerspectiveCamera, renderer: WebGLRenderer) {
+export function updateCameraFocusRect(focusRect: FocusRect, settings: FocusRectSettings, dt: number, camera: PerspectiveCamera, renderer: WebGLRenderer) {
 
     if (focusRect instanceof Element) {
         focusRect = focusRect.getBoundingClientRect();
@@ -76,16 +84,62 @@ export function updateCameraFocusRect(focusRect: FocusRect, dt: number, camera:
     rect.x -= rendererRect.x;
     rect.y -= rendererRect.y;
 
-    const targetX = rect.width / -2 - (rect.x - (rendererRect.width / 2));
-    const targetY = rect.height / -2 - (rect.y - (rendererRect.height / 2));
+    const sourceWidth = rendererRect.width;
+    const sourceHeight = rendererRect.height;
 
-    const view = camera.view;
+    const view = camera.view as PerspectiveCamera["view"];
 
+    // Apply zoom
+    const zoom = settings.zoom;
     let offsetX = view?.offsetX || 0;
     let offsetY = view?.offsetY || 0;
-    offsetX = Mathf.lerp(offsetX, targetX, dt);
-    offsetY = Mathf.lerp(offsetY, targetY, dt);
 
-    camera.setViewOffset(rendererRect.width, rendererRect.height, offsetX, offsetY, rendererRect.width, rendererRect.height);
+    let width = rendererRect.width;
+    let height = rendererRect.height;
+    width /= zoom;
+    height /= zoom;
+    offsetX = width * (zoom - 1) * .5;
+    offsetY = height * (zoom - 1) * .5;
+
+    const focusRectCenterX = rect.x + rect.width * .5;
+    const focusRectCenterY = rect.y + rect.height * .5;
+    const rendererCenterX = rendererRect.width * .5;
+    const rendererCenterY = rendererRect.height * .5;
+
+    const diffx = focusRectCenterX - rendererCenterX;
+    const diffy = focusRectCenterY - rendererCenterY;
+    offsetX -= diffx / zoom;
+    offsetY -= diffy / zoom;
+    if (settings.offsetX !== undefined) {
+        offsetX += settings.offsetX * (rendererRect.width * .5);
+    }
+    if (settings.offsetY !== undefined) {
+        offsetY -= settings.offsetY * (rendererRect.height * .5);
+    }
+
+
+    const currentOffsetX = view?.offsetX || offsetX;
+    const currentOffsetY = view?.offsetY || offsetY;
+    offsetX = Mathf.lerp(currentOffsetX, offsetX, dt);
+    offsetY = Mathf.lerp(currentOffsetY, offsetY, dt);
+    const currentWidth = view?.width || sourceWidth;
+    const currentHeight = view?.height || sourceHeight;
+    width = Mathf.lerp(currentWidth, width, dt);
+    height = Mathf.lerp(currentHeight, height, dt);
+
+    camera.setViewOffset(sourceWidth, sourceHeight, offsetX, offsetY, width, height);
     camera.updateProjectionMatrix();
+
+    if (settings.damping > 0) {
+        settings.damping *= (1.0 - dt);
+        if (settings.damping < 0.01) settings.damping = 0;
+        settings.damping = Math.max(0, settings.damping);
+    }
+}
+
+
+function fit(width1: number, height1: number, width2: number, height2: number) {
+    const scaleX = width2 / width1;
+    const scaleY = height2 / height1;
+    return Math.max(scaleX, scaleY);
 }

package/src/engine/engine_context.ts

@@ -1382,21 +1382,61 @@ export class Context implements IContext {
 	 * @param settings Optional settings for the focus rect. These will override the `focusRectSettings` property
 	 */
 	public setCameraFocusRect(rect: FocusRect | null, settings?: Partial<FocusRectSettings>) {
+		const oldRect = this._focusRect;
 		this._focusRect = rect;
 		if (settings) {
 			Object.assign(this.focusRectSettings, settings);
 		}
+		if (settings?.damping === undefined) {
+			// if the new rect is on screen then set damping
+			if (oldRect) {
+				let domRect = oldRect as DOMRect;
+				if (oldRect instanceof HTMLElement) {
+					domRect = oldRect.getBoundingClientRect();
+				}
+				if (domRect && "top" in domRect) {
+					const allowedDistance = 100;
+					const isVisible = domRect.bottom >= -allowedDistance && domRect.right >= -allowedDistance && domRect.top <= window.innerHeight + allowedDistance && domRect.left <= window.innerWidth + allowedDistance;
+					if (isVisible) this.focusRectSettings.damping = .2;
+				}
+			}
+		}
+
 	}
 	get focusRect() { return this._focusRect; }
+	get focusRectSize(): null | { x: number, y: number, width: number, height: number } {
+		const rect = this._focusRect;
+		if (rect && (rect instanceof DOMRect || ("width" in rect && "height" in rect && "x" in rect && "y" in rect))) {
+			return { x: rect.x, y: rect.y, width: rect.width, height: rect.height };
+		}
+		else if (rect instanceof HTMLElement) {
+			const r = rect.getBoundingClientRect();
+			return { x: r.x, y: r.y, width: r.width, height: r.height };
+		}
+		return null;
+	}
 	/** Settings when a focus rect is set. Use `setCameraFocusRect(...)` to do so.  
 	 * This can be used to offset the renderer center e.g. to a specific DOM element.
 	 */
 	readonly focusRectSettings: FocusRectSettings = {
 		/** Controls how fast the rect is centered. Smaller values mean the rect is centered faster.   
 		 * A minimum value of 0 means the rect is centered instantly.
-		 * @default .05
+		 * @default 0
 		*/
-		damping: .05
+		damping: 0,
+
+		/**
+		 * Zoom factor when a focus rect is set.
+		 */
+		zoom: 1,
+		/**
+		 * Additional offset in pixels from the center of the rect
+		 */
+		offsetX: 0,
+		/**
+		 * Additional offset in pixels from the center of the rect
+		 */
+		offsetY: 0,
 	};
 	private _focusRect: FocusRect | null = null;
 
@@ -1528,14 +1568,6 @@ export class Context implements IContext {
 
 		if (this.isVisibleToUser || this.runInBackground) {
 
-			if (this._focusRect) {
-				if (this.mainCamera instanceof PerspectiveCamera) {
-					const settings = this.focusRectSettings;
-					const dt = settings.damping > 0 ? this.time.deltaTime / settings.damping : 1;
-					updateCameraFocusRect(this._focusRect, dt, this.mainCamera, this.renderer);
-				}
-			}
-
 			this._currentFrameEvent = FrameEvent.OnBeforeRender;
 
 			// should we move these callbacks in the regular three onBeforeRender events?
@@ -1552,6 +1584,14 @@ export class Context implements IContext {
 			this.executeCoroutines(FrameEvent.OnBeforeRender);
 			invokeLifecycleFunctions(this, FrameEvent.OnBeforeRender);
 
+			if (this._focusRect) {
+				if (this.mainCamera instanceof PerspectiveCamera) {
+					const settings = this.focusRectSettings;
+					const dt = settings.damping > 0 ? this.time.deltaTime / settings.damping : 1;
+					updateCameraFocusRect(this._focusRect, this.focusRectSettings, dt, this.mainCamera, this.renderer);
+				}
+			}
+
 			if (this._needsUpdateSize)
 				this.updateSize();
 

package/src/engine/engine_lightdata.ts

@@ -1,7 +1,7 @@
 import { ShaderChunk, Texture, UniformsLib, Vector4 } from "three";
 
 import { setDisposable } from "./engine_assetdatabase.js";
-import { Context } from "./engine_setup.js";
+import type { Context } from "./engine_setup.js";
 import type { SourceIdentifier } from "./engine_types.js";
 import { getParam } from "./engine_utils.js";
 import { LightmapType } from "./extensions/NEEDLE_lightmaps.js";
@@ -27,22 +27,22 @@ export interface ILightDataRegistry {
 
 export class LightDataRegistry implements ILightDataRegistry {
 
-    private _context: Context;
-    private _lightmaps: Map<SourceIdentifier, Map<LightmapType, Texture[]>> = new Map();
+    private readonly context: Context;
+    private readonly map: Map<SourceIdentifier, Map<LightmapType, Texture[]>> = new Map();
 
     clear() {
-        this._lightmaps.clear();
+        this.map.clear();
     }
 
     constructor(context: Context) {
-        this._context = context;
+        this.context = context;
     }
 
     registerTexture(sourceId: SourceIdentifier, type: LightmapType, tex: Texture, index: number) {
         if (debugLightmap) console.log("Registering ", LightmapType[type] + " \"" + sourceId + "\"", tex);
-        if (!this._lightmaps.has(sourceId))
-            this._lightmaps.set(sourceId, new Map());
-        const map = this._lightmaps.get(sourceId);
+        if (!this.map.has(sourceId))
+            this.map.set(sourceId, new Map());
+        const map = this.map.get(sourceId);
         const arr = map?.get(type) ?? [];
         if (arr.length < index) arr.length = index + 1;
         setDisposable(tex, false);
@@ -55,12 +55,12 @@ export class LightDataRegistry implements ILightDataRegistry {
     }
 
     tryGetSkybox(sourceId?: SourceIdentifier | null): Texture | null {
-        if (debugLightmap) console.log("[Get Skybox]", sourceId, this._lightmaps)
+        if (debugLightmap) console.log("[Get Skybox]", sourceId, this.map)
         return this.tryGet(sourceId, LightmapType.Skybox, 0);
     }
 
     tryGetReflection(sourceId?: SourceIdentifier | null): Texture | null {
-        if (debugLightmap) console.log("[Get Reflection]", sourceId, this._lightmaps)
+        if (debugLightmap) console.log("[Get Reflection]", sourceId, this.map)
         return this.tryGet(sourceId, LightmapType.Reflection, 0);
     }
 
@@ -69,7 +69,7 @@ export class LightDataRegistry implements ILightDataRegistry {
             if (debugLightmap) console.warn("Missing source id");
             return null;
         }
-        const entry = this._lightmaps.get(sourceId);
+        const entry = this.map.get(sourceId);
         if (!entry) {
             if (debugLightmap) console.warn(`[Lighting] No ${LightmapType[type]} texture entry for`, sourceId);
             return null;

package/src/engine/engine_physics_rapier.ts

@@ -67,6 +67,7 @@ export class RapierPhysics implements IPhysicsEngine {
     debugRenderRaycasts: boolean = false;
 
     removeBody(obj: IComponent) {
+        if(debugPhysics) console.log("REMOVE BODY", obj?.name, obj[$bodyKey]);
         if (!obj) return;
         this.validate();
         const body = obj[$bodyKey];
@@ -901,6 +902,8 @@ export class RapierPhysics implements IPhysicsEngine {
             // set the collider layers
             this.updateColliderCollisionGroups(collider);
 
+            if (debugPhysics) console.log("Created collider", collider.name, col);
+
             return col;
         }
         catch (e) {

package/src/engine/engine_scenelighting.ts

@@ -162,7 +162,7 @@ export class RendererData {
     private __currentReflectionId: SourceIdentifier | null = null;
 
     /** @internal */
-    internalEnableReflection(sourceId: SourceIdentifier) {
+    internalEnableReflection(sourceId: SourceIdentifier) : Texture | null {
         this.__currentReflectionId = sourceId;
         const settings = this._sceneLightSettings?.get(sourceId);
 
@@ -181,7 +181,7 @@ export class RendererData {
                     const tex = existing.Source;
                     tex.mapping = EquirectangularReflectionMapping;
                     scene.environment = tex;
-                    return;
+                    return tex;
                 }
                 else if (debug) console.warn("Could not find reflection for source", sourceId);
                 break;
@@ -196,22 +196,21 @@ export class RendererData {
                         tex.colorSpace = SRGBColorSpace;
                         tex.mapping = EquirectangularReflectionMapping;
                         this.context.scene.environment = tex;
+                        return tex;
                     }
                     else console.error("Missing ambient trilight", settings.sourceId);
-                    return;
                 case AmbientMode.Flat:
                     if (settings.ambientLight) {
                         const tex = createFlatTexture(settings.ambientLight, 64);
                         tex.colorSpace = SRGBColorSpace;
                         tex.mapping = EquirectangularReflectionMapping;
                         this.context.scene.environment = tex;
+                        return tex;
                     }
                     else console.error("Missing ambientlight", settings.sourceId);
-                    return;
-                default:
-                    return;
             }
         }
+        return null;
     }
 
     /** @internal */

package/src/engine/engine_utils.ts

@@ -381,6 +381,14 @@ export function resolveUrl(source: SourceIdentifier | undefined, uri: string): s
     }
     return uri;
 }
+
+export function toSourceId(src: string | null): SourceIdentifier | undefined {
+    if (!src) return undefined;
+    src = src.trim();
+    src = src.split("?")[0]?.split("#")[0];
+    return src;
+}
+
 // export function getPath(glbLocation: SourceIdentifier | undefined, path: string) {
 //     if (path && glbLocation && !path.includes("/")) {
 //         // get directory of glb and prepend it to the audio file path
@@ -793,6 +801,7 @@ const mutationObserverMap = new WeakMap<HTMLElement, HtmlElementExtra>();
 /** 
  * Register a callback when an {@link HTMLElement} attribute changes.   
  * This is used, for example, by the Skybox component to watch for changes to the environment-* and skybox-* attributes.
+ * @returns A function that can be used to unregister the callback
 */
 export function addAttributeChangeCallback(domElement: HTMLElement, name: string, callback: AttributeChangeCallback) {
     if (!mutationObserverMap.get(domElement)) {
@@ -811,6 +820,9 @@ export function addAttributeChangeCallback(domElement: HTMLElement, name: string
         listeners.set(name, []);
     }
     listeners.get(name)!.push(callback);
+    return () => {
+        removeAttributeChangeCallback(domElement, name, callback);
+    }
 };
 
 /** 

package/src/engine/extensions/NEEDLE_lightmaps.ts

@@ -107,7 +107,7 @@ export class NEEDLE_lightmaps implements GLTFLoaderPlugin {
 
     private resolveTexture(entry: LightmapInfo, res: any) {
         const tex: Texture = res as unknown as Texture;
-        if (debug) console.log("Lightmap loaded:", tex);
+        if (debug) console.log("Light Texture loaded:", tex);
         if (tex?.isTexture) {
             if (!this.registry)
                 console.log(LightmapType[entry.type], entry.pointer, tex);