@galacean/effects-threejs 2.0.0-alpha.30 → 2.0.0-alpha.31

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/index.js CHANGED
@@ -3,7 +3,7 @@
3
3
  * Description: Galacean Effects runtime threejs plugin for the web
4
4
  * Author: Ant Group CO., Ltd.
5
5
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
6
- * Version: v2.0.0-alpha.30
6
+ * Version: v2.0.0-alpha.31
7
7
  */
8
8
 
9
9
  'use strict';
@@ -8434,7 +8434,8 @@ var seed$a = 1;
8434
8434
  texture = Texture.create(engine, {
8435
8435
  sourceType: exports.TextureSourceType.image,
8436
8436
  image: image,
8437
- id: generateGUID()
8437
+ id: generateGUID(),
8438
+ flipY: true
8438
8439
  });
8439
8440
  texture.initialize();
8440
8441
  return [
@@ -13503,6 +13504,11 @@ var SpriteLoader = /*#__PURE__*/ function(AbstractPlugin) {
13503
13504
  return SpriteLoader;
13504
13505
  }(AbstractPlugin);
13505
13506
 
13507
+ function _assert_this_initialized(self) {
13508
+ if (self === void 0) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
13509
+ return self;
13510
+ }
13511
+
13506
13512
  /**
13507
13513
  * 动画图,负责更新所有的动画节点
13508
13514
  * @since 2.0.0
@@ -13910,6 +13916,8 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
13910
13916
  function SpriteComponent(engine, props) {
13911
13917
  var _this;
13912
13918
  _this = RendererComponent.call(this, engine) || this;
13919
+ _this.cachePrefix = "-";
13920
+ _this.frameAnimationLoop = false;
13913
13921
  _this.frameAnimationTime = 0;
13914
13922
  _this.color = [
13915
13923
  1,
@@ -13933,6 +13941,39 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
13933
13941
  }
13934
13942
  }
13935
13943
  };
13944
+ _this.name = "MSprite" + seed$4++;
13945
+ _this.renderer = {
13946
+ renderMode: RenderMode.BILLBOARD,
13947
+ blending: BlendingMode.ALPHA,
13948
+ texture: _this.engine.emptyTexture,
13949
+ occlusion: false,
13950
+ transparentOcclusion: false,
13951
+ side: SideMode.DOUBLE,
13952
+ mask: 0,
13953
+ maskMode: MaskMode.NONE,
13954
+ order: 0
13955
+ };
13956
+ _this.emptyTexture = _this.engine.emptyTexture;
13957
+ _this.splits = singleSplits;
13958
+ _this.renderInfo = getImageItemRenderInfo(_assert_this_initialized(_this));
13959
+ var geometry = _this.createGeometry(glContext.TRIANGLES);
13960
+ var material = _this.createMaterial(_this.renderInfo, 2);
13961
+ _this.worldMatrix = Matrix4.fromIdentity();
13962
+ _this.material = material;
13963
+ _this.geometry = geometry;
13964
+ _this.material.setVector4("_Color", new Vector4().setFromArray([
13965
+ 1,
13966
+ 1,
13967
+ 1,
13968
+ 1
13969
+ ]));
13970
+ _this.material.setVector4("_TexOffset", new Vector4().setFromArray([
13971
+ 0,
13972
+ 0,
13973
+ 1,
13974
+ 1
13975
+ ]));
13976
+ _this.setItem();
13936
13977
  if (props) {
13937
13978
  _this.fromData(props);
13938
13979
  }
@@ -13986,9 +14027,13 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
13986
14027
  this.frameAnimationTime += dt / 1000;
13987
14028
  var time = this.frameAnimationTime;
13988
14029
  var duration = this.item.duration;
14030
+ if (time > duration && this.frameAnimationLoop) {
14031
+ time = time % duration;
14032
+ }
13989
14033
  var life = Math.min(Math.max(time / duration, 0.0), 1.0);
13990
14034
  var ta = this.textureSheetAnimation;
13991
14035
  if (ta) {
14036
+ var _this_material_getVector4;
13992
14037
  var total = ta.total || ta.row * ta.col;
13993
14038
  var texRectX = 0;
13994
14039
  var texRectY = 0;
@@ -14034,7 +14079,7 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
14034
14079
  dy
14035
14080
  ];
14036
14081
  }
14037
- this.material.getVector4("_TexOffset").setFromArray([
14082
+ (_this_material_getVector4 = this.material.getVector4("_TexOffset")) == null ? void 0 : _this_material_getVector4.setFromArray([
14038
14083
  texRectX + texOffset[0],
14039
14084
  texRectH + texRectY - texOffset[1],
14040
14085
  dx,
@@ -14047,12 +14092,9 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
14047
14092
  this.item.composition.destroyTextures(this.getTextures());
14048
14093
  }
14049
14094
  };
14050
- _proto.getItemInitData = function getItemInitData(item, idx, pointStartIndex, textureIndex) {
14051
- var geoData = item.geoData;
14052
- if (!geoData) {
14053
- geoData = item.geoData = this.getItemGeometryData(item, idx);
14054
- }
14055
- var index = geoData.index;
14095
+ _proto.getItemInitData = function getItemInitData() {
14096
+ this.geoData = this.getItemGeometryData();
14097
+ var _this_geoData = this.geoData, index = _this_geoData.index, atlasOffset = _this_geoData.atlasOffset;
14056
14098
  var idxCount = index.length;
14057
14099
  // @ts-expect-error
14058
14100
  var indexData = this.wireframe ? new Uint8Array([
@@ -14067,11 +14109,11 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
14067
14109
  ]) : new index.constructor(idxCount);
14068
14110
  if (!this.wireframe) {
14069
14111
  for(var i = 0; i < idxCount; i++){
14070
- indexData[i] = pointStartIndex + index[i];
14112
+ indexData[i] = 0 + index[i];
14071
14113
  }
14072
14114
  }
14073
14115
  return {
14074
- atlasOffset: geoData.atlasOffset,
14116
+ atlasOffset: atlasOffset,
14075
14117
  index: indexData
14076
14118
  };
14077
14119
  };
@@ -14082,8 +14124,7 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
14082
14124
  addItem(textures, texture);
14083
14125
  }
14084
14126
  texture = this.renderer.texture;
14085
- var textureIndex = texture ? textures.indexOf(texture) : -1;
14086
- var data = this.getItemInitData(this, 0, 0, textureIndex);
14127
+ var data = this.getItemInitData();
14087
14128
  var renderer = this.renderer;
14088
14129
  var texParams = this.material.getVector4("_TexParams");
14089
14130
  texParams.x = renderer.occlusion ? +renderer.transparentOcclusion : 1;
@@ -14174,6 +14215,7 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
14174
14215
  setBlendMode(material, states.blendMode);
14175
14216
  setMaskMode(material, states.maskMode);
14176
14217
  setSideMode(material, states.side);
14218
+ material.shader.shaderData.properties = 'uSampler0("uSampler0",2D) = "white" {}';
14177
14219
  if (!material.hasUniform("_Color")) {
14178
14220
  material.setVector4("_Color", new Vector4(0, 0, 0, 1));
14179
14221
  }
@@ -14185,8 +14227,8 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
14185
14227
  }
14186
14228
  return material;
14187
14229
  };
14188
- _proto.getItemGeometryData = function getItemGeometryData(item, aIndex) {
14189
- var splits = item.splits, renderer = item.renderer, textureSheetAnimation = item.textureSheetAnimation;
14230
+ _proto.getItemGeometryData = function getItemGeometryData() {
14231
+ var _this = this, splits = _this.splits, renderer = _this.renderer, textureSheetAnimation = _this.textureSheetAnimation;
14190
14232
  var sx = 1, sy = 1;
14191
14233
  if (renderer.shape) {
14192
14234
  var _renderer_shape = renderer.shape, _renderer_shape_index = _renderer_shape.index, index = _renderer_shape_index === void 0 ? [] : _renderer_shape_index, _renderer_shape_aPoint = _renderer_shape.aPoint, aPoint = _renderer_shape_aPoint === void 0 ? [] : _renderer_shape_aPoint;
@@ -14341,7 +14383,6 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
14341
14383
  this.worldMatrix = Matrix4.fromIdentity();
14342
14384
  this.material = material;
14343
14385
  this.geometry = geometry;
14344
- this.name = "MSprite" + seed$4++;
14345
14386
  var startColor = options.startColor || [
14346
14387
  1,
14347
14388
  1,
@@ -18458,11 +18499,6 @@ var CalculateLoader = /*#__PURE__*/ function(AbstractPlugin) {
18458
18499
  return CalculateLoader;
18459
18500
  }(AbstractPlugin);
18460
18501
 
18461
- function _assert_this_initialized(self) {
18462
- if (self === void 0) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
18463
- return self;
18464
- }
18465
-
18466
18502
  var AnimationStream = /*#__PURE__*/ function() {
18467
18503
  function AnimationStream(playable) {
18468
18504
  this.curveValues = {};
@@ -27471,7 +27507,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem, true);
27471
27507
  registerPlugin("particle", ParticleLoader, exports.VFXItem, true);
27472
27508
  registerPlugin("cal", CalculateLoader, exports.VFXItem, true);
27473
27509
  registerPlugin("interact", InteractLoader, exports.VFXItem, true);
27474
- var version$1 = "2.0.0-alpha.30";
27510
+ var version$1 = "2.0.0-alpha.31";
27475
27511
  logger.info("Core version: " + version$1 + ".");
27476
27512
 
27477
27513
  var _obj;
@@ -29104,7 +29140,7 @@ setMaxSpriteMeshItemCount(8);
29104
29140
  */ Mesh.create = function(engine, props) {
29105
29141
  return new ThreeMesh(engine, props);
29106
29142
  };
29107
- var version = "2.0.0-alpha.30";
29143
+ var version = "2.0.0-alpha.31";
29108
29144
  logger.info("THREEJS plugin version: " + version + ".");
29109
29145
 
29110
29146
  exports.AbstractPlugin = AbstractPlugin;