@needle-tools/engine 2.28.0-pre → 2.29.0-pre

package/src/engine-components/SyncedCamera.ts

@@ -12,6 +12,7 @@ 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";
 
 const SyncedCameraModelIdentifier = "SCAM";
 registerType(SyncedCameraModelIdentifier, SyncedCameraModel.getRootAsSyncedCameraModel);
@@ -33,8 +34,7 @@ class CameraModel {
         this.userId = connectionId;
     }
 
-    send(sync: SyncedCamera, con: NetworkConnection) {
-        const cam = sync.cam?.cam;
+    send(cam: THREE.Camera | null | undefined, con: NetworkConnection) {
         if (cam) {
             builder.clear();
             const guid = builder.createString(this.guid);
@@ -53,23 +53,22 @@ class CameraModel {
     }
 }
 
-declare type UserCamInfo =
-    {
-        obj: THREE.Object3D,
-        lastUpdate: number;
-        userId: string;
-    };
+declare type UserCamInfo = {
+    obj: THREE.Object3D,
+    lastUpdate: number;
+    userId: string;
+};
 
 export class SyncedCamera extends Behaviour {
 
-    getUserCamera(userId: string): THREE.Object3D | null {
+    static instances: UserCamInfo[] = [];
+
+    getCameraObject(userId: string): THREE.Object3D | null {
         const guid = this.userToCamMap[userId];
         if (!guid) return null;
         return this.remoteCams[guid].obj;
     }
 
-    @serializeable(Camera)
-    public cam: Camera | null = null;
     @serializeable([Object3D, AssetReference])
     public cameraPrefab: THREE.Object3D | null | AssetReference = null;
 
@@ -97,15 +96,8 @@ export class SyncedCamera extends Behaviour {
             if (this.cameraPrefab && "isObject3D" in this.cameraPrefab) {
                 this.cameraPrefab.visible = false;
             }
-
         }
-    }
 
-    start() {
-        if (!this.cam) {
-            console.warn("Missing camera, fallback to main camera", this);
-            this.cam = this.context.mainCameraComponent as Camera ?? null;
-        }
     }
 
     onEnable(): void {
@@ -129,13 +121,17 @@ export class SyncedCamera extends Behaviour {
                 delete this.remoteCams[guid];
                 if (cam)
                     delete this.userToCamMap[cam.userId];
+
+                SyncedCamera.instances.push(cam);
+                this.context.players.removePlayerView(cam.userId, ViewDevice.Browser);
                 continue;
             }
         }
 
         if (WebXR.IsInWebXR) return;
 
-        if (this.cam === null) {
+        const cam = this.context.mainCamera
+        if (cam === null) {
             this.enabled = false;
             return;
         }
@@ -146,8 +142,8 @@ export class SyncedCamera extends Behaviour {
             this._model = new CameraModel(this.context.connection.connectionId, this.context.connection.connectionId + "_camera");
         }
 
-        const wp = utils.getWorldPosition(this.cam.cam);
-        const wq = utils.getWorldQuaternion(this.cam.cam);
+        const wp = utils.getWorldPosition(cam);
+        const wq = utils.getWorldQuaternion(cam);
         if (wp.distanceTo(this._lastWorldPosition) > 0.001 || wq.angleTo(this._lastWorldQuaternion) > 0.01) {
             this._needsUpdate = true;
         }
@@ -163,7 +159,9 @@ export class SyncedCamera extends Behaviour {
 
         this._lastUpdateTime = this.context.time.realtimeSinceStartup;
         this._needsUpdate = false;
-        this._model.send(this, this.context.connection);
+        this._model.send(cam, this.context.connection);
+        if (!this.context.isInXR)
+            this.context.players.setPlayerView(this.context.connection.connectionId, cam, ViewDevice.Browser);
     }
 
     private onReceivedRemoteCameraInfoBin(model: SyncedCameraModel) {
@@ -183,10 +181,12 @@ export class SyncedCamera extends Behaviour {
                 rc.obj.visible = true;
                 this.gameObject.add(instance);
                 this.userToCamMap[userId] = guid;
+                SyncedCamera.instances.push(rc);
 
                 const marker = GameObject.getOrAddComponent(instance, AvatarMarker);
                 marker.connectionId = userId;
                 marker.avatar = instance;
+
             }
             else {
                 return;
@@ -194,6 +194,7 @@ export class SyncedCamera extends Behaviour {
             // console.log(this.remoteCams);
         }
         const obj = rc.obj;
+        this.context.players.setPlayerView(userId, obj, ViewDevice.Browser);
         rc.lastUpdate = this.context.time.realtimeSinceStartup;
         InstancingUtil.markDirty(obj);
         const pos = model.pos();

package/src/engine-components/WebXR.ts

@@ -313,6 +313,7 @@ export class WebXR extends Behaviour {
             }
             else {
                 this.rig = new THREE.Group();
+                this.rig.rotateY(Math.PI);
                 this.rig.name = "XRRig";
                 this.context.scene.add(this.rig);
             }

package/src/engine-components/WebXRAvatar.ts

@@ -10,6 +10,7 @@ import { Object3D } from "three";
 import { VRUserState } from "./WebXRSync";
 import { getParam } from "../engine/engine_utils";
 import { serializeable } from "../engine/engine_serialization_decorator";
+import { ViewDevice } from "../engine/engine_playerview";
 
 export const debug = getParam("debugavatar");
 
@@ -18,8 +19,14 @@ export type AvatarMarkerEventArgs = {
     gameObject: Object3D;
 }
 
-
 export class AvatarMarker extends Behaviour {
+
+    public static getAvatar(index: number): AvatarMarker | null {
+        if (index >= 0 && index < AvatarMarker.instances.length)
+            return AvatarMarker.instances[index];
+        return null;
+    }
+
     public static instances: AvatarMarker[] = [];
 
     public static onAvatarMarkerCreated(cb: (args: AvatarMarkerEventArgs) => void): Function {
@@ -55,7 +62,7 @@ export class AvatarMarker extends Behaviour {
             cb({ avatarMarker: this, gameObject: this.gameObject });
     }
 
-    isLocalAvatar(){
+    isLocalAvatar() {
         return this.connectionId === this.context.connection.connectionId;
     }
 
@@ -80,7 +87,10 @@ export class WebXRAvatar {
         this.updateVisibility();
     }
 
+    get isWebXRAvatar() { return true; }
+
     // TODO: set layers on all avatars 
+    /** the user id */
     public guid: string;
 
     private root: THREE.Object3D | null = null;
@@ -148,6 +158,16 @@ export class WebXRAvatar {
 
             this.lastUpdate = state.time;
             if (this.head) {
+
+                const device = this.webxr.IsInAR ? ViewDevice.Handheld : ViewDevice.Headset;
+                let viewObj = this.head;
+                // if (this.isLocalAvatar) {
+                //     if (this.context.mainCamera && this.context.isInXR) {
+                //         viewObj = this.context.renderer.xr.getCamera(this.context.mainCamera);
+                //     }
+                // }
+                this.context.players.setPlayerView(state.guid, viewObj, device);
+
                 this._canInterpolate = true;
                 const ht = this.isLocalAvatar ? this.head : this._headTarget;
                 ht.position.set(state.position.x, state.position.y, state.position.z);

package/src/engine-components/WebXRController.ts

@@ -566,7 +566,7 @@ export class WebXRController extends Behaviour {
                 const scale = Mathf.clamp(this.lastHit.distance * .01 * factor, .015, .1);
                 this._raycastHitPoint.scale.set(scale, scale, scale);
             }
-            this._raycastHitPoint.visible = this.lastHit !== null;
+            this._raycastHitPoint.visible = this.lastHit !== null && this.lastHit !== undefined;
         }
         return hit;
     }

package/src/engine-components/WebXRSync.ts

@@ -346,8 +346,8 @@ export class WebXRSync extends Behaviour {
 
     private buildLocalAvatar() {
         if (this.localAvatar) return;
-        const id = this.context.connection?.connectionId ?? this.k_LocalAvatarNoNetworkingGuid;
-        this.localAvatar = new WebXRAvatar(this.context, id, this.webXR!);
+        const connectionId = this.context.connection?.connectionId ?? this.k_LocalAvatarNoNetworkingGuid;
+        this.localAvatar = new WebXRAvatar(this.context, connectionId, this.webXR!);
         this.localAvatar.isLocalAvatar = true;
         this.localAvatar.setAvatarOverride(this.getAvatarId());
         this.avatars[this.localAvatar.guid] = this.localAvatar;
@@ -452,7 +452,7 @@ export class WebXRSync extends Behaviour {
 
     private getAvatarId() {
         const urlAvatar = utils.getParam("avatar") as string;
-        const avatarId = urlAvatar;
+        const avatarId = urlAvatar ?? null;
         return avatarId;
     }
 }

package/src/engine-components/XRFlag.ts

@@ -11,6 +11,7 @@ export enum XRStateFlag {
     VR = 1 << 2,
     FirstPerson = 1 << 3,
     ThirdPerson = 1 << 4,
+    All = 0xffffffff
 }
 
 // console.log(XRStateFlag);