@galacean/effects-core 2.0.0-alpha.6 → 2.0.0-alpha.8

package/dist/material/material.d.ts

@@ -1,5 +1,5 @@
 import type { Matrix3, Matrix4, Quaternion, Vector2, Vector3, Vector4 } from '@galacean/effects-math/es/core/index';
-import type { GlobalUniforms, Renderer, ShaderWithSource } from '../render';
+import type { GlobalUniforms, Renderer, Shader, ShaderWithSource } from '../render';
 import type { Texture } from '../texture';
 import type { DestroyOptions, Disposable } from '../utils';
 import type { UniformSemantic, UniformValue } from './types';
@@ -55,7 +55,9 @@ export interface MaterialProps {
  * Material 抽象类
  */
 export declare abstract class Material extends EffectsObject implements Disposable {
+    shader: Shader;
     shaderSource: ShaderWithSource;
+    stringTags: Record<string, string>;
     readonly uniformSemantics: Record<string, UniformSemantic>;
     readonly renderType: MaterialRenderType;
     readonly name: string;
@@ -320,7 +322,7 @@ export declare abstract class Material extends EffectsObject implements Disposab
      */
     abstract hasUniform(name: string): boolean;
     /******** 预留接口，暂时不用实现 ***********************/
-    abstract enableMacro(keyword: string): void;
+    abstract enableMacro(keyword: string, value?: boolean | number): void;
     abstract disableMacro(keyword: string): void;
     abstract isMacroEnabled(keyword: string): boolean;
     /***************************************************/

package/dist/material/types.d.ts

@@ -33,11 +33,6 @@ export interface MaterialStates extends MaterialBlendingStates, MaterialStencilS
     polygonOffset?: [factor: number, units: number];
     polygonOffsetFill?: boolean;
 }
-export interface FilterMaterialStates extends MaterialStates {
-    blendMode?: spec.BlendingMode;
-    side?: spec.SideMode;
-    maskMode?: spec.MaskMode;
-}
 export interface MaterialDataBlockDestroyOptions {
     textures?: DestroyOptions;
 }

package/dist/material/utils.d.ts

@@ -14,4 +14,4 @@ export declare function getPreMultiAlpha(blending?: number): number;
 export declare function createShaderWithMarcos(marcos: ShaderMarcos, shader: string, shaderType: ShaderType, level: number): string;
 export declare function setBlendMode(material: Material, blendMode?: number): void;
 export declare function setSideMode(material: Material, side: spec.SideMode): void;
-export declare function setMaskMode(material: Material, maskMode: number): void;
+export declare function setMaskMode(material: Material, maskMode: spec.MaskMode): void;

package/dist/plugins/camera/camera-controller-node.d.ts

@@ -1,5 +1,5 @@
 import { Euler, Vector3 } from '@galacean/effects-math/es/core/index';
-import type * as spec from '@galacean/effects-specification';
+import * as spec from '@galacean/effects-specification';
 import { ItemBehaviour } from '../../components';
 import type { Engine } from '../../engine';
 export declare class CameraController extends ItemBehaviour {

package/dist/plugins/particle/particle-mesh.d.ts

@@ -66,7 +66,6 @@ export interface ParticleMeshProps extends ParticleMeshData {
     mask: number;
     maskMode: number;
     side: number;
-    filter?: spec.FilterParams;
     transparentOcclusion?: boolean;
     matrix?: Matrix4;
     sprite?: {

package/dist/plugins/sprite/sprite-item.d.ts

@@ -23,9 +23,6 @@ export interface SpriteItemProps extends Omit<spec.SpriteContent, 'renderer'> {
         shape: GeometryFromShape;
         texture: Texture;
     } & Omit<spec.RendererOptions, 'texture'>;
-    filter?: {
-        feather: number | spec.FunctionExpression;
-    } & Omit<spec.FilterParams, 'feather'>;
 }
 /**
  * 图层元素基础属性, 经过处理后的 spec.SpriteContent.options

package/dist/render/create-copy-shader.d.ts

@@ -2,5 +2,5 @@ import type { SharedShaderWithSource } from './shader';
 export declare const EFFECTS_COPY_MESH_NAME = "effects-internal-copy";
 export declare const COPY_MESH_SHADER_ID = "effects-internal-copy-mesh";
 export declare const COPY_VERTEX_SHADER = "\n#ifdef WEBGL2\n#define vsIn in\n#define vsOut out\n#else\n#define vsIn attribute\n#define vsOut varying\n#endif\nprecision highp float;\nvsIn vec2 aPos;\nvsOut vec2 vTex;\nvoid main(){\n    gl_Position = vec4(aPos,0.,1.0);\n    vTex = (aPos + vec2(1.0))/2.;\n}";
-export declare const COPY_FRAGMENT_SHADER: string;
+export declare const COPY_FRAGMENT_SHADER = "precision mediump float;\n#ifdef WEBGL2\n#define fsIn in\n#define fsOut out\n#define texture2D texture\n#else\n#define fsIn varying\n#endif\nfsIn vec2 vTex;\n#ifdef WEBGL2\nlayout (location = 0) out vec4 fragColor;\n#else\n#define fragColor gl_FragColor\n#endif\n\n#ifdef DEPTH_TEXTURE\nuniform sampler2D uDepth;\n#ifndef WEBGL2\n#extension GL_EXT_frag_depth : enable\n#define gl_FragDepth gl_FragDepthEXT\n#endif\n#endif\nvoid main(){\n    #ifdef DEPTH_TEXTURE\n    gl_FragDepth = texture2D(uDepth,vTex).r;\n    #endif\n}\n";
 export declare function createCopyShader(level: number, writeDepth?: boolean): SharedShaderWithSource;

package/dist/render/global-volume.d.ts

@@ -10,6 +10,9 @@ export interface GlobalVolume {
     brightness: number;
     saturation: number;
     contrast: number;
+    vignetteIntensity: number;
+    vignetteSmoothness: number;
+    vignetteRoundness: number;
     useToneMapping: number;
 }
 export declare const defaultGlobalVolume: GlobalVolume;

package/dist/render/shader.d.ts

@@ -1,4 +1,4 @@
-import type { ShaderData } from '../asset-loader';
+import type * as spec from '@galacean/effects-specification';
 import { EffectsObject } from '../effects-object';
 import type { Engine } from '../engine';
 export type ShaderMarcos = [key: string, value: string | number | boolean][];
@@ -85,9 +85,9 @@ export declare abstract class ShaderVariant extends EffectsObject {
     constructor(engine: Engine, source: ShaderWithSource);
 }
 export declare class Shader extends EffectsObject {
-    shaderData: ShaderData;
+    shaderData: spec.ShaderData;
     createVariant(macros?: Record<string, number | boolean>): ShaderVariant;
-    fromData(data: ShaderData): void;
+    fromData(data: spec.ShaderData): void;
 }
 export interface ShaderLibrary {
     readonly shaderResults: {

package/dist/semantic-map.d.ts

@@ -8,7 +8,7 @@ export declare class SemanticMap implements Disposable {
     constructor(semantics?: Record<string, SemanticGetter>);
     toObject(): Record<string, SemanticGetter>;
     setSemantic(name: string, value?: SemanticGetter): void;
-    getSemanticValue(name: string, state: RenderingData): number | Float32Array | Int32Array | Float64Array | Uint8Array | Uint32Array | Uint16Array | Int8Array | Int16Array | number[] | number[][] | import("@galacean/effects-math/es/core").Vector3 | import("@galacean/effects-core").Texture | import("@galacean/effects-math/es/core").Vector2 | import("@galacean/effects-math/es/core").Vector4 | import("@galacean/effects-math/es/core").Matrix3 | import("@galacean/effects-math/es/core").Matrix4 | import("@galacean/effects-core").Texture[] | import("packages/effects-core/src/material/types").UniformStruct | import("packages/effects-core/src/material/types").UniformStruct[] | SemanticFunc | undefined;
+    getSemanticValue(name: string, state: RenderingData): number | Float32Array | Int32Array | Float64Array | Uint8Array | Uint32Array | Uint16Array | Int8Array | Int16Array | number[] | number[][] | import("@galacean/effects-core").Texture | import("@galacean/effects-math/es/core").Vector2 | import("@galacean/effects-math/es/core").Vector3 | import("@galacean/effects-math/es/core").Vector4 | import("@galacean/effects-math/es/core").Matrix3 | import("@galacean/effects-math/es/core").Matrix4 | import("@galacean/effects-core").Texture[] | import("packages/effects-core/src/material/types").UniformStruct | import("packages/effects-core/src/material/types").UniformStruct[] | SemanticFunc | undefined;
     hasSemanticValue(name: string): boolean;
     dispose(): void;
 }

package/dist/shader/index.d.ts

@@ -11,16 +11,6 @@ export { default as particleVert } from './particle.vert.glsl';
 export { default as trailVert } from './trail.vert.glsl';
 export { default as value } from './value.glsl';
 export { default as valueDefine } from './value-define.glsl';
-export { default as copyFrag } from './adjust/copy.frag.glsl';
-export { default as alphaFrameFrag } from './adjust/alpha-frame.frag.glsl';
-export { default as alphaMaskFrag } from './adjust/alpha-mask.frag.glsl';
-export { default as cameraMoveFrag } from './adjust/camera-move.frag.glsl';
-export { default as cameraMoveVert } from './adjust/camera-move.vert.glsl';
-export { default as delayFrag } from './adjust/delay.frag.glsl';
-export { default as distortionFrag } from './adjust/distortion.frag.glsl';
-export { default as distortionVert } from './adjust/distortion.vert.glsl';
-export { default as bloomMixVert } from './adjust/bloom-mix.frag.glsl';
-export { default as bloomThresholdVert } from './adjust/bloom-threshold.frag.glsl';
 export { default as screenMeshVert } from './post-processing/screen-mesh.vert.glsl';
 export { default as colorGradingFrag } from './post-processing/color-grading.frag.glsl';
 export { default as gaussianDownFrag } from './post-processing/gaussian-down.frag.glsl';

package/dist/template-image.d.ts

@@ -0,0 +1,21 @@
+import type { TemplateContent } from '@galacean/effects-specification';
+export declare const DEFAULT_FONTS: string[];
+declare class CanvasPool {
+    readonly elements: HTMLCanvasElement[];
+    constructor();
+    dispose(): void;
+    getCanvas(): HTMLCanvasElement;
+    saveCanvas(cvs: HTMLCanvasElement): void;
+}
+export declare const canvasPool: CanvasPool;
+export declare function getDefaultTemplateCanvasPool(): CanvasPool;
+export declare function getBackgroundImage(template: TemplateContent, variables?: Record<string, number | string | string[]>): string | number | string[] | undefined;
+/**
+ * @param url
+ * @param template
+ * @param variables
+ * @param options
+ * @returns
+ */
+export declare function combineImageTemplate(url: string | HTMLImageElement, template?: TemplateContent, variables?: Record<string, number | string>): Promise<number | HTMLImageElement | string[]>;
+export {};

package/dist/vfx-item.d.ts

@@ -1,6 +1,6 @@
 import { Vector3 } from '@galacean/effects-math/es/core/vector3';
 import * as spec from '@galacean/effects-specification';
-import { type VFXItemData } from './asset-loader';
+import type { VFXItemData } from './asset-loader';
 import { RendererComponent } from './components';
 import type { Component } from './components/component';
 import { ItemBehaviour } from './components/component';
@@ -258,7 +258,6 @@ export declare class VFXItem<T extends VFXItemContent> extends EffectsObject imp
 }
 export declare namespace Item {
     function is<T extends spec.Item>(item: spec.Item, type: spec.ItemType): item is T;
-    function isFilter(item: spec.Item): item is spec.FilterItem;
     function isComposition(item: spec.Item): item is spec.CompositionItem;
     function isParticle(item: spec.Item): item is spec.ParticleItem;
     function isNull(item: spec.Item): item is spec.NullItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-core",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.8",
   "description": "Galacean Effects runtime core for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",
@@ -42,7 +42,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@galacean/effects-specification": "2.0.0-alpha.5",
+    "@galacean/effects-specification": "2.0.0-alpha.8",
     "@galacean/effects-math": "1.1.0-alpha.0",
     "uuid": "9.0.1"
   },

package/dist/template-image/index.d.ts

@@ -1,68 +0,0 @@
-import type { TemplateContentV1, TemplateContentV2 } from '@galacean/effects-specification';
-export * from './qcanvas-viewer';
-export * from './qtext';
-export * from './template-v1';
-export declare const DEFAULT_FONTS: string[];
-export interface TextLayout {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-}
-export interface TemplateOptions {
-    templateScale?: number;
-    canvas?: HTMLCanvasElement;
-    textLayouts?: TextLayout[];
-    debug?: boolean;
-    borderColor?: string;
-    borderWidth?: number;
-    flipY?: boolean;
-    scaleX?: number;
-    scaleY?: number;
-    toData?: boolean;
-}
-declare class CanvasPool {
-    readonly elements: HTMLCanvasElement[];
-    constructor();
-    dispose(): void;
-    getCanvas(): HTMLCanvasElement;
-    saveCanvas(cvs: HTMLCanvasElement): void;
-}
-export declare const canvasPool: CanvasPool;
-export declare function getDefaultTemplateCanvasPool(): CanvasPool;
-export declare function getBackgroundImage(template: TemplateContentV2, variables?: Record<string, number | string | string[]>): string | string[];
-export declare function loadMedia(url: string | string[], loadFn: (url: string) => Promise<any>): Promise<any>;
-/**
- * @param {string|HTMLImageElement} url
- * @param {TemplateContentV2} [template]
- * @param {Record<string, number | string>} [variables]
- * @param {TemplateOptions} [opts]
- * @param {boolean} [flipY]
- * @returns
- */
-export declare function combineImageTemplate2(url: string | HTMLImageElement, template?: TemplateContentV2, variables?: Record<string, number | string>, opts?: TemplateOptions, flipY?: boolean): Promise<HTMLCanvasElement>;
-/**
- * @internal
- * @deprecated since 2.0.0 - use `combineImageTemplate2` instead
- */
-export declare function combineImageTemplate2Async(url: string | HTMLImageElement, template?: TemplateContentV2, variables?: Record<string, number | string>, opts?: TemplateOptions, flipY?: boolean): Promise<HTMLCanvasElement | ImageData>;
-/**
- * @param url
- * @param template
- * @param variables
- * @param opts
- * @param flipY
- * @returns
- */
-export declare function combineImageTemplate(url: string | HTMLImageElement, template: TemplateContentV1 | TemplateContentV2, variables: Record<string, number | string>, opts?: {
-    templateScale?: number;
-    canvas?: HTMLCanvasElement;
-}, flipY?: boolean): Promise<HTMLCanvasElement>;
-/**
- * @internal
- * @deprecated since 2.0.0 - use `combineImageTemplate` instead
- */
-export declare function combineImageTemplateAsync(url: string | HTMLImageElement, template: TemplateContentV1 | TemplateContentV2, variables: Record<string, number | string>, opts?: {
-    templateScale?: number;
-    canvas?: HTMLCanvasElement;
-}, flipY?: boolean): Promise<HTMLCanvasElement | HTMLImageElement | ImageData>;

package/dist/template-image/qcanvas-viewer.d.ts

@@ -1,21 +0,0 @@
-import type { QText } from './qtext';
-declare class QCanvasViewer {
-    width: number;
-    height: number;
-    background: HTMLImageElement;
-    scaleX: number;
-    scaleY: number;
-    renderCanvas: HTMLCanvasElement;
-    renderContext: CanvasRenderingContext2D;
-    textList: QText[];
-    devicePixelRatio: number;
-    flipY: boolean;
-    constructor(canvas: string | HTMLCanvasElement, width: number, height: number, scaleX?: number, scaleY?: number, flipY?: boolean);
-    initDimension(width: number, height: number, scaleX?: number, scaleY?: number): void;
-    clearText(): void;
-    clearCanvasWithContext(ctx: CanvasRenderingContext2D): void;
-    clearCanvas(): void;
-    addObject(text: QText): void;
-    render(): void;
-}
-export { QCanvasViewer };

package/dist/template-image/qtext.d.ts

@@ -1,96 +0,0 @@
-import type { QCanvasViewer } from './qcanvas-viewer';
-import type { IFontMetrics } from './text-metrics';
-declare enum QTextWrapMode {
-    Default = 0,
-    Clip = 1,
-    Ellipsis = 2
-}
-interface QTextOptions {
-    left?: number;
-    top?: number;
-    maxWidth?: number;
-    fontFamily?: string;
-    fontSize?: number;
-    fontWeight?: string;
-    align?: string;
-    verticalAlign?: string;
-    padding?: number;
-    letterSpacing?: number;
-    wrap?: QTextWrapMode;
-    color?: string;
-    fontStyle?: string;
-    angle?: number;
-    name?: string;
-}
-interface QChar {
-    left: number;
-    top: number;
-    char: string;
-    width: number;
-    heigh: number;
-    font: string;
-    fontSize: number;
-    isEllipsis: boolean;
-    scale: number;
-    index: number;
-}
-declare class QText {
-    left: number;
-    top: number;
-    width?: number;
-    height?: number;
-    text: string;
-    name: string;
-    fontSize: number;
-    fontFamily: string;
-    color: string;
-    letterSpacing: number;
-    maxLineWidth: number;
-    wrap: QTextWrapMode;
-    fontStyle: 'normal' | 'italic' | 'oblique' | 'initial' | 'inherit';
-    textAlign: 'center' | 'end' | 'left' | 'right' | 'start';
-    textBaseline: 'alphabetic' | 'bottom' | 'hanging' | 'ideographic' | 'middle' | 'top';
-    scaleX: number;
-    scaleY: number;
-    angle: number;
-    active: boolean;
-    padding: number;
-    fontWeight: string;
-    chars: QChar[];
-    borderColor: string;
-    borderWidth: number;
-    fontProperties: IFontMetrics;
-    fontVariant: string;
-    private viewer;
-    private originX;
-    private originY;
-    private ellipsis;
-    constructor(text: string, options: QTextOptions);
-    update(): void;
-    render(): void;
-    init(viewer: QCanvasViewer): void;
-    getLayout(): {
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-    };
-    private updateDimension;
-    private configTextStyle;
-    private getFontDesc;
-    private configTextLayout;
-    private setRenderTransform;
-    private renderText;
-    private drawCharsInTextBox;
-    private addEllipsisToChars;
-    private createCharsFromText;
-    private addOffsetToChars;
-    private clipCharsWithTextBox;
-    private cloneChars;
-    private replaceCharWithEllipsis;
-    private findEllipsisPositionAndReplaceCharsFromLeft;
-    private findEllipsisPositionAndReplaceCharsFromRight;
-    private drawCharsFromLeft;
-    private drawBorders;
-}
-export { QText, QTextOptions, QTextWrapMode };

package/dist/template-image/template-v1.d.ts

@@ -1,27 +0,0 @@
-import type { TemplateContentV1 } from '@galacean/effects-specification';
-export declare function requestAsync(url: string, opt?: {
-    responseType?: XMLHttpRequestResponseType;
-    method?: string;
-    data?: Document | XMLHttpRequestBodyInit | null;
-}): Promise<unknown>;
-/**
- *
- * @param url
- * @param template
- * @param variables
- * @param opts
- * @param flipY
- * @returns
- */
-export declare function combineImageTemplate1(url: string | HTMLImageElement, template: TemplateContentV1, variables: Record<string, number | string | HTMLImageElement>, opts?: {
-    templateScale?: number;
-    canvas?: HTMLCanvasElement;
-}, flipY?: boolean): Promise<HTMLCanvasElement>;
-/**
- * @internal
- * @deprecated since 2.0.0 - use `combineImageTemplate1` instead
- */
-export declare function combineImageTemplate1Async(url: string | HTMLImageElement, template: TemplateContentV1, variables: Record<string, number | string | HTMLImageElement>, opts?: {
-    templateScale?: number;
-    canvas?: HTMLCanvasElement;
-}, flipY?: boolean): Promise<HTMLCanvasElement>;

package/dist/template-image/text-metrics.d.ts

@@ -1,18 +0,0 @@
-export interface IFontMetrics {
-    ascent: number;
-    descent: number;
-    fontSize: number;
-}
-export declare class TextMetrics {
-    static _fonts: {
-        [font: string]: IFontMetrics;
-    };
-    static METRICS_STRING: string;
-    static BASELINE_SYMBOL: string;
-    static BASELINE_MULTIPLIER: number;
-    static HEIGHT_MULTIPLIER: number;
-    private static __canvas;
-    private static __context;
-    static measureFont(font: string): IFontMetrics;
-    static get _canvas(): HTMLCanvasElement;
-}