@galacean/engine 1.4.0-beta.1 → 1.4.0-beta.2

package/dist/browser.js

@@ -34782,11 +34782,7 @@
                 if (transition.mute) continue;
                 if (transitionCollection.isSoloMode && !transition.solo) continue;
                 if (this._checkConditions(transition)) {
-                    if (this._applyTransition(layerData, transition, aniUpdate)) {
-                        return transition;
-                    } else {
-                        return null;
-                    }
+                    return this._applyTransition(layerData, transition, aniUpdate);
                 }
             }
         };
@@ -34806,13 +34802,11 @@
             return true;
         };
         _proto._applyTransition = function _applyTransition(layerData, transition, aniUpdate) {
-            // Need prepare first, it should crossFade when to exit
-            var success = this._prepareCrossFadeByTransition(transition, layerData.layerIndex);
             if (transition.isExit) {
                 this._checkAnyAndEntryState(layerData, 0, aniUpdate);
-                return transition;
+                return null;
             }
-            return success ? transition : null;
+            return this._prepareCrossFadeByTransition(transition, layerData.layerIndex) ? transition : null;
         };
         _proto._checkConditions = function _checkConditions(transition) {
             var conditions = transition.conditions;
@@ -43434,10 +43428,16 @@
             return this._getEntityByConfig(entityConfig).then(function(entity) {
                 var _entityConfig_isActive;
                 entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : true;
-                var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
-                if (position) entity.transform.position.copyFrom(position);
-                if (rotation) entity.transform.rotation.copyFrom(rotation);
-                if (scale) entity.transform.scale.copyFrom(scale);
+                var transform = entity.transform;
+                var transformConfig = entityConfig.transform;
+                if (transformConfig) {
+                    _this.parsePropsAndMethods(transform, transformConfig);
+                } else {
+                    var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
+                    if (position) transform.position.copyFrom(position);
+                    if (rotation) transform.rotation.copyFrom(rotation);
+                    if (scale) transform.scale.copyFrom(scale);
+                }
                 var _entityConfig_layer;
                 entity.layer = (_entityConfig_layer = entityConfig.layer) != null ? _entityConfig_layer : entity.layer;
                 // @ts-ignore
@@ -43578,7 +43578,8 @@
                     return entity;
                 });
             } else {
-                var entity = new Entity(engine, entityConfig.name);
+                var transform = entityConfig.transform;
+                var entity = new Entity(engine, entityConfig.name, transform ? Loader.getClass(transform.class) : Transform);
                 return Promise.resolve(entity);
             }
         };
@@ -44071,7 +44072,8 @@
             });
         };
         _proto._parseEntity = function _parseEntity(entityConfig, engine) {
-            var entity = new Entity(engine, entityConfig.name);
+            var transform = entityConfig.transform;
+            var entity = new Entity(engine, entityConfig.name, transform ? Loader.getClass(transform.class) : Transform);
             if (!entityConfig.parent) this.context.rootIds.push(entityConfig.id);
             return Promise.resolve(entity);
         };
@@ -44131,11 +44133,17 @@
             entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : entity.isActive;
             var _entityConfig_name;
             entity.name = (_entityConfig_name = entityConfig.name) != null ? _entityConfig_name : entity.name;
-            var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale, layer = entityConfig.layer;
-            if (position) entity.transform.position.copyFrom(position);
-            if (rotation) entity.transform.rotation.copyFrom(rotation);
-            if (scale) entity.transform.scale.copyFrom(scale);
-            if (layer) entity.layer = layer;
+            var transform = entity.transform;
+            var transformConfig = entityConfig.transform;
+            if (transformConfig) {
+                this._reflectionParser.parsePropsAndMethods(transform, transformConfig);
+            } else {
+                var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
+                if (position) transform.position.copyFrom(position);
+                if (rotation) transform.rotation.copyFrom(rotation);
+                if (scale) transform.scale.copyFrom(scale);
+            }
+            if (entityConfig.layer) entity.layer = entityConfig.layer;
             return entity;
         };
         _proto._generateInstanceContext = function _generateInstanceContext(entity, context, path) {
@@ -49937,7 +49945,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.4.0-beta.1";
+    var version = "1.4.0-beta.2";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);