@galacean/engine-shaderlab 1.6.5 → 1.6.6

package/dist/browser.js

@@ -7609,12 +7609,19 @@
             for(var i = 0, n = shaderSource.subShaders.length; i < n; i++){
                 var subShader = shaderSource.subShaders[i];
                 var curSubShaderGlobalStatements = shaderPendingContents.concat(subShader.pendingContents);
-                var constMap = _extends({}, shaderRenderStates.constantMap, subShader.renderStates.constantMap);
-                var variableMap = _extends({}, shaderRenderStates.variableMap, subShader.renderStates.variableMap);
+                var globalSubShaderStates = {
+                    constantMap: _extends({}, shaderRenderStates.constantMap),
+                    variableMap: _extends({}, shaderRenderStates.variableMap)
+                };
+                this._mergeRenderStates(globalSubShaderStates, subShader.renderStates);
                 for(var j = 0, m = subShader.passes.length; j < m; j++){
                     var pass = subShader.passes[j];
-                    Object.assign(pass.renderStates.constantMap, constMap);
-                    Object.assign(pass.renderStates.variableMap, variableMap);
+                    var globalPassRenderStates = {
+                        constantMap: _extends({}, globalSubShaderStates.constantMap),
+                        variableMap: _extends({}, globalSubShaderStates.variableMap)
+                    };
+                    this._mergeRenderStates(globalPassRenderStates, pass.renderStates);
+                    pass.renderStates = globalPassRenderStates;
                     if (pass.isUsePass) continue;
                     var passGlobalStatements = curSubShaderGlobalStatements.concat(pass.pendingContents);
                     pass.contents = passGlobalStatements.map(function(item) {
@@ -7666,7 +7673,7 @@
                 }
             }
         };
-        ShaderSourceParser._parseRenderStateDeclarationOrAssignment = function _parseRenderStateDeclarationOrAssignment(renderStates, stateToken) {
+        ShaderSourceParser._parseRenderStateDeclarationOrAssignment = function _parseRenderStateDeclarationOrAssignment(outRenderStates, stateToken) {
             var lexer = this._lexer;
             var token = lexer.scanToken();
             if (token.type === ETokenType.ID) {
@@ -7676,19 +7683,37 @@
                 var symbol = new ShaderSourceSymbol(token.lexeme, stateToken.type, renderState);
                 this._symbolTableStack.insert(symbol);
             } else if (token.lexeme === "=") {
-                // Assignment
-                var variable = lexer.scanToken();
-                lexer.scanLexeme(";");
-                var lookupSymbol = this._lookupSymbol;
-                lookupSymbol.set(variable.lexeme, stateToken.type);
-                var sm = this._symbolTableStack.lookup(lookupSymbol);
-                if (!(sm == null ? void 0 : sm.value)) {
-                    this._createCompileError('Invalid "' + stateToken.lexeme + '" variable: ' + variable.lexeme, variable.location);
+                // Check if it's direct assignment syntax sugar or variable assignment
+                var nextToken = lexer.scanToken();
+                var renderState1;
+                if (nextToken.lexeme === "{") {
+                    // Syntax: DepthState = { ... }
+                    renderState1 = this._parseRenderStateProperties(stateToken.lexeme);
+                } else {
+                    // Syntax: DepthState = customDepthState;
+                    lexer.scanLexeme(";");
+                    var lookupSymbol = this._lookupSymbol;
+                    lookupSymbol.set(nextToken.lexeme, stateToken.type);
+                    var sm = this._symbolTableStack.lookup(lookupSymbol);
+                    if (!(sm == null ? void 0 : sm.value)) {
+                        this._createCompileError('Invalid "' + stateToken.lexeme + '" variable: ' + nextToken.lexeme, nextToken.location);
+                    }
+                    renderState1 = sm.value;
                 }
-                var renderState1 = sm.value;
-                Object.assign(renderStates.constantMap, renderState1.constantMap);
-                Object.assign(renderStates.variableMap, renderState1.variableMap);
-                return;
+                this._mergeRenderStates(outRenderStates, renderState1);
+            }
+        };
+        ShaderSourceParser._mergeRenderStates = function _mergeRenderStates(outTarget, source) {
+            // For each key in the source, remove it from the opposite map in target to ensure proper override
+            var targetConstantMap = outTarget.constantMap, targetVariableMap = outTarget.variableMap;
+            var sourceConstantMap = source.constantMap, sourceVariableMap = source.variableMap;
+            for(var key in sourceConstantMap){
+                delete targetVariableMap[key];
+                targetConstantMap[key] = sourceConstantMap[key];
+            }
+            for(var key1 in sourceVariableMap){
+                delete targetConstantMap[key1];
+                targetVariableMap[key1] = sourceVariableMap[key1];
             }
         };
         ShaderSourceParser._parseVariableDeclaration = function _parseVariableDeclaration() {
@@ -8033,7 +8058,7 @@
     ShaderLab._shaderRangePool = ShaderLabUtils.createObjectPool(ShaderRange);
 
     //@ts-ignore
-    var version = "1.6.5";
+    var version = "1.6.6";
     var mode = "Release";
     console.log("Galacean Engine ShaderLab Version: " + version + " | Mode: " + mode);