@cesium/engine 11.0.0 → 11.1.0

package/Source/Scene/Model/InstancingPipelineStage.js

@@ -83,14 +83,14 @@ InstancingPipelineStage.process = function (renderResources, node, frameState) {
     instances,
     instancingVertexAttributes,
     use2D,
-    keepTypedArray
+    keepTypedArray,
   );
 
   processFeatureIdAttributes(
     renderResources,
     frameState,
     instances,
-    instancingVertexAttributes
+    instancingVertexAttributes,
   );
 
   const uniformMap = {};
@@ -99,17 +99,17 @@ InstancingPipelineStage.process = function (renderResources, node, frameState) {
     shaderBuilder.addDefine(
       "USE_LEGACY_INSTANCING",
       undefined,
-      ShaderDestination.VERTEX
+      ShaderDestination.VERTEX,
     );
     shaderBuilder.addUniform(
       "mat4",
       "u_instance_modifiedModelView",
-      ShaderDestination.VERTEX
+      ShaderDestination.VERTEX,
     );
     shaderBuilder.addUniform(
       "mat4",
       "u_instance_nodeTransform",
-      ShaderDestination.VERTEX
+      ShaderDestination.VERTEX,
     );
 
     // The i3dm format applies the instancing transforms in world space.
@@ -132,7 +132,7 @@ InstancingPipelineStage.process = function (renderResources, node, frameState) {
         // For i3dm models, components.transform contains the RTC_CENTER
         // translation.
         sceneGraph.components.transform,
-        modelViewScratch
+        modelViewScratch,
       );
 
       if (use2D) {
@@ -144,7 +144,7 @@ InstancingPipelineStage.process = function (renderResources, node, frameState) {
         return Matrix4.multiplyTransformation(
           frameState.context.uniformState.view3D,
           modifiedModelMatrix,
-          modelViewScratch
+          modelViewScratch,
         );
       }
 
@@ -154,7 +154,7 @@ InstancingPipelineStage.process = function (renderResources, node, frameState) {
         modifiedModelMatrix = Transforms.basisTo2D(
           frameState.mapProjection,
           modifiedModelMatrix,
-          modelViewScratch
+          modelViewScratch,
         );
       }
 
@@ -162,7 +162,7 @@ InstancingPipelineStage.process = function (renderResources, node, frameState) {
       return Matrix4.multiplyTransformation(
         frameState.context.uniformState.view,
         modifiedModelMatrix,
-        modelViewScratch
+        modelViewScratch,
       );
     };
 
@@ -174,7 +174,7 @@ InstancingPipelineStage.process = function (renderResources, node, frameState) {
         // This transforms from the node's coordinate system to the root
         // of the node hierarchy
         runtimeNode.computedTransform,
-        nodeTransformScratch
+        nodeTransformScratch,
       );
     };
 
@@ -187,7 +187,7 @@ InstancingPipelineStage.process = function (renderResources, node, frameState) {
     shaderBuilder.addDefine(
       "USE_2D_INSTANCING",
       undefined,
-      ShaderDestination.VERTEX
+      ShaderDestination.VERTEX,
     );
 
     shaderBuilder.addUniform("mat4", "u_modelView2D", ShaderDestination.VERTEX);
@@ -195,14 +195,14 @@ InstancingPipelineStage.process = function (renderResources, node, frameState) {
     const context = frameState.context;
     const modelMatrix2D = Matrix4.fromTranslation(
       runtimeNode.instancingReferencePoint2D,
-      new Matrix4()
+      new Matrix4(),
     );
 
     uniformMap.u_modelView2D = function () {
       return Matrix4.multiplyTransformation(
         context.uniformState.view,
         modelMatrix2D,
-        modelView2DScratch
+        modelView2DScratch,
       );
     };
   }
@@ -212,7 +212,7 @@ InstancingPipelineStage.process = function (renderResources, node, frameState) {
   renderResources.instanceCount = count;
   renderResources.attributes.push.apply(
     renderResources.attributes,
-    instancingVertexAttributes
+    instancingVertexAttributes,
   );
 };
 
@@ -224,24 +224,24 @@ function projectTransformTo2D(
   modelMatrix,
   nodeTransform,
   frameState,
-  result
+  result,
 ) {
   let projectedTransform = Matrix4.multiplyTransformation(
     modelMatrix,
     transform,
-    projectedTransformScratch
+    projectedTransformScratch,
   );
 
   projectedTransform = Matrix4.multiplyTransformation(
     projectedTransform,
     nodeTransform,
-    projectedTransformScratch
+    projectedTransformScratch,
   );
 
   result = Transforms.basisTo2D(
     frameState.mapProjection,
     projectedTransform,
-    result
+    result,
   );
 
   return result;
@@ -252,34 +252,34 @@ function projectPositionTo2D(
   modelMatrix,
   nodeTransform,
   frameState,
-  result
+  result,
 ) {
   const translationMatrix = Matrix4.fromTranslation(
     position,
-    projectedTransformScratch
+    projectedTransformScratch,
   );
 
   let projectedTransform = Matrix4.multiplyTransformation(
     modelMatrix,
     translationMatrix,
-    projectedTransformScratch
+    projectedTransformScratch,
   );
 
   projectedTransform = Matrix4.multiplyTransformation(
     projectedTransform,
     nodeTransform,
-    projectedTransformScratch
+    projectedTransformScratch,
   );
 
   const finalPosition = Matrix4.getTranslation(
     projectedTransform,
-    projectedPositionScratch
+    projectedPositionScratch,
   );
 
   result = SceneTransforms.computeActualEllipsoidPosition(
     frameState,
     finalPosition,
-    result
+    result,
   );
 
   return result;
@@ -288,7 +288,7 @@ function projectPositionTo2D(
 function getModelMatrixAndNodeTransform(
   renderResources,
   modelMatrix,
-  nodeComputedTransform
+  nodeComputedTransform,
 ) {
   const model = renderResources.model;
   const sceneGraph = model.sceneGraph;
@@ -299,13 +299,13 @@ function getModelMatrixAndNodeTransform(
     modelMatrix = Matrix4.multiplyTransformation(
       model.modelMatrix,
       sceneGraph.components.transform,
-      modelMatrix
+      modelMatrix,
     );
 
     nodeComputedTransform = Matrix4.multiplyTransformation(
       sceneGraph.axisCorrectionMatrix,
       renderResources.runtimeNode.computedTransform,
-      nodeComputedTransform
+      nodeComputedTransform,
     );
   } else {
     // The node transform should be pre-multiplied with the instancing transform.
@@ -313,12 +313,12 @@ function getModelMatrixAndNodeTransform(
     modelMatrix = Matrix4.multiplyTransformation(
       modelMatrix,
       renderResources.runtimeNode.computedTransform,
-      modelMatrix
+      modelMatrix,
     );
 
     nodeComputedTransform = Matrix4.clone(
       Matrix4.IDENTITY,
-      nodeComputedTransform
+      nodeComputedTransform,
     );
   }
 }
@@ -332,7 +332,7 @@ function projectTransformsTo2D(
   transforms,
   renderResources,
   frameState,
-  result
+  result,
 ) {
   const modelMatrix = modelMatrixScratch;
   const nodeComputedTransform = nodeComputedTransformScratch;
@@ -340,7 +340,7 @@ function projectTransformsTo2D(
   getModelMatrixAndNodeTransform(
     renderResources,
     modelMatrix,
-    nodeComputedTransform
+    nodeComputedTransform,
   );
 
   const runtimeNode = renderResources.runtimeNode;
@@ -355,24 +355,24 @@ function projectTransformsTo2D(
       modelMatrix,
       nodeComputedTransform,
       frameState,
-      transformScratch
+      transformScratch,
     );
 
     const position = Matrix4.getTranslation(
       projectedTransform,
-      positionScratch
+      positionScratch,
     );
 
     const finalTranslation = Cartesian3.subtract(
       position,
       referencePoint,
-      position
+      position,
     );
 
     result[i] = Matrix4.setTranslation(
       projectedTransform,
       finalTranslation,
-      result[i]
+      result[i],
     );
   }
 
@@ -383,7 +383,7 @@ function projectTranslationsTo2D(
   translations,
   renderResources,
   frameState,
-  result
+  result,
 ) {
   const modelMatrix = modelMatrixScratch;
   const nodeComputedTransform = nodeComputedTransformScratch;
@@ -391,7 +391,7 @@ function projectTranslationsTo2D(
   getModelMatrixAndNodeTransform(
     renderResources,
     modelMatrix,
-    nodeComputedTransform
+    nodeComputedTransform,
   );
 
   const runtimeNode = renderResources.runtimeNode;
@@ -405,13 +405,13 @@ function projectTranslationsTo2D(
       modelMatrix,
       nodeComputedTransform,
       frameState,
-      translation
+      translation,
     );
 
     result[i] = Cartesian3.subtract(
       projectedPosition,
       referencePoint,
-      result[i]
+      result[i],
     );
   }
 
@@ -429,32 +429,32 @@ function computeReferencePoint2D(renderResources, frameState) {
   const transformedPositionMin = Matrix4.multiplyByPoint(
     modelMatrix,
     runtimeNode.instancingTranslationMin,
-    scratchProjectedMin
+    scratchProjectedMin,
   );
 
   const projectedMin = SceneTransforms.computeActualEllipsoidPosition(
     frameState,
     transformedPositionMin,
-    transformedPositionMin
+    transformedPositionMin,
   );
 
   const transformedPositionMax = Matrix4.multiplyByPoint(
     modelMatrix,
     runtimeNode.instancingTranslationMax,
-    scratchProjectedMax
+    scratchProjectedMax,
   );
 
   const projectedMax = SceneTransforms.computeActualEllipsoidPosition(
     frameState,
     transformedPositionMax,
-    transformedPositionMax
+    transformedPositionMax,
   );
 
   runtimeNode.instancingReferencePoint2D = Cartesian3.lerp(
     projectedMin,
     projectedMax,
     0.5,
-    new Cartesian3()
+    new Cartesian3(),
   );
 }
 
@@ -510,26 +510,26 @@ function getInstanceTransformsAsMatrices(instances, count, renderResources) {
 
   const translationAttribute = ModelUtility.getAttributeBySemantic(
     instances,
-    InstanceAttributeSemantic.TRANSLATION
+    InstanceAttributeSemantic.TRANSLATION,
   );
   const rotationAttribute = ModelUtility.getAttributeBySemantic(
     instances,
-    InstanceAttributeSemantic.ROTATION
+    InstanceAttributeSemantic.ROTATION,
   );
   const scaleAttribute = ModelUtility.getAttributeBySemantic(
     instances,
-    InstanceAttributeSemantic.SCALE
+    InstanceAttributeSemantic.SCALE,
   );
 
   const instancingTranslationMax = new Cartesian3(
     -Number.MAX_VALUE,
     -Number.MAX_VALUE,
-    -Number.MAX_VALUE
+    -Number.MAX_VALUE,
   );
   const instancingTranslationMin = new Cartesian3(
     Number.MAX_VALUE,
     Number.MAX_VALUE,
-    Number.MAX_VALUE
+    Number.MAX_VALUE,
   );
 
   const hasTranslation = defined(translationAttribute);
@@ -553,7 +553,7 @@ function getInstanceTransformsAsMatrices(instances, count, renderResources) {
       rotationTypedArray,
       rotationAttribute.componentDatatype,
       rotationAttribute.type,
-      count
+      count,
     );
   }
 
@@ -571,18 +571,18 @@ function getInstanceTransformsAsMatrices(instances, count, renderResources) {
       translationTypedArray[i * 3],
       translationTypedArray[i * 3 + 1],
       translationTypedArray[i * 3 + 2],
-      translationScratch
+      translationScratch,
     );
 
     Cartesian3.maximumByComponent(
       instancingTranslationMax,
       translation,
-      instancingTranslationMax
+      instancingTranslationMax,
     );
     Cartesian3.minimumByComponent(
       instancingTranslationMin,
       translation,
-      instancingTranslationMin
+      instancingTranslationMin,
     );
 
     const rotation = new Quaternion(
@@ -590,21 +590,21 @@ function getInstanceTransformsAsMatrices(instances, count, renderResources) {
       rotationTypedArray[i * 4 + 1],
       rotationTypedArray[i * 4 + 2],
       hasRotation ? rotationTypedArray[i * 4 + 3] : 1,
-      rotationScratch
+      rotationScratch,
     );
 
     const scale = new Cartesian3(
       scaleTypedArray[i * 3],
       scaleTypedArray[i * 3 + 1],
       scaleTypedArray[i * 3 + 2],
-      scaleScratch
+      scaleScratch,
     );
 
     const transform = Matrix4.fromTranslationQuaternionRotationScale(
       translation,
       rotation,
       scale,
-      new Matrix4()
+      new Matrix4(),
     );
 
     transforms[i] = transform;
@@ -632,7 +632,7 @@ function getInstanceTransformsAsMatrices(instances, count, renderResources) {
 function getInstanceTranslationsAsCartesian3s(
   translationAttribute,
   count,
-  renderResources
+  renderResources,
 ) {
   const instancingTranslations = new Array(count);
   const translationTypedArray = translationAttribute.typedArray;
@@ -640,19 +640,19 @@ function getInstanceTranslationsAsCartesian3s(
   const instancingTranslationMin = new Cartesian3(
     Number.MAX_VALUE,
     Number.MAX_VALUE,
-    Number.MAX_VALUE
+    Number.MAX_VALUE,
   );
   const instancingTranslationMax = new Cartesian3(
     -Number.MAX_VALUE,
     -Number.MAX_VALUE,
-    -Number.MAX_VALUE
+    -Number.MAX_VALUE,
   );
 
   for (let i = 0; i < count; i++) {
     const translation = new Cartesian3(
       translationTypedArray[i * 3],
       translationTypedArray[i * 3 + 1],
-      translationTypedArray[i * 3 + 2]
+      translationTypedArray[i * 3 + 2],
     );
 
     instancingTranslations[i] = translation;
@@ -660,12 +660,12 @@ function getInstanceTranslationsAsCartesian3s(
     Cartesian3.minimumByComponent(
       instancingTranslationMin,
       translation,
-      instancingTranslationMin
+      instancingTranslationMin,
     );
     Cartesian3.maximumByComponent(
       instancingTranslationMax,
       translation,
-      instancingTranslationMax
+      instancingTranslationMax,
     );
   }
 
@@ -700,11 +700,11 @@ function processTransformAttributes(
   instances,
   instancingVertexAttributes,
   use2D,
-  keepTypedArray
+  keepTypedArray,
 ) {
   const rotationAttribute = ModelUtility.getAttributeBySemantic(
     instances,
-    InstanceAttributeSemantic.ROTATION
+    InstanceAttributeSemantic.ROTATION,
   );
 
   // Only use matrices for the transforms if the rotation attribute is defined.
@@ -715,7 +715,7 @@ function processTransformAttributes(
       instancingVertexAttributes,
       frameState,
       use2D,
-      keepTypedArray
+      keepTypedArray,
     );
   } else {
     processTransformVec3Attributes(
@@ -723,7 +723,7 @@ function processTransformAttributes(
       instances,
       instancingVertexAttributes,
       frameState,
-      use2D
+      use2D,
     );
   }
 }
@@ -734,7 +734,7 @@ function processTransformMatrixAttributes(
   instancingVertexAttributes,
   frameState,
   use2D,
-  keepTypedArray
+  keepTypedArray,
 ) {
   const shaderBuilder = renderResources.shaderBuilder;
   const count = instances.attributes[0].count;
@@ -753,7 +753,7 @@ function processTransformMatrixAttributes(
     transforms = getInstanceTransformsAsMatrices(
       instances,
       count,
-      renderResources
+      renderResources,
     );
 
     const transformsTypedArray = transformsToTypedArray(transforms);
@@ -771,7 +771,7 @@ function processTransformMatrixAttributes(
     renderResources,
     buffer,
     instancingVertexAttributes,
-    attributeString
+    attributeString,
   );
 
   if (!use2D) {
@@ -795,7 +795,7 @@ function processTransformMatrixAttributes(
       transforms,
       renderResources,
       frameStateCV,
-      transforms
+      transforms,
     );
     const projectedTypedArray = transformsToTypedArray(projectedTransforms);
 
@@ -812,7 +812,7 @@ function processTransformMatrixAttributes(
     renderResources,
     buffer2D,
     instancingVertexAttributes,
-    attributeString2D
+    attributeString2D,
   );
 }
 
@@ -822,17 +822,17 @@ function processTransformVec3Attributes(
   instancingVertexAttributes,
   frameState,
   use2D,
-  keepTypedArray
+  keepTypedArray,
 ) {
   const shaderBuilder = renderResources.shaderBuilder;
   const runtimeNode = renderResources.runtimeNode;
   const translationAttribute = ModelUtility.getAttributeBySemantic(
     instances,
-    InstanceAttributeSemantic.TRANSLATION
+    InstanceAttributeSemantic.TRANSLATION,
   );
   const scaleAttribute = ModelUtility.getAttributeBySemantic(
     instances,
-    InstanceAttributeSemantic.SCALE
+    InstanceAttributeSemantic.SCALE,
   );
 
   if (defined(scaleAttribute)) {
@@ -846,7 +846,7 @@ function processTransformVec3Attributes(
       scaleAttribute.byteOffset,
       scaleAttribute.byteStride,
       instancingVertexAttributes,
-      attributeString
+      attributeString,
     );
   }
 
@@ -863,7 +863,7 @@ function processTransformVec3Attributes(
     instancingTranslations = getInstanceTranslationsAsCartesian3s(
       translationAttribute,
       translationAttribute.count,
-      renderResources
+      renderResources,
     );
   } else if (!defined(runtimeNode.instancingTranslationMin)) {
     runtimeNode.instancingTranslationMin = translationAttribute.min;
@@ -879,7 +879,7 @@ function processTransformVec3Attributes(
     translationAttribute.byteOffset,
     translationAttribute.byteStride,
     instancingVertexAttributes,
-    attributeString
+    attributeString,
   );
 
   if (!use2D && !keepTypedArray) {
@@ -904,7 +904,7 @@ function processTransformVec3Attributes(
       instancingTranslations,
       renderResources,
       frameStateCV,
-      instancingTranslations
+      instancingTranslations,
     );
     const projectedTypedArray = translationsToTypedArray(projectedTranslations);
 
@@ -934,7 +934,7 @@ function processTransformVec3Attributes(
     byteOffset,
     byteStride,
     instancingVertexAttributes,
-    attributeString2D
+    attributeString2D,
   );
 }
 
@@ -942,11 +942,11 @@ function processMatrixAttributes(
   renderResources,
   buffer,
   instancingVertexAttributes,
-  attributeString
+  attributeString,
 ) {
   const vertexSizeInFloats = 12;
   const componentByteSize = ComponentDatatype.getSizeInBytes(
-    ComponentDatatype.FLOAT
+    ComponentDatatype.FLOAT,
   );
   const strideInBytes = componentByteSize * vertexSizeInFloats;
 
@@ -990,7 +990,7 @@ function processMatrixAttributes(
 
   instancingVertexAttributes.push.apply(
     instancingVertexAttributes,
-    matrixAttributes
+    matrixAttributes,
   );
 }
 
@@ -1000,7 +1000,7 @@ function processVec3Attribute(
   byteOffset,
   byteStride,
   instancingVertexAttributes,
-  attributeString
+  attributeString,
 ) {
   instancingVertexAttributes.push({
     index: renderResources.attributeIndex++,
@@ -1021,7 +1021,7 @@ function processFeatureIdAttributes(
   renderResources,
   frameState,
   instances,
-  instancingVertexAttributes
+  instancingVertexAttributes,
 ) {
   const attributes = instances.attributes;
   const shaderBuilder = renderResources.shaderBuilder;
@@ -1042,7 +1042,7 @@ function processFeatureIdAttributes(
       index: renderResources.attributeIndex++,
       vertexBuffer: attribute.buffer,
       componentsPerAttribute: AttributeType.getNumberOfComponents(
-        attribute.type
+        attribute.type,
       ),
       componentDatatype: attribute.componentDatatype,
       normalize: false,
@@ -1053,7 +1053,7 @@ function processFeatureIdAttributes(
 
     shaderBuilder.addAttribute(
       "float",
-      `a_instanceFeatureId_${attribute.setIndex}`
+      `a_instanceFeatureId_${attribute.setIndex}`,
     );
   }
 }

package/Source/Scene/Model/LightingPipelineStage.js

@@ -34,13 +34,13 @@ LightingPipelineStage.process = function (renderResources, primitive) {
     shaderBuilder.addDefine(
       "USE_CUSTOM_LIGHT_COLOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
 
     shaderBuilder.addUniform(
       "vec3",
       "model_lightColorHdr",
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
 
     const uniformMap = renderResources.uniformMap;
@@ -57,13 +57,13 @@ LightingPipelineStage.process = function (renderResources, primitive) {
     shaderBuilder.addDefine(
       "LIGHTING_PBR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   } else {
     shaderBuilder.addDefine(
       "LIGHTING_UNLIT",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }