@needle-tools/engine 2.35.5-pre → 2.36.0-pre

package/src/engine-components/WebXRSync.ts

@@ -1,8 +1,8 @@
 import { Behaviour, GameObject } from "./Component";
 import { RoomEvents, OwnershipModel, NetworkConnection } from "../engine/engine_networking";
 import { WebXR, WebXREvent } from "./WebXR";
-import * as THREE from "three";
-import * as utils from "../engine/engine_utils";
+import { Group, Quaternion, Vector3, Vector4, WebXRManager, XRFrame, XRInputSource, XRRigidTransform, XRSession } from "three";
+import { getParam } from "../engine/engine_utils";
 import { Voip } from "./Voip";
 import { Builder, Long } from "flatbuffers";
 import { VrUserStateBuffer } from "../engine-schemes/vr-user-state-buffer";
@@ -17,9 +17,9 @@ import { WebXRAvatar } from "./WebXRAvatar";
 // import { InteractiveGroup } from 'three/examples/jsm/interactive/InteractiveGroup.js';
 // import { renderer, sceneData } from "../engine/engine_setup";
 
-const debugLogs = utils.getParam("debugxr");
-const debugAvatar = utils.getParam("debugavatar");
-// const debugAvatarVoip = utils.getParam("debugavatarvoip");
+const debugLogs = getParam("debugxr");
+const debugAvatar = getParam("debugavatar");
+// const debugAvatarVoip = getParam("debugavatarvoip");
 
 enum WebXRSyncEvent {
     WebXR_UserJoined = "webxr-user-joined",
@@ -51,23 +51,23 @@ export class VRUserState {
     public guid: string;
     public time!: number;
     public avatarId!: string;
-    public position: THREE.Vector3 = new THREE.Vector3();
-    public rotation: THREE.Vector4 = new THREE.Vector4();
+    public position: Vector3 = new Vector3();
+    public rotation: Vector4 = new Vector4();
     public scale: number = 1;
 
-    public posLeftHand = new THREE.Vector3();
-    public posRightHand = new THREE.Vector3();
+    public posLeftHand = new Vector3();
+    public posRightHand = new Vector3();
 
-    public rotLeftHand = new THREE.Quaternion();
-    public rotRightHand = new THREE.Quaternion();
+    public rotLeftHand = new Quaternion();
+    public rotRightHand = new Quaternion();
 
     public constructor(guid: string) {
         this.guid = guid;
     }
 
-    private static invertRotation: THREE.Quaternion = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), Math.PI);
+    private static invertRotation: Quaternion = new Quaternion().setFromAxisAngle(new Vector3(0, 1, 0), Math.PI);
 
-    public update(rig: THREE.Group, pos: DOMPointReadOnly, rot: DOMPointReadOnly, webXR: WebXR, avatarId: string) {
+    public update(rig: Group, pos: DOMPointReadOnly, rot: DOMPointReadOnly, webXR: WebXR, avatarId: string) {
         this.time = getTimeStampNow();
         this.avatarId = avatarId;
         this.position.set(pos.x, pos.y, pos.z);
@@ -117,8 +117,8 @@ export class VRUserState {
         }
     }
 
-    private static quat0: THREE.Quaternion = new THREE.Quaternion();
-    private static quat1: THREE.Quaternion = new THREE.Quaternion();
+    private static quat0: Quaternion = new Quaternion();
+    private static quat1: Quaternion = new Quaternion();
 
     public sendAsBuffer(builder: Builder, net: NetworkConnection) {
         builder.clear();
@@ -379,7 +379,7 @@ export class WebXRSync extends Behaviour {
         }
     }
 
-    private onXRSessionStart(_evt: { session: THREE.XRSession }) {
+    private onXRSessionStart(_evt: { session: XRSession }) {
         console.log("XR session started");
         this.context.connection.send(WebXRSyncEvent.WebXR_UserJoined, { id: this.context.connection.connectionId, mode: XRMode.VR });
 
@@ -399,7 +399,7 @@ export class WebXRSync extends Behaviour {
         }
     }
 
-    private onXRSessionEnded(_evt: { session: THREE.XRSession }) {
+    private onXRSessionEnded(_evt: { session: XRSession }) {
         console.log("XR session ended");
         this.context.connection.send(WebXRSyncEvent.WebXR_UserLeft, { id: this.context.connection.connectionId, mode: XRMode.VR });
     }
@@ -408,7 +408,7 @@ export class WebXRSync extends Behaviour {
     private xrState: VRUserState | null = null;
     private builder: Builder = new Builder(1024);
 
-    private onXRSessionUpdate(evt: { rig: THREE.Group, frame: THREE.XRFrame, xr: THREE.WebXRManager, input: THREE.XRInputSource[] }) {
+    private onXRSessionUpdate(evt: { rig: Group, frame: XRFrame, xr: WebXRManager, input: XRInputSource[] }) {
 
         this.xrState ??= new VRUserState(this.context.connection.connectionId ?? this.k_LocalAvatarNoNetworkingGuid);
         this.ownership ??= new OwnershipModel(this.context.connection, this.context.connection.connectionId ?? this.k_LocalAvatarNoNetworkingGuid);
@@ -419,7 +419,7 @@ export class WebXRSync extends Behaviour {
         const { frame, xr, rig } = evt;
         const pose = frame.getViewerPose(xr.getReferenceSpace()!);
         if (!pose) return; // e.g. if user is not wearing headset
-        const transform: THREE.XRRigidTransform = pose?.transform;
+        const transform: XRRigidTransform = pose?.transform;
         const pos = transform.position;
         const rot = transform.orientation;
         this.xrState.update(rig, pos, rot, this.webXR!, this.getAvatarId());
@@ -451,7 +451,7 @@ export class WebXRSync extends Behaviour {
     }
 
     private getAvatarId() {
-        const urlAvatar = utils.getParam("avatar") as string;
+        const urlAvatar = getParam("avatar") as string;
         const avatarId = urlAvatar ?? null;
         return avatarId;
     }

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

@@ -50,6 +50,7 @@ export { MainModule } from "../ParticleSystemModules";
 export { EmissionModule } from "../ParticleSystemModules";
 export { ShapeModule } from "../ParticleSystemModules";
 export { PlayerColor } from "../PlayerColor";
+export { ReflectionProbe } from "../ReflectionProbe";
 export { FieldWithDefault } from "../Renderer";
 export { Renderer } from "../Renderer";
 export { MeshRenderer } from "../Renderer";

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

@@ -5,7 +5,7 @@ import { ControllerEvents, WebXRController } from "../WebXRController";
 import * as ThreeMeshUI from 'three-mesh-ui'
 import { Context } from "../../engine/engine_setup";
 import { OrbitControls } from "../OrbitControls";
-import { PointerEventData } from "./PointerEvents";
+import { IPointerEventHandler, PointerEventData } from "./PointerEvents";
 import { Raycaster } from "./Raycaster";
 import { InputEvents, KeyCode } from "../../engine/engine_input";
 import { Object3D } from "three";
@@ -83,6 +83,7 @@ export class EventSystem extends Behaviour {
 
     onEnable(): void {
 
+        const grabbed: Map<any, Object3D | null> = new Map();
         this._selectStartFn ??= (ctrl, args: { grab: THREE.Object3D | null }) => {
             if (!args.grab) return;
             MeshUIHelper.resetLastSelected();
@@ -92,6 +93,7 @@ export class EventSystem extends Behaviour {
             opts.isUp = ctrl.selectionUp;
             opts.isPressed = ctrl.selectionPressed;
             opts.isClicked = false;
+            grabbed.set(ctrl, args.grab);
             if (args.grab && !this.handleEvents(args.grab, opts)) {
                 args.grab = null;
             };
@@ -105,6 +107,21 @@ export class EventSystem extends Behaviour {
             opts.isPressed = ctrl.selectionPressed;
             opts.isClicked = ctrl.selectionClick;
             this.handleEvents(args.grab, opts);
+            
+            const prevGrabbed = grabbed.get(ctrl);
+            grabbed.set(ctrl, null);
+            if (prevGrabbed) {
+                for (let i = 0; i < this.raisedPointerDownEvents.length; i++) {
+                    const comp = this.raisedPointerDownEvents[i];
+                    const obj = this.raisedPointerDownObjects[i];
+                    if (obj === prevGrabbed && comp) {
+                        comp.onPointerUp?.call(comp, opts);
+                        this.raisedPointerDownEvents.splice(i, 1);
+                        this.raisedPointerDownObjects.splice(i, 1);
+                        i--;
+                    }
+                }
+            }
         };
 
         const controllerRcOpts = new RaycastOptions();
@@ -143,8 +160,11 @@ export class EventSystem extends Behaviour {
     private lastPointerEvent: PointerEventData | null = null;
     private objectsHoveredThisFrame: THREE.Object3D[] = [];
     private objectsHoveredLastFrame: THREE.Object3D[] = [];
+
     // todo: these should be listed by input source (e.g. per controller, mouse, touch)
-    private raisedPointerDownEvents: any[] = [];
+    private raisedPointerDownEvents: IPointerEventHandler[] = []; // << keep in sync
+    private raisedPointerDownObjects: THREE.Object3D[] = []; // < keep in sync
+
     private _didMove: boolean = false;
 
     onBeforeUpdate() {
@@ -216,6 +236,7 @@ export class EventSystem extends Behaviour {
                 }
             }
             this.raisedPointerDownEvents.length = 0;
+            this.raisedPointerDownObjects.length = 0;
         }
 
         for (const obj of this.objectsHoveredLastFrame) {
@@ -310,6 +331,7 @@ export class EventSystem extends Behaviour {
             return false;
         }
 
+        const originalObject = object;
         args.object = object;
         this.lastPointerEvent = args;
 
@@ -326,7 +348,7 @@ export class EventSystem extends Behaviour {
                 const actualGo = parent[$shadowDomOwner].gameObject;
                 if (actualGo) {
                     const res = UIRaycastUtils.isInteractable(actualGo, this.out);
-                    if(!res) return this.out.canvasGroup?.interactable ?? false;
+                    if (!res) return this.out.canvasGroup?.interactable ?? false;
                     canvasGroup = this.out.canvasGroup ?? null;
 
                     const handled = this.handleMeshUIIntersection(object, pressedOrClicked);
@@ -371,6 +393,7 @@ export class EventSystem extends Behaviour {
                         comp.onPointerDown(args);
                         // need to save this to also send pointer up event
                         this.raisedPointerDownEvents.push(comp);
+                        this.raisedPointerDownObjects.push(originalObject);
                     }
                 }