@galacean/engine-xr 0.0.0-experimental-1.3-xr.4 → 0.0.0-experimental-1.3-xr.8

package/dist/browser.js

@@ -99,9 +99,10 @@
      */ exports.XRSessionState = void 0;
     (function(XRSessionState) {
         XRSessionState[XRSessionState[/** Not initialized. */ "None"] = 0] = "None";
-        XRSessionState[XRSessionState[/** Initialized but not started. */ "Initialized"] = 1] = "Initialized";
-        XRSessionState[XRSessionState[/** Running. */ "Running"] = 2] = "Running";
-        XRSessionState[XRSessionState[/** Paused. */ "Paused"] = 3] = "Paused";
+        XRSessionState[XRSessionState[/** Initializing session. */ "Initializing"] = 1] = "Initializing";
+        XRSessionState[XRSessionState[/** Initialized but not started. */ "Initialized"] = 2] = "Initialized";
+        XRSessionState[XRSessionState[/** Running. */ "Running"] = 3] = "Running";
+        XRSessionState[XRSessionState[/** Paused. */ "Paused"] = 4] = "Paused";
     })(exports.XRSessionState || (exports.XRSessionState = {}));
 
     /**
@@ -526,7 +527,7 @@
             this._engine = _engine;
             this._mode = exports.XRSessionMode.None;
             this._state = exports.XRSessionState.None;
-            this._listeners = [];
+            this._listeners = new engine.SafeLoopArray();
             // @ts-ignore
             this._rhi = _engine._hardwareRenderer;
             this._raf = requestAnimationFrame.bind(window);
@@ -549,7 +550,7 @@
                 throw new Error("Without session to run.");
             }
             platformSession.start();
-            this.state = exports.XRSessionState.Running;
+            this._setState(exports.XRSessionState.Running);
             this._xrManager._onSessionStart();
             if (!engine.isPaused) {
                 engine.pause();
@@ -569,7 +570,7 @@
             rhi._mainFrameBuffer = null;
             rhi._mainFrameWidth = rhi._mainFrameHeight = 0;
             platformSession.stop();
-            this.state = exports.XRSessionState.Paused;
+            this._setState(exports.XRSessionState.Paused);
             this._xrManager._onSessionStop();
             if (!engine.isPaused) {
                 engine.pause();
@@ -579,17 +580,27 @@
         /**
        * Add a listening function for session state changes.
        * @param listener - The listening function
-       */ _proto.addChangedListener = function addChangedListener(listener) {
-            this._listeners.push(listener);
+       */ _proto.addStateChangedListener = function addStateChangedListener(listener) {
+            this._listeners.push({
+                fn: listener
+            });
         };
         /**
        * Remove a listening function of session state changes.
        * @param listener - The listening function
-       */ _proto.removeChangedListener = function removeChangedListener(listener) {
-            var _this = this, listeners = _this._listeners;
-            var index = listeners.indexOf(listener);
-            if (index >= 0) {
-                listeners.splice(index, 1);
+       */ _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);
             }
         };
         /**
@@ -607,7 +618,7 @@
                 xrManager._platformDevice.requestSession(_this._rhi, mode, platformFeatures).then(function(platformSession) {
                     _this._mode = mode;
                     _this._platformSession = platformSession;
-                    _this.state = exports.XRSessionState.Initialized;
+                    _this._setState(exports.XRSessionState.Initialized);
                     platformSession.setSessionExitCallBack(_this._onSessionExit);
                     platformSession.addEventListener();
                     xrManager._onSessionInit();
@@ -656,7 +667,7 @@
             rhi._mainFrameWidth = rhi._mainFrameHeight = 0;
             platformSession.removeEventListener();
             this._platformSession = null;
-            this.state = exports.XRSessionState.None;
+            this._setState(exports.XRSessionState.None);
             this._xrManager._onSessionExit();
             if (!engine.isPaused) {
                 engine.pause();
@@ -665,7 +676,12 @@
         };
         /**
        * @internal
-       */ _proto._onDestroy = function _onDestroy() {};
+       */ _proto._onDestroy = function _onDestroy() {
+            this._listeners.findAndRemove(function(value) {
+                return value.destroyed = true;
+            });
+            this._raf = this._caf = null;
+        };
         _create_class(XRSessionManager, [
             {
                 key: "mode",
@@ -681,15 +697,6 @@
        * Return the current session state.
        */ function get() {
                     return this._state;
-                },
-                set: /**
-       * @internal
-       */ function set(value) {
-                    this._state = value;
-                    var listeners = this._listeners;
-                    for(var i = 0, n = listeners.length; i < n; i++){
-                        listeners[i](value);
-                    }
                 }
             },
             {
@@ -713,26 +720,20 @@
     }();
 
     /**
-     * XRManager is the entry point of the XR system.
+     * @internal
      */ var XRManagerExtended = /*#__PURE__*/ function(XRManager1) {
         _inherits(XRManagerExtended, XRManager1);
         function XRManagerExtended() {
-            return XRManager1.apply(this, arguments);
+            var _this;
+            _this = XRManager1.apply(this, arguments) || this;
+            _this.features = [];
+            return _this;
         }
         var _proto = XRManagerExtended.prototype;
-        /**
-       * Check if the specified feature is supported.
-       * @param type - The type of the feature
-       * @returns If the feature is supported
-       */ _proto.isSupportedFeature = function isSupportedFeature(feature) {
+        _proto.isSupportedFeature = function isSupportedFeature(feature) {
             return this._platformDevice.isSupportedFeature(XRManagerExtended._featureMap.get(feature));
         };
-        /**
-       * Add feature based on the xr feature type.
-       * @param type - The type of the feature
-       * @param args - The constructor params of the feature
-       * @returns The feature which has been added
-       */ _proto.addFeature = function addFeature(type) {
+        _proto.addFeature = function addFeature(type) {
             for(var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
                 args[_key - 1] = arguments[_key];
             }
@@ -750,11 +751,7 @@
             features.push(feature);
             return feature;
         };
-        /**
-       * Get feature which match the type.
-       * @param type - The type of the feature
-       * @returns	The feature which match type
-       */ _proto.getFeature = function getFeature(type) {
+        _proto.getFeature = function getFeature(type) {
             var features = this.features;
             for(var i = 0, n = features.length; i < n; i++){
                 var feature = features[i];
@@ -763,12 +760,7 @@
                 }
             }
         };
-        /**
-       * Enter XR immersive mode, when you call this method, it will initialize and display the XR virtual world.
-       * @param sessionMode - The mode of the session
-       * @param autoRun - Whether to automatically run the session, when `autoRun` is set to true, xr will start working immediately after initialization. Otherwise, you need to call `sessionManager.run` later to work.
-       * @returns A promise that resolves if the XR virtual world is entered, otherwise rejects
-       */ _proto.enterXR = function enterXR(sessionMode, autoRun) {
+        _proto.enterXR = function enterXR(sessionMode, autoRun) {
             if (autoRun === void 0) autoRun = true;
             var _this = this;
             var sessionManager = this.sessionManager;
@@ -781,6 +773,7 @@
             return new Promise(function(resolve, reject) {
                 // 1. Check if this xr mode is supported
                 sessionManager.isSupportedMode(sessionMode).then(function() {
+                    sessionManager._setState(exports.XRSessionState.Initializing);
                     // 2. Initialize session
                     sessionManager._initialize(sessionMode, _this.features).then(function() {
                         autoRun && sessionManager.run();
@@ -789,10 +782,7 @@
                 }, reject);
             });
         };
-        /**
-       * Exit XR immersive mode, when you call this method, it will destroy the XR virtual world.
-       * @returns A promise that resolves if the XR virtual world is destroyed, otherwise rejects
-       */ _proto.exitXR = function exitXR() {
+        _proto.exitXR = function exitXR() {
             var _this = this;
             return new Promise(function(resolve, reject) {
                 _this.sessionManager._exit().then(function() {
@@ -800,18 +790,13 @@
                 }, reject);
             });
         };
-        /**
-       * @internal
-       */ _proto._initialize = function _initialize(engine, xrDevice) {
-            this.features.length = 0;
+        _proto._initialize = function _initialize(engine, xrDevice) {
             this._platformDevice = xrDevice;
             this.sessionManager = new XRSessionManager(this, engine);
             this.inputManager = new XRInputManager(this, engine);
             this.cameraManager = new XRCameraManager(this);
         };
-        /**
-       * @internal
-       */ _proto._update = function _update() {
+        _proto._update = function _update() {
             var sessionManager = this.sessionManager;
             if (sessionManager.state !== exports.XRSessionState.Running) return;
             sessionManager._onUpdate();
@@ -823,9 +808,7 @@
                 feature.enabled && feature._onUpdate();
             }
         };
-        /**
-       * @internal
-       */ _proto._destroy = function _destroy() {
+        _proto._destroy = function _destroy() {
             var _this = this;
             if (this.sessionManager._platformSession) {
                 this.exitXR().then(function() {
@@ -839,19 +822,13 @@
                 this.cameraManager._onDestroy();
             }
         };
-        /**
-       * @internal
-       */ _proto._getRequestAnimationFrame = function _getRequestAnimationFrame() {
+        _proto._getRequestAnimationFrame = function _getRequestAnimationFrame() {
             return this.sessionManager._getRequestAnimationFrame();
         };
-        /**
-       * @internal
-       */ _proto._getCancelAnimationFrame = function _getCancelAnimationFrame() {
+        _proto._getCancelAnimationFrame = function _getCancelAnimationFrame() {
             return this.sessionManager._getCancelAnimationFrame();
         };
-        /**
-       * @internal
-       */ _proto._getCameraClearFlagsMask = function _getCameraClearFlagsMask(type) {
+        _proto._getCameraClearFlagsMask = function _getCameraClearFlagsMask(type) {
             return this.cameraManager._getCameraClearFlagsMask(type);
         };
         /**
@@ -897,10 +874,7 @@
         _create_class(XRManagerExtended, [
             {
                 key: "origin",
-                get: /**
-       * The current origin of XR space.
-       * @remarks The connection point between the virtual world and the real world ( XR Space )
-       */ function get() {
+                get: function get() {
                     return this._origin;
                 },
                 set: function set(value) {
@@ -1024,7 +998,7 @@
             _this._updated = [];
             _this._removed = [];
             _this._statusSnapshot = {};
-            _this._listeners = [];
+            _this._listeners = new engine.SafeLoopArray();
             return _this;
         }
         var _proto = XRTrackableFeature.prototype;
@@ -1032,22 +1006,22 @@
        * Add a listening function for tracked object changes.
        * @param listener - The listening function
        */ _proto.addChangedListener = function addChangedListener(listener) {
-            this._listeners.push(listener);
+            this._listeners.push({
+                fn: listener
+            });
         };
         /**
        * Remove a listening function of tracked object changes.
        * @param listener - The listening function
        */ _proto.removeChangedListener = function removeChangedListener(listener) {
-            var _this = this, listeners = _this._listeners;
-            var index = listeners.indexOf(listener);
-            if (index >= 0) {
-                listeners.splice(index, 1);
-            }
+            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;
-            var _this = this, platformFeature = _this._platformFeature, listeners = _this._listeners, requestTrackings = _this._requestTrackings, statusSnapshot = _this._statusSnapshot, allTracked = _this._tracked, added = _this._added, updated = _this._updated, removed = _this._removed;
+            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) {
                 return;
             }
@@ -1099,8 +1073,10 @@
                 requestTrackings[i1].state === exports.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++){
-                    listeners[i2](added, updated, removed);
+                    var listener = listeners[i2];
+                    !listener.destroyed && listener.fn(added, updated, removed);
                 }
             }
         };
@@ -1110,6 +1086,9 @@
         _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;
+            });
         };
         _proto._addRequestTracking = function _addRequestTracking(requestTracking) {
             var _this = this, platformFeature = _this._platformFeature;
@@ -1188,34 +1167,6 @@
       return c > 3 && r && Object.defineProperty(target, key, r), r;
     }
 
-    function __generator(thisArg, body) {
-      var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-      return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-      function verb(n) { return function (v) { return step([n, v]); }; }
-      function step(op) {
-          if (f) throw new TypeError("Generator is already executing.");
-          while (g && (g = 0, op[0] && (_ = 0)), _) try {
-              if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-              if (y = 0, t) op = [op[0] & 2, t.value];
-              switch (op[0]) {
-                  case 0: case 1: t = op; break;
-                  case 4: _.label++; return { value: op[1], done: false };
-                  case 5: _.label++; y = op[1]; op = [0]; continue;
-                  case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                  default:
-                      if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                      if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                      if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                      if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                      if (t[2]) _.ops.pop();
-                      _.trys.pop(); continue;
-              }
-              op = body.call(thisArg, _);
-          } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-          if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-      }
-    }
-
     typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
       var e = new Error(message);
       return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
@@ -1656,202 +1607,6 @@
         engine.resourceLoader("XRReferenceImage", [])
     ], exports.XRReferenceImageLoader);
 
-    function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-        try {
-            var info = gen[key](arg);
-            var value = info.value;
-        } catch (error) {
-            reject(error);
-            return;
-        }
-        if (info.done) resolve(value);
-        else Promise.resolve(value).then(_next, _throw);
-    }
-    function _async_to_generator(fn) {
-        return function() {
-            var self = this, args = arguments;
-
-            return new Promise(function(resolve, reject) {
-                var gen = fn.apply(self, args);
-
-                function _next(value) {
-                    asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-                }
-
-                function _throw(err) {
-                    asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-                }
-
-                _next(undefined);
-            });
-        };
-    }
-
-    exports.XRSceneExtendParser = /*#__PURE__*/ function() {
-        function XRSceneExtendParser() {}
-        XRSceneExtendParser.parse = function parse(engine$1, context, data) {
-            return _async_to_generator(function() {
-                var xrManager, xr, origin, camera, leftCamera, rightCamera, features, entityMap, cameraManager, i, n, feature, _;
-                return __generator(this, function(_state) {
-                    switch(_state.label){
-                        case 0:
-                            xrManager = engine$1.xrManager;
-                            if (!xrManager) {
-                                engine.Logger.error("XRManager is not found in the engine.");
-                                return [
-                                    2
-                                ];
-                            }
-                            xr = data.scene.xr;
-                            origin = xr.origin, camera = xr.camera, leftCamera = xr.leftCamera, rightCamera = xr.rightCamera, features = xr.features;
-                            entityMap = context.entityMap;
-                            origin && (xrManager.origin = entityMap.get(origin));
-                            cameraManager = xrManager.cameraManager;
-                            setCamera(cameraManager, exports.XRTrackedInputDevice.Camera, entityMap.get(camera));
-                            setCamera(cameraManager, exports.XRTrackedInputDevice.LeftCamera, entityMap.get(leftCamera));
-                            setCamera(cameraManager, exports.XRTrackedInputDevice.RightCamera, entityMap.get(rightCamera));
-                            i = 0, n = features.length;
-                            _state.label = 1;
-                        case 1:
-                            if (!(i < n)) return [
-                                3,
-                                9
-                            ];
-                            feature = features[i];
-                            if (!feature.enable) return [
-                                3,
-                                8
-                            ];
-                            _ = feature.type;
-                            switch(_){
-                                case exports.XRFeatureType.ImageTracking:
-                                    return [
-                                        3,
-                                        2
-                                    ];
-                                case exports.XRFeatureType.PlaneTracking:
-                                    return [
-                                        3,
-                                        4
-                                    ];
-                                case exports.XRFeatureType.AnchorTracking:
-                                    return [
-                                        3,
-                                        5
-                                    ];
-                                case exports.XRFeatureType.HitTest:
-                                    return [
-                                        3,
-                                        6
-                                    ];
-                            }
-                            return [
-                                3,
-                                7
-                            ];
-                        case 2:
-                            return [
-                                4,
-                                addImageTracking(engine$1, xrManager, feature)
-                            ];
-                        case 3:
-                            _state.sent();
-                            return [
-                                3,
-                                8
-                            ];
-                        case 4:
-                            addPlaneTracking(xrManager, feature);
-                            return [
-                                3,
-                                8
-                            ];
-                        case 5:
-                            addAnchorTracking(xrManager, feature);
-                            return [
-                                3,
-                                8
-                            ];
-                        case 6:
-                            addHitTest(xrManager);
-                            return [
-                                3,
-                                8
-                            ];
-                        case 7:
-                            return [
-                                3,
-                                8
-                            ];
-                        case 8:
-                            i++;
-                            return [
-                                3,
-                                1
-                            ];
-                        case 9:
-                            return [
-                                2
-                            ];
-                    }
-                });
-            })();
-        };
-        return XRSceneExtendParser;
-    }();
-    exports.XRSceneExtendParser = __decorate([
-        engine.registerSceneExtendParser("XR")
-    ], exports.XRSceneExtendParser);
-    function addImageTracking(engine$1, xrManager, schema) {
-        if (!xrManager.isSupportedFeature(exports.XRImageTracking)) {
-            engine.Logger.error("Image Tracking is not supported.");
-            return;
-        }
-        var promises = [];
-        var images = schema.images;
-        var resourceManager = engine$1.resourceManager;
-        for(var i = 0, n = images.length; i < n; i++){
-            // @ts-ignore
-            promises.push(resourceManager.getResourceByRef(images[i]));
-        }
-        return Promise.all(promises).then(function(xrReferenceImages) {
-            xrManager.addFeature(exports.XRImageTracking, xrReferenceImages);
-        });
-    }
-    function addPlaneTracking(xrManager, schema) {
-        if (!xrManager.isSupportedFeature(exports.XRPlaneTracking)) {
-            engine.Logger.error("Plane Tracking is not supported.");
-            return;
-        }
-        xrManager.addFeature(exports.XRPlaneTracking, schema.detectionMode);
-    }
-    function addAnchorTracking(xrManager, schema) {
-        if (!xrManager.isSupportedFeature(exports.XRAnchorTracking)) {
-            engine.Logger.error("Anchor Tracking is not supported.");
-            return;
-        }
-        var anchorTracking = xrManager.addFeature(exports.XRAnchorTracking);
-        var anchors = schema.anchors;
-        for(var i = 0, n = anchors.length; i < n; i++){
-            var anchor = anchors[i];
-            var position = new engine.Vector3().copyFrom(anchor.position);
-            var rotation = new engine.Quaternion().copyFrom(anchor.rotation);
-            anchorTracking.addAnchor(position, rotation);
-        }
-    }
-    function addHitTest(xrManager, schema) {
-        if (!xrManager.isSupportedFeature(exports.XRHitTest)) {
-            engine.Logger.error("Hit Test is not supported.");
-            return;
-        }
-        xrManager.addFeature(exports.XRHitTest);
-    }
-    function setCamera(cameraManager, device, entity) {
-        var _entity;
-        var camera = (_entity = entity) == null ? void 0 : _entity.getComponent(engine.Camera);
-        camera && cameraManager.attachCamera(device, camera);
-    }
-
     exports.XRAnchor = XRAnchor;
     exports.XRCamera = XRCamera;
     exports.XRCameraManager = XRCameraManager;