@galacean/effects-core 2.0.0-alpha.32 → 2.0.0-alpha.34

package/dist/material/material.d.ts

@@ -46,10 +46,6 @@ export interface MaterialProps {
      * uniform 数据
      */
     uniformValues?: Record<string, UniformValue>;
-    transformFeedbackOutput?: {
-        mode: WebGL2RenderingContext['INTERLEAVED_ATTRIBS'] | WebGL2RenderingContext['SEPARATE_ATTRIBS'];
-        varyings: string[];
-    };
 }
 /**
  * Material 抽象类
@@ -349,7 +345,7 @@ export declare abstract class Material extends EffectsObject implements Disposab
      * 销毁当前 Material
      * @param destroy - 包含纹理的销毁选项
      */
-    abstract dispose(destroy?: MaterialDestroyOptions): void;
+    abstract dispose(destroy?: MaterialDestroyOptions | DestroyOptions): void;
     /**
      * 创建 Material
      */

package/dist/material/utils.d.ts

@@ -1,17 +1,7 @@
 import * as spec from '@galacean/effects-specification';
-import type { ShaderMacros } from '../render';
 import type { Material } from './material';
-import { ShaderType } from './types';
 export declare function valIfUndefined<T>(val: any, def: T): T;
 export declare function getPreMultiAlpha(blending?: number): number;
-/**
- * 生成 shader，检测到 WebGL1 上下文会降级
- * @param macros - 宏定义数组
- * @param shader - 原始 shader 文本
- * @param shaderType - shader 类型
- * @return 去除版本号的 shader 文本
- */
-export declare function createShaderWithMacros(macros: ShaderMacros, 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: spec.MaskMode): void;

package/dist/math/utils.d.ts

@@ -6,8 +6,6 @@ import type { Camera } from '../camera';
 export type vec = number[];
 export declare function ensureVec3(num?: any): vec3;
 export declare function vecFill<T extends vec | vec3 | vec4 | vec2>(out: T | number[], number: number): T;
-export declare function vecAssign<T extends vec | vec3 | vec4 | vec2>(out: T | number[] | Float32Array, a: T, count: number, start?: number): T;
-export declare function vecNormalize<T extends vec | vec2 | vec3 | vec4>(out: T | number[], a?: T | number[]): T;
 export declare function vecMulCombine<T extends vec | vec3 | vec4 | vec2>(out: T | number[] | Float32Array, a?: T, b?: T): T;
 export declare const particleOriginTranslateMap: Record<number, vec2>;
 export declare function nearestPowerOfTwo(value: number): number;
@@ -15,4 +13,3 @@ export declare function setRayFromCamera(x: number, y: number, camera: Camera):
 export declare function trianglesFromRect(position: Vector3, halfWidth: number, halfHeight: number): TriangleLike[];
 export declare function decimalEqual(a: number, b: number, epsilon?: number): boolean;
 export declare function numberToFix(a: number, fixed?: number): number;
-export declare function pointOnLine(x1: number, y1: number, x2: number, y2: number, x3: number, y3: number): boolean;

package/dist/plugins/particle/burst.d.ts

@@ -1,6 +1,12 @@
+import { ValueGetter } from '../../math';
+interface BurstOptions {
+    time: number;
+    interval: number;
+    count: number | ValueGetter<number>;
+    cycles: number;
+    probability: number;
+}
 export declare class Burst {
-    once: boolean;
-    disabled: boolean;
     private now;
     private index;
     private internalCycles;
@@ -9,7 +15,7 @@ export declare class Burst {
     private readonly count;
     private readonly cycles;
     private readonly probability;
-    constructor(opts: any);
+    constructor(options: BurstOptions);
     getGeneratorOptions(timePassed: number, lifetime: number): {
         index: number;
         total: number;
@@ -19,3 +25,4 @@ export declare class Burst {
     reset(): void;
     clone(): Burst;
 }
+export {};

package/dist/plugins/particle/link.d.ts

@@ -17,5 +17,6 @@ export declare class Link<T> {
     removeNode(node: LinkNode<T>): void;
     forEach(func: (content: T, index: number) => void, thisObj?: any): void;
     forEachReverse(func: (content: T, index: number) => void, thisObj?: any): void;
+    getNodeByIndex(index: number): LinkNode<T> | null;
 }
 export {};

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

@@ -1,7 +1,7 @@
 import type * as spec from '@galacean/effects-specification';
 import type { Engine } from '../../engine';
 import type { Renderer } from '../../render';
-import { AbstractPlugin } from '../index';
+import { AbstractPlugin } from '../plugin';
 import type { PrecompileOptions } from '../../plugin-system';
 export declare class ParticleLoader extends AbstractPlugin {
     engine: Engine;

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

@@ -140,11 +140,6 @@ export declare class ParticleMesh implements ParticleMeshData {
     readonly anchor: Vector2;
     constructor(engine: Engine, props: ParticleMeshProps);
     getPointColor(index: number): number[];
-    /**
-     * 待废弃
-     * @deprecated - 使用 `particle-system.getPointPosition` 替代
-     */
-    getPointPosition(index: number): Vector3;
     clearPoints(): void;
     resetGeometryData(geometry: Geometry): void;
     minusTime(time: number): void;

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

@@ -112,7 +112,7 @@ type ParticleInteraction = {
     multiple?: boolean;
     radius: number;
 };
-interface ParticleSystemOptions extends spec.ParticleOptions {
+export interface ParticleSystemOptions extends spec.ParticleOptions {
     meshSlots?: number[];
 }
 export interface ParticleSystemProps extends Omit<spec.ParticleContent, 'options' | 'renderer' | 'trails'> {
@@ -182,9 +182,15 @@ export declare class ParticleSystem extends Component {
     raycast(options: ParticleSystemRayCastOptions): Vector3[] | undefined;
     clearPointTrail(pointIndex: number): void;
     updatePointTrail(pointIndex: number, emitterLifetime: number, point: Point, startTime: number): void;
+    /**
+     * 通过索引获取指定index粒子当前时刻的位置
+     * @params index - 粒子索引
+     */
+    getPointPositionByIndex(index: number): Vector3 | null;
+    /**
+     * 通过粒子参数获取当前时刻粒子的位置
+     */
     getPointPosition(point: Point): Vector3;
-    onEnd(particle: ParticleSystem): void;
-    onIterate(particle: ParticleSystem): void;
     initPoint(data: Record<string, any>): Point;
     addBurst(burst: Burst, offsets: vec3[]): number;
     removeBurst(index: number): void;

package/dist/plugins/particle/particle-vfx-item.d.ts

@@ -6,6 +6,7 @@ import { ParticleSystem } from './particle-system';
  * @internal
  */
 export declare class ParticleBehaviourPlayable extends Playable {
+    lastTime: number;
     particleSystem: ParticleSystem;
     start(context: FrameContext): void;
     processFrame(context: FrameContext): void;

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

@@ -1,6 +1,6 @@
 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 = "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 const COPY_VERTEX_SHADER = "\nprecision highp float;\nattribute vec2 aPos;\nvarying 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 = "precision mediump float;\nvarying vec2 vTex;\n\n#ifdef DEPTH_TEXTURE\nuniform sampler2D uDepth;\n#extension GL_EXT_frag_depth : enable\n#endif\nvoid main(){\n    #ifdef DEPTH_TEXTURE\n    gl_FragDepthEXT = texture2D(uDepth,vTex).r;\n    #endif\n}\n";
 export declare function createCopyShader(level: number, writeDepth?: boolean): SharedShaderWithSource;

package/dist/render/mesh.d.ts

@@ -16,7 +16,7 @@ export interface GeometryMeshProps extends MeshOptionsBase {
 }
 export interface MeshDestroyOptions {
     geometries?: DestroyOptions;
-    material?: MaterialDestroyOptions | DestroyOptions.keep;
+    material?: MaterialDestroyOptions | DestroyOptions;
 }
 /**
  * Mesh 抽象类

package/dist/shader/index.d.ts

@@ -1,6 +1,4 @@
 export { default as blend } from './blend.glsl';
-export { default as compatibleFrag } from './compatible.frag.glsl';
-export { default as compatibleVert } from './compatible.vert.glsl';
 export { default as itemFrameFrag } from './item-frame.frag.glsl';
 export { default as integrate } from './integrate.glsl';
 export { default as itemVert } from './item.vert.glsl';
@@ -17,3 +15,4 @@ export { default as gaussianDownHFrag } from './post-processing/gaussian-down-h.
 export { default as gaussianDownVFrag } from './post-processing/gaussian-down-v.frag.glsl';
 export { default as gaussianUpFrag } from './post-processing/gaussian-up.frag.glsl';
 export { default as thresholdFrag } from './post-processing/threshold.frag.glsl';
+export * from './shader-factory';

package/dist/shader/shader-factory.d.ts

@@ -0,0 +1,35 @@
+import type { ShaderMacros } from '../render';
+import { ShaderType } from '../material';
+export interface ShaderCodeOptions {
+    level: number;
+    shaderType: ShaderType;
+    shader: string;
+    macros?: ShaderMacros;
+    removeVersion?: boolean;
+}
+export declare class ShaderFactory {
+    static registerInclude(includeName: string, includeSource: string): void;
+    static unRegisterInclude(includeName: string): void;
+    static unRegisterAllIncludes(): void;
+    /**
+     * 生成 shader，检测到 WebGL1 上下文会降级
+     * @param macros - 宏定义数组
+     * @param shader - 原始 shader 文本
+     * @param shaderType - shader 类型
+     * @return 去除版本号的 shader 文本
+     */
+    static genFinalShaderCode(options: ShaderCodeOptions): string;
+    /**
+     * Convert lower GLSL version to GLSL 300 es.
+     * @param source - code
+     * @param isFragment - Whether it is a fragment shader.
+     * */
+    private static convertTo300;
+    private static parseIncludes;
+    private static genMacroString;
+    private static genShaderVersion;
+    private static isVersion300;
+    private static removeWebGLVersion;
+    private static has300Output;
+    private static replaceMRTShader;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-core",
-  "version": "2.0.0-alpha.32",
+  "version": "2.0.0-alpha.34",
   "description": "Galacean Effects runtime core for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",