@galacean/effects-core 2.3.2 → 2.4.0-alpha.0

package/dist/components/base-render-component.d.ts

@@ -1,21 +1,22 @@
+import { Color } from '@galacean/effects-math/es/core/color';
 import * as spec from '@galacean/effects-specification';
-import { Matrix4 } from '@galacean/effects-math/es/core/matrix4';
-import { RendererComponent } from './renderer-component';
-import { Texture } from '../texture';
-import type { GeometryDrawMode, Renderer } from '../render';
-import { Geometry } from '../render';
 import type { Engine } from '../engine';
+import type { Maskable, MaterialProps } from '../material';
+import { MaskMode, Material, MaskProcessor } from '../material';
 import type { BoundingBoxTriangle, HitTestTriangleParams } from '../plugins';
-import type { MaterialProps } from '../material';
-import { Material } from '../material';
+import type { GeometryDrawMode, Renderer } from '../render';
+import { Geometry } from '../render';
 import type { GeometryFromShape } from '../shape';
+import { Texture } from '../texture';
+import { RendererComponent } from './renderer-component';
 /**
  * 图层元素渲染属性, 经过处理后的 spec.SpriteContent.renderer
  */
-export interface ItemRenderer extends Required<Omit<spec.RendererOptions, 'texture' | 'shape' | 'anchor' | 'particleOrigin'>> {
+export interface ItemRenderer extends Required<Omit<spec.RendererOptions, 'texture' | 'shape' | 'anchor' | 'particleOrigin' | 'mask'>> {
     order: number;
-    mask: number;
     texture: Texture;
+    mask: number;
+    maskMode: MaskMode;
     shape?: GeometryFromShape;
     anchor?: spec.vec2;
     particleOrigin?: spec.ParticleOrigin;
@@ -36,26 +37,17 @@ export interface ItemRenderInfo {
 /**
  * @since 2.1.0
  */
-export declare class BaseRenderComponent extends RendererComponent {
+export declare class BaseRenderComponent extends RendererComponent implements Maskable {
     interaction?: {
         behavior: spec.InteractBehavior;
     };
-    cachePrefix: string;
-    geoData: {
-        atlasOffset: number[] | spec.TypedArray;
-        index: number[] | spec.TypedArray;
-    };
-    anchor?: spec.vec2;
     renderer: ItemRenderer;
-    emptyTexture: Texture;
-    color: spec.vec4;
-    worldMatrix: Matrix4;
+    color: Color;
     geometry: Geometry;
+    readonly maskManager: MaskProcessor;
     protected renderInfo: ItemRenderInfo;
-    protected readonly wireframe?: boolean;
     protected preMultiAlpha: number;
     protected visible: boolean;
-    protected isManualTimeSet: boolean;
     protected frameAnimationTime: number;
     /**
      *
@@ -71,6 +63,13 @@ export declare class BaseRenderComponent extends RendererComponent {
      * 获取当前 Mesh 的可见性。
      */
     getVisible(): boolean;
+    /**
+     * 设置当前图层的颜色
+     * > Tips: 透明度也属于颜色的一部分，当有透明度/颜色 K 帧变化时，该 API 会失效
+     * @since 2.4.0
+     * @param color - 颜色值
+     */
+    setColor(color: Color): void;
     /**
      * 设置当前图层的颜色
      * > Tips: 透明度也属于颜色的一部分，当有透明度/颜色 K 帧变化时，该 API 会失效
@@ -93,10 +92,6 @@ export declare class BaseRenderComponent extends RendererComponent {
     render(renderer: Renderer): void;
     onStart(): void;
     onDestroy(): void;
-    protected getItemInitData(): {
-        atlasOffset: spec.TypedArray | number[];
-        index: number[];
-    };
     protected setItem(): void;
     protected getItemGeometryData(): {
         index: number[];

package/dist/components/shape-component.d.ts

@@ -1,5 +1,7 @@
 import * as spec from '@galacean/effects-specification';
 import type { Engine } from '../engine';
+import type { Maskable } from '../material';
+import { MaskProcessor } from '../material';
 import { MeshComponent } from './mesh-component';
 interface ShapeAttribute {
     /**
@@ -90,7 +92,7 @@ export interface PolygonAttribute extends ShapeAttribute {
  * 图形组件
  * @since 2.1.0
  */
-export declare class ShapeComponent extends MeshComponent {
+export declare class ShapeComponent extends MeshComponent implements Maskable {
     private hasStroke;
     private hasFill;
     private shapeDirty;
@@ -100,6 +102,7 @@ export declare class ShapeComponent extends MeshComponent {
     private shapeAttribute;
     private vert;
     private frag;
+    readonly maskManager: MaskProcessor;
     get shape(): ShapeAttribute;
     /**
      *

package/dist/composition-source-manager.d.ts

@@ -32,9 +32,5 @@ export declare class CompositionSourceManager implements Disposable {
     private preProcessItemContent;
     private changeTex;
     private addTextureUsage;
-    /**
-     * 处理蒙版和遮挡关系写入 stencil 的 ref 值
-     */
-    private processMask;
     dispose(): void;
 }

package/dist/engine.d.ts

@@ -3,6 +3,7 @@ import type { Database, SceneData } from './asset-loader';
 import { AssetLoader } from './asset-loader';
 import type { EffectsObject } from './effects-object';
 import type { Material } from './material';
+import { MaskRefManager } from './material';
 import type { GPUCapability, Geometry, Mesh, RenderPass, Renderer, ShaderLibrary } from './render';
 import type { Scene } from './scene';
 import type { Texture } from './texture';
@@ -29,6 +30,10 @@ export declare class Engine implements Disposable {
      * 渲染过程中错误队列
      */
     renderErrors: Set<Error>;
+    /**
+     * maskRef 值分配
+     */
+    maskRefManager: MaskRefManager;
     protected destroyed: boolean;
     protected textures: Texture[];
     protected materials: Material[];

package/dist/fallback/migration.d.ts

@@ -1,3 +1,4 @@
+import * as spec from '@galacean/effects-specification';
 import type { BaseContent, BinaryFile, JSONScene, JSONSceneLegacy, SpineResource, SpineContent } from '@galacean/effects-specification';
 /**
  * 2.1 以下版本数据适配（mars-player@2.4.0 及以上版本支持 2.1 以下数据的适配）
@@ -12,6 +13,9 @@ export declare function version22Migration(json: JSONSceneLegacy): JSONSceneLega
  * - 富文本插件名称的适配
  */
 export declare function version31Migration(json: JSONScene): JSONScene;
+export declare function version32Migration(json: JSONScene): JSONScene;
+export declare function processContent(composition: spec.CompositionData): void;
+export declare function processMask(renderContent: any): void;
 /**
  * 3.0 以下版本数据适配（runtime 2.0及以上版本支持）
  */