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

package/dist/browser.js

@@ -278,7 +278,7 @@
             {
                 key: "fixedFoveation",
                 get: /**
-       * The fixed foveation of the camera.
+       * Fixed foveation, or `undefined` if unsupported by the active session.
        */ function get() {
                     var _this__xrManager_sessionManager = this._xrManager.sessionManager, platformSession = _this__xrManager_sessionManager._platformSession;
                     if (platformSession) {
@@ -441,7 +441,7 @@
                 controller.down = controller.up = 0;
             }
             // Handle events and update tracked devices
-            var _this__xrManager_sessionManager = this._xrManager.sessionManager, platformSession = _this__xrManager_sessionManager._platformSession;
+            var platformSession = this._xrManager.sessionManager._platformSession;
             var platformEvents = platformSession.events;
             for(var i1 = 0, n1 = platformEvents.length; i1 < n1; i1++){
                 this._handleEvent(platformEvents[i1]);
@@ -741,7 +741,7 @@
             {
                 key: "supportedFrameRate",
                 get: /**
-       * Return a list of supported frame rates.(only available in-session)
+       * Supported frame rates, or `undefined` if unsupported. Only available in-session.
        */ function get() {
                     return this._platformSession.supportedFrameRates;
                 }
@@ -749,7 +749,7 @@
             {
                 key: "frameRate",
                 get: /**
-       * Return the current frame rate as reported by the device.
+       * Current frame rate, or `undefined` if unsupported. Only available in-session.
        */ function get() {
                     return this._platformSession.frameRate;
                 }
@@ -1036,7 +1036,7 @@
         }
         var _proto = XRTrackableFeature.prototype;
         _proto._onUpdate = function _onUpdate() {
-            var _this__xrManager_sessionManager = this._xrManager.sessionManager, platformSession = _this__xrManager_sessionManager._platformSession;
+            var platformSession = this._xrManager.sessionManager._platformSession;
             var platformFrame = platformSession.frame;
             var _this = this, platformFeature = _this._platformFeature, requestTrackings = _this._requestTrackings, statusSnapshot = _this._statusSnapshot, allTracked = _this._tracked, added = _this._added, updated = _this._updated, removed = _this._removed;
             if (!platformFrame || !requestTrackings.length) {
@@ -2638,6 +2638,7 @@
        * 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;
@@ -4107,6 +4108,7 @@
        * 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;
@@ -4413,7 +4415,7 @@
             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++){
@@ -4425,31 +4427,33 @@
                     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) {
@@ -4724,6 +4728,8 @@
                 case XRFeatureType.ImageTracking:
                     // @ts-ignore
                     return typeof XRImageTrackingResult !== "undefined";
+                default:
+                    return false;
             }
         };
         _proto.createPlatformFeature = function createPlatformFeature(type) {
@@ -4753,11 +4759,12 @@
                         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,
@@ -4915,6 +4922,7 @@
         _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);
@@ -4974,8 +4982,7 @@
                         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;
                     }
@@ -5046,11 +5053,14 @@
         };
         _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);
@@ -5110,7 +5120,8 @@
             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;