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

package/src/engine-components/Collider.ts

@@ -17,6 +17,11 @@ export class Collider extends Behaviour {
         this._shape = null;
     }
 
+    start(){
+        if (!this.attachedRigidbody)
+            this.attachedRigidbody = this.gameObject.getComponentInParent(Rigidbody);
+    }
+
     onEnable() {
         // a rigidbody is not assigned if we export an asset
         if (!this.attachedRigidbody)

package/src/engine-components/Component.ts

@@ -11,6 +11,7 @@ import { InstantiateIdProvider, syncDestroy, syncInstantiate } from "../engine/e
 import { SourceIdentifier } from "../engine/engine_gltf";
 import { Collision } from "../engine/engine_physics";
 import * as Object3DExtensions from "./js-extensions/Object3D";
+import { InstancingUtil } from "../engine/engine_instancing";
 
 export interface UIDProvider {
     seed: number;
@@ -96,7 +97,7 @@ abstract class GameObject extends THREE.Object3D implements THREE.Object3D {
         go["__isUsingInstancing"] = instanced;
     }
 
-    public static isUsingInstancing(instance: THREE.Object3D): boolean { return instance["__isUsingInstancing"] === true; }
+    public static isUsingInstancing(instance: THREE.Object3D): boolean { return InstancingUtil.isUsingInstancing(instance); }
 
     public static foreachComponent(instance: THREE.Object3D, cb: (comp: Component) => any, recursive: boolean = true): any {
         if (!instance) return;

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

@@ -8,6 +8,7 @@ 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";
 
 const suppressInstancing = getParam("noInstancing");
 const debugLightmap = getParam("debuglightmaps") ? true : false;
@@ -491,26 +492,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/ScreenCapture.ts

@@ -9,7 +9,6 @@ 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";
 
 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/SyncedCamera.ts

@@ -7,7 +7,7 @@ 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";

package/src/engine-components/SyncedTransform.ts

@@ -4,7 +4,7 @@ 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';