@needle-tools/engine 3.37.1-alpha → 3.37.2-alpha

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

@@ -1,4 +1,4 @@
-import { Group,Material, Mesh, Object3D, Quaternion, Vector3 } from "three";
+import { Material, Mesh, Object3D, Quaternion, Vector3 } from "three";
 
 import { isDevEnvironment, showBalloonWarning } from "../../../../../engine/debug/index.js";
 import { serializable } from "../../../../../engine/engine_serialization_decorator.js";
@@ -10,14 +10,13 @@ import { Animation } from "../../../../Animation.js";
 import { Animator } from "../../../../Animator.js";
 import { AudioSource } from "../../../../AudioSource.js";
 import { Behaviour, GameObject } from "../../../../Component.js";
-import { Renderer } from "../../../../Renderer.js";
 import type { IPointerClickHandler, PointerEventData } from "../../../../ui/PointerEvents.js";
 import { ObjectRaycaster,Raycaster } from "../../../../ui/Raycaster.js";
 import { USDDocument, USDObject, USDZExporterContext } from "../../ThreeUSDZExporter.js";
 import { AnimationExtension, RegisteredAnimationInfo, type UsdzAnimation } from "../Animation.js";
 import { AudioExtension } from "./AudioExtension.js";
 import type { BehaviorExtension, UsdzBehaviour } from "./Behaviour.js";
-import { ActionBuilder, ActionModel, AuralMode, BehaviorModel, type IBehaviorElement, MotionType, MultiplePerformOperation,PlayAction, Space, TriggerBuilder } from "./BehavioursBuilder.js";
+import { ActionBuilder, ActionModel, BehaviorModel, EmphasizeActionMotionType,type IBehaviorElement, TriggerBuilder } from "./BehavioursBuilder.js";
 
 const debug = getParam("debugusdzbehaviours");
 
@@ -583,7 +582,7 @@ export class EmphasizeOnClick extends Behaviour implements UsdzBehaviour {
     duration: number = 0.5;
 
     @serializable()
-    motionType: MotionType = "bounce";
+    motionType: EmphasizeActionMotionType = "bounce";
 
     beforeCreateDocument() { }
 

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

@@ -234,7 +234,10 @@ export class GroupActionModel implements IBehaviorElement {
 }
 
 /** @internal */
-export type MotionType = "pop" | "blink" | "bounce" | "flip" | "float" | "jiggle" | "pulse" | "spin";
+export type EmphasizeActionMotionType = "pop" | "blink" | "bounce" | "flip" | "float" | "jiggle" | "pulse" | "spin";
+
+/** @internal */
+export type VisibilityActionMotionType = "none" | "pop" | "scaleUp" | "scaleDown" | "moveLeft" | "moveRight" | "moveAbove" | "moveBelow" | "moveForward" | "moveBack";
 
 /** @internal */
 export type MotionStyle = "basic";
@@ -257,7 +260,7 @@ export class ActionModel implements IBehaviorElement {
     tokenId?: string;
     affectedObjects?: string | Target;
     easeType?: EaseType;;
-    motionType?: MotionType;
+    motionType: EmphasizeActionMotionType | VisibilityActionMotionType = "none";
     duration?: number;
     moveDistance?: number;
     style?: MotionStyle;
@@ -306,8 +309,7 @@ export class ActionModel implements IBehaviorElement {
             writer.appendLine(`token easeType = "${this.easeType}"`);
         if (this.tokenId)
             writer.appendLine(`token info:id = "${this.tokenId}"`);
-        if (this.motionType)
-            writer.appendLine(`token motionType = "${this.motionType}"`);
+        writer.appendLine(`token motionType = "${this.motionType}"`);
         if (typeof this.moveDistance === "number")
             writer.appendLine(`double moveDistance = ${this.moveDistance} `);
         if (this.style)
@@ -405,7 +407,7 @@ export class ActionBuilder {
         act.duration = duration;
 
         act.style = "basic";
-        act.motionType = undefined;
+        act.motionType = "none"; // only VisibilityActionMotionType allowed
         act.moveDistance = 0;
         act.easeType = "none";
         return act;
@@ -464,7 +466,7 @@ export class ActionBuilder {
         return act;
     }
 
-    static emphasize(targets: Target, duration: number, motionType: MotionType = "bounce", moveDistance: number = 1, style: MotionStyle = "basic") {
+    static emphasize(targets: Target, duration: number, motionType: EmphasizeActionMotionType = "bounce", moveDistance: number = 1, style: MotionStyle = "basic") {
         const act = new ActionModel(targets);
         act.tokenId = "Emphasize";
         act.duration = duration;

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

@@ -26,7 +26,7 @@ export class PhysicsExtension implements IUSDExporterExtension {
         // see https://developer.apple.com/documentation/realitykit/collisioncomponent#overview        
         let temporaryRigidbody: Rigidbody | undefined = undefined;
         if (colliderSource && !rigidBody) {
-            rigidBody = GameObject.addComponent(object, Rigidbody);
+            rigidBody = new Rigidbody();
             rigidBody.isKinematic = true;
             temporaryRigidbody = rigidBody;
         }
@@ -70,10 +70,6 @@ export class PhysicsExtension implements IUSDExporterExtension {
                 }
                 writer.closeBlock( "}" );
             });
-
-            // we can remove the temporary component again here
-            if (temporaryRigidbody)
-                GameObject.removeComponent(temporaryRigidbody);
         }
 
         if (colliderSource) {

package/src/engine-components/webxr/WebXR.ts

@@ -223,7 +223,7 @@ export class WebXR extends Behaviour {
     setDefaultMovementEnabled(enabled: boolean): XRControllerMovement | null {
         let movement = this.gameObject.getComponent(XRControllerMovement)
         if (!movement && enabled) {
-            movement = this.gameObject.addNewComponent(XRControllerMovement)!;
+            movement = this.gameObject.addComponent(XRControllerMovement)!;
             this._createdComponentsInSession.push(movement);
         }
         if (movement) movement.enabled = enabled;
@@ -233,7 +233,7 @@ export class WebXR extends Behaviour {
     setDefaultControllerRenderingEnabled(enabled: boolean): XRControllerModel | null {
         let models = this.gameObject.getComponent(XRControllerModel);
         if (!models && enabled) {
-            models = this.gameObject.addNewComponent(XRControllerModel)!;
+            models = this.gameObject.addComponent(XRControllerModel)!;
             this._createdComponentsInSession.push(models);
             models.createControllerModel = this.showControllerModels;
             models.createHandModel == this.showHandModels;