@needle-tools/engine 3.7.7-beta → 3.9.0-alpha

package/src/engine-components/webxr/WebARCameraBackground.ts

@@ -3,7 +3,6 @@ import { serializable } from "../../engine/engine_serialization_decorator";
 import { RGBAColor } from "../js-extensions/RGBAColor"
 import { WebXR } from "./WebXR";
 import { 
-    Camera as ThreeCamera, 
     Scene, 
     Texture, 
     Mesh, MeshBasicMaterial, 
@@ -11,7 +10,8 @@ import {
     PlaneGeometry, 
     ShaderLib, 
     ShaderMaterial,
-    DoubleSide
+    DoubleSide,
+    PerspectiveCamera
 } from "three";
 
 export class WebARCameraBackground extends Behaviour {
@@ -53,7 +53,7 @@ export class WebARCameraBackground extends Behaviour {
         const geometry = new PlaneGeometry();
         const scene = new Scene();
         scene.add(new Mesh(geometry, material));
-        const camera = new ThreeCamera();
+        const camera = new PerspectiveCamera();
     
         return function forceTextureInitialization(renderer, texture) {
           material.map = texture;

package/src/engine-components/webxr/WebXR.ts

@@ -1,4 +1,4 @@
-import { ArrayCamera, Color, Euler, EventDispatcher, Group, Matrix4, Mesh, MeshBasicMaterial, Object3D, Quaternion, RingGeometry, Texture, Vector3 } from 'three';
+import { ArrayCamera, Color, Euler, EventDispatcher, Group, Matrix4, Mesh, MeshBasicMaterial, Object3D, Quaternion, RingGeometry, Texture, Vector3, WebXRArrayCamera } from 'three';
 import { ARButton } from '../../include/three/ARButton.js';
 import { VRButton } from '../../include/three/VRButton.js';
 
@@ -370,7 +370,7 @@ export class WebXR extends Behaviour {
             if (xrRig) {
                 // make it match unity forward
                 this.rig = xrRig.gameObject;
-                // this.rig.rotateY(Math.PI);
+                this.rig.rotateY(Math.PI);
                 // this.rig.position.copy(existing.worldPosition);
                 // this.rig.quaternion.premultiply(existing.worldQuaternion);
             }
@@ -393,7 +393,7 @@ export class WebXR extends Behaviour {
     private _originalXRRigRotation: Quaternion = new Quaternion();
 
     private onEnterXR(session: XRSession, frame: XRFrame) {
-        console.log("[XR] session begin", session);
+        console.log("[XR] session begin", session, frame);
         WebXR._isInXr = true;
 
         this.ensureRig();
@@ -414,16 +414,16 @@ export class WebXR extends Behaviour {
         // we set layers to sync raycasting and have a similar behaviour to unity
         const xr = this.context.renderer.xr;
         if (this.context.mainCamera) {
-            //@ts-ignore
-            const cam = xr.getCamera(this.context.mainCamera) as ArrayCamera;
+            const cam = xr.getCamera() as WebXRArrayCamera;
+            if(debugWebXR) console.log("WebXRCamera", cam);
             const cull = this.context.mainCameraComponent?.cullingMask;
-            if(cull !== undefined){
+            if(cam && cull !== undefined){
                 for (const c of cam.cameras) {
                     c.layers.mask = cull;
                 }
                 cam.layers.mask = cull;
             }
-            else {
+            else if (cam) {
                 for (const c of cam.cameras) {
                     c.layers.enableAll();
                 }