@galacean/engine 1.4.4 → 1.4.6

package/dist/browser.js

@@ -22323,21 +22323,14 @@
         };
         /**
        * Find the entity by path.
-       * @param path - The path fo the entity eg: /entity
+       * @param path - The path of the entity eg: /entity
        * @returns The component which be found
        */ _proto.findByPath = function findByPath(path) {
-            var splits = path.split("/");
-            var entity = this;
-            for(var i = 0, length = splits.length; i < length; ++i){
-                var split = splits[i];
-                if (split) {
-                    entity = Entity._findChildByName(entity, split);
-                    if (!entity) {
-                        return null;
-                    }
-                }
+            var splits = path.split("/").filter(Boolean);
+            if (!splits.length) {
+                return this;
             }
-            return entity;
+            return Entity._findChildByName(this, 0, splits, 0);
         };
         /**
        * Create child entity.
@@ -22669,15 +22662,19 @@
         };
         /**
        * @internal
-       */ Entity._findChildByName = function _findChildByName(root, name) {
-            var children = root._children;
-            for(var i = children.length - 1; i >= 0; i--){
-                var child = children[i];
-                if (child.name === name) {
-                    return child;
+       */ Entity._findChildByName = function _findChildByName(entity, childIndex, paths, pathIndex) {
+            var searchPath = paths[pathIndex];
+            var isEndPath = pathIndex === paths.length - 1;
+            var children = entity._children;
+            for(var n = children.length; childIndex < n; childIndex++){
+                var child = children[childIndex];
+                if (child.name === searchPath) {
+                    // Search success if end path, or downward search
+                    return isEndPath ? child : Entity._findChildByName(child, 0, paths, pathIndex + 1);
                 }
             }
-            return null;
+            // Search failed if first path, or upward search
+            return pathIndex === 0 ? null : Entity._findChildByName(entity.parent, entity.siblingIndex + 1, paths, pathIndex - 1);
         };
         /**
        * @internal
@@ -26102,7 +26099,16 @@
        */ _proto._onLateUpdate = function _onLateUpdate() {
             var transform = this.entity.transform;
             var worldPosition = transform.worldPosition, worldRotationQuaternion = transform.worldRotationQuaternion;
-            this._nativeCollider.getWorldTransform(worldPosition, worldRotationQuaternion);
+            var outPosition = DynamicCollider._tempVector3;
+            var outRotation = DynamicCollider._tempQuat;
+            this._nativeCollider.getWorldTransform(outPosition, outRotation);
+            // To resolve the issue where onValueChanged is triggered even though the values are equal
+            if (!Vector3.equals(outPosition, worldPosition)) {
+                worldPosition.copyFrom(outPosition);
+            }
+            if (!Quaternion.equals(outRotation, worldRotationQuaternion)) {
+                worldRotationQuaternion.copyFrom(outRotation);
+            }
             this._updateFlag.flag = false;
         };
         /**
@@ -26138,6 +26144,7 @@
             this._nativeCollider.setMaxDepenetrationVelocity(this._maxDepenetrationVelocity);
             this._nativeCollider.setSleepThreshold(this._sleepThreshold);
             this._nativeCollider.setSolverIterations(this._solverIterations);
+            this._nativeCollider.setUseGravity(this._useGravity);
             this._nativeCollider.setIsKinematic(this._isKinematic);
             this._nativeCollider.setConstraints(this._constraints);
             this._nativeCollider.setCollisionDetectionMode(this._collisionDetectionMode);
@@ -26437,6 +26444,8 @@
         ]);
         return DynamicCollider;
     }(exports.Collider);
+    DynamicCollider._tempVector3 = new Vector3();
+    DynamicCollider._tempQuat = new Quaternion();
     __decorate$1([
         ignoreClone
     ], DynamicCollider.prototype, "_linearVelocity", void 0);
@@ -26644,6 +26653,7 @@
        */ _proto._onEnableInScene = function _onEnableInScene() {
             this._createJoint();
             this._syncNative();
+            this._updateRotation();
         };
         /**
        * @internal
@@ -26672,20 +26682,19 @@
         _proto._calculateConnectedAnchor = function _calculateConnectedAnchor() {
             var colliderInfo = this._colliderInfo;
             var connectedColliderInfo = this._connectedColliderInfo;
-            var _this_entity_transform = this.entity.transform, selfPos = _this_entity_transform.worldPosition;
-            var selfActualAnchor = colliderInfo.actualAnchor;
             var connectedAnchor = connectedColliderInfo.anchor;
             var connectedActualAnchor = connectedColliderInfo.actualAnchor;
             var connectedCollider = connectedColliderInfo.collider;
             // @ts-ignore
             connectedAnchor._onValueChanged = null;
             if (connectedCollider) {
-                var _connectedCollider_entity_transform = connectedCollider.entity.transform, connectedPos = _connectedCollider_entity_transform.worldPosition, connectedWorldScale = _connectedCollider_entity_transform.lossyWorldScale;
-                Vector3.subtract(selfPos, connectedPos, Joint._tempVector3);
-                Vector3.add(Joint._tempVector3, selfActualAnchor, connectedActualAnchor);
-                Vector3.divide(connectedActualAnchor, connectedWorldScale, connectedAnchor);
+                var tempVector3 = Joint._tempVector3;
+                var tempMatrix = Joint._tempMatrix;
+                Vector3.transformCoordinate(colliderInfo.anchor, this.entity.transform.worldMatrix, tempVector3);
+                Matrix.invert(connectedCollider.entity.transform.worldMatrix, tempMatrix);
+                Vector3.transformCoordinate(tempVector3, tempMatrix, connectedAnchor);
             } else {
-                Vector3.add(selfPos, selfActualAnchor, connectedActualAnchor);
+                Vector3.transformCoordinate(colliderInfo.anchor, this.entity.transform.worldMatrix, connectedActualAnchor);
                 connectedAnchor.copyFrom(connectedActualAnchor);
             }
             // @ts-ignore
@@ -26709,6 +26718,17 @@
                 this._updateActualAnchor(2);
             }
         };
+        _proto._updateRotation = function _updateRotation() {
+            var _this__nativeJoint;
+            var quat = Joint._tempQuat;
+            var connectedColliderInfo = this._connectedColliderInfo;
+            var connectedCollider = connectedColliderInfo.collider;
+            if (connectedCollider) {
+                Quaternion.invert(connectedCollider.entity.transform.worldRotationQuaternion, quat);
+            }
+            Quaternion.multiply(quat, this.entity.transform.worldRotationQuaternion, quat);
+            (_this__nativeJoint = this._nativeJoint) == null ? void 0 : _this__nativeJoint.setRotation(quat);
+        };
         _proto._updateActualAnchor = function _updateActualAnchor(flag) {
             if (flag & 1) {
                 var _this__nativeJoint;
@@ -26746,6 +26766,7 @@
                         value == null ? void 0 : value.entity._updateFlagManager.addListener(this._onConnectedTransformChanged);
                         this._connectedColliderInfo.collider = value;
                         (_this__nativeJoint = this._nativeJoint) == null ? void 0 : _this__nativeJoint.setConnectedCollider(value == null ? void 0 : value._nativeCollider);
+                        this._updateRotation();
                         if (this._automaticConnectedAnchor) {
                             this._calculateConnectedAnchor();
                         } else {
@@ -26892,6 +26913,8 @@
         return Joint;
     }(Component);
     exports.Joint._tempVector3 = new Vector3();
+    exports.Joint._tempQuat = new Quaternion();
+    exports.Joint._tempMatrix = new Matrix();
     __decorate$1([
         deepClone
     ], exports.Joint.prototype, "_colliderInfo", void 0);
@@ -31713,12 +31736,20 @@
        * @returns Entity
        */ _proto.findEntityByPath = function findEntityByPath(path) {
             var splits = path.split("/").filter(Boolean);
+            if (!splits.length) {
+                return null;
+            }
+            var searchRootName = splits.shift();
             for(var i = 0, n = this.rootEntitiesCount; i < n; i++){
                 var findEntity = this.getRootEntity(i);
-                if (findEntity.name != splits[0]) continue;
-                for(var j = 1, m = splits.length; j < m; ++j){
-                    findEntity = Entity._findChildByName(findEntity, splits[j]);
-                    if (!findEntity) break;
+                if (findEntity.name !== searchRootName) {
+                    continue;
+                }
+                if (splits.length) {
+                    findEntity = Entity._findChildByName(findEntity, 0, splits, 0);
+                    if (!findEntity) {
+                        continue;
+                    }
                 }
                 return findEntity;
             }
@@ -43948,6 +43979,7 @@
             this._organizeEntities = this._organizeEntities.bind(this);
             this._parseComponents = this._parseComponents.bind(this);
             this._parsePrefabModification = this._parsePrefabModification.bind(this);
+            this._parseAddedComponents = this._parseAddedComponents.bind(this);
             this._parsePrefabRemovedEntities = this._parsePrefabRemovedEntities.bind(this);
             this._parsePrefabRemovedComponents = this._parsePrefabRemovedComponents.bind(this);
             this._clearAndResolve = this._clearAndResolve.bind(this);
@@ -43959,7 +43991,7 @@
         }
         var _proto = HierarchyParser.prototype;
         /** start parse the scene or prefab or others */ _proto.start = function start() {
-            this._parseEntities().then(this._organizeEntities).then(this._parseComponents).then(this._parsePrefabModification).then(this._parsePrefabRemovedEntities).then(this._parsePrefabRemovedComponents).then(this._clearAndResolve).then(this._resolve).catch(this._reject);
+            this._parseEntities().then(this._organizeEntities).then(this._parseComponents).then(this._parsePrefabModification).then(this._parseAddedComponents).then(this._parsePrefabRemovedEntities).then(this._parsePrefabRemovedComponents).then(this._clearAndResolve).then(this._resolve).catch(this._reject);
         };
         _proto._parseEntities = function _parseEntities() {
             var _this = this;
@@ -43987,21 +44019,11 @@
             var promises = [];
             for(var i = 0, l = entitiesConfig.length; i < l; i++){
                 var entityConfig = entitiesConfig[i];
-                var entity = entityMap.get(entityConfig.id);
-                for(var i1 = 0; i1 < entityConfig.components.length; i1++){
-                    var componentConfig = entityConfig.components[i1];
-                    var key = !componentConfig.refId ? componentConfig.class : componentConfig.refId;
-                    var component = entity.addComponent(Loader.getClass(key));
-                    this.context.addComponent(componentConfig.id, component);
-                    var promise = this._reflectionParser.parsePropsAndMethods(component, componentConfig);
-                    promises.push(promise);
+                if (entityConfig.strippedId) {
+                    continue;
                 }
-            }
-            for(var _iterator = _create_for_of_iterator_helper_loose(this.context.componentWaitingMap.values()), _step; !(_step = _iterator()).done;){
-                var waitingList = _step.value;
-                waitingList.forEach(function(resolve) {
-                    return resolve(null);
-                });
+                var entity = entityMap.get(entityConfig.id);
+                this._addComponents(entity, entityConfig.components, promises);
             }
             return Promise.all(promises);
         };
@@ -44036,6 +44058,25 @@
             for(var i = 0, l = entitiesConfig.length; i < l; i++)_loop(i);
             return Promise.all(promises);
         };
+        _proto._parseAddedComponents = function _parseAddedComponents() {
+            var entityMap = this.context.entityMap;
+            var entityConfigMap = this.context.entityConfigMap;
+            var strippedIds = this.context.strippedIds;
+            var promises = [];
+            for(var i = 0, n = strippedIds.length; i < n; i++){
+                var entityConfig = entityConfigMap.get(strippedIds[i]);
+                var prefabContext = this._prefabContextMap.get(entityMap.get(entityConfig.prefabInstanceId));
+                var entity = prefabContext.entityMap.get(entityConfig.prefabSource.entityId);
+                this._addComponents(entity, entityConfig.components, promises);
+            }
+            for(var _iterator = _create_for_of_iterator_helper_loose(this.context.componentWaitingMap.values()), _step; !(_step = _iterator()).done;){
+                var waitingList = _step.value;
+                waitingList.forEach(function(resolve) {
+                    return resolve(null);
+                });
+            }
+            return Promise.all(promises);
+        };
         _proto._parsePrefabRemovedEntities = function _parsePrefabRemovedEntities() {
             var _loop = function _loop(i, l) {
                 var entityConfig = entitiesConfig[i];
@@ -44165,6 +44206,17 @@
                 }
             }
         };
+        _proto._addComponents = function _addComponents(entity, components, promises) {
+            for(var i = 0, n = components.length; i < n; i++){
+                var componentConfig = components[i];
+                var key = !componentConfig.refId ? componentConfig.class : componentConfig.refId;
+                var component = entity.addComponent(Loader.getClass(key));
+                this.context.addComponent(componentConfig.id, component);
+                var promise = this._reflectionParser.parsePropsAndMethods(component, componentConfig);
+                promises.push(promise);
+            }
+            return promises;
+        };
         _proto._applyEntityData = function _applyEntityData(entity, entityConfig) {
             if (entityConfig === void 0) entityConfig = {};
             var _entityConfig_isActive;
@@ -49983,7 +50035,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.4.4";
+    var version = "1.4.6";
     console.log("Galacean Engine Version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);