@galacean/engine-core 2.0.0-alpha.55 → 2.0.0-alpha.56

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/module.js CHANGED
@@ -7162,10 +7162,8 @@ ShaderBlockProperty._nameMap = Object.create(null);
7162
7162
  mrtIndexSet.forEach(function(index) {
7163
7163
  declaration += "layout(location=" + index + ") out vec4 fragOutColor" + index + ";\n";
7164
7164
  });
7165
- declaration += "void main(";
7166
7165
  shader = shader.replace(/\bgl_FragData\[(.+?)\]/g, "fragOutColor$1");
7167
- shader = shader.replace(/void\s+?main\s*\(/g, declaration);
7168
- return shader;
7166
+ return declaration + shader;
7169
7167
  };
7170
7168
  return ShaderFactory;
7171
7169
  }();
@@ -9015,7 +9013,7 @@ var precisionStr = "\n #ifdef GL_FRAGMENT_PRECISION_HIGH\n precision hig
9015
9013
  * Shader pass containing vertex and fragment source.
9016
9014
  */ var ShaderPass = /*#__PURE__*/ function(ShaderPart) {
9017
9015
  _inherits(ShaderPass, ShaderPart);
9018
- function ShaderPass(name, vertexShaderInstructions, fragmentShaderInstructions, platformTarget, tags) {
9016
+ function ShaderPass(name, vertexShaderInstructions, fragmentShaderInstructions, platformTarget, tags, vertexOutputNames) {
9019
9017
  var _this;
9020
9018
  _this = ShaderPart.call(this) || this, /** @internal */ _this._shaderPassId = 0, /** @internal Pass-level render state — always present, populated from ShaderLab declarations. */ _this._renderState = new RenderState(), /** @internal */ _this._renderStateDataMap = {}, /** @internal */ _this._shaderProgramMaps = [];
9021
9019
  _this._shaderPassId = ShaderPass._shaderPassCounter++;
@@ -9023,6 +9021,7 @@ var precisionStr = "\n #ifdef GL_FRAGMENT_PRECISION_HIGH\n precision hig
9023
9021
  _this._vertexShaderInstructions = vertexShaderInstructions;
9024
9022
  _this._fragmentShaderInstructions = fragmentShaderInstructions;
9025
9023
  _this._platformTarget = platformTarget;
9024
+ _this._vertexOutputNames = vertexOutputNames;
9026
9025
  var mergedTags = _extends({
9027
9026
  pipelineStage: PipelineStage.Forward
9028
9027
  }, tags);
@@ -9058,6 +9057,12 @@ var precisionStr = "\n #ifdef GL_FRAGMENT_PRECISION_HIGH\n precision hig
9058
9057
  /**
9059
9058
  * @internal
9060
9059
  */ _proto._compileShaderProgram = function _compileShaderProgram(engine, macroCollection, feedbackVaryings) {
9060
+ var names = this._vertexOutputNames;
9061
+ if (names && (feedbackVaryings == null ? void 0 : feedbackVaryings.length)) {
9062
+ feedbackVaryings = feedbackVaryings.map(function(name) {
9063
+ return Object.prototype.hasOwnProperty.call(names, name) ? names[name] : name;
9064
+ });
9065
+ }
9061
9066
  var isGPUInstance = macroCollection.isEnable(InstanceBuffer.gpuInstanceMacro);
9062
9067
  var _this__compileShaderSource = this._compileShaderSource(engine, macroCollection, isGPUInstance), vertexSource = _this__compileShaderSource.vertexSource, fragmentSource = _this__compileShaderSource.fragmentSource, instanceLayout = _this__compileShaderSource.instanceLayout;
9063
9068
  var program = new ShaderProgram(engine, vertexSource, fragmentSource, feedbackVaryings);
@@ -9258,7 +9263,7 @@ ShaderPass._macroMap = new Map();
9258
9263
  if (!shaderPassSource) {
9259
9264
  throw 'Shader pass "' + parsedSource.name + "." + subShaderSource.name + "." + passSource.name + '" parse failed, please check the shader source code.';
9260
9265
  }
9261
- var shaderPass = new ShaderPass(passSource.name, shaderPassSource.vertexShaderInstructions, shaderPassSource.fragmentShaderInstructions, platformTarget, passSource.tags);
9266
+ var shaderPass = new ShaderPass(passSource.name, shaderPassSource.vertexShaderInstructions, shaderPassSource.fragmentShaderInstructions, platformTarget, passSource.tags, shaderPassSource.vertexOutputNames);
9262
9267
  Shader._applyRenderStates(shaderPass, passSource.renderStates.constantMap, passSource.renderStates.variableMap, false);
9263
9268
  return shaderPass;
9264
9269
  });
@@ -9285,7 +9290,7 @@ ShaderPass._macroMap = new Map();
9285
9290
  if (passData.isUsePass) {
9286
9291
  return Shader._resolveUsePass(passData.name);
9287
9292
  }
9288
- var shaderPass = new ShaderPass(passData.name, passData.vertexShaderInstructions, passData.fragmentShaderInstructions, data.platformTarget, passData.tags);
9293
+ var shaderPass = new ShaderPass(passData.name, passData.vertexShaderInstructions, passData.fragmentShaderInstructions, data.platformTarget, passData.tags, passData.vertexOutputNames);
9289
9294
  Shader._applyRenderStates(shaderPass, passData.renderStates.constantMap, passData.renderStates.variableMap, true);
9290
9295
  return shaderPass;
9291
9296
  });