@galacean/engine-xr 2.0.0-alpha.2 → 2.0.0-alpha.21

package/dist/module.js

@@ -1,4 +1,4 @@
-import { CameraType, Matrix, CameraClearFlags, Vector3, Quaternion, Rect, SafeLoopArray, XRManager, Ray, Plane, Vector2, decoder, AssetPromise, resourceLoader, decode, Loader } from '@galacean/engine';
+import { CameraType, Matrix, CameraClearFlags, Vector3, Quaternion, Rect, Signal, XRManager, Ray, Plane, Vector2, decoder, AssetPromise, resourceLoader, decode, Loader } from '@galacean/engine';
 
 function _is_native_reflect_construct() {
     // Since Reflect.construct can't be properly polyfilled, some
@@ -341,13 +341,13 @@ var XRTargetRayMode = /*#__PURE__*/ function(XRTargetRayMode) {
     function XRInputManager(_xrManager, _engine) {
         this._xrManager = _xrManager;
         this._engine = _engine;
+        this.onTrackedDeviceChanged = new Signal();
         this./** @internal */ _cameras = [];
         this./** @internal */ _controllers = [];
         this._added = [];
         this._removed = [];
         this._trackedDevices = [];
         this._statusSnapshot = [];
-        this._listeners = new SafeLoopArray();
         var _this = this, trackedDevices = _this._trackedDevices, controllers = _this._controllers, cameras = _this._cameras;
         for(var i = 0; i < 6; i++){
             switch(i){
@@ -374,22 +374,6 @@ var XRTargetRayMode = /*#__PURE__*/ function(XRTargetRayMode) {
         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;
@@ -425,19 +409,13 @@ var XRTargetRayMode = /*#__PURE__*/ function(XRTargetRayMode) {
         }
         // 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];
@@ -513,6 +491,18 @@ var XRTargetRayMode = /*#__PURE__*/ function(XRTargetRayMode) {
         }
         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;
 }();
 
@@ -531,9 +521,9 @@ var XRTargetRayMode = /*#__PURE__*/ function(XRTargetRayMode) {
     function XRSessionManager(_xrManager, _engine) {
         this._xrManager = _xrManager;
         this._engine = _engine;
+        this.onStateChanged = new Signal();
         this._mode = XRSessionMode.None;
         this._state = XRSessionState.None;
-        this._listeners = new SafeLoopArray();
         // @ts-ignore
         this._rhi = _engine._hardwareRenderer;
         this._raf = requestAnimationFrame.bind(window);
@@ -584,30 +574,10 @@ var XRTargetRayMode = /*#__PURE__*/ function(XRTargetRayMode) {
         }
     };
     /**
-   * 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
@@ -683,11 +653,21 @@ var XRTargetRayMode = /*#__PURE__*/ function(XRTargetRayMode) {
     /**
    * @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",
@@ -1003,26 +983,10 @@ var XRRequestTrackingState = /*#__PURE__*/ function(XRRequestTrackingState) {
     _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 SafeLoopArray();
+        _this = XRFeature.apply(this, arguments) || this, /** Signal emitted when tracked objects change. */ _this.onChanged = new 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;
@@ -1078,11 +1042,7 @@ var XRRequestTrackingState = /*#__PURE__*/ function(XRRequestTrackingState) {
             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() {
@@ -1091,9 +1051,7 @@ var XRRequestTrackingState = /*#__PURE__*/ function(XRRequestTrackingState) {
     _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;
@@ -1120,6 +1078,18 @@ var XRRequestTrackingState = /*#__PURE__*/ function(XRRequestTrackingState) {
             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;