@needle-tools/engine 3.2.4-alpha.2 → 3.2.5-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@needle-tools/engine",
-    "version": "3.2.4-alpha.2",
+    "version": "3.2.5-alpha.1",
     "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",

package/src/engine/api.ts

@@ -18,6 +18,7 @@ export * from "./engine_gltf";
 export * from "./engine_hot_reload";
 export * from "./engine_gameobject";
 export * from "./engine_networking";
+export * from "./engine_networking_types";
 export { syncField } from "./engine_networking_auto";
 export * from "./engine_networking_files";
 export * from "./engine_networking_instantiate";
@@ -32,6 +33,7 @@ export * from "./js-extensions";
 export * from "./engine_scenetools";
 export * from "./engine_serialization";
 export * from "./engine_texture";
+export * from "./engine_three_utils";
 export * from "./engine_time";
 export * from "./engine_types";
 export * from "./engine_utils_screenshot";

package/src/engine/codegen/register_types.js

@@ -1,5 +1,5 @@
 import { TypeStore } from "./../engine_typestore"
-
+
 // Import types
 import { __Ignore } from "../../engine-components/codegen/components";
 import { AlignmentConstraint } from "../../engine-components/AlignmentConstraint";
@@ -10,7 +10,7 @@ import { AnimationTrackHandler } from "../../engine-components/timeline/Timeline
 import { Animator } from "../../engine-components/Animator";
 import { AnimatorController } from "../../engine-components/AnimatorController";
 import { Antialiasing } from "../../engine-components/postprocessing/Effects/Antialiasing";
-import { AttachedObject } from "../../engine-components/WebXRController";
+import { AttachedObject } from "../../engine-components/webxr/WebXRController";
 import { AudioListener } from "../../engine-components/AudioListener";
 import { AudioSource } from "../../engine-components/AudioSource";
 import { AudioTrackHandler } from "../../engine-components/timeline/TimelineTracks";
@@ -21,11 +21,12 @@ import { Avatar_POI } from "../../engine-components/avatar/Avatar_Brain_LookAt";
 import { AvatarBlink_Simple } from "../../engine-components/avatar/AvatarBlink_Simple";
 import { AvatarEyeLook_Rotation } from "../../engine-components/avatar/AvatarEyeLook_Rotation";
 import { AvatarLoader } from "../../engine-components/AvatarLoader";
-import { AvatarMarker } from "../../engine-components/WebXRAvatar";
+import { AvatarMarker } from "../../engine-components/webxr/WebXRAvatar";
 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 { Behaviour } from "../../engine-components/Component";
 import { Bloom } from "../../engine-components/postprocessing/Effects/Bloom";
 import { BoxCollider } from "../../engine-components/Collider";
 import { BoxGizmo } from "../../engine-components/Gizmos";
@@ -43,6 +44,7 @@ import { Collider } from "../../engine-components/Collider";
 import { ColorAdjustments } from "../../engine-components/postprocessing/Effects/ColorAdjustments";
 import { ColorBySpeedModule } from "../../engine-components/ParticleSystemModules";
 import { ColorOverLifetimeModule } from "../../engine-components/ParticleSystemModules";
+import { Component } from "../../engine-components/Component";
 import { ControlTrackHandler } from "../../engine-components/timeline/TimelineTracks";
 import { Deletable } from "../../engine-components/DeleteBox";
 import { DeleteBox } from "../../engine-components/DeleteBox";
@@ -146,7 +148,7 @@ 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 { TeleportTarget } from "../../engine-components/WebXRController";
+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";
@@ -168,23 +170,24 @@ import { Voip } from "../../engine-components/Voip";
 import { Volume } from "../../engine-components/postprocessing/Volume";
 import { VolumeParameter } from "../../engine-components/postprocessing/VolumeParameter";
 import { VolumeProfile } from "../../engine-components/postprocessing/VolumeProfile";
-import { VRUserState } from "../../engine-components/WebXRSync";
-import { WebAR } from "../../engine-components/WebXR";
-import { WebARCameraBackground } from "../../engine-components/WebARCameraBackground";
-import { WebARSessionRoot } from "../../engine-components/WebARSessionRoot";
-import { WebXR } from "../../engine-components/WebXR";
-import { WebXRAvatar } from "../../engine-components/WebXRAvatar";
-import { WebXRController } from "../../engine-components/WebXRController";
-import { WebXRImageTracking } from "../../engine-components/WebXRImageTracking";
-import { WebXRImageTrackingModel } from "../../engine-components/WebXRImageTracking";
-import { WebXRSync } from "../../engine-components/WebXRSync";
-import { WebXRTrackedImage } from "../../engine-components/WebXRImageTracking";
+import { VRUserState } from "../../engine-components/webxr/WebXRSync";
+import { WebAR } from "../../engine-components/webxr/WebXR";
+import { WebARCameraBackground } from "../../engine-components/webxr/WebARCameraBackground";
+import { WebARSessionRoot } from "../../engine-components/webxr/WebARSessionRoot";
+import { WebXR } from "../../engine-components/webxr/WebXR";
+import { WebXRAvatar } from "../../engine-components/webxr/WebXRAvatar";
+import { WebXRController } from "../../engine-components/webxr/WebXRController";
+import { WebXRImageTracking } from "../../engine-components/webxr/WebXRImageTracking";
+import { WebXRImageTrackingModel } from "../../engine-components/webxr/WebXRImageTracking";
+import { WebXRPlaneTracking } from "../../engine-components/webxr/WebXRPlaneTracking";
+import { WebXRSync } from "../../engine-components/webxr/WebXRSync";
+import { WebXRTrackedImage } from "../../engine-components/webxr/WebXRImageTracking";
 import { XRFlag } from "../../engine-components/XRFlag";
-import { XRGrabModel } from "../../engine-components/WebXRGrabRendering";
-import { XRGrabRendering } from "../../engine-components/WebXRGrabRendering";
-import { XRRig } from "../../engine-components/WebXRRig";
+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("AlignmentConstraint", AlignmentConstraint);
@@ -211,6 +214,7 @@ TypeStore.add("AvatarModel", AvatarModel);
 TypeStore.add("AxesHelper", AxesHelper);
 TypeStore.add("BaseUIComponent", BaseUIComponent);
 TypeStore.add("BasicIKConstraint", BasicIKConstraint);
+TypeStore.add("Behaviour", Behaviour);
 TypeStore.add("Bloom", Bloom);
 TypeStore.add("BoxCollider", BoxCollider);
 TypeStore.add("BoxGizmo", BoxGizmo);
@@ -228,6 +232,7 @@ TypeStore.add("Collider", Collider);
 TypeStore.add("ColorAdjustments", ColorAdjustments);
 TypeStore.add("ColorBySpeedModule", ColorBySpeedModule);
 TypeStore.add("ColorOverLifetimeModule", ColorOverLifetimeModule);
+TypeStore.add("Component", Component);
 TypeStore.add("ControlTrackHandler", ControlTrackHandler);
 TypeStore.add("Deletable", Deletable);
 TypeStore.add("DeleteBox", DeleteBox);
@@ -362,6 +367,7 @@ TypeStore.add("WebXRAvatar", WebXRAvatar);
 TypeStore.add("WebXRController", WebXRController);
 TypeStore.add("WebXRImageTracking", WebXRImageTracking);
 TypeStore.add("WebXRImageTrackingModel", WebXRImageTrackingModel);
+TypeStore.add("WebXRPlaneTracking", WebXRPlaneTracking);
 TypeStore.add("WebXRSync", WebXRSync);
 TypeStore.add("WebXRTrackedImage", WebXRTrackedImage);
 TypeStore.add("XRFlag", XRFlag);

package/src/engine/engine_element_loading.ts

@@ -8,6 +8,8 @@ import { hasProLicense } from "./engine_license";
 const debug = getParam("debugloadingbar");
 const debugRendering = getParam("debugloadingbarrendering");
 
+declare type LoadingStyleOption = "dark" | "light";
+
 export class LoadingElementOptions {
     className?: string;
     additionalClasses?: string[];
@@ -172,6 +174,10 @@ export class EngineLoadingView implements ILoadingViewHandler {
     private createLoadingElement(existing?: HTMLElement): HTMLElement {
         if (debug && !existing) console.log("Creating loading element");
         this._loadingElement = existing || document.createElement("div");
+
+        const loadingStyle: LoadingStyleOption = this._element.getAttribute("loading-style") as LoadingStyleOption;
+        console.log(loadingStyle);
+
         const hasLicense = hasProLicense();
         if (!existing) {
             this._loadingElement.style.position = "fixed";
@@ -179,7 +185,10 @@ export class EngineLoadingView implements ILoadingViewHandler {
             this._loadingElement.style.height = "100%";
             this._loadingElement.style.left = "0";
             this._loadingElement.style.top = "0";
-            this._loadingElement.style.backgroundColor = "#000000";
+            if (loadingStyle === "light")
+                this._loadingElement.style.backgroundColor = "#ddd";
+            else
+                this._loadingElement.style.backgroundColor = "#000";
             this._loadingElement.style.display = "flex";
             this._loadingElement.style.alignItems = "center";
             this._loadingElement.style.justifyContent = "center";
@@ -187,6 +196,10 @@ export class EngineLoadingView implements ILoadingViewHandler {
             this._loadingElement.style.flexDirection = "column";
             this._loadingElement.style.pointerEvents = "none";
             this._loadingElement.style.color = "white";
+            if (loadingStyle === "light")
+                this._loadingElement.style.color = "rgba(0,0,0,.8)";
+            else
+                this._loadingElement.style.color = "rgba(255,255,255,.5)";
             if (hasLicense && this._element) {
                 const loadingBackgroundColor = this._element.getAttribute("loading-background-color");
                 if (loadingBackgroundColor) {
@@ -213,7 +226,10 @@ export class EngineLoadingView implements ILoadingViewHandler {
         loadingBarContainer.style.display = "flex";
         loadingBarContainer.style.width = maxWidth + "%";
         loadingBarContainer.style.height = "2px";
-        loadingBarContainer.style.background = "rgba(255,255,255,.2)"
+        if (loadingStyle === "light")
+            loadingBarContainer.style.backgroundColor = "rgba(0,0,0,.2)"
+        else
+            loadingBarContainer.style.backgroundColor = "rgba(255,255,255,.2)"
         // loadingBarContainer.style.alignItems = "center";
         this._loadingElement.appendChild(loadingBarContainer);
 
@@ -244,20 +260,20 @@ export class EngineLoadingView implements ILoadingViewHandler {
             return Mathf.lerp(maxWidth * .5, 100 - maxWidth * .5, t) + "%";
         }
         this._loadingBar.style.background =
-            `linear-gradient(90deg, #02022B ${getGradientPos(0)}, #0BA398 ${getGradientPos(.4)}, #99CC33 ${getGradientPos(.5)}, #D7DB0A ${getGradientPos(1)})`;
+                `linear-gradient(90deg, #02022B ${getGradientPos(0)}, #0BA398 ${getGradientPos(.4)}, #99CC33 ${getGradientPos(.5)}, #D7DB0A ${getGradientPos(1)})`;
         this._loadingBar.style.backgroundAttachment = "fixed";
         this._loadingBar.style.width = "0%";
         this._loadingBar.style.height = "100%";
-        if(hasLicense && this._element){
+        if (hasLicense && this._element) {
             const primaryColor = this._element.getAttribute("primary-color");
             const secondaryColor = this._element.getAttribute("secondary-color");
-            if(primaryColor && secondaryColor){
+            if (primaryColor && secondaryColor) {
                 this._loadingBar.style.background = `linear-gradient(90deg, ${primaryColor} ${getGradientPos(0)}, ${secondaryColor} ${getGradientPos(1)})`;
             }
-            else if(primaryColor){
+            else if (primaryColor) {
                 this._loadingBar.style.background = primaryColor;
             }
-            else if(secondaryColor){
+            else if (secondaryColor) {
                 this._loadingBar.style.background = secondaryColor;
             }
         }
@@ -273,16 +289,15 @@ export class EngineLoadingView implements ILoadingViewHandler {
         messageContainer.style.display = "flex";
         messageContainer.style.fontSize = ".8em";
         messageContainer.style.paddingTop = ".5em";
-        messageContainer.style.color = "rgba(255,255,255,.5)";
         messageContainer.style.fontWeight = "200";
         messageContainer.style.fontFamily = "Roboto, sans-serif";
         // messageContainer.style.border = "1px solid rgba(255,255,255,.1)";
         messageContainer.style.justifyContent = "center";
         this._loadingElement.appendChild(messageContainer);
 
-        if(hasLicense && this._element){
+        if (hasLicense && this._element) {
             const loadingTextColor = this._element.getAttribute("loading-text-color");
-            if(loadingTextColor){
+            if (loadingTextColor) {
                 messageContainer.style.color = loadingTextColor;
             }
         }

package/src/engine/engine_networking_auto.ts

@@ -121,8 +121,8 @@ class ComponentPropertiesSyncer {
             this._isReceiving = true;
             for (const key in val) {
                 if (key === "guid") continue;
+                // TODO: maybe use serializable here?!
                 const value = val[key];
-                // console.log("SET", key, value, this.comp.guid, this.comp);
                 this.comp[key] = value;
             }
         }

package/src/engine/engine_rendererdata.ts

@@ -1,4 +1,4 @@
-import { Vector4, EquirectangularReflectionMapping, sRGBEncoding, WebGLCubeRenderTarget, Texture, LightProbe, Color } from "three";
+import { Vector4, EquirectangularReflectionMapping, sRGBEncoding, WebGLCubeRenderTarget, Texture, LightProbe, Color, SphericalHarmonics3 } from "three";
 import { LightProbeGenerator } from "three/examples/jsm/lights/LightProbeGenerator.js"
 import { Context } from "./engine_setup";
 import { SceneLightSettings } from "./extensions/NEEDLE_lighting_settings";
@@ -11,7 +11,7 @@ const debug = getParam("debugenvlight");
 
 export declare type SphericalHarmonicsData = {
     array: number[],
-    texture: THREE.WebGLCubeRenderTarget | THREE.Texture,
+    texture: WebGLCubeRenderTarget | Texture,
     lightProbe?: LightProbe
 }
 
@@ -136,8 +136,8 @@ export class RendererData {
         }
     }
 
-    disableReflection(sourceId? : SourceIdentifier) {
-        if(sourceId && sourceId !== this._currentReflectionId) return;
+    disableReflection(sourceId?: SourceIdentifier) {
+        if (sourceId && sourceId !== this._currentReflectionId) return;
         const scene = this.context.scene;
         scene.environment = null;
     }
@@ -178,13 +178,13 @@ export class LightData {
     get Array(): number[] | undefined { return this._sphericalHarmonicsArray; }
 
     private _context: Context;
-    private _source: THREE.Texture;
-    private _sphericalHarmonics: THREE.SphericalHarmonics3 | null = null;
+    private _source: Texture;
+    private _sphericalHarmonics: SphericalHarmonics3 | null = null;
     private _sphericalHarmonicsArray?: number[];
     private _ambientScale: number = 1;
     private _lightProbe?: LightProbe;
 
-    constructor(context: Context, tex: THREE.Texture, ambientScale: number = 1) {
+    constructor(context: Context, tex: Texture, ambientScale: number = 1) {
         this._context = context;
         this._source = tex;
         this._ambientScale = ambientScale;
@@ -199,7 +199,7 @@ export class LightData {
 
         try {
             const reflection = this._source;
-            let rt: THREE.WebGLCubeRenderTarget | null = null;
+            let rt: WebGLCubeRenderTarget | null = null;
             if (reflection) {
                 if (debug) console.log("GENERATING LIGHT PROBE", reflection, this.Source);
                 const size = Math.min(reflection.image.width, 512);
@@ -216,13 +216,15 @@ export class LightData {
                 // console.log(intensityFactor, lightFactor);
                 this._sphericalHarmonics = sampledProbe.sh;
                 this._sphericalHarmonicsArray = this._sphericalHarmonics.toArray();
-                const factor = ((intensityFactor) / (Math.PI * .5));
-                for (let i = 0; i < this._sphericalHarmonicsArray.length; i++) {
-                    this._sphericalHarmonicsArray[i] *= factor;
+                if (this._sphericalHarmonicsArray) {
+                    const factor = ((intensityFactor) / (Math.PI * .5));
+                    for (let i = 0; i < this._sphericalHarmonicsArray.length; i++) {
+                        this._sphericalHarmonicsArray[i] *= factor;
+                    }
+                    sampledProbe.sh.scale(lightFactor);
+                    if (this._source)
+                        return { array: this._sphericalHarmonicsArray, texture: this._source, lightProbe: sampledProbe };
                 }
-                sampledProbe.sh.scale(lightFactor);
-                if (this._source)
-                    return { array: this._sphericalHarmonicsArray, texture: this._source, lightProbe: sampledProbe };
             }
         }
         catch (err) {

package/src/engine-components/DragControls.ts

@@ -4,7 +4,7 @@ import { IPointerDownHandler, IPointerEnterHandler, IPointerExitHandler, IPointe
 import { Context } from "../engine/engine_setup";
 import { Interactable, UsageMarker } from "./Interactable";
 import { Rigidbody } from "./RigidBody";
-import { WebXR } from "./WebXR";
+import { WebXR } from "./webxr/WebXR";
 import { Avatar_POI } from "./avatar/Avatar_Brain_LookAt";
 import { RaycastOptions } from "../engine/engine_physics";
 import { getWorldPosition, setWorldPosition } from "../engine/engine_three_utils";

package/src/engine-components/Duplicatable.ts

@@ -1,5 +1,5 @@
 import { Behaviour, GameObject } from "./Component";
-import { WebXRController, ControllerEvents } from "./WebXRController";
+import { WebXRController, ControllerEvents } from "./webxr/WebXRController";
 import { DragControls, DragEvents } from "./DragControls";
 import { Interactable } from "./Interactable";
 import { Animation } from "./Animation";

package/src/engine-components/Light.ts

@@ -5,8 +5,8 @@ import { setWorldPositionXYZ } from "../engine/engine_three_utils";
 import { FrameEvent } from "../engine/engine_setup";
 import { serializable } from "../engine/engine_serialization_decorator";
 import { Color, DirectionalLight, OrthographicCamera } from "three";
-import { WebXR, WebXREvent } from "./WebXR";
-import { WebARSessionRoot } from "./WebARSessionRoot";
+import { WebXR, WebXREvent } from "./webxr/WebXR";
+import { WebARSessionRoot } from "./webxr/WebARSessionRoot";
 import { ILight } from "../engine/engine_types";
 import { Mathf } from "../engine/engine_math";
 import { isLocalNetwork } from "../engine/engine_networking_utils";

package/src/engine-components/PlayerColor.ts

@@ -1,7 +1,7 @@
 import { RoomEvents } from "../engine/engine_networking";
 import { Behaviour, GameObject } from "./Component";
 import * as THREE from "three";
-import { AvatarMarker } from "./WebXRAvatar";
+import { AvatarMarker } from "./webxr/WebXRAvatar";
 import { WaitForSeconds } from "../engine/engine_coroutine";
 
 

package/src/engine-components/ShadowCatcher.ts

@@ -7,6 +7,7 @@ import { serializable } from "../engine/engine_serialization_decorator";
 enum ShadowMode {
     ShadowMask = 0,
     Additive = 1,
+    Occluder = 2,
 }
 
 export class ShadowCatcher extends Behaviour {
@@ -28,6 +29,9 @@ export class ShadowCatcher extends Behaviour {
             case ShadowMode.Additive:
                 this.applyLightBlendMaterial();
                 break;
+            case ShadowMode.Occluder:
+                this.applyOccluderMaterial();
+                break;
         }
 
     }
@@ -88,6 +92,17 @@ export class ShadowCatcher extends Behaviour {
         }
     }
 
+    applyOccluderMaterial() {
+        const renderer = GameObject.getComponent(this.gameObject, Renderer);
+        if (renderer) {
+            const material = renderer.sharedMaterial;
+            material.depthWrite = true;
+            material.stencilWrite = true;
+            material.colorWrite = false;
+            this.gameObject.renderOrder = -100;
+        }
+    }
+
     private applyMaterialOptions(material: Material) {
         if (material) {
             material.depthWrite = false;

package/src/engine-components/SpectatorCamera.ts

@@ -2,8 +2,8 @@ import { Behaviour, Component, GameObject } from "./Component";
 import { Camera } from "./Camera";
 import * as THREE from "three";
 import { OrbitControls } from "./OrbitControls";
-import { WebXR, WebXREvent } from "./WebXR";
-import { AvatarMarker } from "./WebXRAvatar";
+import { WebXR, WebXREvent } from "./webxr/WebXR";
+import { AvatarMarker } from "./webxr/WebXRAvatar";
 import { XRStateFlag } from "./XRFlag";
 import { SmoothFollow } from "./SmoothFollow";
 import { Object3D } from "three";

package/src/engine-components/SyncedCamera.ts

@@ -2,7 +2,7 @@ import { NetworkConnection } from "../engine/engine_networking";
 import { Behaviour, GameObject } from "./Component";
 import { Camera } from "./Camera";
 import * as utils from "../engine/engine_three_utils"
-import { WebXR } from "./WebXR";
+import { WebXR } from "./webxr/WebXR";
 import { Builder } from "flatbuffers";
 import { SyncedCameraModel } from "../engine-schemes/synced-camera-model";
 import { Vec3 } from "../engine-schemes/vec3";
@@ -10,7 +10,7 @@ import { registerType } from "../engine-schemes/schemes";
 import { InstancingUtil } from "../engine/engine_instancing";
 import { serializable } from "../engine/engine_serialization_decorator";
 import { Object3D } from "three";
-import { AvatarMarker } from "./WebXRAvatar";
+import { AvatarMarker } from "./webxr/WebXRAvatar";
 import { AssetReference } from "../engine/engine_addressables";
 import { ViewDevice } from "../engine/engine_playerview";
 import { InstantiateOptions } from "../engine/engine_gameobject";

package/src/engine-components/api.ts

@@ -9,5 +9,6 @@ export * from "./export"
 export * from "./postprocessing"
 export * from "./timeline"
 export * from "./ui"
+export * from "./webxr"
 
 export { ClearFlags } from "./Camera"

package/src/engine-components/avatar/Avatar_Brain_LookAt.ts

@@ -1,7 +1,7 @@
 import * as THREE from "three";
 import { TypeStore } from "../../engine/engine_typestore";
 import { Behaviour, GameObject } from "../Component";
-import { AvatarMarker } from "../WebXRAvatar";
+import { AvatarMarker } from "../webxr/WebXRAvatar";
 import * as utils from "../../engine/engine_three_utils";
 import { OwnershipModel } from "../../engine/engine_networking";
 import { Int8BufferAttribute } from "three";

package/src/engine-components/avatar/Avatar_MouthShapes.ts

@@ -1,6 +1,6 @@
 import { Behaviour, GameObject } from "../Component";
 import { Voip } from "../Voip";
-import { AvatarMarker } from "../WebXRAvatar";
+import { AvatarMarker } from "../webxr/WebXRAvatar";
 import * as utils from "../../engine/engine_utils";
 import { Object3D } from "three";
 import { serializable } from "../../engine/engine_serialization_decorator";

package/src/engine-components/avatar/Avatar_MustacheShake.ts

@@ -1,6 +1,6 @@
 import { Behaviour, GameObject } from "../Component";
 import { Voip } from "../Voip";
-import { AvatarMarker } from "../WebXRAvatar";
+import { AvatarMarker } from "../webxr/WebXRAvatar";
 
 export class Avatar_MustacheShake extends Behaviour {
     private voip: Voip | null = null;

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

@@ -8,7 +8,7 @@ export { AnimationTrackHandler } from "../timeline/TimelineTracks";
 export { Animator } from "../Animator";
 export { AnimatorController } from "../AnimatorController";
 export { Antialiasing } from "../postprocessing/Effects/Antialiasing";
-export { AttachedObject } from "../WebXRController";
+export { AttachedObject } from "../webxr/WebXRController";
 export { AudioListener } from "../AudioListener";
 export { AudioSource } from "../AudioSource";
 export { AudioTrackHandler } from "../timeline/TimelineTracks";
@@ -19,11 +19,12 @@ export { Avatar_POI } from "../avatar/Avatar_Brain_LookAt";
 export { AvatarBlink_Simple } from "../avatar/AvatarBlink_Simple";
 export { AvatarEyeLook_Rotation } from "../avatar/AvatarEyeLook_Rotation";
 export { AvatarLoader } from "../AvatarLoader";
-export { AvatarMarker } from "../WebXRAvatar";
+export { AvatarMarker } from "../webxr/WebXRAvatar";
 export { AvatarModel } from "../AvatarLoader";
 export { AxesHelper } from "../AxesHelper";
 export { BaseUIComponent } from "../ui/BaseUIComponent";
 export { BasicIKConstraint } from "../BasicIKConstraint";
+export { Behaviour } from "../Component";
 export { Bloom } from "../postprocessing/Effects/Bloom";
 export { BoxCollider } from "../Collider";
 export { BoxGizmo } from "../Gizmos";
@@ -41,6 +42,7 @@ export { Collider } from "../Collider";
 export { ColorAdjustments } from "../postprocessing/Effects/ColorAdjustments";
 export { ColorBySpeedModule } from "../ParticleSystemModules";
 export { ColorOverLifetimeModule } from "../ParticleSystemModules";
+export { Component } from "../Component";
 export { ControlTrackHandler } from "../timeline/TimelineTracks";
 export { Deletable } from "../DeleteBox";
 export { DeleteBox } from "../DeleteBox";
@@ -141,7 +143,7 @@ export { SubEmitterSystem } from "../ParticleSystem";
 export { SyncedCamera } from "../SyncedCamera";
 export { SyncedRoom } from "../SyncedRoom";
 export { SyncedTransform } from "../SyncedTransform";
-export { TeleportTarget } from "../WebXRController";
+export { TeleportTarget } from "../webxr/WebXRController";
 export { TestRunner } from "../TestRunner";
 export { TestSimulateUserData } from "../TestRunner";
 export { Text } from "../ui/Text";
@@ -163,19 +165,20 @@ export { Voip } from "../Voip";
 export { Volume } from "../postprocessing/Volume";
 export { VolumeParameter } from "../postprocessing/VolumeParameter";
 export { VolumeProfile } from "../postprocessing/VolumeProfile";
-export { VRUserState } from "../WebXRSync";
-export { WebAR } from "../WebXR";
-export { WebARCameraBackground } from "../WebARCameraBackground";
-export { WebARSessionRoot } from "../WebARSessionRoot";
-export { WebXR } from "../WebXR";
-export { WebXRAvatar } from "../WebXRAvatar";
-export { WebXRController } from "../WebXRController";
-export { WebXRImageTracking } from "../WebXRImageTracking";
-export { WebXRImageTrackingModel } from "../WebXRImageTracking";
-export { WebXRSync } from "../WebXRSync";
-export { WebXRTrackedImage } from "../WebXRImageTracking";
+export { VRUserState } from "../webxr/WebXRSync";
+export { WebAR } from "../webxr/WebXR";
+export { WebARCameraBackground } from "../webxr/WebARCameraBackground";
+export { WebARSessionRoot } from "../webxr/WebARSessionRoot";
+export { WebXR } from "../webxr/WebXR";
+export { WebXRAvatar } from "../webxr/WebXRAvatar";
+export { WebXRController } from "../webxr/WebXRController";
+export { WebXRImageTracking } from "../webxr/WebXRImageTracking";
+export { WebXRImageTrackingModel } from "../webxr/WebXRImageTracking";
+export { WebXRPlaneTracking } from "../webxr/WebXRPlaneTracking";
+export { WebXRSync } from "../webxr/WebXRSync";
+export { WebXRTrackedImage } from "../webxr/WebXRImageTracking";
 export { XRFlag } from "../XRFlag";
-export { XRGrabModel } from "../WebXRGrabRendering";
-export { XRGrabRendering } from "../WebXRGrabRendering";
-export { XRRig } from "../WebXRRig";
+export { XRGrabModel } from "../webxr/WebXRGrabRendering";
+export { XRGrabRendering } from "../webxr/WebXRGrabRendering";
+export { XRRig } from "../webxr/WebXRRig";
 export { XRState } from "../XRFlag";

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

@@ -8,11 +8,11 @@ import { getFormattedDate } from "./utils/timeutils";
 import { registerAnimatorsImplictly } from "./utils/animationutils";
 import { IUSDZExporterExtension } from "./Extension";
 import { Behaviour, GameObject } from "../../Component";
-import { WebXR } from "../../WebXR"
+import { WebXR } from "../../webxr/WebXR"
 import { serializable } from "../../../engine/engine_serialization";
 import { showBalloonWarning } from "../../../engine/debug/debug";
 import { Context } from "../../../engine/engine_setup";
-import { WebARSessionRoot } from "../../WebARSessionRoot";
+import { WebARSessionRoot } from "../../webxr/WebARSessionRoot";
 
 const debug = getParam("debugusdz");
 

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

@@ -1,7 +1,7 @@
 import { RaycastOptions } from "../../engine/engine_physics";
 import { Behaviour, Component, GameObject } from "../Component";
-import { WebXR } from "../WebXR";
-import { ControllerEvents, WebXRController } from "../WebXRController";
+import { WebXR } from "../webxr/WebXR";
+import { ControllerEvents, WebXRController } from "../webxr/WebXRController";
 import * as ThreeMeshUI from 'three-mesh-ui'
 import { Context } from "../../engine/engine_setup";
 import { OrbitControls } from "../OrbitControls";

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

@@ -144,7 +144,8 @@ export class InputField extends Behaviour implements IPointerEventHandler {
         if (this.placeholder && (!this.textComponent || this.textComponent.text.length <= 0))
             GameObject.setActive(this.placeholder.gameObject, true);
 
-        this.onEndEdit?.invoke();
+        if (InputField.htmlField)
+            this.onEndEdit?.invoke(InputField.htmlField.value);
     }
 
 

package/src/engine-components/{WebARCameraBackground.ts → webxr/WebARCameraBackground.ts}

@@ -1,7 +1,7 @@
-import { Behaviour } from "./Component";
-import { serializable } from "../engine/engine_serialization_decorator";
-import { RGBAColor } from "../engine-components/js-extensions/RGBAColor"
-import { WebXR } from "../engine-components/WebXR";
+import { Behaviour } from "../Component";
+import { serializable } from "../../engine/engine_serialization_decorator";
+import { RGBAColor } from "../js-extensions/RGBAColor"
+import { WebXR } from "./WebXR";
 import { 
     Camera as ThreeCamera, 
     Scene, 

package/src/engine-components/{WebARSessionRoot.ts → webxr/WebARSessionRoot.ts}

@@ -1,8 +1,8 @@
-import { Behaviour, GameObject } from "./Component";
+import { Behaviour, GameObject } from "../Component";
 import { Matrix4, Object3D } from "three";
 import { WebAR, WebXR } from "./WebXR";
-import { InstancingUtil } from "../engine/engine_instancing";
-import { serializable } from "../engine/engine_serialization_decorator";
+import { InstancingUtil } from "../../engine/engine_instancing";
+import { serializable } from "../../engine/engine_serialization_decorator";
 
 // https://github.com/takahirox/takahirox.github.io/blob/master/js.mmdeditor/examples/js/controls/DeviceOrientationControls.js