@galacean/engine-xr-webxr 2.0.0-alpha.49 → 2.0.0-alpha.50

package/dist/module.js

@@ -1117,6 +1117,7 @@ new Vector3();
    * Calculate the inverse of the specified matrix.
    * @param a - The matrix whose inverse is to be calculated
    * @param out - The inverse of the specified matrix
+   * @returns Null if the matrix is singular; otherwise undefined
    */ Matrix3x3.invert = function invert(a, out) {
         var ae = a.elements;
         var oe = out.elements;
@@ -2586,6 +2587,7 @@ new Vector3();
    * Calculate the inverse of the specified matrix.
    * @param a - The matrix whose inverse is to be calculated
    * @param out - The inverse of the specified matrix
+   * @returns Null if the matrix is singular; otherwise undefined
    */ Matrix.invert = function invert(a, out) {
         var ae = a.elements;
         var oe = out.elements;
@@ -2892,7 +2894,7 @@ var WebXRFrame = /*#__PURE__*/ function() {
         this._updateCamera(inputs);
     };
     _proto._updateController = function _updateController(inputs) {
-        var _this = this, frame = _this._platformFrame;
+        var frame = this._platformFrame;
         var _this__session = this._session, session = _this__session._platformSession, referenceSpace = _this__session._platformReferenceSpace;
         var inputSources = session.inputSources;
         for(var i = 0, n = inputSources.length; i < n; i++){
@@ -2904,31 +2906,33 @@ var WebXRFrame = /*#__PURE__*/ function() {
                 case "tracked-pointer":
                     var gripSpace = inputSource.gripSpace, targetRaySpace = inputSource.targetRaySpace;
                     if (gripSpace) {
-                        var _frame_getPose = frame.getPose(gripSpace, referenceSpace), transform = _frame_getPose.transform, emulatedPosition = _frame_getPose.emulatedPosition;
-                        if (transform) {
+                        var pose = frame.getPose(gripSpace, referenceSpace);
+                        if (pose) {
+                            var transform = pose.transform;
                             var gripPose = input.gripPose;
                             gripPose.matrix.copyFromArray(transform.matrix);
                             gripPose.position.copyFrom(transform.position);
                             gripPose.rotation.copyFrom(transform.orientation);
                         }
-                        input.trackingState = emulatedPosition ? XRTrackingState.TrackingLost : XRTrackingState.Tracking;
+                        input.trackingState = !pose || pose.emulatedPosition ? XRTrackingState.TrackingLost : XRTrackingState.Tracking;
                     }
                     if (targetRaySpace) {
-                        var _frame_getPose1 = frame.getPose(targetRaySpace, referenceSpace), transform1 = _frame_getPose1.transform, emulatedPosition1 = _frame_getPose1.emulatedPosition;
-                        if (transform1) {
+                        var pose1 = frame.getPose(targetRaySpace, referenceSpace);
+                        if (pose1) {
+                            var transform1 = pose1.transform;
                             var targetRayPose = input.targetRayPose;
                             targetRayPose.matrix.copyFromArray(transform1.matrix);
                             targetRayPose.position.copyFrom(transform1.position);
                             targetRayPose.rotation.copyFrom(transform1.orientation);
-                            input.trackingState = emulatedPosition1 ? XRTrackingState.TrackingLost : XRTrackingState.Tracking;
                         }
+                        input.trackingState = !pose1 || pose1.emulatedPosition ? XRTrackingState.TrackingLost : XRTrackingState.Tracking;
                     }
                     break;
             }
         }
     };
     _proto._updateCamera = function _updateCamera(inputs) {
-        var _this = this, frame = _this._platformFrame;
+        var frame = this._platformFrame;
         var _this__session = this._session, referenceSpace = _this__session._platformReferenceSpace, layer = _this__session._platformLayer, framebufferWidth = _this__session.framebufferWidth, framebufferHeight = _this__session.framebufferHeight;
         var viewerPose = frame.getViewerPose(referenceSpace);
         if (viewerPose) {
@@ -3203,6 +3207,8 @@ var WebXRDevice = /*#__PURE__*/ function() {
             case XRFeatureType.ImageTracking:
                 // @ts-ignore
                 return typeof XRImageTrackingResult !== "undefined";
+            default:
+                return false;
         }
     };
     _proto.createPlatformFeature = function createPlatformFeature(type) {
@@ -3232,11 +3238,12 @@ var WebXRDevice = /*#__PURE__*/ function() {
                     var attributes = gl.getContextAttributes();
                     if (!attributes) {
                         reject(Error("GetContextAttributes Error!"));
+                        return;
                     }
                     gl.makeXRCompatible().then(function() {
                         var scaleFactor = XRWebGLLayer.getNativeFramebufferScaleFactor(session);
                         var layer;
-                        if (session.renderState.layers === undefined || !!!rhi.isWebGL2) {
+                        if (session.renderState.layers === undefined || !rhi.isWebGL2) {
                             var layerInit = {
                                 antialias: session.renderState.layers === undefined ? attributes.antialias : true,
                                 alpha: true,
@@ -3394,6 +3401,7 @@ var WebXRAnchorTracking = /*#__PURE__*/ function(WebXRTrackableFeature) {
     _proto._updateTrackedAnchor = function _updateTrackedAnchor(frame, space, requestTracking) {
         var xrAnchor = requestTracking.xrAnchor;
         var xrPose = frame.getPose(xrAnchor.anchorSpace, space);
+        if (!xrPose) return true;
         var transform = xrPose.transform;
         var pose = requestTracking.tracked[0].pose;
         pose.matrix.copyFromArray(transform.matrix);
@@ -3453,8 +3461,7 @@ var WebXRImageTracking = /*#__PURE__*/ function(WebXRTrackableFeature) {
                     tracked.referenceImage = requestTrackingImage.image;
                 }
                 if (trackingResult.trackingState === "tracked") {
-                    this._updateTrackedImage(platformFrame, platformReferenceSpace, tracked, trackingResult);
-                    tracked.state = XRTrackingState.Tracking;
+                    tracked.state = this._updateTrackedImage(platformFrame, platformReferenceSpace, tracked, trackingResult) ? XRTrackingState.Tracking : XRTrackingState.TrackingLost;
                 } else {
                     tracked.state = XRTrackingState.TrackingLost;
                 }
@@ -3525,11 +3532,14 @@ var WebXRImageTracking = /*#__PURE__*/ function(WebXRTrackableFeature) {
     };
     _proto._updateTrackedImage = function _updateTrackedImage(frame, space, trackedImage, trackingResult) {
         var pose = trackedImage.pose;
-        var transform = frame.getPose(trackingResult.imageSpace, space).transform;
+        var xrPose = frame.getPose(trackingResult.imageSpace, space);
+        if (!xrPose) return false;
+        var transform = xrPose.transform;
         pose.matrix.copyFromArray(transform.matrix);
         pose.rotation.copyFrom(transform.orientation);
         pose.position.copyFrom(transform.position);
         trackedImage.measuredPhysicalWidth = trackingResult.measuredWidthInMeters;
+        return true;
     };
     return WebXRImageTracking;
 }(WebXRTrackableFeature);
@@ -3589,7 +3599,8 @@ var WebXRPlaneTracking = /*#__PURE__*/ function(WebXRTrackableFeature) {
         options.optionalFeatures.push("plane-detection");
     };
     _proto._updatePlane = function _updatePlane(frame, space, trackedPlane) {
-        var pose = trackedPlane.pose, polygon = trackedPlane.polygon, xrPlane = trackedPlane.xrPlane;
+        var pose = trackedPlane.pose, polygon = trackedPlane.polygon;
+        var xrPlane = trackedPlane.xrPlane;
         var planePose = frame.getPose(xrPlane.planeSpace, space);
         if (!planePose) return;
         var transform = planePose.transform, emulatedPosition = planePose.emulatedPosition;