feat: remove redundant

galacean · Nov 15, 2024 · eeb1188 · eeb1188
1 parent 9de0104
commit eeb1188
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/packages/shader-lab/src/preprocessor/PpParser.ts b/packages/shader-lab/src/preprocessor/PpParser.ts
@@ -2,7 +2,7 @@ import { ShaderPosition, ShaderRange } from "../common";
 import LexerUtils from "../lexer/Utils";
 import { MacroDefine } from "./MacroDefine";
 import { BaseToken } from "../common/BaseToken";
-import { EPpKeyword, EPpToken, PpConstant, SkipTokens } from "./constants";
+import { EPpKeyword, EPpToken, PpConstant } from "./constants";
 import PpScanner from "./PpScanner";
 import { PpUtils } from "./Utils";
 import { ShaderLab } from "../ShaderLab";
@@ -644,21 +644,7 @@ export class PpParser {
   }
 
   private static _onToken(token: BaseToken, scanner: PpScanner) {
-    if (SkipTokens.indexOf(token.lexeme) !== -1) {
-      this._skipBlock(token, scanner);
-    } else {
-      this._expandToken(token, scanner);
-    }
-  }
-
-  private static _skipBlock(token: BaseToken, scanner: PpScanner) {
-    const start = scanner.current - token.lexeme.length;
-    scanner.scanPairedBlock("{", "}");
-    const end = scanner.current;
-    const startPosition = ShaderLab.createPosition(start);
-    const endPosition = ShaderLab.createPosition(end);
-    const range = ShaderLab.createRange(startPosition, endPosition);
-    this.expandSegments.push({ rangeInBlock: range, replace: "" });
+    this._expandToken(token, scanner);
   }
 
   private static _expandToken(token: BaseToken, scanner: PpScanner) {

diff --git a/packages/shader-lab/src/preprocessor/constants.ts b/packages/shader-lab/src/preprocessor/constants.ts
@@ -70,5 +70,3 @@ export const PpKeyword = new Map<string, EPpKeyword>([
 ]);
 
 export type PpConstant = boolean | number;
-
-export const SkipTokens = ["EditorProperties", "EditorMacros", "Editor"];