@galacean/engine-core 1.1.0-alpha.1 → 1.1.0-alpha.2

package/dist/miniprogram.js

@@ -3287,6 +3287,23 @@ var rePropName$1 = RegExp(// Match anything that isn't a dot or bracket.
         scale.z < 0 && (isInvert = !isInvert);
         return isInvert;
     };
+    _proto._onDestroy = function _onDestroy() {
+        Component.prototype._onDestroy.call(this);
+        //@ts-ignore
+        this._worldPosition._onValueChanged = null;
+        //@ts-ignore
+        this._rotation._onValueChanged = null;
+        //@ts-ignore
+        this._worldRotation._onValueChanged = null;
+        //@ts-ignore
+        this._rotationQuaternion._onValueChanged = null;
+        //@ts-ignore
+        this._worldRotationQuaternion._onValueChanged = null;
+        //@ts-ignore
+        this._position._onValueChanged = null;
+        //@ts-ignore
+        this._scale._onValueChanged = null;
+    };
     /**
    * Get worldMatrix: Will trigger the worldMatrix update of itself and all parent entities.
    * Get worldPosition: Will trigger the worldMatrix, local position update of itself and the worldMatrix update of all parent entities.
@@ -12547,6 +12564,7 @@ var /** @internal */ PromiseState;
         this._referResourcePool = Object.create(null);
         this._graphicResourcePool = Object.create(null);
         this._contentRestorerPool = Object.create(null);
+        this._subAssetPromiseCallbacks = {};
         this.//-----------------Editor temp solution-----------------
         /** @internal */ _objectPool = Object.create(null);
         this./** @internal */ _editorResourceConfig = Object.create(null);
@@ -12574,6 +12592,21 @@ var /** @internal */ PromiseState;
         return (_this__assetUrlPool_url = this._assetUrlPool[url]) != null ? _this__assetUrlPool_url : null;
     };
     /**
+   * Find the resource by type.
+   * @param type - Resource type
+   * @returns - Resource collection
+   */ _proto.findResourcesByType = function findResourcesByType(type) {
+        var resources = new Array();
+        var referResourcePool = this._referResourcePool;
+        for(var k in referResourcePool){
+            var resource = referResourcePool[k];
+            if (_instanceof(resource, type)) {
+                resources.push(resource);
+            }
+        }
+        return resources;
+    };
+    /**
    * Get asset url from instanceId.
    * @param instanceId - Engine instance id
    * @returns Asset url
@@ -12611,6 +12644,20 @@ var /** @internal */ PromiseState;
     };
     /**
    * @internal
+   */ _proto._onSubAssetSuccess = function _onSubAssetSuccess(assetURL, value) {
+        var _this__subAssetPromiseCallbacks_assetURL;
+        (_this__subAssetPromiseCallbacks_assetURL = this._subAssetPromiseCallbacks[assetURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetURL.resolve(value);
+        delete this._subAssetPromiseCallbacks[assetURL];
+    };
+    /**
+   * @internal
+   */ _proto._onSubAssetFail = function _onSubAssetFail(assetURL, value) {
+        var _this__subAssetPromiseCallbacks_assetURL;
+        (_this__subAssetPromiseCallbacks_assetURL = this._subAssetPromiseCallbacks[assetURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetURL.reject(value);
+        delete this._subAssetPromiseCallbacks[assetURL];
+    };
+    /**
+   * @internal
    */ _proto._addAsset = function _addAsset(path, asset) {
         this._assetPool[asset.instanceId] = path;
         this._assetUrlPool[path] = asset;
@@ -12720,6 +12767,10 @@ var /** @internal */ PromiseState;
         var assetURL = assetBaseURL;
         if (queryPath) {
             assetURL += "?q=" + paths.shift();
+            var index;
+            while(index = paths.shift()){
+                assetURL += "[" + index + "]";
+            }
         }
         // Check is loading
         var loadingPromises = this._loadingPromises;
@@ -12727,7 +12778,7 @@ var /** @internal */ PromiseState;
         if (loadingPromise) {
             return new AssetPromise(function(resolve, reject) {
                 loadingPromise.then(function(resource) {
-                    resolve(_this._getResolveResource(resource, paths));
+                    resolve(resource);
                 }).catch(function(error) {
                     reject(error);
                 });
@@ -12741,38 +12792,37 @@ var /** @internal */ PromiseState;
         // Load asset
         item.url = assetBaseURL;
         var promise = loader.load(item, this);
-        if (_instanceof(promise, AssetPromise)) {
-            loadingPromises[assetBaseURL] = promise;
-            promise.then(function(resource) {
-                if (loader.useCache) {
-                    _this._addAsset(assetBaseURL, resource);
-                }
-                delete loadingPromises[assetBaseURL];
+        loadingPromises[assetBaseURL] = promise;
+        promise.then(function(resource) {
+            if (loader.useCache) {
+                _this._addAsset(assetBaseURL, resource);
+            }
+            delete loadingPromises[assetBaseURL];
+        }, function() {
+            return delete loadingPromises[assetBaseURL];
+        });
+        if (queryPath) {
+            var subPromise = new AssetPromise(function(resolve, reject) {
+                _this._pushSubAssetPromiseCallback(assetURL, resolve, reject);
+            });
+            loadingPromises[assetURL] = subPromise;
+            subPromise.then(function() {
+                delete loadingPromises[assetURL];
             }, function() {
-                return delete loadingPromises[assetBaseURL];
+                return delete loadingPromises[assetURL];
             });
-            return promise;
-        } else {
-            var _loop = function(subURL) {
-                var subPromise = promise[subURL];
-                var isMaster = assetBaseURL === subURL;
-                loadingPromises[subURL] = subPromise;
-                subPromise.then(function(resource) {
-                    if (isMaster) {
-                        if (loader.useCache) {
-                            _this._addAsset(subURL, resource);
-                            for(var k in promise)delete loadingPromises[k];
-                        }
-                    }
-                }, function() {
-                    for(var k in promise)delete loadingPromises[k];
-                });
-            };
-            for(var subURL in promise)_loop(subURL);
-            return promise[assetURL].then(function(resource) {
-                return _this._getResolveResource(resource, paths);
+            promise.catch(function(e) {
+                _this._onSubAssetFail(assetURL, e);
             });
+            return subPromise;
         }
+        return promise;
+    };
+    _proto._pushSubAssetPromiseCallback = function _pushSubAssetPromiseCallback(assetURL, resolve, reject) {
+        this._subAssetPromiseCallbacks[assetURL] = {
+            resolve: resolve,
+            reject: reject
+        };
     };
     _proto._gc = function _gc(forceDestroy) {
         var objects = Utils.objectValues(this._referResourcePool);
@@ -13582,6 +13632,7 @@ var Collision = function Collision() {
     function PhysicsScene(scene) {
         var _this = this;
         this._restTime = 0;
+        this._fixedTimeStep = 1 / 60;
         this._colliders = new DisorderedArray();
         this._gravity = new miniprogram.Vector3(0, -9.81, 0);
         this._onContactEnter = function(obj1, obj2) {
@@ -13698,7 +13749,6 @@ var Collision = function Collision() {
                 script1._waitHandlingInValid || script1.onTriggerStay(shape1);
             }
         };
-        /** The fixed time step in seconds at which physics are performed. */ this.fixedTimeStep = 1 / 60;
         this._scene = scene;
         this._setGravity = this._setGravity.bind(this);
         //@ts-ignore
@@ -13755,7 +13805,7 @@ var Collision = function Collision() {
    * Call on every frame to update pose of objects.
    * @internal
    */ _proto._update = function _update(deltaTime) {
-        var _this = this, fixedTimeStep = _this.fixedTimeStep, nativePhysicsManager = _this._nativePhysicsScene;
+        var _this = this, fixedTimeStep = _this._fixedTimeStep, nativePhysicsManager = _this._nativePhysicsScene;
         var componentsManager = this._scene._componentsManager;
         var simulateTime = this._restTime + deltaTime;
         var step = Math.floor(simulateTime / fixedTimeStep);
@@ -13863,6 +13913,17 @@ var Collision = function Collision() {
                     gravity.copyFrom(value);
                 }
             }
+        },
+        {
+            key: "fixedTimeStep",
+            get: /**
+   * The fixed time step in seconds at which physics are performed.
+   */ function get() {
+                return this._fixedTimeStep;
+            },
+            set: function set(value) {
+                this._fixedTimeStep = Math.max(value, miniprogram.MathUtil.zeroTolerance);
+            }
         }
     ]);
     return PhysicsScene;
@@ -15736,6 +15797,7 @@ exports.Joint = __decorate([
         CloneManager.deepCloneObject(this.renderStates, target.renderStates);
     };
     _proto._addReferCount = function _addReferCount(value) {
+        if (this._destroyed) return;
         ReferResource.prototype._addReferCount.call(this, value);
         this.shaderData._addReferCount(value);
     };

package/dist/module.js

@@ -3282,6 +3282,23 @@ var rePropName$1 = RegExp(// Match anything that isn't a dot or bracket.
         scale.z < 0 && (isInvert = !isInvert);
         return isInvert;
     };
+    _proto._onDestroy = function _onDestroy() {
+        Component.prototype._onDestroy.call(this);
+        //@ts-ignore
+        this._worldPosition._onValueChanged = null;
+        //@ts-ignore
+        this._rotation._onValueChanged = null;
+        //@ts-ignore
+        this._worldRotation._onValueChanged = null;
+        //@ts-ignore
+        this._rotationQuaternion._onValueChanged = null;
+        //@ts-ignore
+        this._worldRotationQuaternion._onValueChanged = null;
+        //@ts-ignore
+        this._position._onValueChanged = null;
+        //@ts-ignore
+        this._scale._onValueChanged = null;
+    };
     /**
    * Get worldMatrix: Will trigger the worldMatrix update of itself and all parent entities.
    * Get worldPosition: Will trigger the worldMatrix, local position update of itself and the worldMatrix update of all parent entities.
@@ -12542,6 +12559,7 @@ var /** @internal */ PromiseState;
         this._referResourcePool = Object.create(null);
         this._graphicResourcePool = Object.create(null);
         this._contentRestorerPool = Object.create(null);
+        this._subAssetPromiseCallbacks = {};
         this.//-----------------Editor temp solution-----------------
         /** @internal */ _objectPool = Object.create(null);
         this./** @internal */ _editorResourceConfig = Object.create(null);
@@ -12569,6 +12587,21 @@ var /** @internal */ PromiseState;
         return (_this__assetUrlPool_url = this._assetUrlPool[url]) != null ? _this__assetUrlPool_url : null;
     };
     /**
+   * Find the resource by type.
+   * @param type - Resource type
+   * @returns - Resource collection
+   */ _proto.findResourcesByType = function findResourcesByType(type) {
+        var resources = new Array();
+        var referResourcePool = this._referResourcePool;
+        for(var k in referResourcePool){
+            var resource = referResourcePool[k];
+            if (_instanceof(resource, type)) {
+                resources.push(resource);
+            }
+        }
+        return resources;
+    };
+    /**
    * Get asset url from instanceId.
    * @param instanceId - Engine instance id
    * @returns Asset url
@@ -12606,6 +12639,20 @@ var /** @internal */ PromiseState;
     };
     /**
    * @internal
+   */ _proto._onSubAssetSuccess = function _onSubAssetSuccess(assetURL, value) {
+        var _this__subAssetPromiseCallbacks_assetURL;
+        (_this__subAssetPromiseCallbacks_assetURL = this._subAssetPromiseCallbacks[assetURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetURL.resolve(value);
+        delete this._subAssetPromiseCallbacks[assetURL];
+    };
+    /**
+   * @internal
+   */ _proto._onSubAssetFail = function _onSubAssetFail(assetURL, value) {
+        var _this__subAssetPromiseCallbacks_assetURL;
+        (_this__subAssetPromiseCallbacks_assetURL = this._subAssetPromiseCallbacks[assetURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetURL.reject(value);
+        delete this._subAssetPromiseCallbacks[assetURL];
+    };
+    /**
+   * @internal
    */ _proto._addAsset = function _addAsset(path, asset) {
         this._assetPool[asset.instanceId] = path;
         this._assetUrlPool[path] = asset;
@@ -12715,6 +12762,10 @@ var /** @internal */ PromiseState;
         var assetURL = assetBaseURL;
         if (queryPath) {
             assetURL += "?q=" + paths.shift();
+            var index;
+            while(index = paths.shift()){
+                assetURL += "[" + index + "]";
+            }
         }
         // Check is loading
         var loadingPromises = this._loadingPromises;
@@ -12722,7 +12773,7 @@ var /** @internal */ PromiseState;
         if (loadingPromise) {
             return new AssetPromise(function(resolve, reject) {
                 loadingPromise.then(function(resource) {
-                    resolve(_this._getResolveResource(resource, paths));
+                    resolve(resource);
                 }).catch(function(error) {
                     reject(error);
                 });
@@ -12736,38 +12787,37 @@ var /** @internal */ PromiseState;
         // Load asset
         item.url = assetBaseURL;
         var promise = loader.load(item, this);
-        if (_instanceof(promise, AssetPromise)) {
-            loadingPromises[assetBaseURL] = promise;
-            promise.then(function(resource) {
-                if (loader.useCache) {
-                    _this._addAsset(assetBaseURL, resource);
-                }
-                delete loadingPromises[assetBaseURL];
+        loadingPromises[assetBaseURL] = promise;
+        promise.then(function(resource) {
+            if (loader.useCache) {
+                _this._addAsset(assetBaseURL, resource);
+            }
+            delete loadingPromises[assetBaseURL];
+        }, function() {
+            return delete loadingPromises[assetBaseURL];
+        });
+        if (queryPath) {
+            var subPromise = new AssetPromise(function(resolve, reject) {
+                _this._pushSubAssetPromiseCallback(assetURL, resolve, reject);
+            });
+            loadingPromises[assetURL] = subPromise;
+            subPromise.then(function() {
+                delete loadingPromises[assetURL];
             }, function() {
-                return delete loadingPromises[assetBaseURL];
+                return delete loadingPromises[assetURL];
             });
-            return promise;
-        } else {
-            var _loop = function(subURL) {
-                var subPromise = promise[subURL];
-                var isMaster = assetBaseURL === subURL;
-                loadingPromises[subURL] = subPromise;
-                subPromise.then(function(resource) {
-                    if (isMaster) {
-                        if (loader.useCache) {
-                            _this._addAsset(subURL, resource);
-                            for(var k in promise)delete loadingPromises[k];
-                        }
-                    }
-                }, function() {
-                    for(var k in promise)delete loadingPromises[k];
-                });
-            };
-            for(var subURL in promise)_loop(subURL);
-            return promise[assetURL].then(function(resource) {
-                return _this._getResolveResource(resource, paths);
+            promise.catch(function(e) {
+                _this._onSubAssetFail(assetURL, e);
             });
+            return subPromise;
         }
+        return promise;
+    };
+    _proto._pushSubAssetPromiseCallback = function _pushSubAssetPromiseCallback(assetURL, resolve, reject) {
+        this._subAssetPromiseCallbacks[assetURL] = {
+            resolve: resolve,
+            reject: reject
+        };
     };
     _proto._gc = function _gc(forceDestroy) {
         var objects = Utils.objectValues(this._referResourcePool);
@@ -13577,6 +13627,7 @@ var Collision = function Collision() {
     function PhysicsScene(scene) {
         var _this = this;
         this._restTime = 0;
+        this._fixedTimeStep = 1 / 60;
         this._colliders = new DisorderedArray();
         this._gravity = new Vector3(0, -9.81, 0);
         this._onContactEnter = function(obj1, obj2) {
@@ -13693,7 +13744,6 @@ var Collision = function Collision() {
                 script1._waitHandlingInValid || script1.onTriggerStay(shape1);
             }
         };
-        /** The fixed time step in seconds at which physics are performed. */ this.fixedTimeStep = 1 / 60;
         this._scene = scene;
         this._setGravity = this._setGravity.bind(this);
         //@ts-ignore
@@ -13750,7 +13800,7 @@ var Collision = function Collision() {
    * Call on every frame to update pose of objects.
    * @internal
    */ _proto._update = function _update(deltaTime) {
-        var _this = this, fixedTimeStep = _this.fixedTimeStep, nativePhysicsManager = _this._nativePhysicsScene;
+        var _this = this, fixedTimeStep = _this._fixedTimeStep, nativePhysicsManager = _this._nativePhysicsScene;
         var componentsManager = this._scene._componentsManager;
         var simulateTime = this._restTime + deltaTime;
         var step = Math.floor(simulateTime / fixedTimeStep);
@@ -13858,6 +13908,17 @@ var Collision = function Collision() {
                     gravity.copyFrom(value);
                 }
             }
+        },
+        {
+            key: "fixedTimeStep",
+            get: /**
+   * The fixed time step in seconds at which physics are performed.
+   */ function get() {
+                return this._fixedTimeStep;
+            },
+            set: function set(value) {
+                this._fixedTimeStep = Math.max(value, MathUtil$1.zeroTolerance);
+            }
         }
     ]);
     return PhysicsScene;
@@ -15731,6 +15792,7 @@ Joint = __decorate([
         CloneManager.deepCloneObject(this.renderStates, target.renderStates);
     };
     _proto._addReferCount = function _addReferCount(value) {
+        if (this._destroyed) return;
         ReferResource.prototype._addReferCount.call(this, value);
         this.shaderData._addReferCount(value);
     };