@galacean/engine-shaderlab 2.0.0-alpha.24 → 2.0.0-alpha.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-shaderlab",
-  "version": "2.0.0-alpha.24",
+  "version": "2.0.0-alpha.26",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -26,11 +26,11 @@
     "verbose/package.json"
   ],
   "devDependencies": {
-    "@galacean/engine": "2.0.0-alpha.24",
-    "@galacean/engine-design": "2.0.0-alpha.24"
+    "@galacean/engine-design": "2.0.0-alpha.26",
+    "@galacean/engine": "2.0.0-alpha.26"
   },
   "peerDependencies": {
-    "@galacean/engine": "2.0.0-alpha.24"
+    "@galacean/engine": "2.0.0-alpha.26"
   },
   "scripts": {
     "b:types": "tsc"

package/types/ShaderInstructionEncoder.d.ts

@@ -0,0 +1 @@
+export type { ShaderInstruction } from "@galacean/engine-design";

package/types/ShaderLab.d.ts

@@ -1,5 +1,5 @@
-import { ShaderMacro, ShaderLanguage } from "@galacean/engine";
-import { IShaderLab, IShaderSource } from "@galacean/engine-design";
+import { ShaderLanguage } from "@galacean/engine";
+import { IPrecompiledShader, IShaderLab, IShaderSource } from "@galacean/engine-design";
 import { IShaderProgramSource } from "@galacean/engine-design/types/shader-lab/IShaderProgramSource";
 import { ShaderPosition, ShaderRange } from "./common";
 export declare class ShaderLab implements IShaderLab {
@@ -11,5 +11,6 @@ export declare class ShaderLab implements IShaderLab {
     static createRange(start: ShaderPosition, end: ShaderPosition): ShaderRange;
     _parseShaderSource(sourceCode: string): IShaderSource;
     _parseShaderPass(source: string, vertexEntry: string, fragmentEntry: string, backend: ShaderLanguage, basePathForIncludeKey: string): IShaderProgramSource | undefined;
-    _parseMacros(content: string, macros: ShaderMacro[]): string;
+    _precompile(sourceCode: string, platformTarget: ShaderLanguage, basePath: string): IPrecompiledShader;
+    private _serializeRenderStates;
 }

package/types/macroProcessor/MacroDefine.d.ts

@@ -1,13 +0,0 @@
-import { ShaderRange } from "../common";
-import { BaseToken } from "../common/BaseToken";
-export declare class MacroDefine {
-    readonly macro: BaseToken;
-    readonly body?: BaseToken;
-    readonly location?: ShaderRange;
-    readonly args?: BaseToken[];
-    private _replaceRegex?;
-    private readonly _argsLexemes?;
-    get isFunction(): boolean;
-    constructor(macro: BaseToken, body?: BaseToken, location?: ShaderRange, args?: BaseToken[]);
-    expandFunctionBody(args: string[]): string;
-}

package/types/macroProcessor/MacroParser.d.ts

@@ -1,7 +0,0 @@
-import { ShaderRange } from "../common";
-import { BlockInfo } from "./sourceMap";
-export interface ExpandSegment {
-    block?: BlockInfo;
-    rangeInBlock: ShaderRange;
-    replace: string;
-}

package/types/macroProcessor/MacroParserLexer.d.ts

@@ -1,32 +0,0 @@
-import { ShaderPosition, ShaderRange } from "../common";
-import PpSourceMap from "./sourceMap";
-import { BaseLexer } from "../common/BaseLexer";
-import { BaseToken } from "../common/BaseToken";
-import { MacroParserToken } from "./constants";
-export type OnToken = (token: BaseToken, scanner: MacroParserLexer) => void;
-export default class MacroParserLexer extends BaseLexer {
-    private static _isPpCharacters;
-    private static _lexemeTable;
-    private macroLvl;
-    readonly sourceMap: PpSourceMap;
-    readonly file: string;
-    readonly blockRange?: ShaderRange;
-    constructor(source: string, file?: string, blockRange?: ShaderRange);
-    scanWordsUntilTerminator(terminatorChar: string): BaseToken[];
-    scanWord(): BaseToken;
-    scanToken(): BaseToken | undefined;
-    scanQuotedString(): BaseToken<MacroParserToken.string_const>;
-    scanToChar(char: string): void;
-    scanMacroBranchBody(): {
-        body: BaseToken<MacroParserToken.chunk>;
-        nextDirective: BaseToken;
-    };
-    scanPairedBlock(lc: string, rc: string): void;
-    /**
-     * @returns end ShaderPosition
-     */
-    scanRemainMacro(): ShaderPosition;
-    peekNonSpace(): string;
-    scanInteger(): BaseToken<number>;
-    scanMacroBody(): BaseToken<MacroParserToken.line_remain>;
-}

package/types/macroProcessor/Utils.d.ts

@@ -1,5 +0,0 @@
-import { ExpandSegment } from "./MacroParser";
-import PpSourceMap from "./sourceMap";
-export declare class PpUtils {
-    static expand(segments: ExpandSegment[], source: string, sourceMap?: PpSourceMap): string;
-}

package/types/macroProcessor/constants.d.ts

@@ -1,54 +0,0 @@
-export declare enum MacroParserToken {
-    id = 0,
-    line_remain = 1,
-    chunk = 2,
-    int_constant = 3,
-    string_const = 4,
-    /** \>> */
-    right_op = 5,
-    /** << */
-    left_op = 6,
-    left_paren = 7,
-    right_paren = 8,
-    /** \>= */
-    ge = 9,
-    /** <= */
-    le = 10,
-    /** == */
-    eq = 11,
-    /** != */
-    neq = 12,
-    /** && */
-    and = 13,
-    /** || */
-    or = 14,
-    /** < */
-    left_angle = 15,
-    /** \> */
-    right_angle = 16,
-    /** \* */
-    star = 17,
-    /** + */
-    plus = 18,
-    /** \- */
-    dash = 19,
-    /** ! */
-    bang = 20,
-    /** \/ */
-    slash = 21,
-    /** % */
-    percent = 22,
-    EOF = 100
-}
-export declare enum MacroParserKeyword {
-    define = 101,
-    undef = 102,
-    if = 103,
-    ifdef = 104,
-    ifndef = 105,
-    else = 106,
-    elif = 107,
-    endif = 108,
-    defined = 109
-}
-export type MacroParserConstant = boolean | number;

package/types/macroProcessor/index.d.ts

@@ -1 +0,0 @@
-export * from "./MacroParser";

package/types/macroProcessor/sourceMap/index.d.ts

@@ -1,37 +0,0 @@
-import { ShaderRange } from "../../common/ShaderRange";
-export declare class BlockInfo {
-    readonly sourceFile: string;
-    readonly rangeInFile?: ShaderRange;
-    readonly sourceMap?: PpSourceMap;
-    constructor(sourceFile?: string, rangeInFile?: ShaderRange, sourceMap?: PpSourceMap);
-}
-export declare class MapRange {
-    sourceLoc: {
-        block: BlockInfo;
-        rangeInBlock: ShaderRange;
-    };
-    generatedLoc: {
-        start: number;
-        end: number;
-    };
-    constructor(sourceBlock: BlockInfo, rangeInBlock: ShaderRange, generatedLoc: {
-        start: number;
-        end: number;
-    });
-    getSourceIndex(generatedIdx: number): {
-        sourceFile: string;
-        index: number;
-    };
-}
-export default class PpSourceMap {
-    readonly mapRanges: MapRange[];
-    static rangeContains(range: MapRange["generatedLoc"], index: number): boolean;
-    addMapRange(mapRange: MapRange): void;
-    /**
-     * @returns index
-     */
-    map(index: number): {
-        sourceFile: string;
-        index: number;
-    };
-}