@needle-tools/engine 3.2.15-alpha → 3.4.0-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@needle-tools/engine",
-    "version": "3.2.15-alpha",
+    "version": "3.4.0-alpha",
     "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.umd.cjs",
     "type": "module",
@@ -62,7 +62,7 @@
         "simplex-noise": "^4.0.1",
         "stats.js": "^0.17.0",
         "three": "npm:@needle-tools/three@^0.146.8",
-        "three-mesh-ui": "^6.4.5",
+        "three-mesh-ui": "npm:@needle-tools/three-mesh-ui@^7.1.4",
         "three.quarks": "^0.7.3",
         "uuid": "^9.0.0",
         "websocket-ts": "^1.1.1"

package/plugins/vite/reload.js

@@ -9,6 +9,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 const filesUsingHotReload = new Set();
+let assetsDirectory = "";
 
 export const needleReload = (command, config, userSettings) => {
     if (command === "build") return;
@@ -23,8 +24,9 @@ export const needleReload = (command, config, userSettings) => {
         if (res) config = res;
     }
 
-
     const projectConfig = tryLoadProjectConfig();
+    assetsDirectory = path.resolve(projectConfig?.assetsDirectory || "assets");
+
     const buildDirectory = projectConfig?.buildDirectory?.length ? process.cwd().replaceAll("\\", "/") + "/" + projectConfig?.buildDirectory : "";
     if (buildDirectory?.length) {
         setTimeout(() => console.log("Build directory: ", buildDirectory), 100);
@@ -153,7 +155,16 @@ async function handleReload({ file, server, modules, read, buildDirectory }) {
         }
     }
 
-    if (file.endsWith(".vue") || file.endsWith(".ts") || file.endsWith(".js") || file.endsWith(".jsx") || file.endsWith(".tsx"))
+    // these are known file types we export from integrations
+    const knownExportFileTypes = [ ".glb", ".gltf", ".bin", "exr", ".ktx2", ".mp3", ".ogg", ".mp4", ".webm" ];
+    if (!knownExportFileTypes.some((type) => file.endsWith(type)))
+        return;
+
+    // we only care about exports into "assets"
+    if (!path.resolve(file).startsWith(assetsDirectory))
+        return;
+
+    if (file.endsWith(".svelte") || file.endsWith(".vue") || file.endsWith(".ts") || file.endsWith(".js") || file.endsWith(".jsx") || file.endsWith(".tsx"))
         return;
 
     if (file.endsWith(lockFileName)) return;

package/src/engine/codegen/register_types.js

@@ -1,7 +1,10 @@
 import { TypeStore } from "./../engine_typestore"
-
+
 // Import types
 import { __Ignore } from "../../engine-components/codegen/components";
+import { ActionBuilder } from "../../engine-components/export/usdz/extensions/behavior/BehavioursBuilder";
+import { ActionCollection } from "../../engine-components/export/usdz/extensions/behavior/Actions";
+import { ActionModel } from "../../engine-components/export/usdz/extensions/behavior/BehavioursBuilder";
 import { AlignmentConstraint } from "../../engine-components/AlignmentConstraint";
 import { Animation } from "../../engine-components/Animation";
 import { AnimationCurve } from "../../engine-components/AnimationCurve";
@@ -26,6 +29,8 @@ import { AvatarModel } from "../../engine-components/AvatarLoader";
 import { AxesHelper } from "../../engine-components/AxesHelper";
 import { BaseUIComponent } from "../../engine-components/ui/BaseUIComponent";
 import { BasicIKConstraint } from "../../engine-components/BasicIKConstraint";
+import { BehaviorExtension } from "../../engine-components/export/usdz/extensions/behavior/Behaviour";
+import { BehaviorModel } from "../../engine-components/export/usdz/extensions/behavior/BehavioursBuilder";
 import { Behaviour } from "../../engine-components/Component";
 import { Bloom } from "../../engine-components/postprocessing/Effects/Bloom";
 import { BoxCollider } from "../../engine-components/Collider";
@@ -37,6 +42,8 @@ import { Camera } from "../../engine-components/Camera";
 import { Canvas } from "../../engine-components/ui/Canvas";
 import { CanvasGroup } from "../../engine-components/ui/CanvasGroup";
 import { CapsuleCollider } from "../../engine-components/Collider";
+import { ChangeMaterialOnClick } from "../../engine-components/export/usdz/extensions/behavior/BehaviourComponents";
+import { ChangeTransformOnClick } from "../../engine-components/export/usdz/extensions/behavior/BehaviourComponents";
 import { CharacterController } from "../../engine-components/CharacterController";
 import { CharacterControllerInput } from "../../engine-components/CharacterController";
 import { ChromaticAberration } from "../../engine-components/postprocessing/Effects/ChromaticAberration";
@@ -50,10 +57,12 @@ import { Deletable } from "../../engine-components/DeleteBox";
 import { DeleteBox } from "../../engine-components/DeleteBox";
 import { DepthOfField } from "../../engine-components/postprocessing/Effects/DepthOfField";
 import { DeviceFlag } from "../../engine-components/DeviceFlag";
+import { DocumentExtension } from "../../engine-components/export/usdz/extensions/DocumentExtension";
 import { DragControls } from "../../engine-components/DragControls";
 import { DropListener } from "../../engine-components/DropListener";
 import { Duplicatable } from "../../engine-components/Duplicatable";
 import { EmissionModule } from "../../engine-components/ParticleSystemModules";
+import { EmphasizeOnClick } from "../../engine-components/export/usdz/extensions/behavior/BehaviourComponents";
 import { EventList } from "../../engine-components/EventList";
 import { EventListEvent } from "../../engine-components/EventList";
 import { EventSystem } from "../../engine-components/ui/EventSystem";
@@ -70,19 +79,20 @@ import { GraphicRaycaster } from "../../engine-components/ui/Raycaster";
 import { GridHelper } from "../../engine-components/GridHelper";
 import { GridLayoutGroup } from "../../engine-components/ui/Layout";
 import { GroundProjectedEnv } from "../../engine-components/GroundProjection";
+import { GroupActionModel } from "../../engine-components/export/usdz/extensions/behavior/BehavioursBuilder";
+import { HideOnStart } from "../../engine-components/export/usdz/extensions/behavior/BehaviourComponents";
 import { HingeJoint } from "../../engine-components/Joints";
 import { HorizontalLayoutGroup } from "../../engine-components/ui/Layout";
 import { Image } from "../../engine-components/ui/Image";
 import { InheritVelocityModule } from "../../engine-components/ParticleSystemModules";
 import { InputField } from "../../engine-components/ui/InputField";
 import { Interactable } from "../../engine-components/Interactable";
-import { Keyboard } from "../../engine-components/ui/Keyboard";
-import { LayoutGroup } from "../../engine-components/ui/Layout";
 import { Light } from "../../engine-components/Light";
 import { LimitVelocityOverLifetimeModule } from "../../engine-components/ParticleSystemModules";
 import { LODGroup } from "../../engine-components/LODGroup";
 import { LODModel } from "../../engine-components/LODGroup";
 import { LogStats } from "../../engine-components/debug/LogStats";
+import { LookAt } from "../../engine-components/utils/LookAt";
 import { LookAtConstraint } from "../../engine-components/LookAtConstraint";
 import { MainModule } from "../../engine-components/ParticleSystemModules";
 import { MaskableGraphic } from "../../engine-components/ui/Graphic";
@@ -97,17 +107,22 @@ import { ObjectRaycaster } from "../../engine-components/ui/Raycaster";
 import { OffsetConstraint } from "../../engine-components/OffsetConstraint";
 import { OpenURL } from "../../engine-components/utils/OpenURL";
 import { OrbitControls } from "../../engine-components/OrbitControls";
+import { Outline } from "../../engine-components/ui/Outline";
+import { Padding } from "../../engine-components/ui/Layout";
 import { ParticleBurst } from "../../engine-components/ParticleSystemModules";
 import { ParticleSubEmitter } from "../../engine-components/ParticleSystemSubEmitter";
 import { ParticleSystem } from "../../engine-components/ParticleSystem";
 import { ParticleSystemRenderer } from "../../engine-components/ParticleSystem";
 import { PixelationEffect } from "../../engine-components/postprocessing/Effects/Pixelation";
 import { PlayableDirector } from "../../engine-components/timeline/PlayableDirector";
+import { PlayAnimationOnClick } from "../../engine-components/export/usdz/extensions/behavior/BehaviourComponents";
 import { PlayerColor } from "../../engine-components/PlayerColor";
 import { PlayerState } from "../../engine-components-experimental/networking/PlayerSync";
 import { PlayerSync } from "../../engine-components-experimental/networking/PlayerSync";
 import { PointerEventData } from "../../engine-components/ui/PointerEvents";
 import { PostProcessingHandler } from "../../engine-components/postprocessing/PostProcessingHandler";
+import { PreliminaryAction } from "../../engine-components/export/usdz/extensions/behavior/BehaviourComponents";
+import { PreliminaryTrigger } from "../../engine-components/export/usdz/extensions/behavior/BehaviourComponents";
 import { PresentationMode } from "../../engine-components-experimental/Presentation";
 import { QuickLookOverlay } from "../../engine-components/export/usdz/USDZExporter";
 import { RawImage } from "../../engine-components/ui/Image";
@@ -126,6 +141,7 @@ import { RotationOverLifetimeModule } from "../../engine-components/ParticleSyst
 import { SceneSwitcher } from "../../engine-components/SceneSwitcher";
 import { ScreenCapture } from "../../engine-components/ScreenCapture";
 import { ScreenSpaceAmbientOcclusion } from "../../engine-components/postprocessing/Effects/ScreenspaceAmbientOcclusion";
+import { SetActiveOnClick } from "../../engine-components/export/usdz/extensions/behavior/BehaviourComponents";
 import { ShadowCatcher } from "../../engine-components/ShadowCatcher";
 import { ShapeModule } from "../../engine-components/ParticleSystemModules";
 import { SignalAsset } from "../../engine-components/timeline/SignalAsset";
@@ -150,24 +166,33 @@ import { SubEmitterSystem } from "../../engine-components/ParticleSystem";
 import { SyncedCamera } from "../../engine-components/SyncedCamera";
 import { SyncedRoom } from "../../engine-components/SyncedRoom";
 import { SyncedTransform } from "../../engine-components/SyncedTransform";
+import { TapGestureTrigger } from "../../engine-components/export/usdz/extensions/behavior/BehaviourComponents";
 import { TeleportTarget } from "../../engine-components/webxr/WebXRController";
 import { TestRunner } from "../../engine-components/TestRunner";
 import { TestSimulateUserData } from "../../engine-components/TestRunner";
 import { Text } from "../../engine-components/ui/Text";
+import { TextBuilder } from "../../engine-components/export/usdz/extensions/USDZText";
+import { TextExtension } from "../../engine-components/export/usdz/extensions/USDZText";
 import { TextureSheetAnimationModule } from "../../engine-components/ParticleSystemModules";
 import { TiltShiftEffect } from "../../engine-components/postprocessing/Effects/TiltShiftEffect";
 import { ToneMapping } from "../../engine-components/postprocessing/Effects/Tonemapping";
 import { TrailModule } from "../../engine-components/ParticleSystemModules";
 import { TransformData } from "../../engine-components/export/usdz/extensions/Animation";
 import { TransformGizmo } from "../../engine-components/TransformGizmo";
+import { TriggerBuilder } from "../../engine-components/export/usdz/extensions/behavior/BehavioursBuilder";
+import { TriggerModel } from "../../engine-components/export/usdz/extensions/behavior/BehavioursBuilder";
 import { UIRaycastUtils } from "../../engine-components/ui/RaycastUtils";
 import { UIRootComponent } from "../../engine-components/ui/BaseUIComponent";
 import { UsageMarker } from "../../engine-components/Interactable";
+import { USDZBehaviours } from "../../engine-components/export/usdz/extensions/behavior/Behaviour";
 import { USDZExporter } from "../../engine-components/export/usdz/USDZExporter";
+import { USDZText } from "../../engine-components/export/usdz/extensions/USDZText";
+import { VariantAction } from "../../engine-components/export/usdz/extensions/behavior/Actions";
 import { VelocityOverLifetimeModule } from "../../engine-components/ParticleSystemModules";
 import { VerticalLayoutGroup } from "../../engine-components/ui/Layout";
 import { VideoPlayer } from "../../engine-components/VideoPlayer";
 import { Vignette } from "../../engine-components/postprocessing/Effects/Vignette";
+import { VisibilityAction } from "../../engine-components/export/usdz/extensions/behavior/BehaviourComponents";
 import { Voip } from "../../engine-components/Voip";
 import { Volume } from "../../engine-components/postprocessing/Volume";
 import { VolumeParameter } from "../../engine-components/postprocessing/VolumeParameter";
@@ -189,9 +214,12 @@ import { XRGrabModel } from "../../engine-components/webxr/WebXRGrabRendering";
 import { XRGrabRendering } from "../../engine-components/webxr/WebXRGrabRendering";
 import { XRRig } from "../../engine-components/webxr/WebXRRig";
 import { XRState } from "../../engine-components/XRFlag";
-
+
 // Register types
 TypeStore.add("__Ignore", __Ignore);
+TypeStore.add("ActionBuilder", ActionBuilder);
+TypeStore.add("ActionCollection", ActionCollection);
+TypeStore.add("ActionModel", ActionModel);
 TypeStore.add("AlignmentConstraint", AlignmentConstraint);
 TypeStore.add("Animation", Animation);
 TypeStore.add("AnimationCurve", AnimationCurve);
@@ -216,6 +244,8 @@ TypeStore.add("AvatarModel", AvatarModel);
 TypeStore.add("AxesHelper", AxesHelper);
 TypeStore.add("BaseUIComponent", BaseUIComponent);
 TypeStore.add("BasicIKConstraint", BasicIKConstraint);
+TypeStore.add("BehaviorExtension", BehaviorExtension);
+TypeStore.add("BehaviorModel", BehaviorModel);
 TypeStore.add("Behaviour", Behaviour);
 TypeStore.add("Bloom", Bloom);
 TypeStore.add("BoxCollider", BoxCollider);
@@ -227,6 +257,8 @@ TypeStore.add("Camera", Camera);
 TypeStore.add("Canvas", Canvas);
 TypeStore.add("CanvasGroup", CanvasGroup);
 TypeStore.add("CapsuleCollider", CapsuleCollider);
+TypeStore.add("ChangeMaterialOnClick", ChangeMaterialOnClick);
+TypeStore.add("ChangeTransformOnClick", ChangeTransformOnClick);
 TypeStore.add("CharacterController", CharacterController);
 TypeStore.add("CharacterControllerInput", CharacterControllerInput);
 TypeStore.add("ChromaticAberration", ChromaticAberration);
@@ -240,10 +272,12 @@ TypeStore.add("Deletable", Deletable);
 TypeStore.add("DeleteBox", DeleteBox);
 TypeStore.add("DepthOfField", DepthOfField);
 TypeStore.add("DeviceFlag", DeviceFlag);
+TypeStore.add("DocumentExtension", DocumentExtension);
 TypeStore.add("DragControls", DragControls);
 TypeStore.add("DropListener", DropListener);
 TypeStore.add("Duplicatable", Duplicatable);
 TypeStore.add("EmissionModule", EmissionModule);
+TypeStore.add("EmphasizeOnClick", EmphasizeOnClick);
 TypeStore.add("EventList", EventList);
 TypeStore.add("EventListEvent", EventListEvent);
 TypeStore.add("EventSystem", EventSystem);
@@ -260,19 +294,20 @@ TypeStore.add("GraphicRaycaster", GraphicRaycaster);
 TypeStore.add("GridHelper", GridHelper);
 TypeStore.add("GridLayoutGroup", GridLayoutGroup);
 TypeStore.add("GroundProjectedEnv", GroundProjectedEnv);
+TypeStore.add("GroupActionModel", GroupActionModel);
+TypeStore.add("HideOnStart", HideOnStart);
 TypeStore.add("HingeJoint", HingeJoint);
 TypeStore.add("HorizontalLayoutGroup", HorizontalLayoutGroup);
 TypeStore.add("Image", Image);
 TypeStore.add("InheritVelocityModule", InheritVelocityModule);
 TypeStore.add("InputField", InputField);
 TypeStore.add("Interactable", Interactable);
-TypeStore.add("Keyboard", Keyboard);
-TypeStore.add("LayoutGroup", LayoutGroup);
 TypeStore.add("Light", Light);
 TypeStore.add("LimitVelocityOverLifetimeModule", LimitVelocityOverLifetimeModule);
 TypeStore.add("LODGroup", LODGroup);
 TypeStore.add("LODModel", LODModel);
 TypeStore.add("LogStats", LogStats);
+TypeStore.add("LookAt", LookAt);
 TypeStore.add("LookAtConstraint", LookAtConstraint);
 TypeStore.add("MainModule", MainModule);
 TypeStore.add("MaskableGraphic", MaskableGraphic);
@@ -287,17 +322,22 @@ TypeStore.add("ObjectRaycaster", ObjectRaycaster);
 TypeStore.add("OffsetConstraint", OffsetConstraint);
 TypeStore.add("OpenURL", OpenURL);
 TypeStore.add("OrbitControls", OrbitControls);
+TypeStore.add("Outline", Outline);
+TypeStore.add("Padding", Padding);
 TypeStore.add("ParticleBurst", ParticleBurst);
 TypeStore.add("ParticleSubEmitter", ParticleSubEmitter);
 TypeStore.add("ParticleSystem", ParticleSystem);
 TypeStore.add("ParticleSystemRenderer", ParticleSystemRenderer);
 TypeStore.add("PixelationEffect", PixelationEffect);
 TypeStore.add("PlayableDirector", PlayableDirector);
+TypeStore.add("PlayAnimationOnClick", PlayAnimationOnClick);
 TypeStore.add("PlayerColor", PlayerColor);
 TypeStore.add("PlayerState", PlayerState);
 TypeStore.add("PlayerSync", PlayerSync);
 TypeStore.add("PointerEventData", PointerEventData);
 TypeStore.add("PostProcessingHandler", PostProcessingHandler);
+TypeStore.add("PreliminaryAction", PreliminaryAction);
+TypeStore.add("PreliminaryTrigger", PreliminaryTrigger);
 TypeStore.add("PresentationMode", PresentationMode);
 TypeStore.add("QuickLookOverlay", QuickLookOverlay);
 TypeStore.add("RawImage", RawImage);
@@ -316,6 +356,7 @@ TypeStore.add("RotationOverLifetimeModule", RotationOverLifetimeModule);
 TypeStore.add("SceneSwitcher", SceneSwitcher);
 TypeStore.add("ScreenCapture", ScreenCapture);
 TypeStore.add("ScreenSpaceAmbientOcclusion", ScreenSpaceAmbientOcclusion);
+TypeStore.add("SetActiveOnClick", SetActiveOnClick);
 TypeStore.add("ShadowCatcher", ShadowCatcher);
 TypeStore.add("ShapeModule", ShapeModule);
 TypeStore.add("SignalAsset", SignalAsset);
@@ -340,24 +381,33 @@ TypeStore.add("SubEmitterSystem", SubEmitterSystem);
 TypeStore.add("SyncedCamera", SyncedCamera);
 TypeStore.add("SyncedRoom", SyncedRoom);
 TypeStore.add("SyncedTransform", SyncedTransform);
+TypeStore.add("TapGestureTrigger", TapGestureTrigger);
 TypeStore.add("TeleportTarget", TeleportTarget);
 TypeStore.add("TestRunner", TestRunner);
 TypeStore.add("TestSimulateUserData", TestSimulateUserData);
 TypeStore.add("Text", Text);
+TypeStore.add("TextBuilder", TextBuilder);
+TypeStore.add("TextExtension", TextExtension);
 TypeStore.add("TextureSheetAnimationModule", TextureSheetAnimationModule);
 TypeStore.add("TiltShiftEffect", TiltShiftEffect);
 TypeStore.add("ToneMapping", ToneMapping);
 TypeStore.add("TrailModule", TrailModule);
 TypeStore.add("TransformData", TransformData);
 TypeStore.add("TransformGizmo", TransformGizmo);
+TypeStore.add("TriggerBuilder", TriggerBuilder);
+TypeStore.add("TriggerModel", TriggerModel);
 TypeStore.add("UIRaycastUtils", UIRaycastUtils);
 TypeStore.add("UIRootComponent", UIRootComponent);
 TypeStore.add("UsageMarker", UsageMarker);
+TypeStore.add("USDZBehaviours", USDZBehaviours);
 TypeStore.add("USDZExporter", USDZExporter);
+TypeStore.add("USDZText", USDZText);
+TypeStore.add("VariantAction", VariantAction);
 TypeStore.add("VelocityOverLifetimeModule", VelocityOverLifetimeModule);
 TypeStore.add("VerticalLayoutGroup", VerticalLayoutGroup);
 TypeStore.add("VideoPlayer", VideoPlayer);
 TypeStore.add("Vignette", Vignette);
+TypeStore.add("VisibilityAction", VisibilityAction);
 TypeStore.add("Voip", Voip);
 TypeStore.add("Volume", Volume);
 TypeStore.add("VolumeParameter", VolumeParameter);

package/src/engine/engine_addressables.ts

@@ -27,8 +27,8 @@ export class Addressables {
 
     private _assetReferences: { [key: string]: AssetReference } = {};
 
-    findAssetReference(uri: string): AssetReference | null {
-        return this._assetReferences[uri] || null;
+    findAssetReference(key: string): AssetReference | null {
+        return this._assetReferences[key] || null;
     }
 
     registerAssetReference(ref: AssetReference): AssetReference {
@@ -48,9 +48,9 @@ export type ProgressCallback = (asset: AssetReference, prog: ProgressEvent) => v
 
 export class AssetReference {
 
-    static getOrCreate(sourceId: SourceIdentifier, uri: string, context: Context): AssetReference {
-        const fullPath = resolveUrl(sourceId, uri);
-        if (debug) console.log("GetOrCreate Addressable from", sourceId, uri, "FinalPath=", fullPath);
+    static getOrCreate(sourceId: SourceIdentifier, url: string, context: Context): AssetReference {
+        const fullPath = resolveUrl(sourceId, url);
+        if (debug) console.log("GetOrCreate Addressable from", sourceId, url, "FinalPath=", fullPath);
         const addressables = context.addressables;
         const existing = addressables.findAssetReference(fullPath);
         if (existing) return existing;
@@ -89,19 +89,19 @@ export class AssetReference {
     private _isLoadingRawBinary: boolean = false;
     private _rawBinary?: ArrayBuffer | null;
 
-    constructor(uri: string, hash?: string) {
+    constructor(uri: string, hash?: string, asset: any = null) {
         this._url = uri;
         this._hash = hash;
         if (uri.includes("?v="))
             this._hashedUri = uri;
         else
             this._hashedUri = hash ? uri + "?v=" + hash : uri;
-
+        if (asset !== null) this.asset = asset;
         registerPrefabProvider(this._url, this.onResolvePrefab.bind(this));
     }
 
-    private async onResolvePrefab(uri: string): Promise<IGameObject | null> {
-        if (uri === this.uri) {
+    private async onResolvePrefab(url: string): Promise<IGameObject | null> {
+        if (url === this.uri) {
             if (this.mustLoad) await this.loadAssetAsync();
             if (this.asset) {
                 return this.asset;
@@ -320,12 +320,30 @@ class AddressableSerializer extends TypeSerializer {
                 return null;
             }
             if (!context.gltfId) {
-                console.error("Missing spurce id");
+                console.error("Missing source id");
                 return null;
             }
             const ref = AssetReference.getOrCreate(context.gltfId, data, context.context);
             return ref;
         }
+        else if (data instanceof Object3D) {
+            if (!context.context) {
+                console.error("Missing context");
+                return null;
+            }
+            if (!context.gltfId) {
+                console.error("Missing source id");
+                return null;
+            }
+            const obj = data;
+            const ctx = context.context;
+            const guid = obj["guid"] ?? obj.uuid;
+            const existing = ctx.addressables.findAssetReference(guid);
+            if (existing) return existing;
+            const ref = new AssetReference(guid, undefined, obj);
+            ctx.addressables.registerAssetReference(ref);
+            return ref;
+        }
         return null;
     }
 

package/src/engine/engine_element.ts

@@ -448,5 +448,5 @@ function getNameFromUrl(str: string) {
     let index = name.indexOf("?")
     if (index > 0)
         name = name.substring(0, index);
-    return name;
+    return decodeURIComponent(name);
 }

package/src/engine/engine_gameobject.ts

@@ -3,7 +3,7 @@ import { processNewScripts } from "./engine_mainloop_utils";
 import { InstantiateIdProvider } from "./engine_networking_instantiate";
 import { Context, registerComponent } from "./engine_setup";
 import { logHierarchy, setWorldPosition, setWorldQuaternion } from "./engine_three_utils";
-import { GuidsMap, IComponent as Component, IComponent, IGameObject as GameObject, UIDProvider } from "./engine_types";
+import { GuidsMap, IComponent as Component, IComponent, IGameObject as GameObject, UIDProvider, Constructor } from "./engine_types";
 import { getParam, tryFindObject } from "./engine_utils";
 import { apply } from "../engine-components/js-extensions/Object3D";
 import { $isUsingInstancing, InstancingUtil } from "./engine_instancing";
@@ -163,6 +163,24 @@ export function foreachComponent(instance: Object3D, cb: ForEachComponentCallbac
     return internalForEachComponent(instance, cb, recursive);
 }
 
+export function* foreachComponentEnumerator<T extends IComponent>(instance: Object3D, type?: Constructor<T>, includeChildren: boolean = false, maxLevel: number = 999, _currentLevel: number = 0): Generator<T> {
+    if (!instance?.userData.components) return;
+    if (_currentLevel > maxLevel) return;
+    for (const comp of instance.userData.components) {
+        if (type && comp?.isComponent === true && comp instanceof type) {
+            yield comp;
+        }
+        else {
+            yield comp;
+        }
+    }
+    if (includeChildren === true) {
+        for (const ch of instance.children) {
+            yield* foreachComponentEnumerator(ch, type, true, maxLevel, _currentLevel + 1);
+        }
+    }
+}
+
 function internalForEachComponent(instance: Object3D, cb: ForEachComponentCallback, recursive: boolean, level: number = 0): any {
     if (!instance) return;
     if (!instance.isObject3D) {

package/src/engine/engine_input.ts

@@ -512,6 +512,17 @@ export class Input extends EventTarget {
     private onDown(evt: PointerEventArgs) {
         if (debug) console.log(evt.pointerType, "DOWN", evt.button);
         if (!this.isInRect(evt)) return;
+
+        // check if we received an mouse UP event for a touch (for some reason we get a mouse.down for touch.up)
+        if (evt.pointerType === PointerType.Mouse) {
+            const upTime = this._pointerUpTimestamp[evt.button];
+            if (upTime > 0 && upTime === evt.source?.timeStamp) {
+                // we received an UP event for a touch, ignore this DOWN event
+                if(debug) console.log("Ignoring mouse.down for touch.up");
+                return;
+            }
+        }
+
         this.setPointerState(evt.button, this._pointerPressed, true);
         this.setPointerState(evt.button, this._pointerDown, true);
         this.setPointerStateT(evt.button, this._pointerEvent, evt.source);

package/src/engine/engine_math.ts

@@ -49,10 +49,20 @@ class MathHelper {
         return radians * 180 / Math.PI;
     }
 
+    readonly Rad2Deg = 180 / Math.PI;
+
     toRadians(degrees: number) {
         return degrees * Math.PI / 180;
     }
 
+    readonly Deg2Rad = Math.PI / 180;
+
+    readonly Epsilon = 0.00001;
+
+    tan(radians: number) {
+        return Math.tan(radians);
+    }
+
     gammaToLinear(gamma: number) {
         return Math.pow(gamma, 2.2);
     }

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-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/AnimatorController.ts

@@ -7,6 +7,7 @@ import { TypeStore } from "../engine/engine_typestore";
 import { assign } from "../engine/engine_serialization_core";
 import { Mathf } from "../engine/engine_math";
 import { isAnimationAction } from "../engine/engine_three_utils";
+import { isDevEnvironment } from "../engine/debug";
 
 const debug = getParam("debuganimatorcontroller");
 const debugRootMotion = getParam("debugrootmotion");
@@ -407,7 +408,12 @@ export class AnimatorController {
                 }
             }
         }
-        else console.warn("No action", state.motion, this);
+        else if (isDevEnvironment()) {
+            if (!state["__warned_no_motion"]) {
+                state["__warned_no_motion"] = true;
+                console.warn("No action", state.motion, this);
+            }
+        }
 
         if (debug)
             console.log("TRANSITION FROM " + prev?.name + " TO " + state.name, durationInSec, prevAction, action, action?.getEffectiveTimeScale(), action?.getEffectiveWeight(), action?.isRunning(), action?.isScheduled(), action?.paused);

package/src/engine-components/OrbitControls.ts

@@ -8,7 +8,7 @@ import { getParam, isMobileDevice } from "../engine/engine_utils";
 
 import { Camera as ThreeCamera, Box3, Object3D, PerspectiveCamera, Vector2, Vector3 } from "three";
 import { OrbitControls as ThreeOrbitControls } from "three/examples/jsm/controls/OrbitControls";
-import { EventSystem, EventSystemEvents } from "./ui/EventSystem";
+import { AfterHandleInputEvent, EventSystem, EventSystemEvents } from "./ui/EventSystem";
 import { ICameraController } from "../engine/engine_types";
 import { setCameraController } from "../engine/engine_camera";
 import { SyncedTransform } from "./SyncedTransform";
@@ -176,15 +176,22 @@ export class OrbitControls extends Behaviour implements ICameraController {
     }
 
     private onControlsChangeStarted() {
-        if(this._syncedTransform) {
+        if (this._syncedTransform) {
             this._syncedTransform.requestOwnership();
         }
     }
 
     private _shouldDisable: boolean = false;
-    private afterHandleInput() {
-        if (this._controls && this._eventSystem) {
-            this._shouldDisable = this._eventSystem.hasActiveUI;
+    private afterHandleInput(evt: CustomEvent<AfterHandleInputEvent>) {
+        if (evt.detail.args.pointerId === 0) {
+            if (evt.detail.args.isDown) {
+                if (this._controls && this._eventSystem) {
+                    this._shouldDisable = this._eventSystem.hasActiveUI;
+                }
+            }
+            else if (!evt.detail.args.isPressed || evt.detail.args.isUp) {
+                this._shouldDisable = false;
+            }
         }
     }
 
@@ -205,6 +212,7 @@ export class OrbitControls extends Behaviour implements ICameraController {
 
     onBeforeRender() {
         if (!this._controls) return;
+        if (this._cameraObject !== this.context.mainCamera) return;
 
         if (this.context.input.getPointerDown(0) || this.context.input.getPointerDown(1) || this.context.input.getPointerDown(2)) {
             this._inputs += 1;
@@ -267,7 +275,7 @@ export class OrbitControls extends Behaviour implements ICameraController {
         if (this._controls && !this.context.isInXR) {
             if (this.debugLog)
                 this._controls.domElement = this.context.renderer.domElement;
-            this._controls.enabled = !this._shouldDisable;
+            this._controls.enabled = !this._shouldDisable && this._camera === this.context.mainCameraComponent;
             this._controls.update();
         }
     }