@needle-tools/engine 4.11.1 → 4.11.3-next.ccd3ad6

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

@@ -39,9 +39,10 @@ import * as fflate from 'three/examples/jsm/libs/fflate.module.js';
 import { VERSION } from "../../../engine/engine_constants.js";
 import type { OffscreenCanvasExt } from '../../../engine/engine_shims.js';
 import { Progress } from '../../../engine/engine_time_utils.js';
-import { BehaviorExtension } from '../../api.js';
+// import { BehaviorExtension } from '../../api.js';
 import type { IUSDExporterExtension } from './Extension.js';
 import type { AnimationExtension } from './extensions/Animation.js';
+import { BehaviorExtension } from './extensions/behavior/Behaviour.js';
 import type { PhysicsExtension } from './extensions/behavior/PhysicsExtension.js';
 import {buildNodeMaterial} from './extensions/NodeMaterialConverter.js';
 
@@ -622,13 +623,13 @@ class USDZExporterContext {
 	output: string;
 	animations: AnimationClip[];
 
-	constructor( root: Object3D | undefined, exporter: USDZExporter, options: { 
+	constructor( root: Object3D | null | undefined, exporter: USDZExporter, options: { 
 		extensions?: Array<IUSDExporterExtension>, 
 		quickLookCompatible: boolean,
 		exportInvisible: boolean,
 	} ) {
 
-		this.root = root;
+		this.root = root || undefined;
 		this.exporter = exporter;
 		this.quickLookCompatible = options.quickLookCompatible;
 		this.exportInvisible = options.exportInvisible;
@@ -656,18 +657,28 @@ export type Anchoring = "plane" | "image" | "face" | "none"
 /**[documentation](https://developer.apple.com/documentation/arkit/usdz_schemas_for_ar/preliminary_anchoringapi/preliminary_planeanchoring_alignment) */
 export type Alignment = "horizontal" | "vertical" | "any";
 
-class USDZExporterOptions {
+type USDZExporterOptions = {
 	ar: {
 		anchoring: { type: Anchoring },
 		planeAnchoring: { alignment: Alignment },
-	} = { 
-		anchoring: { type: 'plane' },
-		planeAnchoring: { alignment: 'horizontal' }
-	};
-	quickLookCompatible: boolean = false;
-	extensions: any[] = [];
-	maxTextureSize: number = 4096;
-	exportInvisible: boolean = false;
+	}
+	quickLookCompatible: boolean;
+	extensions: Array<IUSDExporterExtension>;
+	maxTextureSize: number;
+	exportInvisible: boolean;
+}
+
+const getDefaultExporterOptions : () => USDZExporterOptions = () => {
+	return {
+		ar: {
+			anchoring: { type: 'plane' },
+			planeAnchoring: { alignment: 'horizontal' }
+		},
+		quickLookCompatible: false,
+		extensions: [],
+		maxTextureSize: 4096,
+		exportInvisible: false
+	}
 }
 
 // #region USDZExporter
@@ -675,7 +686,7 @@ class USDZExporterOptions {
 class USDZExporter {
 	debug: boolean;
 	pruneUnusedNodes: boolean;
-	sceneAnchoringOptions: USDZExporterOptions = new USDZExporterOptions();
+	sceneAnchoringOptions: USDZExporterOptions = getDefaultExporterOptions();
 	extensions: Array<IUSDExporterExtension> = [];
 	keepObject?: (object: Object3D) => boolean;
 	beforeWritingDocument?: () => void;
@@ -687,9 +698,10 @@ class USDZExporter {
 
 	}
 
-	async parse(scene: Object3D | undefined, options: USDZExporterOptions = new USDZExporterOptions()) {
+	async parse(scene: Object3D | null | undefined, options: USDZExporterOptions = getDefaultExporterOptions()) {
 
-		options = Object.assign( new USDZExporterOptions(), options );
+		// clone options to avoid modifying the original object
+		options = Object.assign({}, options );
 
 		this.sceneAnchoringOptions = options;
 		const context = new USDZExporterContext( scene, this, options );

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

@@ -483,7 +483,6 @@ export class USDZExporter extends Behaviour {
 
         Progress.report("export-usdz", "Invoking exporter.parse");
 
-        //@ts-ignore
         const arraybuffer = await exporter.parse(this.objectToExport, {
             ar: {
                 anchoring: {

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

@@ -58,6 +58,13 @@ export class ChangeTransformOnClick extends Behaviour implements IPointerClickHa
         ensureRaycaster(this.gameObject);
     }
 
+    onPointerEnter() {
+        this.context.input.setCursor("pointer");
+    }
+    onPointerExit() {
+        this.context.input.unsetCursor("pointer");
+    }
+
     onPointerClick(args: PointerEventData) {
         args.use();
         if (this.coroutine) this.stopCoroutine(this.coroutine);
@@ -380,6 +387,13 @@ export class SetActiveOnClick extends Behaviour implements IPointerClickHandler,
         ensureRaycaster(this.gameObject);
     }
 
+    onPointerEnter() {
+        this.context.input.setCursor("pointer");
+    }
+    onPointerExit() {
+        this.context.input.unsetCursor("pointer");
+    }
+
     onPointerClick(args: PointerEventData) {
         args.use();
 
@@ -703,6 +717,13 @@ export class PlayAudioOnClick extends Behaviour implements IPointerClickHandler,
         }
     }
 
+
+    onPointerEnter() {
+        this.context.input.setCursor("pointer");
+    }
+    onPointerExit() {
+        this.context.input.unsetCursor("pointer");
+    }
     onPointerClick(args: PointerEventData) {
         args.use();
 
@@ -810,6 +831,13 @@ export class PlayAnimationOnClick extends Behaviour implements IPointerClickHand
         ensureRaycaster(this.gameObject);
     }
 
+
+    onPointerEnter() {
+        this.context.input.setCursor("pointer");
+    }
+    onPointerExit() {
+        this.context.input.unsetCursor("pointer");
+    }
     onPointerClick(args: PointerEventData) {
         args.use();
         if (!this.target) return;

package/src/engine-components/splines/SplineWalker.ts

@@ -114,12 +114,13 @@ export class SplineWalker extends Behaviour {
     /** @internal */
     onEnable(): void {
         window.addEventListener("pointerdown", this.onUserInput, { passive: true });
-        window.addEventListener("wheel", this.onUserInput, { passive: true });
+        // TODO: wheel event is also triggered for touch and it interrupts spline pull if it's an actual site scroll
+        this.context.domElement.addEventListener("wheel", this.onUserInput, { passive: true });
     }
     /** @internal */
     onDisable(): void {
         window.removeEventListener("pointerdown", this.onUserInput);
-        window.removeEventListener("wheel", this.onUserInput);
+        this.context.domElement.removeEventListener("wheel", this.onUserInput);
     }
     private onUserInput = () => {
         if (this.object?.contains(this.context.mainCamera)) {

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

@@ -1,4 +1,5 @@
 import { Vector2 } from "three";
+
 import { NEPointerEvent } from "../../engine/engine_input.js";
 import { onStart } from "../../engine/engine_lifecycle_api.js";
 import { addAttributeChangeCallback } from "../../engine/engine_utils.js";