@needle-tools/engine 2.35.2-pre → 2.35.3-pre

package/lib/engine-components/js-extensions/Object3D.js

@@ -1,22 +1,11 @@
-import { applyPrototypeExtensions } from "./ExtensionUtils";
+import { applyPrototypeExtensions, registerPrototypeExtensions } from "./ExtensionUtils";
 import { Object3D } from "three";
 import { addNewComponentInstance, getComponent, getComponentInChildren, getComponentInParent, getComponents, getComponentsInChildren, getComponentsInParent, getOrAddComponent, removeComponent } from "../../engine/engine_components";
 // used to decorate cloned object3D objects with the same added components defined above
 export function apply(object) {
-    if (object && object.isObject3D === true)
-        applyPrototypeExtensions(object);
-}
-// this is a fix to allow gameObject active animation be applied to a three object
-if (!Object.getOwnPropertyDescriptor(Object3D.prototype, "activeSelf")) {
-    Object.defineProperty(Object3D.prototype, "activeSelf", {
-        get: function () {
-            return this.visible;
-        },
-        set: function (val) {
-            const state = typeof val === "number" ? val > 0.5 : val;
-            this.visible = state;
-        }
-    });
+    if (object && object.isObject3D === true) {
+        applyPrototypeExtensions(object, Object3D);
+    }
 }
 // do we still need this?
 Object3D.prototype["SetActive"] = function (active) {
@@ -49,4 +38,18 @@ Object3D.prototype["getComponentInParent"] = function (type) {
 Object3D.prototype["getComponentsInParent"] = function (type, arr) {
     return getComponentsInParent(this, type, arr);
 };
+// this is a fix to allow gameObject active animation be applied to a three object
+if (!Object.getOwnPropertyDescriptor(Object3D.prototype, "activeSelf")) {
+    Object.defineProperty(Object3D.prototype, "activeSelf", {
+        get: function () {
+            return this.visible;
+        },
+        set: function (val) {
+            const state = typeof val === "number" ? val > 0.5 : val;
+            this.visible = state;
+        }
+    });
+}
+// do this after adding the component extensions
+registerPrototypeExtensions(Object3D);
 //# sourceMappingURL=Object3D.js.map

package/lib/engine-components/js-extensions/Object3D.js.map

@@ -1 +1 @@
-{"version":3,"file":"Object3D.js","sourceRoot":"","sources":["../../../../engine-components/js-extensions/Object3D.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGjC,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,aAAa,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAExO,wFAAwF;AACxF,MAAM,UAAU,KAAK,CAAC,MAAgB;IAClC,IAAI,MAAM,IAAI,MAAM,CAAC,UAAU,KAAK,IAAI;QACpC,wBAAwB,CAAC,MAAM,CAAC,CAAC;AACzC,CAAC;AAGD,kFAAkF;AAClF,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE;IACpE,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY,EAAE;QACpD,GAAG,EAAE;YACD,OAAO,IAAI,CAAC,OAAO,CAAC;QACxB,CAAC;QACD,GAAG,EAAE,UAAU,GAAqB;YAChC,MAAM,KAAK,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YACxD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACzB,CAAC;KACJ,CAAC,CAAC;CACN;AAGD,yBAAyB;AACzB,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,UAAU,MAAe;IACvD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;AAC1B,CAAC,CAAA;AAED,QAAQ,CAAC,SAAS,CAAC,iBAAiB,CAAC,GAAG,UAA+B,IAA4B;IAC/F,OAAO,uBAAuB,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC,CAAA;AAED,QAAQ,CAAC,SAAS,CAAC,iBAAiB,CAAC,GAAG,UAAU,IAAe;IAC7D,OAAO,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACvC,CAAC,CAAA;AAED,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,GAAG,UAAgC,QAAgC;IACtG,OAAO,iBAAiB,CAAI,IAAI,EAAE,QAAQ,CAAC,CAAC;AAChD,CAAC,CAAA;AAED,QAAQ,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,UAAgC,IAAoB;IACrF,OAAO,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACpC,CAAC,CAAA;AAED,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,UAAgC,IAAoB,EAAE,GAAQ;IAChG,OAAO,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;AAC1C,CAAC,CAAA;AAED,QAAQ,CAAC,SAAS,CAAC,wBAAwB,CAAC,GAAG,UAAgC,IAAoB;IAC/F,OAAO,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC9C,CAAC,CAAA;AAED,QAAQ,CAAC,SAAS,CAAC,yBAAyB,CAAC,GAAG,UAAgC,IAAoB,EAAE,GAAQ;IAC1G,OAAO,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;AACpD,CAAC,CAAA;AAED,QAAQ,CAAC,SAAS,CAAC,sBAAsB,CAAC,GAAG,UAAgC,IAAoB;IAC7F,OAAO,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC5C,CAAC,CAAA;AAED,QAAQ,CAAC,SAAS,CAAC,uBAAuB,CAAC,GAAG,UAAa,IAAoB,EAAE,GAAQ;IACrF,OAAO,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;AAClD,CAAC,CAAA"}
+{"version":3,"file":"Object3D.js","sourceRoot":"","sources":["../../../../engine-components/js-extensions/Object3D.ts"],"names":[],"mappings":"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"}

package/lib/engine-components/js-extensions/Vector.js

@@ -1,10 +1,9 @@
-import { applyPrototypeExtensions } from "./ExtensionUtils";
+import { applyPrototypeExtensions, registerPrototypeExtensions } from "./ExtensionUtils";
 import { Mathf } from "../../engine/engine_math";
 import { Vector3 } from "three";
 export function apply(object) {
     if (object && object.isVector3 === true) {
-        console.log(object);
-        applyPrototypeExtensions(object);
+        applyPrototypeExtensions(object, Vector3);
     }
 }
 Vector3.prototype["slerp"] = function (end, t) {
@@ -13,4 +12,5 @@ Vector3.prototype["slerp"] = function (end, t) {
     const targetLen = Mathf.lerp(len1, len2, t);
     return this.lerp(end, t).normalize().multiplyScalar(targetLen);
 };
+registerPrototypeExtensions(Vector3);
 //# sourceMappingURL=Vector.js.map

package/lib/engine-components/js-extensions/Vector.js.map

@@ -1 +1 @@
-{"version":3,"file":"Vector.js","sourceRoot":"","sources":["../../../../engine-components/js-extensions/Vector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,MAAM,UAAU,KAAK,CAAC,MAAe;IACjC,IAAI,MAAM,IAAI,MAAM,CAAC,SAAS,KAAK,IAAI,EAAE;QACrC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,wBAAwB,CAAC,MAAM,CAAC,CAAC;KACpC;AACL,CAAC;AAED,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,UAAU,GAAY,EAAE,CAAS;IAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;IAC1B,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC5C,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;AACnE,CAAC,CAAA"}
+{"version":3,"file":"Vector.js","sourceRoot":"","sources":["../../../../engine-components/js-extensions/Vector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,MAAM,UAAU,KAAK,CAAC,MAAe;IACjC,IAAI,MAAM,IAAI,MAAM,CAAC,SAAS,KAAK,IAAI,EAAE;QACrC,wBAAwB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC7C;AACL,CAAC;AAGD,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,UAAU,GAAY,EAAE,CAAS;IAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;IAC1B,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC5C,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;AACnE,CAAC,CAAA;AAED,2BAA2B,CAAC,OAAO,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@needle-tools/engine",
-    "version": "2.35.2-pre",
+    "version": "2.35.3-pre",
     "description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development, and can be deployed anywhere. It is flexible, extensible, and collaboration and XR come naturally.",
     "main": "dist/needle-engine.js",
     "module": "lib/needle-engine.js",
@@ -63,6 +63,15 @@
             ],
             "extensions": "ts",
             "quiet": false
+        },
+        "build:dist": {
+            "patterns": [
+                "engine/*",
+                "engine-components/*",
+                "engine-experimental/**/*"
+            ],
+            "extensions": "ts",
+            "quiet": false
         }
     },
     "publishConfig": {

package/src/engine/engine_components.ts

@@ -4,6 +4,7 @@ import { Context, registerComponent } from "./engine_setup";
 import { getParam } from "./engine_utils";
 import { removeScriptFromContext, updateActiveInHierarchyWithoutEventCall } from "./engine_mainloop_utils";
 import { activeInHierarchyFieldName } from "./engine_constants";
+import { apply } from "../engine-components/js-extensions/Object3D";
 
 const debug = getParam("debuggetcomponent");
 
@@ -35,10 +36,14 @@ export function getOrAddComponent<T extends IComponent>(go: Object3D, typeName:
 }
 
 export function addNewComponentInstance<T extends IComponent>(obj: Object3D, componentInstance: T, callAwake = true): IComponent {
+    if (!obj) {
+        new Error("Can not add componet to null object");
+    }
     if (!obj.userData) obj.userData = {};
     if (!obj.userData.components) obj.userData.components = [];
     obj.userData.components.push(componentInstance);
     componentInstance.gameObject = obj as IGameObject;
+    apply(obj);
     // componentInstance.transform = obj;
     registerComponent(componentInstance);
     try {

package/src/engine/engine_element.ts

@@ -5,7 +5,12 @@ import { processNewScripts } from "./engine_mainloop_utils";
 import { calculateProgress01, EngineLoadingView, ILoadingViewHandler } from "./engine_element_loading";
 import { delay, getParam } from "./engine_utils";
 import { setDracoDecoderPath, setDracoDecoderType, setKtx2TranscoderPath } from "./engine_loaders";
-import { getLoader } from "../engine/engine_gltf";
+import { getLoader, registerLoader } from "../engine/engine_gltf";
+import { NeedleGltfLoader } from "./engine_scenetools";
+import { INeedleEngineComponent } from "./engine_types";
+
+// registering loader here too to make sure it's imported when using engine via vanilla js
+registerLoader(NeedleGltfLoader);
 
 const debug = getParam("debugwebcomponent");
 
@@ -69,7 +74,7 @@ const desktopContainerClassname = "desktop";
 const knownClasses = [arContainerClassName, vrContainerClassName, desktopContainerClassname];
 
 // https://developers.google.com/web/fundamentals/web-components/customelements
-export class EngineElement extends HTMLElement {
+export class EngineElement extends HTMLElement implements INeedleEngineComponent {
 
     public get loadingProgress01(): number { return this._loadingProgress01; }
     public get loadingFinished(): boolean { return this.loadingProgress01 > .999; }

package/src/engine/engine_gltf.ts

@@ -1,4 +1,4 @@
-import { SourceIdentifier, UIDProvider } from "./engine_types";
+import { Constructor, ConstructorConcrete, SourceIdentifier, UIDProvider } from "./engine_types";
 import { Context } from "./engine_setup";
 import { NEEDLE_components } from "./extensions/NEEDLE_components";
 import { SerializationContext } from "./engine_serialization_core";
@@ -6,18 +6,22 @@ import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js'
 
 
 export interface INeedleGltfLoader {
-    createBuiltinComponents(context: Context, gltfId : SourceIdentifier, gltf, seed: number | null | UIDProvider, extension?: NEEDLE_components) : Promise<void>
+    createBuiltinComponents(context: Context, gltfId: SourceIdentifier, gltf, seed: number | null | UIDProvider, extension?: NEEDLE_components): Promise<void>
     writeBuiltinComponentData(comp: object, context: SerializationContext);
     parseSync(context: Context, data, path: string, seed: number | UIDProvider | null): Promise<GLTF | undefined>;
     loadSync(context: Context, url: string, seed: number | UIDProvider | null, _allowAddingAnimator: boolean, prog?: (ProgressEvent) => void): Promise<GLTF | undefined>
 }
 
 let gltfLoader: INeedleGltfLoader;
+let gltfLoaderType: ConstructorConcrete<INeedleGltfLoader> | null = null;
 
 export function getLoader(): INeedleGltfLoader {
     return gltfLoader;
 }
 
-export function registerLoader(loader : INeedleGltfLoader){
-    gltfLoader = loader;
+export function registerLoader<T extends INeedleGltfLoader>(loader: ConstructorConcrete<T>) {
+    if (gltfLoaderType !== loader) {
+        gltfLoaderType = loader;
+        gltfLoader = new loader();
+    }
 }

package/src/engine/engine_scenetools.ts

@@ -14,7 +14,7 @@ import { NEEDLE_components } from "./extensions/NEEDLE_components";
 import { addNewComponentInstance, getComponentInChildren } from "./engine_components";
 
 
-class NeedleGltfLoader implements INeedleGltfLoader {
+export class NeedleGltfLoader implements INeedleGltfLoader {
     createBuiltinComponents(context: Context, gltfId: string, gltf: any, seed: number | UIDProvider | null, extension?: NEEDLE_components | undefined) {
         return createBuiltinComponents(context, gltfId, gltf, seed, extension);
     }
@@ -31,7 +31,7 @@ class NeedleGltfLoader implements INeedleGltfLoader {
     }
 }
 
-registerLoader(new NeedleGltfLoader());
+registerLoader(NeedleGltfLoader);
 
 
 const printGltf = utils.getParam("printGltf");

package/src/engine/engine_types.ts

@@ -18,7 +18,11 @@ export interface UIDProvider {
     generateUUID(): string;
 }
 
-
+export declare interface INeedleEngineComponent extends HTMLElement {
+    getAROverlayContainer(): HTMLElement;
+    onEnterAR(session: THREE.XRSession, overlayContainer: HTMLElement);
+    onExitAR(session: THREE.XRSession);
+}
 
 export declare interface IGameObject extends Object3D {
     guid: string | undefined;
@@ -36,7 +40,7 @@ export interface IComponent {
     get name(): string;
     get layer(): number;
     get destroyed(): boolean;
-    
+
     context: any;
 
     get activeAndEnabled(): boolean;
@@ -75,7 +79,7 @@ export interface IComponent {
     __internalHandleCollision(col: Collision, isTriggerCollision: boolean);
     __internalHandleExitCollisionEvent(obj: Object3D, isTriggerCollision: boolean);
 
-    get forward() : Vector3;
+    get forward(): Vector3;
 }
 
 
@@ -127,7 +131,7 @@ export declare type CannonCollision = {
 }
 
 export declare type ICollisionContext = {
-    getCollider(obj : Object3D) : ICollider;
+    getCollider(obj: Object3D): ICollider;
 }
 
 export class Collision {
@@ -143,7 +147,7 @@ export class Collision {
     private readonly invert: boolean;
     private readonly collision: CannonCollision;
     private readonly targetBody: Body;
-    private readonly context : ICollisionContext;
+    private readonly context: ICollisionContext;
 
     readonly me: Object3D;
 
@@ -178,7 +182,7 @@ export class Collision {
     //     return this._point;
     // }
 
-    constructor(obj: Object3D, collision: CannonCollision, context : ICollisionContext, invert: boolean = false) {
+    constructor(obj: Object3D, collision: CannonCollision, context: ICollisionContext, invert: boolean = false) {
         this.me = obj;
         this.collision = collision;
         this.context = context;

package/src/engine/extensions/NEEDLE_deferred_texture.ts

@@ -7,7 +7,7 @@ import { getParam, getPath } from "../engine_utils";
 
 export const EXTENSION_NAME = "NEEDLE_deferred_texture";
 
-const debug = getParam("debugdeferredtextures")
+const debug = getParam("debugprogressive");
 
 declare type DeferredTextureModel = {
     uri: string;
@@ -15,9 +15,30 @@ declare type DeferredTextureModel = {
     usage?: string,
 }
 
+const debug_toggle_maps: Map<Material, { [key: string]: { original: Texture, lod0: Texture } }> = new Map();
+let show_lod0 = false;
+if (debug) {
+    window.addEventListener("keyup", evt => {
+        if (evt.key === "p") {
+            debug_toggle_maps.forEach((map, material) => {
+                Object.entries(map).forEach(([key, value]) => {
+                    if (show_lod0) {
+                        material[key] = value.lod0;
+                    } else {
+                        material[key] = value.original;
+                    }
+                    material.needsUpdate = true;
+                });
+            });
+            show_lod0 = !show_lod0;
+        }
+    });
+}
+
 export class NEEDLE_deferred_texture implements GLTFLoaderPlugin {
 
-    static assignTextureLOD(context: Context, source : SourceIdentifier | undefined, material: Material, level: number = 0) {
+
+    static assignTextureLOD(context: Context, source: SourceIdentifier | undefined, material: Material, level: number = 0) {
         if (!material) return;
         for (const slot of Object.keys(material)) {
             const val = material[slot];
@@ -32,6 +53,18 @@ export class NEEDLE_deferred_texture implements GLTFLoaderPlugin {
                         material[slot] = t;
                         material.needsUpdate = true;
 
+                        if (debug) {
+                            let debug_map = debug_toggle_maps.get(material);
+                            if (!debug_map) {
+                                debug_map = {};
+                                debug_toggle_maps.set(material, debug_map);
+                            }
+                            let entry = debug_map[slot];
+                            if (!entry) {
+                                entry = debug_map[slot] = { original: val, lod0: t };
+                            }
+                            entry.lod0 = t;
+                        }
                     }
                 });
             }
@@ -93,7 +126,7 @@ export class NEEDLE_deferred_texture implements GLTFLoaderPlugin {
     private static cache = new Map<string, DeferredTextureModel>();
     private static resolved: { [key: string]: Texture } = {};
 
-    private static async getOrLoadTexture(context: Context, source : SourceIdentifier | undefined, material: Material, slot: string, current: Texture, _level: number): Promise<Texture | null> {
+    private static async getOrLoadTexture(context: Context, source: SourceIdentifier | undefined, material: Material, slot: string, current: Texture, _level: number): Promise<Texture | null> {
 
         const key = current.uuid;
         const ext: DeferredTextureModel | undefined = NEEDLE_deferred_texture.cache.get(key);// || current.userData.deferred;

package/src/engine-components/Component.ts

@@ -113,6 +113,7 @@ abstract class GameObject extends THREE.Object3D implements THREE.Object3D, IGam
 
     public static invoke(go: THREE.Object3D | null | undefined, functionName: string, children: boolean = false, ...args: any) {
         if (!go) return;
+
         // console.log(go);
         this.foreachComponent(go, c => {
             const fn = c[functionName];
@@ -381,6 +382,7 @@ class Component implements IComponent, EventTarget {
         if (this.__didEnable) return false;
         // console.trace("INTERNAL ENABLE");
         this.__didEnable = true;
+        this.__isEnabled = true;
         this.onEnable();
         return true;
     }
@@ -389,6 +391,7 @@ class Component implements IComponent, EventTarget {
         if (!this.__didEnable) return;
         this.__didEnable = false;
         this._collisionExitRoutine = undefined;
+        this.__isEnabled = false;
         this.onDisable();
         this._collisions?.clear();
     }
@@ -415,7 +418,10 @@ class Component implements IComponent, EventTarget {
         }
 
         // need to check here because codegen is calling this before everything is setup
-        if (!this.__didAwake) return;
+        if (!this.__didAwake) {
+            this.__isEnabled = val;
+            return;
+        }
         if (val) {
             this.__internalEnable();
         } else {

package/src/engine-components/DragControls.ts

@@ -13,6 +13,7 @@ import { getWorldPosition, getWorldQuaternion, setWorldPosition } from "../engin
 import { KeyCode } from "../engine/engine_input";
 import { nameofFactory } from "../engine/engine_utils";
 import { InstancingUtil } from "../engine/engine_instancing";
+import { OrbitControls } from "./OrbitControls";
 
 const debug = false;
 
@@ -43,7 +44,7 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
     // public targets: THREE.Object3D[] | null = null;
 
     // private controls: Control | null = null;
-    // private orbit: OrbitControls | null = null;
+    private orbit: OrbitControls | null = null;
 
     private selectStartEventListener: ((controls: DragControls, args: SelectArgs) => void)[] = [];
     private selectEndEventListener: Array<Function> = [];
@@ -70,7 +71,7 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
 
 
     start() {
-        // this.orbit = GameObject.findObjectOfType(OrbitControls, this.context);
+        this.orbit = GameObject.findObjectOfType(OrbitControls, this.context);
     }
 
     private static lastHovered: THREE.Object3D;
@@ -148,8 +149,11 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
             this.onUpdateDrag();
         }
 
-        if (this._isDragging && !this._dragHelper?.hasSelected) {
-            this.onDragEnd(null);
+
+        if (this._isDragging) {
+            if (this._dragHelper?.hasSelected === false) {
+                this.onDragEnd(null);
+            }
         }
     }
 
@@ -197,7 +201,7 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
         object = args.attached;
         this._isDragging = true;
         this._dragHelper.setSelected(object, this.context);
-        // if (this.orbit) this.orbit.enabled = false;
+        if (this.orbit) this.orbit.enabled = false;
 
         const sync = GameObject.getComponentInChildren(object, SyncedTransform);
         if (debug)
@@ -239,7 +243,7 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
         if (debug)
             console.log("DRAG END", selected, selected?.visible)
         this._dragHelper.setSelected(null, this.context);
-        // if (this.orbit) this.orbit.enabled = true;
+        if (this.orbit) this.orbit.enabled = true;
         if (evt?.object) {
             const sync = GameObject.getComponentInChildren(evt.object, SyncedTransform);
             if (sync) {
@@ -316,7 +320,6 @@ class DragHelper {
     }
 
     setSelected(newSelected: THREE.Object3D | null, context: Context) {
-
         if (this._selected && context) {
             for (const rb of this._rbs) {
                 rb.wakeUp();
@@ -343,7 +346,6 @@ class DragHelper {
             this._groundMarker.removeFromParent();
         }
 
-
         if (this._selected) {
             if (!context) {
                 console.error("DragHelper: no context");

package/src/engine-components/Renderer.ts

@@ -17,8 +17,8 @@ export { InstancingUtil } from "../engine/engine_instancing";
 const suppressInstancing = getParam("noInstancing");
 const debugLightmap = getParam("debuglightmaps") ? true : false;
 const debugInstancing = getParam("debuginstancing");
-const debugProgressiveLoading = getParam("debugprogressiveload");
-const suppressProgressiveLoading = getParam("noprogressiveload");
+const debugProgressiveLoading = getParam("debugprogressive");
+const suppressProgressiveLoading = getParam("noprogressive");
 
 export class FieldWithDefault {
     public path: string | null = null;

package/src/engine-components/ScreenCapture.ts

@@ -31,6 +31,12 @@ function disposeStream(str: MediaStream | null | undefined) {
         cap.stop();
 }
 
+declare type ScreenCaptureOptions = {
+    device?: ScreenCaptureDevice,
+    deviceId?: string,
+    constraints?: MediaTrackConstraints,
+}
+
 export class ScreenCapture extends Behaviour implements IPointerClickHandler {
 
     onPointerClick() {
@@ -82,7 +88,8 @@ export class ScreenCapture extends Behaviour implements IPointerClickHandler {
     private _currentMode: ScreenCaptureMode = ScreenCaptureMode.Idle;
 
     awake() {
-        console.log(this);
+        if (debug)
+            console.log(this);
         AudioSource.registerWaitForAllowAudio(() => {
             if (this.videoPlayer && this._currentStream && this._currentMode === ScreenCaptureMode.Receiving) {
                 this.videoPlayer.setVideo(this._currentStream);
@@ -105,12 +112,16 @@ export class ScreenCapture extends Behaviour implements IPointerClickHandler {
         this._net.addEventListener(PeerEvent.ReceiveVideo, this.onReceiveVideo.bind(this));
     }
 
-    async share() {
+    async share(opts?: ScreenCaptureOptions) {
+
+        if (opts?.device)
+            this.device = opts.device;
+
         this._requestOpen = true;
         try {
             if (this.videoPlayer) {
 
-                const settings: MediaTrackConstraints = {
+                const settings: MediaTrackConstraints = opts?.constraints ?? {
                     echoCancellation: true,
                     autoGainControl: false,
                 };
@@ -122,7 +133,7 @@ export class ScreenCapture extends Behaviour implements IPointerClickHandler {
                 switch (this.device) {
                     // Capture a connected camera
                     case ScreenCaptureDevice.Camera:
-                        this.tryShareUserCamera(displayMediaOptions);
+                        this.tryShareUserCamera(displayMediaOptions, opts);
                         break;
 
                     // capture any screen, will show a popup
@@ -197,7 +208,7 @@ export class ScreenCapture extends Behaviour implements IPointerClickHandler {
 
 
 
-    private async tryShareUserCamera(opts: DisplayMediaStreamConstraints) {
+    private async tryShareUserCamera(opts: DisplayMediaStreamConstraints, options?: ScreenCaptureOptions) {
 
         // let newWindow = open('', 'example', 'width=300,height=300');
         // if (window) {
@@ -212,6 +223,10 @@ export class ScreenCapture extends Behaviour implements IPointerClickHandler {
                 if (!this._requestOpen) break;
                 if (dev.kind !== "videoinput") continue;
                 const id = dev.deviceId;
+                if (options?.deviceId !== undefined) {
+                    if (id !== options.deviceId)
+                        continue;
+                }
                 if (opts.video !== false) {
                     if (typeof opts.video === "undefined" || typeof opts.video === "boolean") {
                         opts.video = {};

package/src/engine-components/WebXR.ts

@@ -13,11 +13,11 @@ import { ControllerType, WebXRController } from "./WebXRController";
 import { WebARSessionRoot } from "./WebARSessionRoot";
 import { getWorldPosition, getWorldQuaternion, setWorldPosition, setWorldQuaternion } from "../engine/engine_three_utils";
 import { XRRig } from "./WebXRRig";
-import { EngineElement } from "../engine/engine_element";
 import { AssetReference } from "../engine/engine_addressables";
 import { serializeable } from "../engine/engine_serialization_decorator";
 import { WebXRSync } from "./WebXRSync";
 import { XRSessionMode } from "../engine/engine_setup";
+import { INeedleEngineComponent } from "../engine/engine_types";
 
 
 export async function detectARSupport() {
@@ -210,7 +210,7 @@ export class WebXR extends Behaviour {
         }
 
         // VR support
-        if (this.createVRButton && this.enableVR && (browserSupportsXR || !this.enableAR)) {
+        if (this.createVRButton && this.enableVR) {
             vrButton = WebXR.createVRButton(this);
             this._vrButton = vrButton;
             buttonsContainer.appendChild(vrButton);
@@ -477,16 +477,17 @@ export class WebAR {
         this._webxr = webxr;
     }
 
-    private arDomOverlay: EngineElement | null = null;
-    private arOverlayElement: HTMLElement | null = null;
+    private arDomOverlay: HTMLElement | null = null;
+    private arOverlayElement: INeedleEngineComponent | HTMLElement | null = null;
     private noHitTestAvailable: boolean = false;
     private didPlaceARSessionRoot: boolean = false;
 
     getAROverlayContainer(): HTMLElement | null {
-        this.arDomOverlay = this.webxr.context.domElement as EngineElement;
+        this.arDomOverlay = this.webxr.context.domElement as HTMLElement;
         // for react cases we dont have an Engine Element
-        if (this.arDomOverlay.getAROverlayContainer)
-            this.arOverlayElement = this.arDomOverlay.getAROverlayContainer();
+        const element : any = this.arDomOverlay;
+        if (element.getAROverlayContainer)
+            this.arOverlayElement = element.getAROverlayContainer();
         else this.arOverlayElement = this.arDomOverlay;
         return this.arOverlayElement;
     }
@@ -548,13 +549,14 @@ export class WebAR {
         else console.warn("No WebARSessionRoot found in scene")
 
         if (this.arDomOverlay && this.arOverlayElement) {
-            this.arDomOverlay.onEnterAR(session, this.arOverlayElement);
+            const el = this.arOverlayElement as INeedleEngineComponent;
+            el.onEnterAR?.call(el, session, this.arOverlayElement);
         }
 
         this.context.mainCameraComponent?.applyClearFlagsIfIsActiveCamera();
     }
 
-    onEnd(_session: THREE.XRSession) {
+    onEnd(session: THREE.XRSession) {
         if (this._previousParent) {
             console.log("ADD", this._previousParent);
             GameObject.addComponent(this._previousParent as GameObject, this.webxr);
@@ -565,9 +567,13 @@ export class WebAR {
         context.scene.background = this.previousBackground;
         context.scene.environment = this.previousEnvironment;
         if (this.sessionRoot) {
-            this.sessionRoot.onEnd(this.webxr.Rig, _session);
+            this.sessionRoot.onEnd(this.webxr.Rig, session);
+        }
+        if (this.arDomOverlay) 
+        {
+            const el = this.arOverlayElement as INeedleEngineComponent;
+            el.onExitAR?.call(el, session);
         }
-        if (this.arDomOverlay) this.arDomOverlay.onExitAR(_session);
 
         this.context.mainCameraComponent?.applyClearFlagsIfIsActiveCamera();
     }