@galacean/engine-shaderlab 2.0.0-alpha.2 → 2.0.0-alpha.21

package/dist/module.js

@@ -1,4 +1,4 @@
-import { ClearableObjectPool, Logger, ShaderPass, ShaderLib, ReturnableObjectPool, Color, RenderStateElementKey, RenderQueueType, CompareFunction, StencilOperation, BlendOperation, BlendFactor, CullMode, ShaderLanguage } from '@galacean/engine';
+import { ClearableObjectPool, Logger, ShaderPass, ShaderLib, ReturnableObjectPool, Color, RenderStateElementKey, RenderQueueType, CompareFunction, StencilOperation, BlendOperation, BlendFactor, CullMode, ColorWriteMask, ShaderLanguage } from '@galacean/engine';
 
 function _set_prototype_of(o, p) {
     _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
@@ -297,40 +297,42 @@ var Keyword = /*#__PURE__*/ function(Keyword) {
     Keyword[Keyword["LeftBrace"] = 71] = "LeftBrace";
     Keyword[Keyword["RightBrace"] = 72] = "RightBrace";
     Keyword[Keyword["Equal"] = 73] = "Equal";
+    Keyword[Keyword["BitwiseOr"] = 74] = "BitwiseOr";
     // Source Parser Tokens
-    Keyword[Keyword["GSRenderQueueType"] = 74] = "GSRenderQueueType";
-    Keyword[Keyword["GSBlendState"] = 75] = "GSBlendState";
-    Keyword[Keyword["GSDepthState"] = 76] = "GSDepthState";
-    Keyword[Keyword["GSStencilState"] = 77] = "GSStencilState";
-    Keyword[Keyword["GSRasterState"] = 78] = "GSRasterState";
-    Keyword[Keyword["GSEditorProperties"] = 79] = "GSEditorProperties";
-    Keyword[Keyword["GSEditorMacros"] = 80] = "GSEditorMacros";
-    Keyword[Keyword["GSEditor"] = 81] = "GSEditor";
-    Keyword[Keyword["GSTags"] = 82] = "GSTags";
-    Keyword[Keyword["GSVertexShader"] = 83] = "GSVertexShader";
-    Keyword[Keyword["GSFragmentShader"] = 84] = "GSFragmentShader";
-    Keyword[Keyword["GSSubShader"] = 85] = "GSSubShader";
-    Keyword[Keyword["GSPass"] = 86] = "GSPass";
-    Keyword[Keyword["GSBlendFactor"] = 87] = "GSBlendFactor";
-    Keyword[Keyword["GSBlendOperation"] = 88] = "GSBlendOperation";
-    Keyword[Keyword["GSBool"] = 89] = "GSBool";
-    Keyword[Keyword["GSNumber"] = 90] = "GSNumber";
-    Keyword[Keyword["GSColor"] = 91] = "GSColor";
-    Keyword[Keyword["GSCompareFunction"] = 92] = "GSCompareFunction";
-    Keyword[Keyword["GSStencilOperation"] = 93] = "GSStencilOperation";
-    Keyword[Keyword["GSCullMode"] = 94] = "GSCullMode";
-    Keyword[Keyword["GSUsePass"] = 95] = "GSUsePass";
+    Keyword[Keyword["GSRenderQueueType"] = 75] = "GSRenderQueueType";
+    Keyword[Keyword["GSBlendState"] = 76] = "GSBlendState";
+    Keyword[Keyword["GSDepthState"] = 77] = "GSDepthState";
+    Keyword[Keyword["GSStencilState"] = 78] = "GSStencilState";
+    Keyword[Keyword["GSRasterState"] = 79] = "GSRasterState";
+    Keyword[Keyword["GSEditorProperties"] = 80] = "GSEditorProperties";
+    Keyword[Keyword["GSEditorMacros"] = 81] = "GSEditorMacros";
+    Keyword[Keyword["GSEditor"] = 82] = "GSEditor";
+    Keyword[Keyword["GSTags"] = 83] = "GSTags";
+    Keyword[Keyword["GSVertexShader"] = 84] = "GSVertexShader";
+    Keyword[Keyword["GSFragmentShader"] = 85] = "GSFragmentShader";
+    Keyword[Keyword["GSSubShader"] = 86] = "GSSubShader";
+    Keyword[Keyword["GSPass"] = 87] = "GSPass";
+    Keyword[Keyword["GSBlendFactor"] = 88] = "GSBlendFactor";
+    Keyword[Keyword["GSBlendOperation"] = 89] = "GSBlendOperation";
+    Keyword[Keyword["GSBool"] = 90] = "GSBool";
+    Keyword[Keyword["GSNumber"] = 91] = "GSNumber";
+    Keyword[Keyword["GSColor"] = 92] = "GSColor";
+    Keyword[Keyword["GSCompareFunction"] = 93] = "GSCompareFunction";
+    Keyword[Keyword["GSStencilOperation"] = 94] = "GSStencilOperation";
+    Keyword[Keyword["GSCullMode"] = 95] = "GSCullMode";
+    Keyword[Keyword["GSColorWriteMask"] = 96] = "GSColorWriteMask";
+    Keyword[Keyword["GSUsePass"] = 97] = "GSUsePass";
     // Macros
-    Keyword[Keyword["MACRO_IF"] = 96] = "MACRO_IF";
-    Keyword[Keyword["MACRO_IFDEF"] = 97] = "MACRO_IFDEF";
-    Keyword[Keyword["MACRO_IFNDEF"] = 98] = "MACRO_IFNDEF";
-    Keyword[Keyword["MACRO_ELSE"] = 99] = "MACRO_ELSE";
-    Keyword[Keyword["MACRO_ELIF"] = 100] = "MACRO_ELIF";
-    Keyword[Keyword["MACRO_ENDIF"] = 101] = "MACRO_ENDIF";
-    Keyword[Keyword["MACRO_UNDEF"] = 102] = "MACRO_UNDEF";
-    Keyword[Keyword["MACRO_DEFINE_EXPRESSION"] = 103] = "MACRO_DEFINE_EXPRESSION";
-    Keyword[Keyword["MACRO_CONDITIONAL_EXPRESSION"] = 104] = "MACRO_CONDITIONAL_EXPRESSION";
-    Keyword[Keyword["MACRO_CALL"] = 105] = "MACRO_CALL";
+    Keyword[Keyword["MACRO_IF"] = 98] = "MACRO_IF";
+    Keyword[Keyword["MACRO_IFDEF"] = 99] = "MACRO_IFDEF";
+    Keyword[Keyword["MACRO_IFNDEF"] = 100] = "MACRO_IFNDEF";
+    Keyword[Keyword["MACRO_ELSE"] = 101] = "MACRO_ELSE";
+    Keyword[Keyword["MACRO_ELIF"] = 102] = "MACRO_ELIF";
+    Keyword[Keyword["MACRO_ENDIF"] = 103] = "MACRO_ENDIF";
+    Keyword[Keyword["MACRO_UNDEF"] = 104] = "MACRO_UNDEF";
+    Keyword[Keyword["MACRO_DEFINE_EXPRESSION"] = 105] = "MACRO_DEFINE_EXPRESSION";
+    Keyword[Keyword["MACRO_CONDITIONAL_EXPRESSION"] = 106] = "MACRO_CONDITIONAL_EXPRESSION";
+    Keyword[Keyword["MACRO_CALL"] = 107] = "MACRO_CALL";
     return Keyword;
 }({});
 
@@ -7540,7 +7542,8 @@ var SourceLexer = /*#__PURE__*/ function(BaseLexer1) {
         charCode === 59 || // ;
         charCode === 46 || // .   CullMode.Back
         charCode === 91 || // [   Enabled[0],
-        charCode === 40 // (      Color(1.0, 1.0, 1.0, 1.0);
+        charCode === 40 || // (      Color(1.0, 1.0, 1.0, 1.0);
+        charCode === 124 // |      ColorWriteMask.Red | ColorWriteMask.Green
         ;
     };
     SourceLexer._scanDigits = function _scanDigits(source, startIndex) {
@@ -7579,6 +7582,7 @@ SourceLexer._keywordLexemeTable = {
     CompareFunction: Keyword.GSCompareFunction,
     StencilOperation: Keyword.GSStencilOperation,
     CullMode: Keyword.GSCullMode,
+    ColorWriteMask: Keyword.GSColorWriteMask,
     UsePass: Keyword.GSUsePass,
     true: Keyword.True,
     false: Keyword.False
@@ -7586,7 +7590,8 @@ SourceLexer._keywordLexemeTable = {
 SourceLexer._symbolLexemeTable = {
     "{": Keyword.LeftBrace,
     "}": Keyword.RightBrace,
-    "=": Keyword.Equal
+    "=": Keyword.Equal,
+    "|": Keyword.BitwiseOr
 };
 
 /**
@@ -7741,6 +7746,17 @@ SourceLexer._symbolLexemeTable = {
     ShaderSourceParser._createCompileError = function _createCompileError(message, location) {
         this._lexer.createCompileError(message, location);
     };
+    ShaderSourceParser._scanEnumConstValue = function _scanEnumConstValue(enumName) {
+        var _this__renderStateConstMap_enumName;
+        var lexer = this._lexer;
+        lexer.advance(1);
+        var constValueToken = lexer.scanToken();
+        var value = (_this__renderStateConstMap_enumName = this._renderStateConstMap[enumName]) == null ? void 0 : _this__renderStateConstMap_enumName[constValueToken.lexeme];
+        if (value == undefined) {
+            this._createCompileError("Invalid engine constant: " + enumName + "." + constValueToken.lexeme, constValueToken.location);
+        }
+        return value;
+    };
     ShaderSourceParser._parseRenderStateProperty = function _parseRenderStateProperty(stateLexeme, out) {
         var lexer = this._lexer;
         var propertyToken = lexer.scanToken();
@@ -7780,12 +7796,31 @@ SourceLexer._symbolLexemeTable = {
             } else if (valueTokenType === Keyword.GSColor) {
                 propertyValue = lexer.scanColor();
             } else if (lexer.getCurChar() === ".") {
-                var _this__renderStateConstMap_valueToken_lexeme;
-                lexer.advance(1);
-                var constValueToken = lexer.scanToken();
-                propertyValue = (_this__renderStateConstMap_valueToken_lexeme = this._renderStateConstMap[valueToken.lexeme]) == null ? void 0 : _this__renderStateConstMap_valueToken_lexeme[constValueToken.lexeme];
-                if (propertyValue == undefined) {
-                    this._createCompileError("Invalid engine constant: " + valueToken.lexeme + "." + constValueToken.lexeme, constValueToken.location);
+                propertyValue = this._scanEnumConstValue(valueToken.lexeme);
+                if (propertyValue == undefined) return;
+                // Support bitwise OR only for bitmask enums (e.g. ColorWriteMask)
+                lexer.skipCommentsAndSpace();
+                if (lexer.getCurChar() === "|") {
+                    if (valueToken.lexeme !== "ColorWriteMask") {
+                        this._createCompileError("Bitwise OR '|' is not supported for '" + valueToken.lexeme + "', only bitmask enums like 'ColorWriteMask' support this", valueToken.location);
+                        return;
+                    }
+                    while(lexer.getCurChar() === "|"){
+                        lexer.advance(1);
+                        var nextEnumToken = lexer.scanToken();
+                        if (nextEnumToken == undefined || lexer.getCurChar() !== ".") {
+                            this._createCompileError("Invalid syntax after '|', expect 'EnumType.Value'", nextEnumToken == null ? void 0 : nextEnumToken.location);
+                            return;
+                        }
+                        if (nextEnumToken.lexeme !== valueToken.lexeme) {
+                            this._createCompileError("Cannot mix enum types in bitwise OR: expected '" + valueToken.lexeme + "' but got '" + nextEnumToken.lexeme + "'", nextEnumToken.location);
+                            return;
+                        }
+                        var nextValue = this._scanEnumConstValue(nextEnumToken.lexeme);
+                        if (nextValue == undefined) return;
+                        propertyValue = propertyValue | nextValue;
+                        lexer.skipCommentsAndSpace();
+                    }
                 }
             } else {
                 propertyValue = valueToken.lexeme;
@@ -7973,6 +8008,7 @@ SourceLexer._symbolLexemeTable = {
             case Keyword.GSCompareFunction:
             case Keyword.GSStencilOperation:
             case Keyword.GSCullMode:
+            case Keyword.GSColorWriteMask:
                 this._addPendingContents(start, token.lexeme.length, outGlobalContents);
                 this._parseVariableDeclaration();
                 start = this._lexer.getShaderPosition(0);
@@ -7997,7 +8033,8 @@ ShaderSourceParser._renderStateConstMap = {
     StencilOperation: StencilOperation,
     BlendOperation: BlendOperation,
     BlendFactor: BlendFactor,
-    CullMode: CullMode
+    CullMode: CullMode,
+    ColorWriteMask: ColorWriteMask
 };
 ShaderSourceParser._symbolTableStack = new SymbolTableStack();
 ShaderSourceParser._lexer = new SourceLexer();
@@ -8056,7 +8093,7 @@ ShaderLab._shaderPositionPool = ShaderLabUtils.createObjectPool(ShaderPosition);
 ShaderLab._shaderRangePool = ShaderLabUtils.createObjectPool(ShaderRange);
 
 //@ts-ignore
-var version = "2.0.0-alpha.2";
+var version = "2.0.0-alpha.21";
 var mode = "Release";
 console.log("Galacean Engine ShaderLab Version: " + version + " | Mode: " + mode);