@needle-tools/engine 3.27.3-beta → 3.27.5-beta

package/src/engine-components/Renderer.ts

@@ -998,13 +998,6 @@ class InstancedMeshRenderer {
         }
         this.inst = new THREE.InstancedMesh(geo, material, count);
         this.inst[$instancingAutoUpdateBounds] = true;
-        this.inst.onBeforeRender = () => {
-            if (this._needUpdateBounds && this.inst[$instancingAutoUpdateBounds] === true) {
-                if (debugInstancing)
-                    console.log("Update instancing bounds", this.name);
-                this.updateBounds();
-            }
-        };
         this.inst.count = 0;
         this.inst.layers.set(2);
         this.inst.visible = true;
@@ -1012,6 +1005,7 @@ class InstancedMeshRenderer {
         // this.inst.castShadow = true;
         // this.inst.receiveShadow = true;
         this.context.scene.add(this.inst);
+        context.pre_render_callbacks.push(this.onBeforeRender);
         // console.log(this.inst);
         // this.context.pre_render_callbacks.push(this.onPreRender.bind(this));
 
@@ -1020,6 +1014,14 @@ class InstancedMeshRenderer {
         // }, 500);
     }
 
+    private onBeforeRender = () => {
+        if (this._needUpdateBounds && this.inst[$instancingAutoUpdateBounds] === true) {
+            if (debugInstancing)
+                console.log("Update instancing bounds", this.name, this.inst.matrixWorldNeedsUpdate);
+            this.updateBounds();
+        }
+    }
+
     private randomColor() {
         return new THREE.Color(Math.random(), Math.random(), Math.random());
     }

package/src/engine-components/export/usdz/ThreeUSDZExporter.ts

@@ -1,5 +1,7 @@
 import { Renderer } from '../../Renderer.js';
 import { GameObject } from '../../Component.js';
+import type { OffscreenCanvasExt } from '../../../engine/engine_shims.js';
+import '../../../engine/engine_shims.js';
 import {
 	PlaneGeometry,
 	Texture,
@@ -77,12 +79,6 @@ function findStructuralNodesInBoneHierarchy(bones: Array<Object3D>) {
 	return structuralNodes;
 }
 
-// TODO: remove once we update to TypeScript 5 that has proper types for OffscreenCanvas
-declare type OffsetCanvasExt = OffscreenCanvas & {
-	convertToBlob: (options?: any) => Promise<Blob>;
-
-}
-
 class USDObject {
 
 	static USDObject_export_id = 0;
@@ -975,7 +971,7 @@ async function imageToCanvas( image, color: string | undefined = undefined, flip
 
 		}
 
-		return canvas as OffsetCanvasExt;
+		return canvas as OffscreenCanvasExt;
 
 	} else {
 

package/src/engine-components/export/usdz/extensions/behavior/BehaviourComponents.ts

@@ -477,11 +477,7 @@ export class PlayAudioOnClick extends Behaviour implements IPointerClickHandler,
         ensureRaycaster(this.gameObject);
     }
 
-    onPointerClick(args: PointerEventData) {
-        args.use();
-
-        if (!this.clip) return;
-
+    ensureAudioSource() {
         if (!this.target) {
             const newAudioSource = this.gameObject.addNewComponent(AudioSource);
             if (newAudioSource) {
@@ -491,6 +487,14 @@ export class PlayAudioOnClick extends Behaviour implements IPointerClickHandler,
                 newAudioSource.loop = false;
             }
         }
+    }
+
+    onPointerClick(args: PointerEventData) {
+        args.use();
+
+        if (!this.clip) return;
+
+        this.ensureAudioSource();
 
         if (this.target) {
 
@@ -519,11 +523,21 @@ export class PlayAudioOnClick extends Behaviour implements IPointerClickHandler,
             const clipName = clipUrl.split("/").pop();
             const volume = this.target ? this.target.volume : 1;
             const auralMode = this.target && this.target.spatialBlend == 0 ? AuralMode.NonSpatial : AuralMode.Spatial;
-            const playClip = new BehaviorModel("playAudio " + this.name,
+            
+            const playClipOnTap = new BehaviorModel("playAudio " + this.name,
                 TriggerBuilder.tapTrigger(this.gameObject),
                 ActionBuilder.playAudioAction(playbackTarget, "audio/" + clipName, PlayAction.Play, volume, auralMode),
             );
-            ext.addBehavior(playClip);
+            ext.addBehavior(playClipOnTap);
+
+            // automatically play audio on start too if the referenced AudioSource has playOnAwake enabled
+            if (this.target && this.target.playOnAwake && this.target.enabled) {
+                const playClipOnStart = new BehaviorModel("playAudioOnStart " + this.name,
+                    TriggerBuilder.sceneStartTrigger(),
+                    ActionBuilder.playAudioAction(playbackTarget, "audio/" + clipName, PlayAction.Play, volume, auralMode),
+                );
+                ext.addBehavior(playClipOnStart);
+            }
         }
     }
 

package/src/engine-components/ui/EventSystem.ts

@@ -7,7 +7,7 @@ import { Context } from "../../engine/engine_setup.js";
 import { type IPointerEventHandler, PointerEventData, hasPointerEventComponent } from "./PointerEvents.js";
 import { ObjectRaycaster, Raycaster } from "./Raycaster.js";
 import { InputEvents, NEPointerEvent, PointerType } from "../../engine/engine_input.js";
-import { Object3D } from "three";
+import { Mesh, Object3D } from "three";
 import type { ICanvasGroup } from "./Interfaces.js";
 import { getParam } from "../../engine/engine_utils.js";
 import { UIRaycastUtils } from "./RaycastUtils.js";
@@ -295,6 +295,14 @@ export class EventSystem extends Behaviour {
      * */
     private shouldRaycastObject = (obj: Object3D): RaycastTestObjectReturnType => {
 
+        if (!(obj instanceof Mesh)) 
+            return "continue in children";
+
+        // Layer 2 is IgnoreRaycast
+        if (obj.layers.isEnabled(2)) {
+            return "continue in children"
+        }
+
         // check if this object is actually a UI shadow hierarchy object
         let shadowComponent: Object3D | null = null;
         const isUI = isUIObject(obj);