@cesium/engine 11.0.0 → 11.1.0

package/Source/Renderer/ShaderBuilder.js

@@ -155,7 +155,7 @@ ShaderBuilder.prototype.addDefine = function (identifier, value, destination) {
 ShaderBuilder.prototype.addStruct = function (
   structId,
   structName,
-  destination
+  destination,
 ) {
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.string("structId", structId);
@@ -213,7 +213,7 @@ ShaderBuilder.prototype.addStructField = function (structId, type, identifier) {
 ShaderBuilder.prototype.addFunction = function (
   functionName,
   signature,
-  destination
+  destination,
 ) {
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.string("functionName", functionName);
@@ -254,7 +254,7 @@ ShaderBuilder.prototype.addFunctionLines = function (functionName, lines) {
   Check.typeOf.string("functionName", functionName);
   if (typeof lines !== "string" && !Array.isArray(lines)) {
     throw new DeveloperError(
-      `Expected lines to be a string or an array of strings, actual value was ${lines}`
+      `Expected lines to be a string or an array of strings, actual value was ${lines}`,
     );
   }
   //>>includeEnd('debug');
@@ -317,7 +317,7 @@ ShaderBuilder.prototype.setPositionAttribute = function (type, identifier) {
 
   if (defined(this._positionAttributeLine)) {
     throw new DeveloperError(
-      "setPositionAttribute() must be called exactly once for the attribute used for gl_Position. For other attributes, use addAttribute()"
+      "setPositionAttribute() must be called exactly once for the attribute used for gl_Position. For other attributes, use addAttribute()",
     );
   }
   //>>includeEnd('debug');
@@ -407,7 +407,7 @@ ShaderBuilder.prototype.addVertexLines = function (lines) {
   //>>includeStart('debug', pragmas.debug);
   if (typeof lines !== "string" && !Array.isArray(lines)) {
     throw new DeveloperError(
-      `Expected lines to be a string or an array of strings, actual value was ${lines}`
+      `Expected lines to be a string or an array of strings, actual value was ${lines}`,
     );
   }
   //>>includeEnd('debug');
@@ -442,7 +442,7 @@ ShaderBuilder.prototype.addFragmentLines = function (lines) {
   //>>includeStart('debug', pragmas.debug);
   if (typeof lines !== "string" && !Array.isArray(lines)) {
     throw new DeveloperError(
-      `Expected lines to be a string or an array of strings, actual value was ${lines}`
+      `Expected lines to be a string or an array of strings, actual value was ${lines}`,
     );
   }
   //>>includeEnd('debug');
@@ -488,7 +488,7 @@ ShaderBuilder.prototype.buildShaderProgram = function (context) {
       this._vertexShaderParts.varyingLines,
       structLines.vertexLines,
       functionLines.vertexLines,
-      this._vertexShaderParts.shaderLines
+      this._vertexShaderParts.shaderLines,
     )
     .join("\n");
   const vertexShaderSource = new ShaderSource({
@@ -501,7 +501,7 @@ ShaderBuilder.prototype.buildShaderProgram = function (context) {
       this._fragmentShaderParts.varyingLines,
       structLines.fragmentLines,
       functionLines.fragmentLines,
-      this._fragmentShaderParts.shaderLines
+      this._fragmentShaderParts.shaderLines,
     )
     .join("\n");
   const fragmentShaderSource = new ShaderSource({

package/Source/Renderer/ShaderCache.js

@@ -112,12 +112,10 @@ ShaderCache.prototype.getShaderProgram = function (options) {
   } else {
     const context = this._context;
 
-    const vertexShaderText = vertexShaderSource.createCombinedVertexShader(
-      context
-    );
-    const fragmentShaderText = fragmentShaderSource.createCombinedFragmentShader(
-      context
-    );
+    const vertexShaderText =
+      vertexShaderSource.createCombinedVertexShader(context);
+    const fragmentShaderText =
+      fragmentShaderSource.createCombinedFragmentShader(context);
 
     const shaderProgram = new ShaderProgram({
       gl: context._gl,
@@ -151,7 +149,7 @@ ShaderCache.prototype.getShaderProgram = function (options) {
 ShaderCache.prototype.replaceDerivedShaderProgram = function (
   shaderProgram,
   keyword,
-  options
+  options,
 ) {
   const cachedShader = shaderProgram._cachedShader;
   const derivedKeyword = keyword + cachedShader.keyword;
@@ -169,7 +167,7 @@ ShaderCache.prototype.replaceDerivedShaderProgram = function (
 
 ShaderCache.prototype.getDerivedShaderProgram = function (
   shaderProgram,
-  keyword
+  keyword,
 ) {
   const cachedShader = shaderProgram._cachedShader;
   const derivedKeyword = keyword + cachedShader.keyword;
@@ -184,7 +182,7 @@ ShaderCache.prototype.getDerivedShaderProgram = function (
 ShaderCache.prototype.createDerivedShaderProgram = function (
   shaderProgram,
   keyword,
-  options
+  options,
 ) {
   const cachedShader = shaderProgram._cachedShader;
   const derivedKeyword = keyword + cachedShader.keyword;
@@ -207,12 +205,10 @@ ShaderCache.prototype.createDerivedShaderProgram = function (
 
   const context = this._context;
 
-  const vertexShaderText = vertexShaderSource.createCombinedVertexShader(
-    context
-  );
-  const fragmentShaderText = fragmentShaderSource.createCombinedFragmentShader(
-    context
-  );
+  const vertexShaderText =
+    vertexShaderSource.createCombinedVertexShader(context);
+  const fragmentShaderText =
+    fragmentShaderSource.createCombinedFragmentShader(context);
 
   const derivedShaderProgram = new ShaderProgram({
     gl: context._gl,

package/Source/Renderer/ShaderFunction.js

@@ -37,7 +37,7 @@ ShaderFunction.prototype.addLines = function (lines) {
   //>>includeStart('debug', pragmas.debug);
   if (typeof lines !== "string" && !Array.isArray(lines)) {
     throw new DeveloperError(
-      `Expected lines to be a string or an array of strings, actual value was ${lines}`
+      `Expected lines to be a string or an array of strings, actual value was ${lines}`,
     );
   }
   //>>includeEnd('debug');

package/Source/Renderer/ShaderProgram.js

@@ -28,7 +28,7 @@ function ShaderProgram(options) {
 
   const modifiedFS = handleUniformPrecisionMismatches(
     vertexShaderText,
-    fragmentShaderText
+    fragmentShaderText,
   );
 
   this._gl = options.gl;
@@ -143,7 +143,7 @@ function extractUniforms(shaderText) {
 
 function handleUniformPrecisionMismatches(
   vertexShaderText,
-  fragmentShaderText
+  fragmentShaderText,
 ) {
   // If a uniform exists in both the vertex and fragment shader but with different precision qualifiers,
   // give the fragment shader uniform a different name. This fixes shader compilation errors on devices
@@ -204,7 +204,7 @@ function createAndLinkProgram(gl, shader) {
         gl.bindAttribLocation(
           program,
           attributeLocations[attribute],
-          attribute
+          attribute,
         );
       }
     }
@@ -275,7 +275,7 @@ function createAndLinkProgram(gl, shader) {
       return;
     }
     console.error(
-      `${consolePrefix}Translated ${name} shaderSource:\n${translation}`
+      `${consolePrefix}Translated ${name} shaderSource:\n${translation}`,
     );
   }
 }
@@ -309,7 +309,7 @@ function findUniforms(gl, program) {
     const uniformName =
       activeUniform.name.indexOf(
         suffix,
-        activeUniform.name.length - suffix.length
+        activeUniform.name.length - suffix.length,
       ) !== -1
         ? activeUniform.name.slice(0, activeUniform.name.length - 3)
         : activeUniform.name;
@@ -328,7 +328,7 @@ function findUniforms(gl, program) {
             gl,
             activeUniform,
             uniformName,
-            location
+            location,
           );
 
           uniformsByName[uniformName] = uniform;
@@ -388,7 +388,7 @@ function findUniforms(gl, program) {
             gl,
             activeUniform,
             uniformName,
-            locations
+            locations,
           );
 
           uniformsByName[uniformName] = uniformArray;
@@ -470,12 +470,12 @@ function reinitialize(shader) {
   const program = createAndLinkProgram(gl, shader, shader._debugShaders);
   const numberOfVertexAttributes = gl.getProgramParameter(
     program,
-    gl.ACTIVE_ATTRIBUTES
+    gl.ACTIVE_ATTRIBUTES,
   );
   const uniforms = findUniforms(gl, program);
   const partitionedUniforms = partitionUniforms(
     shader,
-    uniforms.uniformsByName
+    uniforms.uniformsByName,
   );
 
   shader._program = program;
@@ -483,7 +483,7 @@ function reinitialize(shader) {
   shader._vertexAttributes = findVertexAttributes(
     gl,
     program,
-    numberOfVertexAttributes
+    numberOfVertexAttributes,
   );
   shader._uniformsByName = uniforms.uniformsByName;
   shader._uniforms = uniforms.uniforms;
@@ -493,7 +493,7 @@ function reinitialize(shader) {
   shader.maximumTextureUnitIndex = setSamplerUniforms(
     gl,
     program,
-    uniforms.samplerUniforms
+    uniforms.samplerUniforms,
   );
 
   if (oldProgram) {
@@ -507,7 +507,7 @@ function reinitialize(shader) {
       vertexSourceCode, // The new vertex shader source
       fragmentSourceCode, // The new fragment shader source
       onCompiled, // Callback triggered by your engine when the compilation is successful. It needs to send back the new linked program.
-      onError // Callback triggered by your engine in case of error. It needs to send the WebGL error to allow the editor to display the error in the gutter.
+      onError, // Callback triggered by your engine in case of error. It needs to send the WebGL error to allow the editor to display the error in the gutter.
     ) {
       const originalVS = shader._vertexShaderText;
       const originalFS = shader._fragmentShaderText;
@@ -546,7 +546,7 @@ ShaderProgram.prototype._bind = function () {
 ShaderProgram.prototype._setUniforms = function (
   uniformMap,
   uniformState,
-  validate
+  validate,
 ) {
   let len;
   let i;
@@ -595,8 +595,8 @@ ShaderProgram.prototype._setUniforms = function (
     if (!gl.getProgramParameter(program, gl.VALIDATE_STATUS)) {
       throw new DeveloperError(
         `Program validation failed.  Program info log: ${gl.getProgramInfoLog(
-          program
-        )}`
+          program,
+        )}`,
       );
     }
     //>>includeEnd('debug');

package/Source/Renderer/ShaderSource.js

@@ -72,7 +72,7 @@ function generateDependencies(currentNode, dependencyNodes) {
         const referencedNode = getDependencyNode(
           element,
           ShaderSource._czmBuiltinsAndUniforms[element],
-          dependencyNodes
+          dependencyNodes,
         );
         currentNode.dependsOn.push(referencedNode);
         referencedNode.requiredBy.push(currentNode);
@@ -170,45 +170,46 @@ function combineShader(shaderSource, isFragmentShader, context) {
 
   // Extract existing shader version from sources
   let version;
-  combinedSources = combinedSources.replace(/#version\s+(.*?)\n/gm, function (
-    match,
-    group1
-  ) {
-    //>>includeStart('debug', pragmas.debug);
-    if (defined(version) && version !== group1) {
-      throw new DeveloperError(
-        `inconsistent versions found: ${version} and ${group1}`
-      );
-    }
-    //>>includeEnd('debug');
+  combinedSources = combinedSources.replace(
+    /#version\s+(.*?)\n/gm,
+    function (match, group1) {
+      //>>includeStart('debug', pragmas.debug);
+      if (defined(version) && version !== group1) {
+        throw new DeveloperError(
+          `inconsistent versions found: ${version} and ${group1}`,
+        );
+      }
+      //>>includeEnd('debug');
 
-    // Extract #version to put at the top
-    version = group1;
+      // Extract #version to put at the top
+      version = group1;
 
-    // Replace original #version directive with a new line so the line numbers
-    // are not off by one.  There can be only one #version directive
-    // and it must appear at the top of the source, only preceded by
-    // whitespace and comments.
-    return "\n";
-  });
+      // Replace original #version directive with a new line so the line numbers
+      // are not off by one.  There can be only one #version directive
+      // and it must appear at the top of the source, only preceded by
+      // whitespace and comments.
+      return "\n";
+    },
+  );
 
   // Extract shader extensions from sources
   const extensions = [];
-  combinedSources = combinedSources.replace(/#extension.*\n/gm, function (
-    match
-  ) {
-    // Extract extension to put at the top
-    extensions.push(match);
-
-    // Replace original #extension directive with a new line so the line numbers
-    // are not off by one.
-    return "\n";
-  });
+  combinedSources = combinedSources.replace(
+    /#extension.*\n/gm,
+    function (match) {
+      // Extract extension to put at the top
+      extensions.push(match);
+
+      // Replace original #extension directive with a new line so the line numbers
+      // are not off by one.
+      return "\n";
+    },
+  );
 
   // Remove precision qualifier
   combinedSources = combinedSources.replace(
     /precision\s(lowp|mediump|highp)\s(float|int);/,
-    ""
+    "",
   );
 
   // Replace main() for picked if desired.
@@ -216,7 +217,7 @@ function combineShader(shaderSource, isFragmentShader, context) {
   if (defined(pickColorQualifier)) {
     combinedSources = ShaderSource.createPickFragmentShaderSource(
       combinedSources,
-      pickColorQualifier
+      pickColorQualifier,
     );
   }
 
@@ -280,7 +281,7 @@ function combineShader(shaderSource, isFragmentShader, context) {
     context.webgl2 &&
     isFragmentShader &&
     !/layout\s*\(location\s*=\s*0\)\s*out\s+vec4\s+out_FragColor;/g.test(
-      combinedShader
+      combinedShader,
     ) &&
     !/czm_out_FragColor/g.test(combinedShader) &&
     /out_FragColor/g.test(combinedShader)
@@ -338,7 +339,7 @@ function ShaderSource(options) {
     pickColorQualifier !== "in"
   ) {
     throw new DeveloperError(
-      "options.pickColorQualifier must be 'uniform' or 'in'."
+      "options.pickColorQualifier must be 'uniform' or 'in'.",
     );
   }
   //>>includeEnd('debug');
@@ -422,9 +423,8 @@ for (const uniformName in AutomaticUniforms) {
   if (AutomaticUniforms.hasOwnProperty(uniformName)) {
     const uniform = AutomaticUniforms[uniformName];
     if (typeof uniform.getDeclaration === "function") {
-      ShaderSource._czmBuiltinsAndUniforms[
-        uniformName
-      ] = uniform.getDeclaration(uniformName);
+      ShaderSource._czmBuiltinsAndUniforms[uniformName] =
+        uniform.getDeclaration(uniformName);
     }
   }
 }
@@ -432,7 +432,7 @@ for (const uniformName in AutomaticUniforms) {
 ShaderSource.createPickVertexShaderSource = function (vertexShaderSource) {
   const renamedVS = ShaderSource.replaceMain(
     vertexShaderSource,
-    "czm_old_main"
+    "czm_old_main",
   );
   const pickMain =
     "in vec4 pickColor; \n" +
@@ -448,11 +448,11 @@ ShaderSource.createPickVertexShaderSource = function (vertexShaderSource) {
 
 ShaderSource.createPickFragmentShaderSource = function (
   fragmentShaderSource,
-  pickColorQualifier
+  pickColorQualifier,
 ) {
   const renamedFS = ShaderSource.replaceMain(
     fragmentShaderSource,
-    "czm_old_main"
+    "czm_old_main",
   );
   const pickMain =
     `${pickColorQualifier} vec4 czm_pickColor; \n` +