@cesium/engine 11.0.0 → 11.1.0

package/Source/Scene/Model/MaterialPipelineStage.js

@@ -12,13 +12,8 @@ import VertexAttributeSemantic from "../VertexAttributeSemantic.js";
 import LightingModel from "./LightingModel.js";
 import ModelUtility from "./ModelUtility.js";
 
-const {
-  Material,
-  MetallicRoughness,
-  SpecularGlossiness,
-  Specular,
-  Clearcoat,
-} = ModelComponents;
+const { Material, MetallicRoughness, SpecularGlossiness, Specular, Clearcoat } =
+  ModelComponents;
 
 /**
  * The material pipeline stage processes textures and other uniforms needed
@@ -59,7 +54,7 @@ const MaterialPipelineStage = {
 MaterialPipelineStage.process = function (
   renderResources,
   primitive,
-  frameState
+  frameState,
 ) {
   // gltf-pipeline automatically creates a default material so this will always
   // be defined.
@@ -72,11 +67,8 @@ MaterialPipelineStage.process = function (
   const disableTextures = hasClassification;
 
   // When textures are loaded incrementally, fall back to a default 1x1 texture
-  const {
-    defaultTexture,
-    defaultNormalTexture,
-    defaultEmissiveTexture,
-  } = frameState.context;
+  const { defaultTexture, defaultNormalTexture, defaultEmissiveTexture } =
+    frameState.context;
 
   processMaterialUniforms(
     material,
@@ -85,7 +77,7 @@ MaterialPipelineStage.process = function (
     defaultTexture,
     defaultNormalTexture,
     defaultEmissiveTexture,
-    disableTextures
+    disableTextures,
   );
 
   if (defined(material.specularGlossiness)) {
@@ -94,7 +86,7 @@ MaterialPipelineStage.process = function (
       uniformMap,
       shaderBuilder,
       defaultTexture,
-      disableTextures
+      disableTextures,
     );
   } else {
     if (
@@ -106,7 +98,7 @@ MaterialPipelineStage.process = function (
         uniformMap,
         shaderBuilder,
         defaultTexture,
-        disableTextures
+        disableTextures,
       );
     }
     if (
@@ -118,7 +110,7 @@ MaterialPipelineStage.process = function (
         uniformMap,
         shaderBuilder,
         defaultTexture,
-        disableTextures
+        disableTextures,
       );
     }
     if (
@@ -130,7 +122,7 @@ MaterialPipelineStage.process = function (
         uniformMap,
         shaderBuilder,
         defaultTexture,
-        disableTextures
+        disableTextures,
       );
     }
     processMetallicRoughnessUniforms(
@@ -138,14 +130,14 @@ MaterialPipelineStage.process = function (
       uniformMap,
       shaderBuilder,
       defaultTexture,
-      disableTextures
+      disableTextures,
     );
   }
 
   // If the primitive does not have normals, fall back to unlit lighting.
   const hasNormals = ModelUtility.getAttributeBySemantic(
     primitive,
-    VertexAttributeSemantic.NORMAL
+    VertexAttributeSemantic.NORMAL,
   );
 
   // Classification models will be rendered as unlit.
@@ -173,7 +165,7 @@ MaterialPipelineStage.process = function (
     shaderBuilder.addDefine(
       "HAS_DOUBLE_SIDED_MATERIAL",
       undefined,
-      ShaderDestination.BOTH
+      ShaderDestination.BOTH,
     );
   }
 };
@@ -194,14 +186,14 @@ function processTextureTransform(
   uniformMap,
   textureReader,
   uniformName,
-  defineName
+  defineName,
 ) {
   // Add a define to enable the texture transformation code in the shader.
   const transformDefine = `HAS_${defineName}_TEXTURE_TRANSFORM`;
   shaderBuilder.addDefine(
     transformDefine,
     undefined,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   // Add a uniform for the transformation matrix
@@ -209,7 +201,7 @@ function processTextureTransform(
   shaderBuilder.addUniform(
     "mat3",
     transformUniformName,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   uniformMap[transformUniformName] = function () {
     return textureReader.transform;
@@ -232,14 +224,14 @@ function processTextureScale(
   uniformMap,
   textureReader,
   uniformName,
-  defineName
+  defineName,
 ) {
   // Add a define to enable the texture transformation code in the shader.
   const transformDefine = `HAS_${defineName}_TEXTURE_SCALE`;
   shaderBuilder.addDefine(
     transformDefine,
     undefined,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   // Add a uniform for the transformation matrix
@@ -247,7 +239,7 @@ function processTextureScale(
   shaderBuilder.addUniform(
     "float",
     scaleUniformName,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   uniformMap[scaleUniformName] = function () {
     return textureReader.scale;
@@ -271,13 +263,13 @@ function processTexture(
   textureReader,
   uniformName,
   defineName,
-  defaultTexture
+  defaultTexture,
 ) {
   // Add a uniform for the texture itself
   shaderBuilder.addUniform(
     "sampler2D",
     uniformName,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   uniformMap[uniformName] = function () {
     return defaultValue(textureReader.texture, defaultTexture);
@@ -294,7 +286,7 @@ function processTexture(
   shaderBuilder.addDefine(
     texCoordDefine,
     texCoordVarying,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   // Some textures have matrix transforms (e.g. for texture atlases). Add those
@@ -309,7 +301,7 @@ function processTexture(
       uniformMap,
       textureReader,
       uniformName,
-      defineName
+      defineName,
     );
   }
 
@@ -320,7 +312,7 @@ function processTexture(
       uniformMap,
       textureReader,
       uniformName,
-      defineName
+      defineName,
     );
   }
 }
@@ -332,14 +324,10 @@ function processMaterialUniforms(
   defaultTexture,
   defaultNormalTexture,
   defaultEmissiveTexture,
-  disableTextures
+  disableTextures,
 ) {
-  const {
-    emissiveFactor,
-    emissiveTexture,
-    normalTexture,
-    occlusionTexture,
-  } = material;
+  const { emissiveFactor, emissiveTexture, normalTexture, occlusionTexture } =
+    material;
 
   if (
     defined(emissiveFactor) &&
@@ -348,7 +336,7 @@ function processMaterialUniforms(
     shaderBuilder.addUniform(
       "vec3",
       "u_emissiveFactor",
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     uniformMap.u_emissiveFactor = function () {
       return material.emissiveFactor;
@@ -356,7 +344,7 @@ function processMaterialUniforms(
     shaderBuilder.addDefine(
       "HAS_EMISSIVE_FACTOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
 
     if (defined(emissiveTexture) && !disableTextures) {
@@ -366,7 +354,7 @@ function processMaterialUniforms(
         emissiveTexture,
         "u_emissiveTexture",
         "EMISSIVE",
-        defaultEmissiveTexture
+        defaultEmissiveTexture,
       );
     }
   }
@@ -378,7 +366,7 @@ function processMaterialUniforms(
       normalTexture,
       "u_normalTexture",
       "NORMAL",
-      defaultNormalTexture
+      defaultNormalTexture,
     );
   }
 
@@ -389,7 +377,7 @@ function processMaterialUniforms(
       occlusionTexture,
       "u_occlusionTexture",
       "OCCLUSION",
-      defaultTexture
+      defaultTexture,
     );
   }
 }
@@ -409,7 +397,7 @@ function processSpecularGlossinessUniforms(
   uniformMap,
   shaderBuilder,
   defaultTexture,
-  disableTextures
+  disableTextures,
 ) {
   const {
     diffuseTexture,
@@ -422,7 +410,7 @@ function processSpecularGlossinessUniforms(
   shaderBuilder.addDefine(
     "USE_SPECULAR_GLOSSINESS",
     undefined,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   if (defined(diffuseTexture) && !disableTextures) {
@@ -432,7 +420,7 @@ function processSpecularGlossinessUniforms(
       diffuseTexture,
       "u_diffuseTexture",
       "DIFFUSE",
-      defaultTexture
+      defaultTexture,
     );
   }
 
@@ -443,7 +431,7 @@ function processSpecularGlossinessUniforms(
     shaderBuilder.addUniform(
       "vec4",
       "u_diffuseFactor",
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     uniformMap.u_diffuseFactor = function () {
       return specularGlossiness.diffuseFactor;
@@ -451,7 +439,7 @@ function processSpecularGlossinessUniforms(
     shaderBuilder.addDefine(
       "HAS_DIFFUSE_FACTOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
@@ -462,7 +450,7 @@ function processSpecularGlossinessUniforms(
       specularGlossinessTexture,
       "u_specularGlossinessTexture",
       "SPECULAR_GLOSSINESS",
-      defaultTexture
+      defaultTexture,
     );
   }
 
@@ -470,13 +458,13 @@ function processSpecularGlossinessUniforms(
     defined(specularFactor) &&
     !Cartesian3.equals(
       specularFactor,
-      SpecularGlossiness.DEFAULT_SPECULAR_FACTOR
+      SpecularGlossiness.DEFAULT_SPECULAR_FACTOR,
     )
   ) {
     shaderBuilder.addUniform(
       "vec3",
       "u_legacySpecularFactor",
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     uniformMap.u_legacySpecularFactor = function () {
       return specularGlossiness.specularFactor;
@@ -484,7 +472,7 @@ function processSpecularGlossinessUniforms(
     shaderBuilder.addDefine(
       "HAS_LEGACY_SPECULAR_FACTOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
@@ -495,7 +483,7 @@ function processSpecularGlossinessUniforms(
     shaderBuilder.addUniform(
       "float",
       "u_glossinessFactor",
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     uniformMap.u_glossinessFactor = function () {
       return specularGlossiness.glossinessFactor;
@@ -503,7 +491,7 @@ function processSpecularGlossinessUniforms(
     shaderBuilder.addDefine(
       "HAS_GLOSSINESS_FACTOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 }
@@ -523,7 +511,7 @@ function processSpecularUniforms(
   uniformMap,
   shaderBuilder,
   defaultTexture,
-  disableTextures
+  disableTextures,
 ) {
   const {
     specularTexture,
@@ -535,7 +523,7 @@ function processSpecularUniforms(
   shaderBuilder.addDefine(
     "USE_SPECULAR",
     undefined,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   if (defined(specularTexture) && !disableTextures) {
@@ -545,7 +533,7 @@ function processSpecularUniforms(
       specularTexture,
       "u_specularTexture",
       "SPECULAR",
-      defaultTexture
+      defaultTexture,
     );
   }
 
@@ -556,7 +544,7 @@ function processSpecularUniforms(
     shaderBuilder.addUniform(
       "float",
       "u_specularFactor",
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     uniformMap.u_specularFactor = function () {
       return specular.specularFactor;
@@ -564,7 +552,7 @@ function processSpecularUniforms(
     shaderBuilder.addDefine(
       "HAS_SPECULAR_FACTOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
@@ -575,7 +563,7 @@ function processSpecularUniforms(
       specularColorTexture,
       "u_specularColorTexture",
       "SPECULAR_COLOR",
-      defaultTexture
+      defaultTexture,
     );
   }
 
@@ -583,13 +571,13 @@ function processSpecularUniforms(
     defined(specularColorFactor) &&
     !Cartesian3.equals(
       specularColorFactor,
-      Specular.DEFAULT_SPECULAR_COLOR_FACTOR
+      Specular.DEFAULT_SPECULAR_COLOR_FACTOR,
     )
   ) {
     shaderBuilder.addUniform(
       "vec3",
       "u_specularColorFactor",
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     uniformMap.u_specularColorFactor = function () {
       return specular.specularColorFactor;
@@ -597,7 +585,7 @@ function processSpecularUniforms(
     shaderBuilder.addDefine(
       "HAS_SPECULAR_COLOR_FACTOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 }
@@ -619,18 +607,15 @@ function processAnisotropyUniforms(
   uniformMap,
   shaderBuilder,
   defaultTexture,
-  disableTextures
+  disableTextures,
 ) {
-  const {
-    anisotropyStrength,
-    anisotropyRotation,
-    anisotropyTexture,
-  } = anisotropy;
+  const { anisotropyStrength, anisotropyRotation, anisotropyTexture } =
+    anisotropy;
 
   shaderBuilder.addDefine(
     "USE_ANISOTROPY",
     undefined,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   if (defined(anisotropyTexture) && !disableTextures) {
@@ -640,7 +625,7 @@ function processAnisotropyUniforms(
       anisotropyTexture,
       "u_anisotropyTexture",
       "ANISOTROPY",
-      defaultTexture
+      defaultTexture,
     );
   }
 
@@ -654,7 +639,7 @@ function processAnisotropyUniforms(
       cosRotation,
       sinRotation,
       anisotropyStrength,
-      scratchAnisotropy
+      scratchAnisotropy,
     );
   };
 }
@@ -674,7 +659,7 @@ function processClearcoatUniforms(
   uniformMap,
   shaderBuilder,
   defaultTexture,
-  disableTextures
+  disableTextures,
 ) {
   const {
     clearcoatFactor,
@@ -687,7 +672,7 @@ function processClearcoatUniforms(
   shaderBuilder.addDefine(
     "USE_CLEARCOAT",
     undefined,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   if (
@@ -697,7 +682,7 @@ function processClearcoatUniforms(
     shaderBuilder.addUniform(
       "float",
       "u_clearcoatFactor",
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     uniformMap.u_clearcoatFactor = function () {
       return clearcoat.clearcoatFactor;
@@ -705,7 +690,7 @@ function processClearcoatUniforms(
     shaderBuilder.addDefine(
       "HAS_CLEARCOAT_FACTOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
@@ -716,7 +701,7 @@ function processClearcoatUniforms(
       clearcoatTexture,
       "u_clearcoatTexture",
       "CLEARCOAT",
-      defaultTexture
+      defaultTexture,
     );
   }
 
@@ -727,7 +712,7 @@ function processClearcoatUniforms(
     shaderBuilder.addUniform(
       "float",
       "u_clearcoatRoughnessFactor",
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     uniformMap.u_clearcoatRoughnessFactor = function () {
       return clearcoat.clearcoatRoughnessFactor;
@@ -735,7 +720,7 @@ function processClearcoatUniforms(
     shaderBuilder.addDefine(
       "HAS_CLEARCOAT_ROUGHNESS_FACTOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
@@ -746,7 +731,7 @@ function processClearcoatUniforms(
       clearcoatRoughnessTexture,
       "u_clearcoatRoughnessTexture",
       "CLEARCOAT_ROUGHNESS",
-      defaultTexture
+      defaultTexture,
     );
   }
 
@@ -757,7 +742,7 @@ function processClearcoatUniforms(
       clearcoatNormalTexture,
       "u_clearcoatNormalTexture",
       "CLEARCOAT_NORMAL",
-      defaultTexture
+      defaultTexture,
     );
   }
 }
@@ -777,12 +762,12 @@ function processMetallicRoughnessUniforms(
   uniformMap,
   shaderBuilder,
   defaultTexture,
-  disableTextures
+  disableTextures,
 ) {
   shaderBuilder.addDefine(
     "USE_METALLIC_ROUGHNESS",
     undefined,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   const baseColorTexture = metallicRoughness.baseColorTexture;
@@ -793,7 +778,7 @@ function processMetallicRoughnessUniforms(
       baseColorTexture,
       "u_baseColorTexture",
       "BASE_COLOR",
-      defaultTexture
+      defaultTexture,
     );
   }
 
@@ -802,13 +787,13 @@ function processMetallicRoughnessUniforms(
     defined(baseColorFactor) &&
     !Cartesian4.equals(
       baseColorFactor,
-      MetallicRoughness.DEFAULT_BASE_COLOR_FACTOR
+      MetallicRoughness.DEFAULT_BASE_COLOR_FACTOR,
     )
   ) {
     shaderBuilder.addUniform(
       "vec4",
       "u_baseColorFactor",
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     uniformMap.u_baseColorFactor = function () {
       return metallicRoughness.baseColorFactor;
@@ -816,7 +801,7 @@ function processMetallicRoughnessUniforms(
     shaderBuilder.addDefine(
       "HAS_BASE_COLOR_FACTOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
@@ -828,7 +813,7 @@ function processMetallicRoughnessUniforms(
       metallicRoughnessTexture,
       "u_metallicRoughnessTexture",
       "METALLIC_ROUGHNESS",
-      defaultTexture
+      defaultTexture,
     );
   }
 
@@ -840,7 +825,7 @@ function processMetallicRoughnessUniforms(
     shaderBuilder.addUniform(
       "float",
       "u_metallicFactor",
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     uniformMap.u_metallicFactor = function () {
       return metallicRoughness.metallicFactor;
@@ -848,7 +833,7 @@ function processMetallicRoughnessUniforms(
     shaderBuilder.addDefine(
       "HAS_METALLIC_FACTOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
@@ -860,7 +845,7 @@ function processMetallicRoughnessUniforms(
     shaderBuilder.addUniform(
       "float",
       "u_roughnessFactor",
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     uniformMap.u_roughnessFactor = function () {
       return metallicRoughness.roughnessFactor;
@@ -868,7 +853,7 @@ function processMetallicRoughnessUniforms(
     shaderBuilder.addDefine(
       "HAS_ROUGHNESS_FACTOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 }