@needle-tools/engine 3.3.0-alpha → 3.5.0-alpha

package/src/engine/engine_three_utils.ts

@@ -98,8 +98,8 @@ export function setWorldScale(obj: Object3D, vec: Vector3) {
     const tempVec = _worldScale2;
     const obj2 = obj.parent;
     obj2.getWorldScale(tempVec);
-    tempVec.divide(vec);
-    obj.scale.copy(tempVec);
+    obj.scale.copy(vec);
+    obj.scale.divide(tempVec);
 }
 
 const _forward = new Vector3();

package/src/engine/engine_types.ts

@@ -1,5 +1,5 @@
 import { RenderTexture } from "./engine_texture";
-import { Camera, Color, Material, Object3D, Vector3, Quaternion, Ray, Scene, Renderer, WebGLRenderer } from "three";
+import { Camera, Color, Material, Object3D, Vector3, Quaternion, Ray, Scene, Renderer, WebGLRenderer, Mesh } from "three";
 import { RGBAColor } from "../engine-components/js-extensions/RGBAColor";
 import { CollisionDetectionMode, PhysicsMaterial, RigidbodyConstraints } from "./engine_physics.types";
 import { CircularBuffer } from "./engine_utils";
@@ -20,7 +20,6 @@ export interface UIDProvider {
     generateUUID(): string;
 }
 
-
 export declare type CoroutineData = {
     comp: IComponent,
     main: Generator,
@@ -31,9 +30,17 @@ export interface ITime {
     get time(): number;
 }
 
+export interface IInput {
+    convertScreenspaceToRaycastSpace(vec: Vec2): void;
+}
+
+export interface IPhysics {
+    engine?: IPhysicsEngine;
+}
+
 export interface IContext {
     alias?: string | null;
-    hash?:string;
+    hash?: string;
 
     scene: Scene;
     renderer: WebGLRenderer;
@@ -42,6 +49,8 @@ export interface IContext {
     domElement: HTMLElement;
 
     time: ITime;
+    input: IInput;
+    physics: IPhysics;
 
     scripts: IComponent[];
     scripts_pausedChanged: IComponent[];
@@ -343,4 +352,57 @@ export class Collision {
     //     }
     //     return this._point;
     // }
-}
+}
+
+export type RaycastResult = null | { point: Vector3, collider: ICollider, normal?: Vector3 };
+
+export class SphereOverlapResult {
+    object: Object3D;
+    collider: ICollider;
+    constructor(object: Object3D, collider: ICollider) {
+        this.object = object;
+        this.collider = collider;
+    }
+}
+
+
+export interface IPhysicsEngine {
+    initialize(ctx: IContext): Promise<boolean>;
+    step(dt: number): void;
+    postStep();
+    get isUpdating(): boolean;
+    /** clear all possibly cached data (e.g. mesh data when creating scaled mesh colliders) */
+    clearCaches();
+
+    // raycasting
+    /** fast raycast without getting the normal vector */
+    raycast(origin: Vec2 | Vec3, direction: Vec3 | undefined, maxDistance: number, solid: boolean): RaycastResult;
+    /** raycast that also gets the normal vector. If you don't need it use raycast() */
+    raycastAndGetNormal(origin: Vec2 | Vec3, direction: Vec3 | undefined, maxDistance: number, solid: boolean) : RaycastResult;
+    sphereOverlap(point: Vector3, radius: number): Array<SphereOverlapResult>;
+
+    // Collider methods
+    addSphereCollider(collider: ICollider, center: Vector3, radius: number);
+    addBoxCollider(collider: ICollider, center: Vector3, size: Vector3);
+    addCapsuleCollider(collider: ICollider, center: Vector3, radius: number, height: number);
+    addMeshCollider(collider: ICollider, mesh: Mesh, convex: boolean, scale: Vector3);
+
+    // Rigidbody methods
+    wakeup(rb: IRigidbody);
+    updateProperties(rb: IRigidbody);
+    resetForces(rb: IRigidbody, wakeup: boolean);
+    resetTorques(rb: IRigidbody, wakeup: boolean);
+    addForce(rb: IRigidbody, vec: Vec3, wakeup: boolean);
+    applyImpulse(rb: IRigidbody, vec: Vec3, wakeup: boolean);
+    getLinearVelocity(rb: IRigidbody): Vec3 | null;
+    getAngularVelocity(rb: IRigidbody): Vec3 | null;
+    setAngularVelocity(rb: IRigidbody, vec: Vec3, wakeup: boolean);
+    setLinearVelocity(rb: IRigidbody, vec: Vec3, wakeup: boolean);
+
+    updateBody(comp: ICollider | IRigidbody, translation: boolean, rotation: boolean);
+    removeBody(body: IComponent);
+
+    // Joints
+    addFixedJoint(body1: IRigidbody, body2: IRigidbody)
+    addHingeJoint(body1: IRigidbody, body2: IRigidbody, anchor: Vec3, axis: Vec3)
+}

package/src/engine-components/Animation.ts

@@ -176,6 +176,10 @@ export class Animation extends Behaviour {
                 return this.internalOnPlay(act, options);
             }
         }
+        if (!(clip instanceof AnimationClip)) {
+            console.warn("Clip is no AnimationClip", clip, "on object: " + this.name)
+            return;
+        }
         const act = this.mixer.clipAction(clip);
         this.actions.push(act);
         return this.internalOnPlay(act, options);

package/src/engine-components/Collider.ts

@@ -40,7 +40,7 @@ export class Collider extends Behaviour implements ICollider {
     }
 
     onDisable() {
-        this.context.physics.removeBody(this);
+        this.context.physics.engine?.removeBody(this);
     }
 
 }
@@ -55,7 +55,7 @@ export class SphereCollider extends Collider {
 
     onEnable() {
         super.onEnable();
-        this.context.physics.addSphereCollider(this, this.center, this.radius);
+        this.context.physics.engine?.addSphereCollider(this, this.center, this.radius);
     }
 }
 
@@ -68,7 +68,7 @@ export class BoxCollider extends Collider {
 
     onEnable() {
         super.onEnable();
-        this.context.physics.addBoxCollider(this, this.center, this.size);
+        this.context.physics.engine?.addBoxCollider(this, this.center, this.size);
     }
 }
 
@@ -90,7 +90,7 @@ export class MeshCollider extends Collider {
             }
         }
         if (this.sharedMesh?.isMesh) {
-            this.context.physics.addMeshCollider(this, this.sharedMesh, this.convex, getWorldScale(this.gameObject));
+            this.context.physics.engine?.addMeshCollider(this, this.sharedMesh, this.convex, getWorldScale(this.gameObject));
         }
         else {
             const group = this.sharedMesh as any as Group;
@@ -99,7 +99,7 @@ export class MeshCollider extends Collider {
                 for (const ch in group.children) {
                     const child = group.children[ch] as Mesh;
                     if (child.isMesh) {
-                        this.context.physics.addMeshCollider(this, child, this.convex, getWorldScale(this.gameObject));
+                        this.context.physics.engine?.addMeshCollider(this, child, this.convex, getWorldScale(this.gameObject));
                     }
                 }
             }
@@ -119,7 +119,7 @@ export class CapsuleCollider extends Collider {
 
     onEnable() {
         super.onEnable();
-        this.context.physics.addCapsuleCollider(this, this.center, this.height, this.radius);
+        this.context.physics.engine?.addCapsuleCollider(this, this.center, this.height, this.radius);
     }
 
 }

package/src/engine-components/Joints.ts

@@ -32,7 +32,7 @@ export abstract class Joint extends Behaviour {
 export class FixedJoint extends Joint {
 
     protected createJoint(self: Rigidbody, other: Rigidbody) {
-        this.context.physics.addFixedJoint(self, other);
+        this.context.physics.engine?.addFixedJoint(self, other);
     }
 }
 
@@ -46,7 +46,7 @@ export class HingeJoint extends Joint {
 
     protected createJoint(self: Rigidbody, other: Rigidbody) {
         if (this.axis && this.anchor)
-            this.context.physics.addHingeJoint(self, other, this.anchor, this.axis);
+            this.context.physics.engine?.addHingeJoint(self, other, this.anchor, this.axis);
     }
 
 }

package/src/engine-components/RigidBody.ts

@@ -89,7 +89,7 @@ class TransformWatch {
             this.position = {};
             // this.position = this.obj.position.clone();
             this._positionWatch.subscribeWrite((val, prop) => {
-                if (this.context.physics.isUpdating || this.mute) return;
+                if (this.context.physics.engine?.isUpdating || this.mute) return;
                 const prev = this.position![prop];
                 if (Math.abs(prev - val) < .00001) return;
                 this.position![prop] = val;
@@ -103,7 +103,7 @@ class TransformWatch {
             this.quaternion = {};
             // this.quaternion = this.obj.quaternion.clone();
             this._rotationWatch.subscribeWrite((val, prop) => {
-                if (this.context.physics.isUpdating || this.mute) return;
+                if (this.context.physics.engine?.isUpdating || this.mute) return;
                 const prev = this.quaternion![prop];
                 if (Math.abs(prev - val) < .00001) return;
                 this.quaternion![prop] = val;
@@ -245,11 +245,11 @@ export class Rigidbody extends Behaviour implements IRigidbody {
 
     onDisable() {
         this._watch?.stop();
-        this.context.physics.removeBody(this);
+        this.context.physics.engine?.removeBody(this);
     }
 
     onDestroy(): void {
-        this.context.physics.removeBody(this);
+        this.context.physics.engine?.removeBody(this);
     }
 
     onValidate() {
@@ -261,12 +261,12 @@ export class Rigidbody extends Behaviour implements IRigidbody {
         while (true) {
             if (this._propertiesChanged) {
                 this._propertiesChanged = false;
-                this.context.physics.updateProperties(this);
+                this.context.physics.engine?.updateProperties(this);
             }
             if (this._watch?.isDirty) {
                 this._watch.mute = true;
                 this._watch.applyValues();
-                this.context.physics.updateBody(this, this._watch.positionChanged, this._watch.rotationChanged);
+                this.context.physics.engine?.updateBody(this, this._watch.positionChanged, this._watch.rotationChanged);
                 this._watch.reset();
             }
             else this._watch?.syncValues();
@@ -275,10 +275,6 @@ export class Rigidbody extends Behaviour implements IRigidbody {
         }
     }
 
-    private get body() {
-        return this.context.physics.internal_getRigidbody(this);
-    }
-
     public teleport(pt: { x: number, y: number, z: number }, localspace: boolean = true) {
         this._watch?.reset(true);
         if (localspace) this.gameObject.position.set(pt.x, pt.y, pt.z);
@@ -288,11 +284,11 @@ export class Rigidbody extends Behaviour implements IRigidbody {
     }
 
     public resetForces() {
-        this.body?.resetForces(true);
+        this.context.physics.engine?.resetForces(this, true);
     }
 
     public resetTorques() {
-        this.body?.resetTorques(true);
+        this.context.physics.engine?.resetTorques(this, true);
     }
 
     public resetVelocities() {
@@ -306,24 +302,24 @@ export class Rigidbody extends Behaviour implements IRigidbody {
     }
 
     public wakeUp() {
-        this.body?.wakeUp();
+        this.context.physics.engine?.wakeup(this);
     }
 
     public applyForce(vec: Vector3, _rel?: THREE.Vector3) {
-        this.body?.addForce(vec, true);
+        this.context.physics.engine?.addForce(this, vec, true);
     }
 
     public applyImpulse(vec: Vector3) {
-        this.body?.applyImpulse(vec, true);
+        this.context.physics.engine?.applyImpulse(this, vec, true);
     }
 
     public setForce(x: number, y: number, z: number) {
-        this.body?.resetForces(true);
-        this.body?.addForce({ x, y, z }, true);
+        this.context.physics.engine?.resetForces(this, true);
+        this.context.physics.engine?.addForce(this, { x, y, z }, true);
     }
 
     public getVelocity(): Vector3 {
-        const vel = this.body?.linvel();
+        const vel = this.context.physics.engine?.getLinearVelocity(this);
         if (!vel) return this._currentVelocity.set(0, 0, 0);
         this._currentVelocity.x = vel.x;
         this._currentVelocity.y = vel.y;
@@ -334,25 +330,25 @@ export class Rigidbody extends Behaviour implements IRigidbody {
     public setVelocity(x: number | Vector3, y?: number, z?: number) {
         if (x instanceof Vector3) {
             const vec = x;
-            this.body?.setLinvel(vec, true);
+            this.context.physics.engine?.setLinearVelocity(this,vec, true);
             return;
         }
         if (y === undefined || z === undefined) return;
-        this.body?.setLinvel({ x: x, y: y, z: z }, true);
+        this.context.physics.engine?.setLinearVelocity(this, { x: x, y: y, z: z }, true);
     }
 
     public setAngularVelocity(x: number | Vector3, y?: number, z?: number) {
         if (x instanceof Vector3) {
             const vec = x;
-            this.body?.setAngvel(vec, true);
+            this.context.physics.engine?.setAngularVelocity(this, vec, true);
             return;
         }
         if (y === undefined || z === undefined) return;
-        this.body?.setAngvel({ x: x, y: y, z: z }, true);
+        this.context.physics.engine?.setAngularVelocity(this, { x: x, y: y, z: z }, true);
     }
 
     public getAngularVelocity(): Vector3 {
-        const vel = this.body?.angvel();
+        const vel = this.context.physics.engine?.getAngularVelocity(this);
         if (!vel) return this._currentVelocity.set(0, 0, 0);
         this._currentVelocity.x = vel.x;
         this._currentVelocity.y = vel.y;
@@ -381,13 +377,10 @@ export class Rigidbody extends Behaviour implements IRigidbody {
 
 
     private captureVelocity() {
-        if (this.body) {
-            const wp = getWorldPosition(this.gameObject);
-            Rigidbody.tempPosition.copy(wp);
-            const vel = wp.sub(this._lastPosition);
-            this._lastPosition.copy(Rigidbody.tempPosition);
-            this._smoothedVelocity.lerp(vel, this.context.time.deltaTime / .1);
-            // this._smoothedVelocity.set(0, 1 / this.context.time.deltaTime, 0);
-        }
+        const wp = getWorldPosition(this.gameObject);
+        Rigidbody.tempPosition.copy(wp);
+        const vel = wp.sub(this._lastPosition);
+        this._lastPosition.copy(Rigidbody.tempPosition);
+        this._smoothedVelocity.lerp(vel, this.context.time.deltaTime / .1);
     }
 }

package/src/engine-components/codegen/components.ts

@@ -1,5 +1,8 @@
 // Export types
 export class __Ignore {}
+export { ActionBuilder } from "../export/usdz/extensions/behavior/BehavioursBuilder";
+export { ActionCollection } from "../export/usdz/extensions/behavior/Actions";
+export { ActionModel } from "../export/usdz/extensions/behavior/BehavioursBuilder";
 export { AlignmentConstraint } from "../AlignmentConstraint";
 export { Animation } from "../Animation";
 export { AnimationCurve } from "../AnimationCurve";
@@ -24,6 +27,8 @@ export { AvatarModel } from "../AvatarLoader";
 export { AxesHelper } from "../AxesHelper";
 export { BaseUIComponent } from "../ui/BaseUIComponent";
 export { BasicIKConstraint } from "../BasicIKConstraint";
+export { BehaviorExtension } from "../export/usdz/extensions/behavior/Behaviour";
+export { BehaviorModel } from "../export/usdz/extensions/behavior/BehavioursBuilder";
 export { Behaviour } from "../Component";
 export { Bloom } from "../postprocessing/Effects/Bloom";
 export { BoxCollider } from "../Collider";
@@ -35,6 +40,8 @@ export { Camera } from "../Camera";
 export { Canvas } from "../ui/Canvas";
 export { CanvasGroup } from "../ui/CanvasGroup";
 export { CapsuleCollider } from "../Collider";
+export { ChangeMaterialOnClick } from "../export/usdz/extensions/behavior/BehaviourComponents";
+export { ChangeTransformOnClick } from "../export/usdz/extensions/behavior/BehaviourComponents";
 export { CharacterController } from "../CharacterController";
 export { CharacterControllerInput } from "../CharacterController";
 export { ChromaticAberration } from "../postprocessing/Effects/ChromaticAberration";
@@ -48,10 +55,12 @@ export { Deletable } from "../DeleteBox";
 export { DeleteBox } from "../DeleteBox";
 export { DepthOfField } from "../postprocessing/Effects/DepthOfField";
 export { DeviceFlag } from "../DeviceFlag";
+export { DocumentExtension } from "../export/usdz/extensions/DocumentExtension";
 export { DragControls } from "../DragControls";
 export { DropListener } from "../DropListener";
 export { Duplicatable } from "../Duplicatable";
 export { EmissionModule } from "../ParticleSystemModules";
+export { EmphasizeOnClick } from "../export/usdz/extensions/behavior/BehaviourComponents";
 export { EventList } from "../EventList";
 export { EventListEvent } from "../EventList";
 export { EventSystem } from "../ui/EventSystem";
@@ -68,13 +77,14 @@ export { GraphicRaycaster } from "../ui/Raycaster";
 export { GridHelper } from "../GridHelper";
 export { GridLayoutGroup } from "../ui/Layout";
 export { GroundProjectedEnv } from "../GroundProjection";
+export { GroupActionModel } from "../export/usdz/extensions/behavior/BehavioursBuilder";
+export { HideOnStart } from "../export/usdz/extensions/behavior/BehaviourComponents";
 export { HingeJoint } from "../Joints";
 export { HorizontalLayoutGroup } from "../ui/Layout";
 export { Image } from "../ui/Image";
 export { InheritVelocityModule } from "../ParticleSystemModules";
 export { InputField } from "../ui/InputField";
 export { Interactable } from "../Interactable";
-export { LayoutGroup } from "../ui/Layout";
 export { Light } from "../Light";
 export { LimitVelocityOverLifetimeModule } from "../ParticleSystemModules";
 export { LODGroup } from "../LODGroup";
@@ -96,15 +106,19 @@ export { OffsetConstraint } from "../OffsetConstraint";
 export { OpenURL } from "../utils/OpenURL";
 export { OrbitControls } from "../OrbitControls";
 export { Outline } from "../ui/Outline";
+export { Padding } from "../ui/Layout";
 export { ParticleBurst } from "../ParticleSystemModules";
 export { ParticleSubEmitter } from "../ParticleSystemSubEmitter";
 export { ParticleSystem } from "../ParticleSystem";
 export { ParticleSystemRenderer } from "../ParticleSystem";
 export { PixelationEffect } from "../postprocessing/Effects/Pixelation";
 export { PlayableDirector } from "../timeline/PlayableDirector";
+export { PlayAnimationOnClick } from "../export/usdz/extensions/behavior/BehaviourComponents";
 export { PlayerColor } from "../PlayerColor";
 export { PointerEventData } from "../ui/PointerEvents";
 export { PostProcessingHandler } from "../postprocessing/PostProcessingHandler";
+export { PreliminaryAction } from "../export/usdz/extensions/behavior/BehaviourComponents";
+export { PreliminaryTrigger } from "../export/usdz/extensions/behavior/BehaviourComponents";
 export { QuickLookOverlay } from "../export/usdz/USDZExporter";
 export { RawImage } from "../ui/Image";
 export { Raycaster } from "../ui/Raycaster";
@@ -122,6 +136,7 @@ export { RotationOverLifetimeModule } from "../ParticleSystemModules";
 export { SceneSwitcher } from "../SceneSwitcher";
 export { ScreenCapture } from "../ScreenCapture";
 export { ScreenSpaceAmbientOcclusion } from "../postprocessing/Effects/ScreenspaceAmbientOcclusion";
+export { SetActiveOnClick } from "../export/usdz/extensions/behavior/BehaviourComponents";
 export { ShadowCatcher } from "../ShadowCatcher";
 export { ShapeModule } from "../ParticleSystemModules";
 export { SignalAsset } from "../timeline/SignalAsset";
@@ -146,24 +161,33 @@ export { SubEmitterSystem } from "../ParticleSystem";
 export { SyncedCamera } from "../SyncedCamera";
 export { SyncedRoom } from "../SyncedRoom";
 export { SyncedTransform } from "../SyncedTransform";
+export { TapGestureTrigger } from "../export/usdz/extensions/behavior/BehaviourComponents";
 export { TeleportTarget } from "../webxr/WebXRController";
 export { TestRunner } from "../TestRunner";
 export { TestSimulateUserData } from "../TestRunner";
 export { Text } from "../ui/Text";
+export { TextBuilder } from "../export/usdz/extensions/USDZText";
+export { TextExtension } from "../export/usdz/extensions/USDZText";
 export { TextureSheetAnimationModule } from "../ParticleSystemModules";
 export { TiltShiftEffect } from "../postprocessing/Effects/TiltShiftEffect";
 export { ToneMapping } from "../postprocessing/Effects/Tonemapping";
 export { TrailModule } from "../ParticleSystemModules";
 export { TransformData } from "../export/usdz/extensions/Animation";
 export { TransformGizmo } from "../TransformGizmo";
+export { TriggerBuilder } from "../export/usdz/extensions/behavior/BehavioursBuilder";
+export { TriggerModel } from "../export/usdz/extensions/behavior/BehavioursBuilder";
 export { UIRaycastUtils } from "../ui/RaycastUtils";
 export { UIRootComponent } from "../ui/BaseUIComponent";
 export { UsageMarker } from "../Interactable";
+export { USDZBehaviours } from "../export/usdz/extensions/behavior/Behaviour";
 export { USDZExporter } from "../export/usdz/USDZExporter";
+export { USDZText } from "../export/usdz/extensions/USDZText";
+export { VariantAction } from "../export/usdz/extensions/behavior/Actions";
 export { VelocityOverLifetimeModule } from "../ParticleSystemModules";
 export { VerticalLayoutGroup } from "../ui/Layout";
 export { VideoPlayer } from "../VideoPlayer";
 export { Vignette } from "../postprocessing/Effects/Vignette";
+export { VisibilityAction } from "../export/usdz/extensions/behavior/BehaviourComponents";
 export { Voip } from "../Voip";
 export { Volume } from "../postprocessing/Volume";
 export { VolumeParameter } from "../postprocessing/VolumeParameter";

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

@@ -1,12 +1,11 @@
-import { USDZObject } from "./types";
+import { USDObject } from "./ThreeUSDZExporter";
 
-
-export interface IUSDZExporterExtension {
+export interface IUSDExporterExtension {
 
     get extensionName(): string;
     onBeforeBuildDocument?(context);
     onAfterBuildDocument?(context);
-    onExportObject?(object, model : USDZObject, context);
+    onExportObject?(object, model : USDObject, context);
     onAfterSerialize?(context);
-    onAfterHierarchy?(context);
+    onAfterHierarchy?(context, writer : any);
 }