@galacean/effects-core 2.4.2 → 2.4.4

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.
@@ -18,6 +18,7 @@ export interface ItemRenderer extends Required<Omit<spec.RendererOptions, 'textu
18
18
  mask: number;
19
19
  maskMode: MaskMode;
20
20
  shape?: GeometryFromShape;
21
+ alphaMask: boolean;
21
22
  }
22
23
  /**
23
24
  * @since 2.1.0
package/dist/index.js CHANGED
@@ -3,7 +3,7 @@
3
3
  * Description: Galacean Effects runtime core for the web
4
4
  * Author: Ant Group CO., Ltd.
5
5
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
6
- * Version: v2.4.2
6
+ * Version: v2.4.4
7
7
  */
8
8
 
9
9
  'use strict';
@@ -483,8 +483,11 @@ function isIOSByUA() {
483
483
  function isAndroid() {
484
484
  return /\b[Aa]ndroid\b/.test(navigator.userAgent);
485
485
  }
486
+ function isOpenHarmony() {
487
+ return /\bOpenHarmony\b/.test(navigator.userAgent);
488
+ }
486
489
  function isSimulatorCellPhone() {
487
- return isAndroid() || /\b(iPad|iPhone|iPod)\b/.test(navigator.userAgent);
490
+ return isAndroid() || isOpenHarmony() || /\b(iPad|iPhone|iPod)\b/.test(navigator.userAgent);
488
491
  }
489
492
  function isMiniProgram() {
490
493
  return isAlipayMiniApp() || isWechatMiniApp();
@@ -12484,7 +12487,8 @@ function getBezier2DValue(out, t, p0, p1, cpx0, cpy0, cpx1, cpy1) {
12484
12487
  transparentOcclusion: false,
12485
12488
  side: SideMode.DOUBLE,
12486
12489
  maskMode: exports.MaskMode.NONE,
12487
- mask: 0
12490
+ mask: 0,
12491
+ alphaMask: false
12488
12492
  };
12489
12493
  var material = Material.create(_this.engine, {
12490
12494
  shader: {
@@ -12706,7 +12710,7 @@ function getBezier2DValue(out, t, p0, p1, cpx0, cpy0, cpx1, cpy1) {
12706
12710
  texParams.z = renderer.renderMode;
12707
12711
  texParams.w = renderer.maskMode;
12708
12712
  material.setVector4("_TexParams", texParams);
12709
- if (texParams.x === 0 || renderer.maskMode === exports.MaskMode.MASK && !renderer.shape) {
12713
+ if (texParams.x === 0 || renderer.alphaMask) {
12710
12714
  material.enableMacro("ALPHA_CLIP");
12711
12715
  } else {
12712
12716
  material.disableMacro("ALPHA_CLIP");
@@ -12744,7 +12748,7 @@ function getBezier2DValue(out, t, p0, p1, cpx0, cpy0, cpx1, cpy1) {
12744
12748
  if (shapeData !== undefined && shapeData !== null && !("aPoint" in shapeData && "index" in shapeData)) {
12745
12749
  shapeGeometry = getGeometryByShape(shapeData, split);
12746
12750
  }
12747
- var _renderer_renderMode, _renderer_blending, _renderer_side;
12751
+ var _renderer_renderMode, _renderer_blending, _renderer_side, _renderer_alphaMask;
12748
12752
  //-------------------------------------------------------------------------
12749
12753
  this.renderer = {
12750
12754
  renderMode: (_renderer_renderMode = renderer.renderMode) != null ? _renderer_renderMode : RenderMode.MESH,
@@ -12755,7 +12759,9 @@ function getBezier2DValue(out, t, p0, p1, cpx0, cpy0, cpx1, cpy1) {
12755
12759
  side: (_renderer_side = renderer.side) != null ? _renderer_side : SideMode.DOUBLE,
12756
12760
  mask: this.maskManager.getRefValue(),
12757
12761
  shape: shapeGeometry,
12758
- maskMode: maskMode
12762
+ maskMode: maskMode,
12763
+ //@ts-expect-error TODO 新蒙版兼容老数据需要增加纹理透明度蒙版是否开启参数
12764
+ alphaMask: (_renderer_alphaMask = renderer.alphaMask) != null ? _renderer_alphaMask : false
12759
12765
  };
12760
12766
  this.configureMaterial(this.renderer);
12761
12767
  };
@@ -31637,7 +31643,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem);
31637
31643
  registerPlugin("particle", ParticleLoader, exports.VFXItem);
31638
31644
  registerPlugin("cal", CalculateLoader, exports.VFXItem);
31639
31645
  registerPlugin("interact", InteractLoader, exports.VFXItem);
31640
- var version = "2.4.2";
31646
+ var version = "2.4.4";
31641
31647
  logger.info("Core version: " + version + ".");
31642
31648
 
31643
31649
  exports.AbstractPlugin = AbstractPlugin;
@@ -31829,6 +31835,7 @@ exports.isIOS = isIOS;
31829
31835
  exports.isIOSByUA = isIOSByUA;
31830
31836
  exports.isMiniProgram = isMiniProgram;
31831
31837
  exports.isObject = isObject;
31838
+ exports.isOpenHarmony = isOpenHarmony;
31832
31839
  exports.isSimulatorCellPhone = isSimulatorCellPhone;
31833
31840
  exports.isString = isString;
31834
31841
  exports.isUniformStruct = isUniformStruct;