@galacean/engine-xr 2.0.0-alpha.5 → 2.0.0-alpha.50

package/dist/browser.js

@@ -122,19 +122,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;
                 }
@@ -148,7 +144,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;
@@ -217,7 +212,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) {
@@ -345,13 +340,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){
@@ -378,22 +373,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;
@@ -405,7 +384,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]);
@@ -429,19 +408,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];
@@ -517,6 +490,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;
     }();
 
@@ -535,10 +520,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);
@@ -588,30 +572,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
@@ -687,11 +651,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(XRSessionManager, [
             {
                 key: "mode",
@@ -712,7 +686,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;
                 }
@@ -720,7 +694,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;
                 }
@@ -1007,28 +981,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) {
@@ -1082,11 +1040,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() {
@@ -1095,9 +1049,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;
@@ -1124,6 +1076,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;
@@ -1582,8 +1546,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) {