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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/browser.js CHANGED
@@ -34782,11 +34782,7 @@
34782
34782
  if (transition.mute) continue;
34783
34783
  if (transitionCollection.isSoloMode && !transition.solo) continue;
34784
34784
  if (this._checkConditions(transition)) {
34785
- if (this._applyTransition(layerData, transition, aniUpdate)) {
34786
- return transition;
34787
- } else {
34788
- return null;
34789
- }
34785
+ return this._applyTransition(layerData, transition, aniUpdate);
34790
34786
  }
34791
34787
  }
34792
34788
  };
@@ -34806,13 +34802,11 @@
34806
34802
  return true;
34807
34803
  };
34808
34804
  _proto._applyTransition = function _applyTransition(layerData, transition, aniUpdate) {
34809
- // Need prepare first, it should crossFade when to exit
34810
- var success = this._prepareCrossFadeByTransition(transition, layerData.layerIndex);
34811
34805
  if (transition.isExit) {
34812
34806
  this._checkAnyAndEntryState(layerData, 0, aniUpdate);
34813
- return transition;
34807
+ return null;
34814
34808
  }
34815
- return success ? transition : null;
34809
+ return this._prepareCrossFadeByTransition(transition, layerData.layerIndex) ? transition : null;
34816
34810
  };
34817
34811
  _proto._checkConditions = function _checkConditions(transition) {
34818
34812
  var conditions = transition.conditions;
@@ -43434,10 +43428,16 @@
43434
43428
  return this._getEntityByConfig(entityConfig).then(function(entity) {
43435
43429
  var _entityConfig_isActive;
43436
43430
  entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : true;
43437
- var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
43438
- if (position) entity.transform.position.copyFrom(position);
43439
- if (rotation) entity.transform.rotation.copyFrom(rotation);
43440
- if (scale) entity.transform.scale.copyFrom(scale);
43431
+ var transform = entity.transform;
43432
+ var transformConfig = entityConfig.transform;
43433
+ if (transformConfig) {
43434
+ _this.parsePropsAndMethods(transform, transformConfig);
43435
+ } else {
43436
+ var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
43437
+ if (position) transform.position.copyFrom(position);
43438
+ if (rotation) transform.rotation.copyFrom(rotation);
43439
+ if (scale) transform.scale.copyFrom(scale);
43440
+ }
43441
43441
  var _entityConfig_layer;
43442
43442
  entity.layer = (_entityConfig_layer = entityConfig.layer) != null ? _entityConfig_layer : entity.layer;
43443
43443
  // @ts-ignore
@@ -43578,7 +43578,8 @@
43578
43578
  return entity;
43579
43579
  });
43580
43580
  } else {
43581
- var entity = new Entity(engine, entityConfig.name);
43581
+ var transform = entityConfig.transform;
43582
+ var entity = new Entity(engine, entityConfig.name, transform ? Loader.getClass(transform.class) : Transform);
43582
43583
  return Promise.resolve(entity);
43583
43584
  }
43584
43585
  };
@@ -44071,7 +44072,8 @@
44071
44072
  });
44072
44073
  };
44073
44074
  _proto._parseEntity = function _parseEntity(entityConfig, engine) {
44074
- var entity = new Entity(engine, entityConfig.name);
44075
+ var transform = entityConfig.transform;
44076
+ var entity = new Entity(engine, entityConfig.name, transform ? Loader.getClass(transform.class) : Transform);
44075
44077
  if (!entityConfig.parent) this.context.rootIds.push(entityConfig.id);
44076
44078
  return Promise.resolve(entity);
44077
44079
  };
@@ -44131,11 +44133,17 @@
44131
44133
  entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : entity.isActive;
44132
44134
  var _entityConfig_name;
44133
44135
  entity.name = (_entityConfig_name = entityConfig.name) != null ? _entityConfig_name : entity.name;
44134
- var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale, layer = entityConfig.layer;
44135
- if (position) entity.transform.position.copyFrom(position);
44136
- if (rotation) entity.transform.rotation.copyFrom(rotation);
44137
- if (scale) entity.transform.scale.copyFrom(scale);
44138
- if (layer) entity.layer = layer;
44136
+ var transform = entity.transform;
44137
+ var transformConfig = entityConfig.transform;
44138
+ if (transformConfig) {
44139
+ this._reflectionParser.parsePropsAndMethods(transform, transformConfig);
44140
+ } else {
44141
+ var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
44142
+ if (position) transform.position.copyFrom(position);
44143
+ if (rotation) transform.rotation.copyFrom(rotation);
44144
+ if (scale) transform.scale.copyFrom(scale);
44145
+ }
44146
+ if (entityConfig.layer) entity.layer = entityConfig.layer;
44139
44147
  return entity;
44140
44148
  };
44141
44149
  _proto._generateInstanceContext = function _generateInstanceContext(entity, context, path) {
@@ -49937,7 +49945,7 @@
49937
49945
  ], EXT_texture_webp);
49938
49946
 
49939
49947
  //@ts-ignore
49940
- var version = "1.4.0-beta.0";
49948
+ var version = "1.4.0-beta.2";
49941
49949
  console.log("Galacean engine version: " + version);
49942
49950
  for(var key in CoreObjects){
49943
49951
  Loader.registerClass(key, CoreObjects[key]);