@galacean/engine-core 2.0.0-alpha.25 → 2.0.0-alpha.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-core",
-  "version": "2.0.0-alpha.25",
+  "version": "2.0.0-alpha.27",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -18,10 +18,10 @@
     "types/**/*"
   ],
   "dependencies": {
-    "@galacean/engine-math": "2.0.0-alpha.25"
+    "@galacean/engine-math": "2.0.0-alpha.27"
   },
   "devDependencies": {
-    "@galacean/engine-design": "2.0.0-alpha.25"
+    "@galacean/engine-design": "2.0.0-alpha.27"
   },
   "scripts": {
     "b:types": "tsc"

package/types/particle/ParticleGenerator.d.ts

@@ -7,6 +7,7 @@ import { MainModule } from "./modules/MainModule";
 import { RotationOverLifetimeModule } from "./modules/RotationOverLifetimeModule";
 import { SizeOverLifetimeModule } from "./modules/SizeOverLifetimeModule";
 import { TextureSheetAnimationModule } from "./modules/TextureSheetAnimationModule";
+import { NoiseModule } from "./modules/NoiseModule";
 import { VelocityOverLifetimeModule } from "./modules/VelocityOverLifetimeModule";
 /**
  * Particle Generator.
@@ -44,6 +45,8 @@ export declare class ParticleGenerator {
     readonly colorOverLifetime: ColorOverLifetimeModule;
     /** Texture sheet animation module. */
     readonly textureSheetAnimation: TextureSheetAnimationModule;
+    /** Noise module. */
+    readonly noise: NoiseModule;
     private _isPlaying;
     private _instanceBufferResized;
     private _waitProcessRetiredElementCount;

package/types/particle/index.d.ts

@@ -20,4 +20,5 @@ export { SizeOverLifetimeModule } from "./modules/SizeOverLifetimeModule";
 export { TextureSheetAnimationModule } from "./modules/TextureSheetAnimationModule";
 export { VelocityOverLifetimeModule } from "./modules/VelocityOverLifetimeModule";
 export { LimitVelocityOverLifetimeModule } from "./modules/LimitVelocityOverLifetimeModule";
+export { NoiseModule } from "./modules/NoiseModule";
 export * from "./modules/shape/index";

package/types/particle/modules/NoiseModule.d.ts

@@ -0,0 +1,90 @@
+import { ShaderMacro, ShaderProperty } from "../../shader";
+import { ParticleGenerator } from "../ParticleGenerator";
+import { ParticleCompositeCurve } from "./ParticleCompositeCurve";
+import { ParticleGeneratorModule } from "./ParticleGeneratorModule";
+/**
+ * Noise module for particle system.
+ * Adds simplex noise-based turbulence displacement to particles.
+ */
+export declare class NoiseModule extends ParticleGeneratorModule {
+    static readonly _enabledMacro: ShaderMacro;
+    static readonly _strengthCurveMacro: ShaderMacro;
+    static readonly _strengthIsRandomTwoMacro: ShaderMacro;
+    static readonly _separateAxesMacro: ShaderMacro;
+    static readonly _noiseProperty: ShaderProperty;
+    static readonly _noiseOctaveProperty: ShaderProperty;
+    static readonly _strengthMinConstProperty: ShaderProperty;
+    static readonly _strengthMaxCurveXProperty: ShaderProperty;
+    static readonly _strengthMaxCurveYProperty: ShaderProperty;
+    static readonly _strengthMaxCurveZProperty: ShaderProperty;
+    static readonly _strengthMinCurveXProperty: ShaderProperty;
+    static readonly _strengthMinCurveYProperty: ShaderProperty;
+    static readonly _strengthMinCurveZProperty: ShaderProperty;
+    private _enabledModuleMacro;
+    private _strengthCurveModeMacro;
+    private _strengthIsRandomTwoModeMacro;
+    private _separateAxesModeMacro;
+    private _noiseParams;
+    private _noiseOctaveParams;
+    private _strengthMinConst;
+    private _strengthX;
+    private _strengthY;
+    private _strengthZ;
+    private _scrollSpeed;
+    private _separateAxes;
+    private _frequency;
+    private _octaveCount;
+    private _octaveIntensityMultiplier;
+    private _octaveFrequencyMultiplier;
+    /**
+     * Specifies whether the strength is separate on each axis, when disabled, only `strength` is used.
+     */
+    get separateAxes(): boolean;
+    set separateAxes(value: boolean);
+    /**
+     * Noise strength. When `separateAxes` is disabled, applies to all axes.
+     * When `separateAxes` is enabled, applies only to x axis.
+     */
+    get strengthX(): ParticleCompositeCurve;
+    set strengthX(value: ParticleCompositeCurve);
+    /**
+     * Noise strength for y axis, used when `separateAxes` is enabled.
+     */
+    get strengthY(): ParticleCompositeCurve;
+    set strengthY(value: ParticleCompositeCurve);
+    /**
+     * Noise strength for z axis, used when `separateAxes` is enabled.
+     */
+    get strengthZ(): ParticleCompositeCurve;
+    set strengthZ(value: ParticleCompositeCurve);
+    /**
+     * Noise spatial frequency.
+     */
+    get frequency(): number;
+    set frequency(value: number);
+    /**
+     * Noise field scroll speed over time.
+     */
+    get scrollSpeed(): number;
+    set scrollSpeed(value: number);
+    /**
+     * Number of noise octave layers (1-3).
+     */
+    get octaveCount(): number;
+    set octaveCount(value: number);
+    /**
+     * Intensity multiplier for each successive octave, only effective when `octaveCount` > 1.
+     * Each layer's contribution is scaled by this factor relative to the previous layer, range [0, 1].
+     */
+    get octaveIntensityMultiplier(): number;
+    set octaveIntensityMultiplier(value: number);
+    /**
+     * Frequency multiplier for each successive octave, only effective when `octaveCount` > 1.
+     * Each layer samples at this multiple of the previous layer's frequency, range [1, 4].
+     */
+    get octaveFrequencyMultiplier(): number;
+    set octaveFrequencyMultiplier(value: number);
+    get enabled(): boolean;
+    set enabled(value: boolean);
+    constructor(generator: ParticleGenerator);
+}

package/types/shader/Shader.d.ts

@@ -61,6 +61,8 @@ export declare class Shader implements IReferable {
      * @param name - Name of the shader
      */
     static find(name: string): Shader;
+    private static _resolveUsePass;
+    private static _applyRenderStates;
     private static _applyConstRenderStates;
     private _refCount;
     private _destroyed;

package/types/shader/ShaderMacroProcessor.d.ts

@@ -0,0 +1 @@
+export {};

package/types/shader/ShaderPass.d.ts

@@ -1,10 +1,14 @@
+import type { ShaderInstruction } from "@galacean/engine-design";
 import { ShaderPart } from "./ShaderPart";
+import { ShaderLanguage } from "./enums/ShaderLanguage";
 /**
  * Shader pass containing vertex and fragment source.
  */
 export declare class ShaderPass extends ShaderPart {
-    private _vertexSource;
-    private _fragmentSource;
+    private _vertexSource?;
+    private _fragmentSource?;
+    private static _shaderMacroList;
+    private static _macroMap;
     /**
      * Create a shader pass.
      * @param name - Shader pass name
@@ -20,6 +24,16 @@ export declare class ShaderPass extends ShaderPart {
      * @param tags - Tags
      */
     constructor(vertexSource: string, fragmentSource: string, tags?: Record<string, number | string | boolean>);
+    /**
+     * Create a shader pass from precompiled instructions.
+     * @param name - Shader pass name
+     * @param vertexShaderInstructions - Precompiled vertex instruction array
+     * @param fragmentShaderInstructions - Precompiled fragment instruction array
+     * @param platformTarget - Target shader language
+     * @param tags - Tags
+     */
+    constructor(name: string, vertexShaderInstructions: ShaderInstruction[], fragmentShaderInstructions: ShaderInstruction[], platformTarget: ShaderLanguage, tags?: Record<string, number | string | boolean>);
     private _getCanonicalShaderProgram;
-    private _getShaderLabProgram;
+    private _compilePlatformSource;
+    private _compileShaderLabSource;
 }

package/types/shader/enums/ShaderPreprocessorDirective.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Directive types for shader preprocessor instructions.
+ */
+export declare enum ShaderPreprocessorDirective {
+    Text = 0,
+    IfDef = 1,
+    IfNdef = 2,
+    IfCmp = 3,
+    IfExpr = 4,
+    Else = 5,
+    Endif = 6,
+    Define = 7,
+    DefineVal = 8,
+    DefineFunc = 9,
+    Undef = 10
+}

package/types/shaderlib/ShaderLib.d.ts

@@ -7,6 +7,7 @@ export declare const ShaderLib: {
     texture_sheet_animation_module: string;
     force_over_lifetime_module: string;
     limit_velocity_over_lifetime_module: string;
+    noise_module: string;
     particle_feedback_simulation: string;
     sphere_billboard: string;
     stretched_billboard: string;
@@ -57,19 +58,5 @@ export declare const ShaderLib: {
     begin_viewdir_frag: string;
     mobile_blinnphong_frag: string;
     noise_common: string;
-    noise_cellular_2D: string;
-    noise_cellular_2x2: string;
-    noise_cellular_2x2x2: string;
-    noise_cellular_3D: string;
-    noise_cellular: string;
-    noise_perlin_2D: string;
-    noise_perlin_3D: string;
-    noise_perlin_4D: string;
-    noise_perlin: string;
-    noise_psrd_2D: string;
-    noise_simplex_2D: string;
     noise_simplex_3D_grad: string;
-    noise_simplex_3D: string;
-    noise_simplex_4D: string;
-    noise_simplex: string;
 };

package/types/shaderlib/particle/index.d.ts

@@ -7,6 +7,7 @@ declare const _default: {
     texture_sheet_animation_module: string;
     force_over_lifetime_module: string;
     limit_velocity_over_lifetime_module: string;
+    noise_module: string;
     particle_feedback_simulation: string;
     sphere_billboard: string;
     stretched_billboard: string;