@galacean/effects-core 2.3.3 → 2.4.0-beta.0

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

@@ -1,62 +1,41 @@
+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 } from '../material';
+import { MaskMode, MaskProcessor } from '../material';
 import type { BoundingBoxTriangle, HitTestTriangleParams } from '../plugins';
-import type { MaterialProps } from '../material';
-import { Material } from '../material';
-import type { GeometryFromShape } from '../shape';
+import { MeshCollider } from '../plugins';
+import type { 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'>> {
-    order: number;
-    mask: number;
+export interface ItemRenderer extends Required<Omit<spec.RendererOptions, 'texture' | 'shape' | 'anchor' | 'particleOrigin' | 'mask'>> {
     texture: Texture;
-    shape?: GeometryFromShape;
-    anchor?: spec.vec2;
-    particleOrigin?: spec.ParticleOrigin;
-}
-/**
- * 图层的渲染属性，用于 Mesh 的合并判断
- */
-export interface ItemRenderInfo {
-    side: number;
-    occlusion: boolean;
-    blending: number;
-    cachePrefix: string;
     mask: number;
-    maskMode: number;
-    cacheId: string;
-    wireframe?: boolean;
+    maskMode: MaskMode;
+    shape?: GeometryFromShape;
 }
 /**
  * @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;
-    protected renderInfo: ItemRenderInfo;
-    protected readonly wireframe?: boolean;
+    readonly maskManager: MaskProcessor;
     protected preMultiAlpha: number;
     protected visible: boolean;
-    protected isManualTimeSet: boolean;
-    protected frameAnimationTime: number;
+    /**
+     * 用于点击测试的碰撞器
+     */
+    protected meshCollider: MeshCollider;
     /**
      *
      * @param engine
@@ -65,12 +44,21 @@ export declare class BaseRenderComponent extends RendererComponent {
     /**
      * 设置当前 Mesh 的可见性。
      * @param visible - true：可见，false：不可见
+     * @deprecated 2.4.0 Please use enabled instead
      */
     setVisible(visible: boolean): void;
     /**
      * 获取当前 Mesh 的可见性。
+     * @deprecated 2.4.0 Please use enabled instead
      */
     getVisible(): boolean;
+    /**
+     * 设置当前图层的颜色
+     * > Tips: 透明度也属于颜色的一部分，当有透明度/颜色 K 帧变化时，该 API 会失效
+     * @since 2.4.0
+     * @param color - 颜色值
+     */
+    setColor(color: Color): void;
     /**
      * 设置当前图层的颜色
      * > Tips: 透明度也属于颜色的一部分，当有透明度/颜色 K 帧变化时，该 API 会失效
@@ -92,25 +80,13 @@ export declare class BaseRenderComponent extends RendererComponent {
     setTexture(input: string): Promise<void>;
     render(renderer: Renderer): void;
     onStart(): void;
-    onDestroy(): void;
-    protected getItemInitData(): {
-        atlasOffset: spec.TypedArray | number[];
-        index: number[];
-    };
-    protected setItem(): void;
-    protected getItemGeometryData(): {
+    getHitTestParams: (force?: boolean) => HitTestTriangleParams | undefined;
+    getBoundingBox(): BoundingBoxTriangle;
+    protected getItemGeometryData(geometry: Geometry): {
         index: number[];
         atlasOffset: number[];
     };
-    protected createGeometry(mode: GeometryDrawMode): Geometry;
-    protected getMaterialProps(renderInfo: ItemRenderInfo, count: number): MaterialProps;
-    protected createMaterial(renderInfo: ItemRenderInfo, count: number): Material;
-    getTextures(): Texture[];
-    /**
-     * 获取图层包围盒的类型和世界坐标
-     * @returns
-     */
-    getBoundingBox(): BoundingBoxTriangle | void;
-    getHitTestParams: (force?: boolean) => HitTestTriangleParams | undefined;
+    protected createGeometry(): Geometry;
+    private configureMaterial;
+    fromData(data: unknown): void;
 }
-export declare function getImageItemRenderInfo(item: BaseRenderComponent): ItemRenderInfo;

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

@@ -1,6 +1,6 @@
 import * as spec from '@galacean/effects-specification';
 import type { Engine } from '../engine';
-import { MeshComponent } from './mesh-component';
+import { BaseRenderComponent } from './base-render-component';
 interface ShapeAttribute {
     /**
      * 矢量图形类型
@@ -90,7 +90,7 @@ export interface PolygonAttribute extends ShapeAttribute {
  * 图形组件
  * @since 2.1.0
  */
-export declare class ShapeComponent extends MeshComponent {
+export declare class ShapeComponent extends BaseRenderComponent {
     private hasStroke;
     private hasFill;
     private shapeDirty;

package/dist/composition.d.ts

@@ -3,12 +3,11 @@ import type { Ray } from '@galacean/effects-math/es/core/ray';
 import type { Matrix4 } from '@galacean/effects-math/es/core/matrix4';
 import { Camera } from './camera';
 import { CompositionComponent } from './comp-vfx-item';
-import { CompositionSourceManager } from './composition-source-manager';
 import type { PluginSystem } from './plugin-system';
 import type { EventSystem, Plugin, Region } from './plugins';
 import type { MeshRendererOptions, Renderer } from './render';
 import { RenderFrame } from './render';
-import type { Scene } from './scene';
+import type { Scene, SceneRenderLevel } from './scene';
 import type { Texture } from './texture';
 import type { Disposable, LostHandler } from './utils';
 import { VFXItem } from './vfx-item';
@@ -16,6 +15,7 @@ import type { CompositionEvent } from './events';
 import { EventEmitter } from './events';
 import type { PostProcessVolume } from './components';
 import { SceneTicking } from './composition/scene-ticking';
+import type { Engine } from './engine';
 /**
  * 合成统计信息
  */
@@ -160,7 +160,6 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
      * 合成是否结束
      */
     isEnded: boolean;
-    compositionSourceManager: CompositionSourceManager;
     /**
      * 合成id
      */
@@ -181,10 +180,6 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
      * 插件系统，保存当前加载的插件对象，负责插件事件和创建插件的 Item 对象
      */
     readonly pluginSystem: PluginSystem;
-    /**
-     * 是否在合成结束时自动销毁引用的纹理，合成重播时不销毁
-     */
-    readonly autoRefTex: boolean;
     /**
      * 当前合成名称
      */
@@ -239,7 +234,7 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
     private paused;
     private lastVideoUpdateTime;
     private isEndCalled;
-    private readonly texInfo;
+    private _textures;
     /**
      * 合成中消息元素创建/销毁时触发的回调
      */
@@ -405,7 +400,7 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
      * 获取 engine 对象
      * @returns
      */
-    getEngine(): import("@galacean/effects-core").Engine;
+    getEngine(): Engine;
     /**
      * Item 求交测试，返回求交结果列表，x 和 y 是归一化到[-1, 1]区间的值，原点在左上角
      * @param x - 鼠标或触点的 x，已经归一化到[-1, 1]
@@ -478,3 +473,4 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
      */
     reloadTexture(): Promise<void>;
 }
+export declare function filterItemsByRenderLevel(composition: spec.CompositionData, engine: Engine, renderLevel?: SceneRenderLevel): spec.CompositionData;

package/dist/engine.d.ts

@@ -3,8 +3,9 @@ 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 { Scene, SceneRenderLevel } from './scene';
 import type { Texture } from './texture';
 import type { Disposable } from './utils';
 /**
@@ -15,6 +16,10 @@ export declare class Engine implements Disposable {
      * 渲染器
      */
     renderer: Renderer;
+    /**
+     * 渲染等级
+     */
+    renderLevel?: SceneRenderLevel;
     emptyTexture: Texture;
     transparentTexture: Texture;
     /**
@@ -29,6 +34,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及以上版本支持）
  */

package/dist/index.d.ts

@@ -10,7 +10,6 @@ export * from './canvas-pool';
 export * from './comp-vfx-item';
 export * from './components';
 export * from './composition';
-export * from './composition-source-manager';
 export * from './config';
 export * from './constants';
 export * from './decorators';