@galacean/engine-core 2.0.0-alpha.41 → 2.0.0-alpha.43

package/dist/module.js

@@ -3061,7 +3061,7 @@ var Utils = /*#__PURE__*/ function() {
    * @param url - The url to be judged.
    * @returns Whether the url is absolute url.
    */ Utils.isAbsoluteUrl = function isAbsoluteUrl(url) {
-        return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url);
+        return /^(?:[a-z][a-z\d+.-]*:|\/\/)/i.test(url);
     };
     /**
    * Judge whether the url is base64 url.
@@ -3086,16 +3086,15 @@ var Utils = /*#__PURE__*/ function() {
         if (Utils.isAbsoluteUrl(relativeUrl)) {
             return relativeUrl;
         }
-        if (Utils.isBase64Url(relativeUrl)) {
-            return relativeUrl;
-        }
         if (Utils.isAbsoluteUrl(baseUrl)) {
             return relativeUrl ? new URL(relativeUrl, baseUrl).href : baseUrl;
         }
-        var head = "file://";
-        var encodedBaseUrl = head + this._encodePathComponents(baseUrl);
+        // Use an empty file URL host to preserve path casing
+        var hasLeadingSlash = baseUrl.startsWith("/") || relativeUrl.startsWith("/");
+        var encodedBaseUrl = "file:///" + this._encodePathComponents(baseUrl.replace(/^\/+/, ""));
         var encodedRelativeUrl = this._encodePathComponents(relativeUrl);
-        return decodeURIComponent(new URL(encodedRelativeUrl, encodedBaseUrl).href.slice(head.length));
+        var resolvedPath = decodeURIComponent(new URL(encodedRelativeUrl, encodedBaseUrl).pathname);
+        return hasLeadingSlash ? resolvedPath : resolvedPath.slice(1);
     };
     /**
    * @internal
@@ -6320,8 +6319,8 @@ function _construct(Parent, args, Class) {
         children.length = 0;
     };
     /**
-   * Clone this entity include children and components.
-   * @returns Cloned entity
+   * Clone this Entity, including children and components.
+   * @returns A detached clone that must be added to a parent Entity or Scene to update and render
    */ _proto.clone = function clone() {
         var cloneMap = new Map();
         var cloneEntity = this._createCloneEntity(cloneMap);
@@ -7787,6 +7786,7 @@ var RendererUpdateFlags = /*#__PURE__*/ function(RendererUpdateFlags) {
             this._intView = new Int32Array(this._data);
             (_this_buffer = this.buffer) == null ? void 0 : _this_buffer.destroy();
             this.buffer = new Buffer(this._engine, BufferBindFlag.ConstantBuffer, totalBytes, BufferUsage.Dynamic);
+            this.buffer.isGCIgnored = true;
         }
     };
     /**
@@ -18630,11 +18630,11 @@ var MultiExecutor = /*#__PURE__*/ function() {
     };
     /**
    * Get the resource from cache by asset url, return the resource object if it loaded, otherwise return null.
-   * @param url - Resource url
+   * @param url - Resource URL
    * @returns Resource object
    */ _proto.getFromCache = function getFromCache(url) {
-        var _this__assetUrlPool_url;
-        return (_this__assetUrlPool_url = this._assetUrlPool[url]) != null ? _this__assetUrlPool_url : null;
+        var _this__assetUrlPool_this__getRemoteUrl;
+        return (_this__assetUrlPool_this__getRemoteUrl = this._assetUrlPool[this._getRemoteUrl(url)]) != null ? _this__assetUrlPool_this__getRemoteUrl : null;
     };
     /**
    * Find the resource by type.
@@ -18659,19 +18659,18 @@ var MultiExecutor = /*#__PURE__*/ function() {
         return this._assetPool[instanceId];
     };
     _proto.cancelNotLoaded = function cancelNotLoaded(url) {
-        var _this = this;
         if (!url) {
             Utils.objectValues(this._loadingPromises).forEach(function(promise) {
                 promise.cancel();
             });
         } else if (typeof url === "string") {
-            var _this__loadingPromises_url;
-            (_this__loadingPromises_url = this._loadingPromises[url]) == null ? void 0 : _this__loadingPromises_url.cancel();
+            var _this__loadingPromises_this__getLoadingKey;
+            (_this__loadingPromises_this__getLoadingKey = this._loadingPromises[this._getLoadingKey(url)]) == null ? void 0 : _this__loadingPromises_this__getLoadingKey.cancel();
         } else {
-            url.forEach(function(p) {
-                var _this__loadingPromises_p;
-                (_this__loadingPromises_p = _this._loadingPromises[p]) == null ? void 0 : _this__loadingPromises_p.cancel();
-            });
+            for(var i = 0, n = url.length; i < n; i++){
+                var _this__loadingPromises_this__getLoadingKey1;
+                (_this__loadingPromises_this__getLoadingKey1 = this._loadingPromises[this._getLoadingKey(url[i])]) == null ? void 0 : _this__loadingPromises_this__getLoadingKey1.cancel();
+            }
         }
     };
     /**
@@ -18693,7 +18692,7 @@ var MultiExecutor = /*#__PURE__*/ function() {
    */ _proto._getRemoteUrl = function _getRemoteUrl(url) {
         var _this__virtualPathResourceMap_url;
         var _this__virtualPathResourceMap_url_path;
-        return (_this__virtualPathResourceMap_url_path = (_this__virtualPathResourceMap_url = this._virtualPathResourceMap[url]) == null ? void 0 : _this__virtualPathResourceMap_url.path) != null ? _this__virtualPathResourceMap_url_path : url;
+        return (_this__virtualPathResourceMap_url_path = (_this__virtualPathResourceMap_url = this._virtualPathResourceMap[url]) == null ? void 0 : _this__virtualPathResourceMap_url.path) != null ? _this__virtualPathResourceMap_url_path : this.baseUrl ? Utils.resolveAbsoluteUrl(this.baseUrl, url) : url;
     };
     /**
    * @internal
@@ -18708,17 +18707,14 @@ var MultiExecutor = /*#__PURE__*/ function() {
     };
     /**
    * @internal
-   */ _proto._onSubAssetSuccess = function _onSubAssetSuccess(assetBaseURL, assetSubPath, value) {
-        var _this__virtualPathResourceMap_assetBaseURL, _this__subAssetPromiseCallbacks_remoteAssetBaseURL;
-        var _this__virtualPathResourceMap_assetBaseURL_path;
-        var remoteAssetBaseURL = (_this__virtualPathResourceMap_assetBaseURL_path = (_this__virtualPathResourceMap_assetBaseURL = this._virtualPathResourceMap[assetBaseURL]) == null ? void 0 : _this__virtualPathResourceMap_assetBaseURL.path) != null ? _this__virtualPathResourceMap_assetBaseURL_path : assetBaseURL;
-        var subPromiseCallback = (_this__subAssetPromiseCallbacks_remoteAssetBaseURL = this._subAssetPromiseCallbacks[remoteAssetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_remoteAssetBaseURL[assetSubPath];
+   */ _proto._onSubAssetSuccess = function _onSubAssetSuccess(remoteAssetBaseURL, assetSubPath, value) {
+        var _this__subAssetPromiseCallbacks, _remoteAssetBaseURL;
+        var subAssetPromiseCallbacks = (_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_remoteAssetBaseURL = remoteAssetBaseURL] || (_this__subAssetPromiseCallbacks[_remoteAssetBaseURL] = {});
+        var subPromiseCallback = subAssetPromiseCallbacks[assetSubPath];
         if (subPromiseCallback) {
             subPromiseCallback.resolve(value);
         } else {
-            var // Pending
-            _this__subAssetPromiseCallbacks, _remoteAssetBaseURL;
-            ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_remoteAssetBaseURL = remoteAssetBaseURL] || (_this__subAssetPromiseCallbacks[_remoteAssetBaseURL] = {}))[assetSubPath] = {
+            subAssetPromiseCallbacks[assetSubPath] = {
                 resolvedValue: value
             };
         }
@@ -18830,13 +18826,10 @@ var MultiExecutor = /*#__PURE__*/ function() {
         // Parse url
         var _this__parseURL = this._parseURL(item.url), assetBaseURL = _this__parseURL.assetBaseURL, queryPath = _this__parseURL.queryPath;
         var paths = queryPath ? this._parseQueryPath(queryPath) : [];
-        // Get remote asset base url
         var virtualResourceEntry = this._virtualPathResourceMap[assetBaseURL];
         this._resolveLoadItemOptions(item, virtualResourceEntry);
-        // Not absolute and base url is set
-        item.url = !Utils.isAbsoluteUrl(assetBaseURL) && this.baseUrl ? Utils.resolveAbsoluteUrl(this.baseUrl, assetBaseURL) : assetBaseURL;
-        var _virtualResourceEntry_path;
-        var remoteAssetBaseURL = (_virtualResourceEntry_path = virtualResourceEntry == null ? void 0 : virtualResourceEntry.path) != null ? _virtualResourceEntry_path : item.url;
+        var remoteAssetBaseURL = this._getRemoteUrl(assetBaseURL);
+        item.url = assetBaseURL;
         // Check cache
         var cacheObject = this._assetUrlPool[remoteAssetBaseURL];
         if (cacheObject) {
@@ -18844,15 +18837,7 @@ var MultiExecutor = /*#__PURE__*/ function() {
                 resolve(_this._getResolveResource(cacheObject, paths));
             });
         }
-        // Get asset url
-        var remoteAssetURL = remoteAssetBaseURL;
-        if (queryPath) {
-            remoteAssetURL += "?q=" + paths.shift();
-            var index;
-            while(index = paths.shift()){
-                remoteAssetURL += "[" + index + "]";
-            }
-        }
+        var remoteAssetURL = this._getRemoteAssetURL(remoteAssetBaseURL, paths);
         // Check is loading
         var loadingPromises = this._loadingPromises;
         var loadingPromise = loadingPromises[remoteAssetURL];
@@ -18958,6 +18943,21 @@ var MultiExecutor = /*#__PURE__*/ function() {
         }
         return subResource;
     };
+    _proto._getLoadingKey = function _getLoadingKey(url) {
+        var _this__parseURL = this._parseURL(url), assetBaseURL = _this__parseURL.assetBaseURL, queryPath = _this__parseURL.queryPath;
+        var remoteAssetBaseURL = this._getRemoteUrl(assetBaseURL);
+        return queryPath ? this._getRemoteAssetURL(remoteAssetBaseURL, this._parseQueryPath(queryPath)) : remoteAssetBaseURL;
+    };
+    _proto._getRemoteAssetURL = function _getRemoteAssetURL(remoteAssetBaseURL, paths) {
+        var remoteAssetURL = remoteAssetBaseURL;
+        if (paths.length > 0) {
+            remoteAssetURL += "?q=" + paths[0];
+            for(var i = 1, n = paths.length; i < n; i++){
+                remoteAssetURL += "[" + paths[i] + "]";
+            }
+        }
+        return remoteAssetURL;
+    };
     _proto._parseURL = function _parseURL(path) {
         var _path_split = path.split("?"), baseUrl = _path_split[0], searchStr = _path_split[1];
         var queryPath = undefined;
@@ -19599,6 +19599,7 @@ var Collider = /*#__PURE__*/ function(Component) {
     var _proto = Collider.prototype;
     /**
    * Add collider shape on this collider.
+   * @remarks If the shape belongs to another Collider, it is moved to this Collider.
    * @param shape - Collider shape
    */ _proto.addShape = function addShape(shape) {
         var oldCollider = shape._collider;
@@ -20501,7 +20502,7 @@ __decorate([
     };
     _proto._syncNative = function _syncNative() {
         // Non-convex triangle meshes require a kinematic native actor before attachment
-        this._nativeCollider.setIsKinematic(this._isKinematic);
+        this._nativeCollider.setMotionState(this._isKinematic, this._collisionDetectionMode);
         Collider.prototype._syncNative.call(this);
         this._nativeCollider.setLinearDamping(this._linearDamping);
         this._nativeCollider.setAngularDamping(this._angularDamping);
@@ -20520,7 +20521,6 @@ __decorate([
         this._nativeCollider.setSolverIterations(this._solverIterations);
         this._nativeCollider.setUseGravity(this._useGravity);
         this._nativeCollider.setConstraints(this._constraints);
-        this._nativeCollider.setCollisionDetectionMode(this._collisionDetectionMode);
     };
     _proto._setMassAndUpdateInertia = function _setMassAndUpdateInertia() {
         // Kinematic bodies don't need mass/inertia computation (PhysX doc: mass is not used in kinematic mode)
@@ -20797,13 +20797,9 @@ __decorate([
                         }
                     }
                     this._isKinematic = value;
-                    this._nativeCollider.setIsKinematic(value);
-                    // Resync properties that PhysX ignores/resets during kinematic mode
-                    if (!value) {
-                        this._nativeCollider.setCollisionDetectionMode(this._collisionDetectionMode);
-                        if (this._automaticCenterOfMass || this._automaticInertiaTensor) {
-                            this._setMassAndUpdateInertia();
-                        }
+                    this._nativeCollider.setMotionState(value, this._collisionDetectionMode);
+                    if (!value && (this._automaticCenterOfMass || this._automaticInertiaTensor)) {
+                        this._setMassAndUpdateInertia();
                     }
                 }
             }
@@ -20825,14 +20821,16 @@ __decorate([
         {
             key: "collisionDetectionMode",
             get: /**
-   * The colliders' collision detection mode.
+   * The collision detection mode.
+   * @remarks With the PhysX backend, Continuous and ContinuousDynamic are mapped to speculative CCD while the collider
+   * is kinematic.
    */ function get() {
                 return this._collisionDetectionMode;
             },
             set: function set(value) {
                 if (this._collisionDetectionMode !== value) {
                     this._collisionDetectionMode = value;
-                    this._nativeCollider.setCollisionDetectionMode(value);
+                    this._nativeCollider.setMotionState(this._isKinematic, value);
                 }
             }
         }
@@ -20919,8 +20917,7 @@ __decorate([
    * You need to obtain the actual number of contact points from the function's return value.
    */ _proto.getContacts = function getContacts(outContacts) {
         var nativeCollision = this._nativeCollision;
-        var smallerShapeId = Math.min(nativeCollision.shape0Id, nativeCollision.shape1Id);
-        var factor = this.shape.id === smallerShapeId ? 1 : -1;
+        var factor = this.shape.id === nativeCollision.shape1Id ? 1 : -1;
         var nativeContactPoints = nativeCollision.getContacts();
         var length = nativeContactPoints.size();
         for(var i = 0; i < length; i++){
@@ -20955,6 +20952,7 @@ __decorate([
         this._fixedTimeStep = 1 / 60;
         this._colliders = new DisorderedArray();
         this._gravity = new Vector3(0, -9.81, 0);
+        this._contactEventConsumerCount = 0;
         this._scene = scene;
         this._setGravity = this._setGravity.bind(this);
         //@ts-ignore
@@ -20962,6 +20960,7 @@ __decorate([
         var engine = scene.engine;
         if (engine._physicsInitialized) {
             this._nativePhysicsScene = Engine._nativePhysics.createPhysicsScene(engine._nativePhysicsManager);
+            this._nativePhysicsScene.setContactEventEnabled(false);
         }
     }
     var _proto = PhysicsScene.prototype;
@@ -21220,6 +21219,17 @@ __decorate([
     };
     /**
    * @internal
+   */ _proto._addContactEventConsumer = function _addContactEventConsumer(delta) {
+        var wasEnabled = this._contactEventConsumerCount > 0;
+        this._contactEventConsumerCount += delta;
+        var enabled = this._contactEventConsumerCount > 0;
+        if (wasEnabled !== enabled) {
+            var _this__nativePhysicsScene;
+            (_this__nativePhysicsScene = this._nativePhysicsScene) == null ? void 0 : _this__nativePhysicsScene.setContactEventEnabled(enabled);
+        }
+    };
+    /**
+   * @internal
    */ _proto._callColliderOnUpdate = function _callColliderOnUpdate() {
         var elements = this._colliders._elements;
         for(var i = this._colliders.length - 1; i >= 0; --i){
@@ -29443,6 +29453,9 @@ Scene._prefilterdDFGProperty = ShaderProperty.getByName("scene_PrefilteredDFG");
             }
         }
         this._entity._addScript(this);
+        if (this._hasCollisionEventCallbacks()) {
+            this.scene.physics._addContactEventConsumer(1);
+        }
     };
     /**
    * @internal
@@ -29462,6 +29475,9 @@ Scene._prefilterdDFGProperty = ShaderProperty.getByName("scene_PrefilteredDFG");
             componentsManager.removeOnPhysicsUpdateScript(this);
         }
         this._entity._removeScript(this);
+        if (this._hasCollisionEventCallbacks()) {
+            this.scene.physics._addContactEventConsumer(-1);
+        }
     };
     /**
    * @internal
@@ -29469,6 +29485,10 @@ Scene._prefilterdDFGProperty = ShaderProperty.getByName("scene_PrefilteredDFG");
         Component.prototype._onDestroy.call(this);
         this.onDestroy();
     };
+    _proto._hasCollisionEventCallbacks = function _hasCollisionEventCallbacks() {
+        var prototype = Script.prototype;
+        return this.onCollisionEnter !== prototype.onCollisionEnter || this.onCollisionExit !== prototype.onCollisionExit || this.onCollisionStay !== prototype.onCollisionStay;
+    };
     return Script;
 }(Component);
 __decorate([
@@ -35152,6 +35172,23 @@ __decorate([
         this._gradients.delete(name);
     };
     /**
+   * Remove all custom data streams.
+   */ _proto.clear = function clear() {
+        var shaderData = this._generator._renderer.shaderData;
+        var curveStreams = this._curveStreams;
+        for(var i = 0, n = curveStreams.length; i < n; i++){
+            this._zeroCurveUniforms(shaderData, curveStreams[i]);
+        }
+        var gradientStreams = this._gradientStreams;
+        for(var i1 = 0, n1 = gradientStreams.length; i1 < n1; i1++){
+            this._zeroGradientUniforms(shaderData, gradientStreams[i1]);
+        }
+        this._curves.clear();
+        this._gradients.clear();
+        curveStreams.length = 0;
+        gradientStreams.length = 0;
+    };
+    /**
    * @internal
    */ _proto._updateShaderData = function _updateShaderData(shaderData) {
         if (!this.enabled) {
@@ -35277,7 +35314,7 @@ CustomDataModule._zeroVector4 = new Vector4(0, 0, 0, 0);
         _this = DataObject.call(this) || this, _this._updateManager = new UpdateFlagManager(), _this._mode = ParticleCurveMode.Constant, _this._constantMin = 0, _this._constantMax = 0;
         _this._updateDispatch = _this._updateManager.dispatch.bind(_this._updateManager);
         if (typeof constantOrCurve === "number") {
-            if (constantMaxOrCurveMax) {
+            if (constantMaxOrCurveMax !== undefined) {
                 _this.constantMin = constantOrCurve;
                 _this.constantMax = constantMaxOrCurveMax;
                 _this.mode = ParticleCurveMode.TwoConstants;
@@ -35286,7 +35323,7 @@ CustomDataModule._zeroVector4 = new Vector4(0, 0, 0, 0);
                 _this.mode = ParticleCurveMode.Constant;
             }
         } else {
-            if (constantMaxOrCurveMax) {
+            if (constantMaxOrCurveMax !== undefined) {
                 _this.curveMin = constantOrCurve;
                 _this.curveMax = constantMaxOrCurveMax;
                 _this.mode = ParticleCurveMode.TwoCurves;
@@ -37971,6 +38008,15 @@ __decorate([
         this._generator._setTransformFeedback();
     };
     /**
+   * Remove all sub-emitter slots.
+   */ _proto.clear = function clear() {
+        if (this._subEmitters.length === 0) {
+            return;
+        }
+        this._subEmitters.length = 0;
+        this._generator._setTransformFeedback();
+    };
+    /**
    * @internal
    */ _proto._dispatchEvent = function _dispatchEvent(type, worldPosition, parentColor, parentSize, parentRotation, worldDirection) {
         var subEmitters = this.subEmitters;