@needle-tools/engine 2.33.0-pre → 2.35.0-pre

package/src/engine-components/DragControls.ts

@@ -7,12 +7,12 @@ import { Context } from "../engine/engine_setup";
 import { Interactable, UsageMarker } from "./Interactable";
 import { Rigidbody } from "./RigidBody";
 import { WebXR } from "./WebXR";
-import { InstancingUtil } from "./Renderer";
 import { Avatar_POI } from "./avatar/Avatar_Brain_LookAt";
 import { RaycastOptions } from "../engine/engine_physics";
 import { getWorldPosition, getWorldQuaternion, setWorldPosition } from "../engine/engine_three_utils";
 import { KeyCode } from "../engine/engine_input";
 import { nameofFactory } from "../engine/engine_utils";
+import { InstancingUtil } from "../engine/engine_instancing";
 
 const debug = false;
 

package/src/engine-components/Duplicatable.ts

@@ -1,10 +1,11 @@
-import { Behaviour, GameObject, InstantiateOptions } from "./Component";
+import { Behaviour, GameObject } from "./Component";
 import { WebXRController, ControllerEvents } from "./WebXRController";
 import { DragControls, DragEvents } from "./DragControls";
 import { Interactable } from "./Interactable";
 import { Animation } from "./Animation";
 import { Vector3, Quaternion, Object3D } from "three";
 import { serializeable } from "../engine/engine_serialization_decorator";
+import { InstantiateOptions } from "../engine/engine_gameobject";
 
 export class Duplicatable extends Interactable {
 
@@ -35,7 +36,7 @@ export class Duplicatable extends Interactable {
         // }
         // console.log(this, this.object);
         if (this.object) {
-            if (this.object === this.gameObject) {
+            if (this.object as any === this.gameObject) {
                 console.error("Can not duplicate self");
                 return;
             }
@@ -90,7 +91,7 @@ export class Duplicatable extends Interactable {
         if (!this.object) return null;
         if (selected === this.gameObject || this.handleMultiObject(selected)) {
 
-            if (this.object === this.gameObject) return null;
+            if (this.object as any === this.gameObject) return null;
             this.object.visible = true;
 
             if (this._startPosition)

package/src/engine-components/LODGroup.ts

@@ -31,7 +31,7 @@ class LOD {
         this.model = model;
         this.renderers = [];
         for (const guid of model.renderers) {
-            const rend = this.findRenderer(guid, group.gameObject);// GameObject.findByGuid(guid, group.gameObject) as Renderer;
+            const rend = this.findRenderer(guid, group.gameObject as GameObject);// GameObject.findByGuid(guid, group.gameObject) as Renderer;
             if (rend && rend.gameObject) {
                 this.renderers.push(rend);
             }

package/src/engine-components/Light.ts

@@ -7,6 +7,7 @@ import { serializeable } from "../engine/engine_serialization_decorator";
 import { Color, DirectionalLight, OrthographicCamera } from "three";
 import { WebXR, WebXREvent } from "./WebXR";
 import { WebARSessionRoot } from "./WebARSessionRoot";
+import { ILight } from "../engine/engine_types";
 
 // https://threejs.org/examples/webgl_shadowmap_csm.html
 
@@ -82,7 +83,7 @@ enum LightShadows {
     Soft = 2,
 }
 
-export class Light extends Behaviour {
+export class Light extends Behaviour implements ILight {
 
     @serializeable()
     private type: LightType = 0;
@@ -263,7 +264,7 @@ export class Light extends Behaviour {
     private _webARRoot?: WebARSessionRoot;
 
     private onWebXRStarted() {
-        this._webARRoot = this.gameObject.getComponentInParent(WebARSessionRoot) ?? undefined;
+        this._webARRoot = GameObject.getComponentInParent(this.gameObject, WebARSessionRoot) ?? undefined;
         this.startCoroutine(this._updateLightIntensityInARRoutine());
     }
 

package/src/engine-components/NestedGltf.ts

@@ -1,8 +1,9 @@
 import { getParam } from "../engine/engine_utils";
-import { Behaviour, InstantiateOptions } from "../engine-components/Component";
+import { Behaviour } from "../engine-components/Component";
 import { AssetReference, ProgressCallback } from "../engine/engine_addressables";
 import { serializeable } from "../engine/engine_serialization_decorator";
 import { InstantiateIdProvider } from "../engine/engine_networking_instantiate";
+import { InstantiateOptions } from "../engine/engine_gameobject";
 
 const debug = getParam("debugnestedgltf");
 

package/src/engine-components/OrbitControls.ts

@@ -1,12 +1,12 @@
 import { Behaviour, GameObject } from "./Component";
-import { Camera } from "./Camera";
+// import { Camera } from "./Camera";
 import { OrbitControls as ThreeOrbitControls } from "three/examples/jsm/controls/OrbitControls";
 import { LookAtConstraint } from "./LookAtConstraint";
 import * as THREE from "three";
 import { getWorldPosition } from "../engine/engine_three_utils";
-import { Physics, RaycastOptions } from "../engine/engine_physics";
+import { RaycastOptions } from "../engine/engine_physics";
 import { serializeable } from "../engine/engine_serialization_decorator";
-import { Vector3 } from "three";
+import { Camera } from "./Camera";
 
 export class OrbitControls extends Behaviour {
     public get controls() {
@@ -30,7 +30,7 @@ export class OrbitControls extends Behaviour {
     minZoom: number = 0;
     maxZoom: number = Infinity;
     enablePan: boolean = true;
-    @serializeable()
+    @serializeable(LookAtConstraint)
     lookAtConstraint: LookAtConstraint | null = null;
     lookAtConstraint01: number = 1;
     middleClickToFocus: boolean = true;
@@ -61,10 +61,10 @@ export class OrbitControls extends Behaviour {
     }
 
     onEnable() {
+    
         this._enableTime = this.context.time.time;
         const camGo = GameObject.getComponent(this.gameObject, Camera);
         const cam = camGo?.cam;
-
         if (!this._controls) {
             console.assert(cam !== null && cam !== undefined, "Missing camera", this);
             if (cam)

package/src/engine-components/Renderer.ts

@@ -8,6 +8,11 @@ import { serializeable } from "../engine/engine_serialization_decorator";
 import { Material, Texture, Vector4 } from "three";
 import { NEEDLE_render_objects } from "../engine/extensions/NEEDLE_render_objects";
 import { NEEDLE_deferred_texture } from "../engine/extensions/NEEDLE_deferred_texture";
+import { NEED_UPDATE_INSTANCE_KEY } from "../engine/engine_instancing";
+import { IRenderer } from "../engine/engine_types";
+
+// for staying compatible with old code
+export { InstancingUtil } from "../engine/engine_instancing";
 
 const suppressInstancing = getParam("noInstancing");
 const debugLightmap = getParam("debuglightmaps") ? true : false;
@@ -98,7 +103,7 @@ class SharedMaterialArray {
 
 }
 
-export class Renderer extends Behaviour {
+export class Renderer extends Behaviour implements IRenderer {
 
     @serializeable()
     receiveShadows: boolean = false;
@@ -491,26 +496,7 @@ export enum ShadowCastingMode {
     ShadowsOnly,
 }
 
-const NEED_UPDATE_INSTANCE_KEY = "NEEDLE_NEED_UPDATE_INSTANCE";
-
-export class InstancingUtil {
-    // TODO: change this so it does not set matrix world directly but some flag that is only used by instancing
-    static markDirty(go: THREE.Object3D | null, recursive: boolean = true) {
-        if (!go) return;
-        // potential optimization:
-        // if(go.matrixWorldNeedsUpdate) return;
-        // console.trace(go, GameObject.isUsingInstancing(go));
-        if (GameObject.isUsingInstancing(go)) {
-            go[NEED_UPDATE_INSTANCE_KEY] = true;
-            go.matrixWorldNeedsUpdate = true;
-        }
-        if (recursive) {
-            for (const child of go.children) {
-                InstancingUtil.markDirty(child, true);
-            }
-        }
-    }
-}
+
 
 declare class InstancingSetupArgs { rend: Renderer; foundMeshes: number };
 

package/src/engine-components/RigidBody.ts

@@ -6,8 +6,9 @@ import { getWorldPosition } from "../engine/engine_three_utils";
 import { serializeable } from "../engine/engine_serialization_decorator";
 import { Watch } from "../engine/engine_utils";
 import { Vector3 } from "three";
+import { IRigidbody } from "../engine/engine_types";
 
-export class Rigidbody extends Behaviour {
+export class Rigidbody extends Behaviour implements IRigidbody {
 
     @serializeable()
     mass: number = 1;

package/src/engine-components/ScreenCapture.ts

@@ -5,12 +5,11 @@ import { Context } from "../engine/engine_setup";
 import { RoomEvents } from "../engine/engine_networking";
 import { UserJoinedOrLeftRoomModel } from "../engine/engine_networking";
 import { serializeable } from "../engine/engine_serialization";
-import { IModel } from "../engine/engine_networking";
 import { IPointerClickHandler } from "./ui/PointerEvents";
 import { EventDispatcher } from "three";
 import { AudioSource } from "./AudioSource";
-import { getWorldScale, setWorldScale } from "../engine/engine_three_utils";
 import { getParam } from "../engine/engine_utils";
+import { IModel } from "../engine/engine_networking_types";
 
 const debug = getParam("debugscreenshare");
 
@@ -26,12 +25,6 @@ export enum ScreenCaptureMode {
     Receiving = 2
 }
 
-export enum AspectMode {
-    None = 0,
-    AdjustHeight = 1,
-    AdjustWidth = 2,
-}
-
 function disposeStream(str: MediaStream | null | undefined) {
     if (!str) return;
     for (const cap of str.getTracks())
@@ -42,6 +35,8 @@ export class ScreenCapture extends Behaviour implements IPointerClickHandler {
 
     onPointerClick() {
         if (this.isReceiving) {
+            if (this.videoPlayer)
+                this.videoPlayer.screenspace = !this.videoPlayer.screenspace;
             return;
         }
         if (this.isSending) {
@@ -58,9 +53,6 @@ export class ScreenCapture extends Behaviour implements IPointerClickHandler {
     @serializeable()
     device: ScreenCaptureDevice = ScreenCaptureDevice.Screen;
 
-    @serializeable()
-    aspectMode: AspectMode = AspectMode.AdjustHeight;
-
     get currentScream(): MediaStream | null {
         return this._currentStream;
     }
@@ -187,11 +179,16 @@ export class ScreenCapture extends Behaviour implements IPointerClickHandler {
         this._requestOpen = true;
         this._currentMode = mode;
         this.videoPlayer.setVideo(stream);
-        if (mode === ScreenCaptureMode.Sending)
+
+        const isSending = mode === ScreenCaptureMode.Sending;
+        if (isSending) {
             this._net?.startSendingVideo(stream);
 
-        this._targetObjects = undefined;
-        this.updateAspect();
+        }
+
+        stream.addEventListener("ended", () => {
+            this.close();
+        });
     }
 
     private onReceiveVideo(evt: ReceiveVideoEvent) {
@@ -200,7 +197,6 @@ export class ScreenCapture extends Behaviour implements IPointerClickHandler {
 
 
 
-
     private async tryShareUserCamera(opts: DisplayMediaStreamConstraints) {
 
         // let newWindow = open('', 'example', 'width=300,height=300');
@@ -239,68 +235,6 @@ export class ScreenCapture extends Behaviour implements IPointerClickHandler {
     // private openWindowToSelectCamera(){
 
     // }
-
-
-
-
-    private _targetObjects?: Array<THREE.Object3D>;
-
-    private updateAspect() {
-        this.startCoroutine(this.updateAspectImpl());
-    }
-
-    private _updateAspectRoutineId: number = -1;
-    private *updateAspectImpl() {
-        const id = ++this._updateAspectRoutineId;
-        const lastAspect: number | undefined = undefined;
-        while (this.aspectMode !== AspectMode.None && this._currentStream && id === this._updateAspectRoutineId) {
-            const video = this.videoPlayer;
-            const stream = this._currentStream;
-            if (!video) return;
-            if (!stream) return;
-            let aspect: number | undefined = undefined;
-            for (const track of stream.getVideoTracks()) {
-                const settings = track.getSettings();
-                if (settings && settings.width && settings.height) {
-                    aspect = settings.width / settings.height;
-                    break;
-                }
-                // on firefox capture canvas stream works but looks like 
-                // the canvas stream track doesnt contain settings?!!?
-                else {
-                    if (this.device === ScreenCaptureDevice.Canvas)
-                        aspect = this.context.renderer.domElement.clientWidth / this.context.renderer.domElement.clientHeight;
-                }
-            }
-            if (aspect === undefined) {
-                yield;
-                continue;
-            }
-            if (lastAspect === aspect) {
-                yield;
-                continue;
-            }
-            if (!this._targetObjects)
-                this._targetObjects = video.getTargetObjects();
-            for (const obj of this._targetObjects) {
-                let worldAspect = 1;
-                if (obj.parent) {
-                    const parentScale = getWorldScale(obj.parent);
-                    worldAspect = parentScale.x / parentScale.y;
-                }
-                switch (this.aspectMode) {
-                    case AspectMode.AdjustHeight:
-                        obj.scale.y = 1 / aspect * obj.scale.x * worldAspect;
-                        break;
-                    case AspectMode.AdjustWidth:
-                        obj.scale.x = aspect * obj.scale.y * worldAspect;
-                        break;
-                }
-            }
-            for (let i = 0; i < 3; i++)
-                yield;
-        }
-    }
 }
 
 

package/src/engine-components/SpectatorCamera.ts

@@ -12,7 +12,9 @@ import { Context } from "../engine/engine_setup";
 import { getParam } from "../engine/engine_utils";
 import { PlayerView, ViewDevice } from "../engine/engine_playerview";
 import { RaycastOptions } from "../engine/engine_physics";
-import { IModel, RoomEvents } from "../engine/engine_networking";
+import { RoomEvents } from "../engine/engine_networking";
+import { ICamera } from "../engine/engine_types";
+import { IModel } from "../engine/engine_networking_types";
 
 
 export enum SpectatorMode {
@@ -177,7 +179,7 @@ export class SpectatorCamera extends Behaviour {
     }
 
     private onXRSessionEnded(_evt) {
-        this.context.removeCamera(this.cam);
+        this.context.removeCamera(this.cam as ICamera);
         GameObject.setActive(this.gameObject, false);
         if (this.orbit) this.orbit.enabled = true;
         this._handler?.set(undefined);
@@ -355,16 +357,16 @@ class SpectatorHandler implements ISpectatorHandler {
         // this.context.setCurrentCamera(this.cam);
         if (debug) console.log("FOLLOW", followObject);
         if (!this.context.isInXR) {
-            this.context.setCurrentCamera(this.cam);
+            this.context.setCurrentCamera(this.cam as ICamera);
         }
-        else this.context.removeCamera(this.cam);
+        else this.context.removeCamera(this.cam as ICamera);
     }
 
     disable() {
         if (debug) console.log("STOP FOLLOW", this.currentObject);
         this.view = undefined;
         this.currentObject = undefined;
-        this.context.removeCamera(this.cam);
+        this.context.removeCamera(this.cam as ICamera);
         if (this.follow)
             this.follow.enabled = false;
     }

package/src/engine-components/SyncedCamera.ts

@@ -1,5 +1,5 @@
 import { NetworkConnection } from "../engine/engine_networking";
-import { Behaviour, GameObject, InstantiateOptions } from "./Component";
+import { Behaviour, GameObject } from "./Component";
 import { Camera } from "./Camera";
 import * as utils from "../engine/engine_three_utils"
 import { WebXR } from "./WebXR";
@@ -7,12 +7,13 @@ import { Builder } from "flatbuffers";
 import { SyncedCameraModel } from "../engine-schemes/synced-camera-model";
 import { Vec3 } from "../engine-schemes/vec3";
 import { registerType } from "../engine-schemes/schemes";
-import { InstancingUtil } from "./Renderer";
+import { InstancingUtil } from "../engine/engine_instancing";
 import { serializeable } from "../engine/engine_serialization_decorator";
 import { Object3D } from "three";
 import { AvatarMarker } from "./WebXRAvatar";
 import { AssetReference } from "../engine/engine_addressables";
 import { ViewDevice } from "../engine/engine_playerview";
+import { InstantiateOptions } from "../engine/engine_gameobject";
 
 const SyncedCameraModelIdentifier = "SCAM";
 registerType(SyncedCameraModelIdentifier, SyncedCameraModel.getRootAsSyncedCameraModel);

package/src/engine-components/SyncedTransform.ts

@@ -1,10 +1,10 @@
 import * as THREE from 'three'
-import { IModel, OwnershipModel, RoomEvents } from "../engine/engine_networking"
+import { OwnershipModel, RoomEvents } from "../engine/engine_networking"
 import { Behaviour, GameObject } from "./Component";
 import { Rigidbody } from "./RigidBody";
 import * as utils from "../engine/engine_utils"
 import { sendDestroyed } from '../engine/engine_networking_instantiate';
-import { InstancingUtil } from './Renderer';
+import { InstancingUtil } from "../engine/engine_instancing";
 import { SyncedTransformModel } from '../engine-schemes/synced-transform-model';
 import * as flatbuffers from "flatbuffers";
 import { Transform } from '../engine-schemes/transform';

package/src/engine-components/TestRunner.ts

@@ -3,10 +3,9 @@ import * as tests from "../engine/tests/test_utils";
 import { createTransformModel, SyncedTransform, SyncedTransformIdentifier } from "./SyncedTransform";
 import * as flatbuffers from 'flatbuffers';
 import { SyncedTransformModel } from "../engine-schemes/synced-transform-model";
-import * as schemes from "../engine-schemes/schemes";
-import { IModel, NetworkConnection } from "../engine/engine_networking";
 import { Rigidbody } from "./Rigidbody";
 import { Vector3 } from "three";
+import { IModel } from "../engine/engine_networking_types";
 
 export class TestRunner extends Behaviour {
     awake(): void {