@galacean/engine-xr-webxr 2.0.0-alpha.5 → 2.0.0-alpha.51

package/dist/browser.js

@@ -189,19 +189,15 @@
             var xrCamera = this._xrManager.inputManager.getTrackedDevice(type);
             var preCamera = xrCamera._camera;
             if (preCamera !== camera) {
-                // @ts-ignore
                 preCamera && (preCamera._cameraType = engine.CameraType.Normal);
                 switch(type){
                     case XRTrackedInputDevice.Camera:
-                        // @ts-ignore
                         camera._cameraType = engine.CameraType.XRCenterCamera;
                         break;
                     case XRTrackedInputDevice.LeftCamera:
-                        // @ts-ignore
                         camera._cameraType = engine.CameraType.XRLeftCamera;
                         break;
                     case XRTrackedInputDevice.RightCamera:
-                        // @ts-ignore
                         camera._cameraType = engine.CameraType.XRRightCamera;
                         break;
                 }
@@ -215,7 +211,6 @@
        */ _proto.detachCamera = function detachCamera(type) {
             var xrCamera = this._xrManager.inputManager.getTrackedDevice(type);
             var preCamera = xrCamera._camera;
-            // @ts-ignore
             preCamera && (preCamera._cameraType = engine.CameraType.Normal);
             xrCamera._camera = null;
             return preCamera;
@@ -283,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) {
@@ -402,13 +397,13 @@
         function XRInputManager(_xrManager, _engine) {
             this._xrManager = _xrManager;
             this._engine = _engine;
+            this.onTrackedDeviceChanged = new engine.Signal();
             this./** @internal */ _cameras = [];
             this./** @internal */ _controllers = [];
             this._added = [];
             this._removed = [];
             this._trackedDevices = [];
             this._statusSnapshot = [];
-            this._listeners = new engine.SafeLoopArray();
             var _this = this, trackedDevices = _this._trackedDevices, controllers = _this._controllers, cameras = _this._cameras;
             for(var i = 0; i < 6; i++){
                 switch(i){
@@ -435,22 +430,6 @@
             return this._trackedDevices[type];
         };
         /**
-       * Add a listener for tracked device changes.
-       * @param listener - The listener to add
-       */ _proto.addTrackedDeviceChangedListener = function addTrackedDeviceChangedListener(listener) {
-            this._listeners.push({
-                fn: listener
-            });
-        };
-        /**
-       * Remove a listener of tracked device changes.
-       * @param listener - The listener to remove
-       */ _proto.removeTrackedDeviceChangedListener = function removeTrackedDeviceChangedListener(listener) {
-            this._listeners.findAndRemove(function(value) {
-                return value.fn === listener ? value.destroyed = true : false;
-            });
-        };
-        /**
        * @internal
        */ _proto._onUpdate = function _onUpdate() {
             var _this = this, added = _this._added, removed = _this._removed, statusSnapshot = _this._statusSnapshot;
@@ -462,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]);
@@ -486,19 +465,13 @@
             }
             // Dispatch change event
             if (added.length > 0 || removed.length > 0) {
-                var listeners = this._listeners.getLoopArray();
-                for(var i3 = 0, n3 = listeners.length; i3 < n3; i3++){
-                    var listener = listeners[i3];
-                    !listener.destroyed && listener.fn(added, removed);
-                }
+                this.onTrackedDeviceChanged.invoke(added, removed);
             }
         };
         /**
        * @internal
        */ _proto._onDestroy = function _onDestroy() {
-            this._listeners.findAndRemove(function(value) {
-                return value.destroyed = true;
-            });
+            this.onTrackedDeviceChanged.removeAll();
         };
         _proto._handleEvent = function _handleEvent(event) {
             var input = this._trackedDevices[event.input];
@@ -574,6 +547,18 @@
             }
             return new PointerEvent(type, eventInitDict);
         };
+        /**
+       * Add a listener for tracked device changes.
+       * @deprecated Use `onTrackedDeviceChanged.on(listener)` instead.
+       */ _proto.addTrackedDeviceChangedListener = function addTrackedDeviceChangedListener(listener) {
+            this.onTrackedDeviceChanged.on(listener);
+        };
+        /**
+       * Remove a listener of tracked device changes.
+       * @deprecated Use `onTrackedDeviceChanged.off(listener)` instead.
+       */ _proto.removeTrackedDeviceChangedListener = function removeTrackedDeviceChangedListener(listener) {
+            this.onTrackedDeviceChanged.off(listener);
+        };
         return XRInputManager;
     }();
     /**
@@ -590,10 +575,9 @@
         function XRSessionManager(_xrManager, _engine) {
             this._xrManager = _xrManager;
             this._engine = _engine;
+            this.onStateChanged = new engine.Signal();
             this._mode = XRSessionMode.None;
             this._state = XRSessionState.None;
-            this._listeners = new engine.SafeLoopArray();
-            // @ts-ignore
             this._rhi = _engine._hardwareRenderer;
             this._raf = requestAnimationFrame.bind(window);
             this._caf = cancelAnimationFrame.bind(window);
@@ -643,30 +627,10 @@
             }
         };
         /**
-       * Add a listening function for session state changes.
-       * @param listener - The listening function
-       */ _proto.addStateChangedListener = function addStateChangedListener(listener) {
-            this._listeners.push({
-                fn: listener
-            });
-        };
-        /**
-       * Remove a listening function of session state changes.
-       * @param listener - The listening function
-       */ _proto.removeStateChangedListener = function removeStateChangedListener(listener) {
-            this._listeners.findAndRemove(function(value) {
-                return value.fn === listener ? value.destroyed = true : false;
-            });
-        };
-        /**
        * @internal
        */ _proto._setState = function _setState(value) {
             this._state = value;
-            var listeners = this._listeners.getLoopArray();
-            for(var i = 0, n = listeners.length; i < n; i++){
-                var listener = listeners[i];
-                !listener.destroyed && listener.fn(value);
-            }
+            this.onStateChanged.invoke(value);
         };
         /**
        * @internal
@@ -742,11 +706,21 @@
         /**
        * @internal
        */ _proto._onDestroy = function _onDestroy() {
-            this._listeners.findAndRemove(function(value) {
-                return value.destroyed = true;
-            });
+            this.onStateChanged.removeAll();
             this._raf = this._caf = null;
         };
+        /**
+       * Add a listening function for session state changes.
+       * @deprecated Use `onStateChanged.on(listener)` instead.
+       */ _proto.addStateChangedListener = function addStateChangedListener(listener) {
+            this.onStateChanged.on(listener);
+        };
+        /**
+       * Remove a listening function of session state changes.
+       * @deprecated Use `onStateChanged.off(listener)` instead.
+       */ _proto.removeStateChangedListener = function removeStateChangedListener(listener) {
+            this.onStateChanged.off(listener);
+        };
         _create_class$1(XRSessionManager, [
             {
                 key: "mode",
@@ -767,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;
                 }
@@ -775,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;
                 }
@@ -1057,28 +1031,12 @@
         _inherits(XRTrackableFeature, XRFeature);
         function XRTrackableFeature() {
             var _this;
-            _this = XRFeature.apply(this, arguments) || this, _this._requestTrackings = [], _this._tracked = [], _this._added = [], _this._updated = [], _this._removed = [], _this._statusSnapshot = {}, _this._listeners = new engine.SafeLoopArray();
+            _this = XRFeature.apply(this, arguments) || this, /** Signal emitted when tracked objects change. */ _this.onChanged = new engine.Signal(), _this._requestTrackings = [], _this._tracked = [], _this._added = [], _this._updated = [], _this._removed = [], _this._statusSnapshot = {};
             return _this;
         }
         var _proto = XRTrackableFeature.prototype;
-        /**
-       * Add a listening function for tracked object changes.
-       * @param listener - The listening function
-       */ _proto.addChangedListener = function addChangedListener(listener) {
-            this._listeners.push({
-                fn: listener
-            });
-        };
-        /**
-       * Remove a listening function of tracked object changes.
-       * @param listener - The listening function
-       */ _proto.removeChangedListener = function removeChangedListener(listener) {
-            this._listeners.findAndRemove(function(value) {
-                return value.fn === listener ? value.destroyed = true : false;
-            });
-        };
         _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) {
@@ -1132,11 +1090,7 @@
                 requestTrackings[i1].state === XRRequestTrackingState.Destroyed && requestTrackings.splice(i1, 1);
             }
             if (added.length > 0 || updated.length > 0 || removed.length > 0) {
-                var listeners = this._listeners.getLoopArray();
-                for(var i2 = 0, n3 = listeners.length; i2 < n3; i2++){
-                    var listener = listeners[i2];
-                    !listener.destroyed && listener.fn(added, updated, removed);
-                }
+                this.onChanged.invoke(added, updated, removed);
             }
         };
         _proto._onSessionStop = function _onSessionStop() {
@@ -1145,9 +1099,7 @@
         _proto._onSessionExit = function _onSessionExit() {
             // prettier-ignore
             this._requestTrackings.length = this._tracked.length = this._added.length = this._updated.length = this._removed.length = 0;
-            this._listeners.findAndRemove(function(value) {
-                return value.destroyed = true;
-            });
+            this.onChanged.removeAll();
         };
         _proto._addRequestTracking = function _addRequestTracking(requestTracking) {
             var _this = this, platformFeature = _this._platformFeature;
@@ -1174,6 +1126,18 @@
                 platformFeature.onDelRequestTracking(requestTrackings[i]);
             }
         };
+        /**
+       * Add a listening function for tracked object changes.
+       * @deprecated Use `onChanged.on(listener)` instead.
+       */ _proto.addChangedListener = function addChangedListener(listener) {
+            this.onChanged.on(listener);
+        };
+        /**
+       * Remove a listening function of tracked object changes.
+       * @deprecated Use `onChanged.off(listener)` instead.
+       */ _proto.removeChangedListener = function removeChangedListener(listener) {
+            this.onChanged.off(listener);
+        };
         return XRTrackableFeature;
     }(XRFeature);
     XRTrackableFeature._uuid = 0;
@@ -1607,8 +1571,7 @@
         var _proto = XRReferenceImageLoader.prototype;
         _proto.load = function load(item, resourceManager) {
             return new engine.AssetPromise(function(resolve, reject) {
-                resourceManager // @ts-ignore
-                ._request(item.url, _extends({}, item, {
+                resourceManager._request(item.url, _extends({}, item, {
                     type: "arraybuffer"
                 })).then(function(data) {
                     engine.decode(data, resourceManager.engine).then(function(referenceImage) {
@@ -2136,13 +2099,16 @@
        * Converts the vector into a unit vector.
        * @param a - The vector to normalize
        * @param out - The normalized vector
+       * @returns True if the vector has a unit form, otherwise false and `out` is left untouched
        */ Vector3.normalize = function normalize(a, out) {
             var _x = a._x, _y = a._y, _z = a._z;
             var len = Math.sqrt(_x * _x + _y * _y + _z * _z);
-            if (len > MathUtil.zeroTolerance) {
-                len = 1 / len;
-                out.set(_x * len, _y * len, _z * len);
+            if (len > MathUtil.zeroTolerance && Number.isFinite(len)) {
+                var inv = 1 / len;
+                out.set(_x * inv, _y * inv, _z * inv);
+                return true;
             }
+            return false;
         };
         /**
        * Scale a vector by the given value.
@@ -2288,8 +2254,6 @@
     new Vector3();
     new Vector3();
     new Vector3();
-    new Vector3();
-    new Vector3();
     /**
      * Represents a 3x3 mathematical matrix.
      */ var Matrix3x3 = /*#__PURE__*/ function() {
@@ -2674,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;
@@ -4143,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;
@@ -4449,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++){
@@ -4461,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) {
@@ -4760,6 +4728,8 @@
                 case XRFeatureType.ImageTracking:
                     // @ts-ignore
                     return typeof XRImageTrackingResult !== "undefined";
+                default:
+                    return false;
             }
         };
         _proto.createPlatformFeature = function createPlatformFeature(type) {
@@ -4789,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,
@@ -4951,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);
@@ -5010,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;
                     }
@@ -5082,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);
@@ -5146,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;