@galacean/engine-xr 2.0.0-alpha.14 → 2.0.0-alpha.15

package/dist/browser.js

@@ -345,13 +345,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 +378,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;
@@ -429,19 +413,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 +495,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,9 +525,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);
@@ -588,30 +578,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 +657,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",
@@ -1007,26 +987,10 @@
         _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 platformFrame = platformSession.frame;
@@ -1082,11 +1046,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 +1055,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 +1082,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;