@cesium/engine 10.1.0 → 11.1.0

package/Source/Scene/VoxelPrimitive.js

@@ -59,7 +59,7 @@ function VoxelPrimitive(options) {
    */
   this._provider = defaultValue(
     options.provider,
-    VoxelPrimitive.DefaultProvider
+    VoxelPrimitive.DefaultProvider,
   );
 
   /**
@@ -231,7 +231,7 @@ function VoxelPrimitive(options) {
    * @private
    */
   this._modelMatrix = Matrix4.clone(
-    defaultValue(options.modelMatrix, Matrix4.IDENTITY)
+    defaultValue(options.modelMatrix, Matrix4.IDENTITY),
   );
 
   /**
@@ -266,7 +266,7 @@ function VoxelPrimitive(options) {
    */
   this._customShader = defaultValue(
     options.customShader,
-    VoxelPrimitive.DefaultCustomShader
+    VoxelPrimitive.DefaultCustomShader,
   );
 
   /**
@@ -332,12 +332,6 @@ function VoxelPrimitive(options) {
   this._transformNormalLocalToWorld = new Matrix3();
 
   // Rendering
-  /**
-   * @type {boolean}
-   * @private
-   */
-  this._jitter = false;
-
   /**
    * @type {boolean}
    * @private
@@ -477,15 +471,15 @@ function initialize(primitive, provider) {
   // Initialize the exaggerated versions of bounds and model matrix
   primitive._exaggeratedMinBounds = Cartesian3.clone(
     primitive._minBounds,
-    primitive._exaggeratedMinBounds
+    primitive._exaggeratedMinBounds,
   );
   primitive._exaggeratedMaxBounds = Cartesian3.clone(
     primitive._maxBounds,
-    primitive._exaggeratedMaxBounds
+    primitive._exaggeratedMaxBounds,
   );
   primitive._exaggeratedModelMatrix = Matrix4.clone(
     primitive._modelMatrix,
-    primitive._exaggeratedModelMatrix
+    primitive._exaggeratedModelMatrix,
   );
 
   checkTransformAndBounds(primitive, provider);
@@ -496,7 +490,7 @@ function initialize(primitive, provider) {
   primitive._shapeVisible = updateShapeAndTransforms(
     primitive,
     primitive._shape,
-    provider
+    provider,
   );
 }
 
@@ -704,29 +698,6 @@ Object.defineProperties(VoxelPrimitive.prototype, {
     },
   },
 
-  /**
-   * Gets or sets whether or not to jitter the view ray during the raymarch.
-   * This reduces stair-step artifacts but introduces noise.
-   *
-   * @memberof VoxelPrimitive.prototype
-   * @type {boolean}
-   */
-  jitter: {
-    get: function () {
-      return this._jitter;
-    },
-    set: function (jitter) {
-      //>>includeStart('debug', pragmas.debug);
-      Check.typeOf.bool("jitter", jitter);
-      //>>includeEnd('debug');
-
-      if (this._jitter !== jitter) {
-        this._jitter = jitter;
-        this._shaderDirty = true;
-      }
-    },
-  },
-
   /**
    * Gets or sets the nearest sampling.
    *
@@ -872,7 +843,7 @@ Object.defineProperties(VoxelPrimitive.prototype, {
 
       this._minClippingBounds = Cartesian3.clone(
         minClippingBounds,
-        this._minClippingBounds
+        this._minClippingBounds,
       );
     },
   },
@@ -895,7 +866,7 @@ Object.defineProperties(VoxelPrimitive.prototype, {
 
       this._maxClippingBounds = Cartesian3.clone(
         maxClippingBounds,
-        this._maxClippingBounds
+        this._maxClippingBounds,
       );
     },
   },
@@ -980,12 +951,12 @@ const scratchTransformPositionLocalToProjection = new Matrix4();
 const transformPositionLocalToUv = Matrix4.fromRotationTranslation(
   Matrix3.fromUniformScale(0.5, new Matrix3()),
   new Cartesian3(0.5, 0.5, 0.5),
-  new Matrix4()
+  new Matrix4(),
 );
 const transformPositionUvToLocal = Matrix4.fromRotationTranslation(
   Matrix3.fromUniformScale(2.0, new Matrix3()),
   new Cartesian3(-1.0, -1.0, -1.0),
-  new Matrix4()
+  new Matrix4(),
 );
 
 /**
@@ -1035,7 +1006,7 @@ VoxelPrimitive.prototype.update = function (frameState) {
   // Update the traversal and prepare for rendering.
   const keyframeLocation = getKeyframeLocation(
     provider.timeIntervalCollection,
-    this._clock
+    this._clock,
   );
 
   const traversal = this._traversal;
@@ -1045,7 +1016,7 @@ VoxelPrimitive.prototype.update = function (frameState) {
     frameState,
     keyframeLocation,
     shapeDirty, // recomputeBoundingVolumes
-    this._disableUpdate // pauseUpdate
+    this._disableUpdate, // pauseUpdate
   );
 
   if (sampleCountOld !== traversal._sampleCount) {
@@ -1084,7 +1055,7 @@ VoxelPrimitive.prototype.update = function (frameState) {
     uniforms.octreeLeafNodeTexture = traversal.leafNodeTexture;
     uniforms.octreeLeafNodeTexelSizeUv = Cartesian2.clone(
       traversal.leafNodeTexelSizeUv,
-      uniforms.octreeLeafNodeTexelSizeUv
+      uniforms.octreeLeafNodeTexelSizeUv,
     );
     uniforms.octreeLeafNodeTilesPerRow = traversal.leafNodeTilesPerRow;
   }
@@ -1102,7 +1073,7 @@ VoxelPrimitive.prototype.update = function (frameState) {
   const ndcAabb = orientedBoundingBoxToNdcAabb(
     orientedBoundingBox,
     transformPositionWorldToProjection,
-    scratchNdcAabb
+    scratchNdcAabb,
   );
 
   // If the object is offscreen, don't render it.
@@ -1119,36 +1090,36 @@ VoxelPrimitive.prototype.update = function (frameState) {
   // Using a uniform instead of going through RenderState's scissor because the viewport is not accessible here, and the scissor command needs pixel coordinates.
   uniforms.ndcSpaceAxisAlignedBoundingBox = Cartesian4.clone(
     ndcAabb,
-    uniforms.ndcSpaceAxisAlignedBoundingBox
+    uniforms.ndcSpaceAxisAlignedBoundingBox,
   );
   const transformPositionViewToWorld = context.uniformState.inverseView;
   uniforms.transformPositionViewToUv = Matrix4.multiplyTransformation(
     this._transformPositionWorldToUv,
     transformPositionViewToWorld,
-    uniforms.transformPositionViewToUv
+    uniforms.transformPositionViewToUv,
   );
   const transformPositionWorldToView = context.uniformState.view;
   uniforms.transformPositionUvToView = Matrix4.multiplyTransformation(
     transformPositionWorldToView,
     this._transformPositionUvToWorld,
-    uniforms.transformPositionUvToView
+    uniforms.transformPositionUvToView,
   );
   const transformDirectionViewToWorld =
     context.uniformState.inverseViewRotation;
   uniforms.transformDirectionViewToLocal = Matrix3.multiply(
     this._transformDirectionWorldToLocal,
     transformDirectionViewToWorld,
-    uniforms.transformDirectionViewToLocal
+    uniforms.transformDirectionViewToLocal,
   );
   uniforms.transformNormalLocalToWorld = Matrix3.clone(
     this._transformNormalLocalToWorld,
-    uniforms.transformNormalLocalToWorld
+    uniforms.transformNormalLocalToWorld,
   );
   const cameraPositionWorld = frameState.camera.positionWC;
   uniforms.cameraPositionUv = Matrix4.multiplyByPoint(
     this._transformPositionWorldToUv,
     cameraPositionWorld,
-    uniforms.cameraPositionUv
+    uniforms.cameraPositionUv,
   );
   uniforms.stepSize = this._stepSizeMultiplier;
 
@@ -1156,8 +1127,8 @@ VoxelPrimitive.prototype.update = function (frameState) {
   const command = frameState.passes.pick
     ? this._drawCommandPick
     : frameState.passes.pickVoxel
-    ? this._drawCommandPickVoxel
-    : this._drawCommand;
+      ? this._drawCommandPickVoxel
+      : this._drawCommand;
   command.boundingVolume = shape.boundingSphere;
   frameState.commandList.push(command);
 };
@@ -1177,11 +1148,11 @@ const scratchExaggerationTranslation = new Cartesian3();
 function updateVerticalExaggeration(primitive, frameState) {
   primitive._exaggeratedMinBounds = Cartesian3.clone(
     primitive._minBounds,
-    primitive._exaggeratedMinBounds
+    primitive._exaggeratedMinBounds,
   );
   primitive._exaggeratedMaxBounds = Cartesian3.clone(
     primitive._maxBounds,
-    primitive._exaggeratedMaxBounds
+    primitive._exaggeratedMaxBounds,
   );
 
   if (primitive.shape === VoxelShapeType.ELLIPSOID) {
@@ -1198,17 +1169,17 @@ function updateVerticalExaggeration(primitive, frameState) {
       1.0,
       1.0,
       frameState.verticalExaggeration,
-      scratchExaggerationScale
+      scratchExaggerationScale,
     );
     primitive._exaggeratedModelMatrix = Matrix4.multiplyByScale(
       primitive._modelMatrix,
       exaggerationScale,
-      primitive._exaggeratedModelMatrix
+      primitive._exaggeratedModelMatrix,
     );
     primitive._exaggeratedModelMatrix = Matrix4.multiplyByTranslation(
       primitive._exaggeratedModelMatrix,
       computeBoxExaggerationTranslation(primitive, frameState),
-      primitive._exaggeratedModelMatrix
+      primitive._exaggeratedModelMatrix,
     );
   }
 }
@@ -1223,24 +1194,24 @@ function computeBoxExaggerationTranslation(primitive, frameState) {
   // Find the Cartesian position of the center of the OBB
   const initialCenter = Matrix4.getTranslation(
     shapeTransform,
-    scratchExaggerationCenter
+    scratchExaggerationCenter,
   );
   const intermediateCenter = Matrix4.multiplyByPoint(
     primitive._modelMatrix,
     initialCenter,
-    scratchExaggerationCenter
+    scratchExaggerationCenter,
   );
   const transformedCenter = Matrix4.multiplyByPoint(
     globalTransform,
     intermediateCenter,
-    scratchExaggerationCenter
+    scratchExaggerationCenter,
   );
 
   // Find the cartographic height
   const ellipsoid = Ellipsoid.WGS84;
   const centerCartographic = ellipsoid.cartesianToCartographic(
     transformedCenter,
-    scratchCartographicCenter
+    scratchCartographicCenter,
   );
 
   let centerHeight = 0.0;
@@ -1253,14 +1224,14 @@ function computeBoxExaggerationTranslation(primitive, frameState) {
   const exaggeratedHeight = VerticalExaggeration.getHeight(
     centerHeight,
     frameState.verticalExaggeration,
-    frameState.verticalExaggerationRelativeHeight
+    frameState.verticalExaggerationRelativeHeight,
   );
 
   return Cartesian3.fromElements(
     0.0,
     0.0,
     (exaggeratedHeight - centerHeight) / frameState.verticalExaggeration,
-    scratchExaggerationTranslation
+    scratchExaggerationTranslation,
   );
 }
 
@@ -1289,7 +1260,7 @@ function initFromProvider(primitive, provider, context) {
       //>>includeStart('debug', pragmas.debug);
       if (defined(uniformMap[name])) {
         oneTimeWarning(
-          `VoxelPrimitive: Uniform name "${name}" is already defined`
+          `VoxelPrimitive: Uniform name "${name}" is already defined`,
         );
       }
       //>>includeEnd('debug');
@@ -1304,23 +1275,23 @@ function initFromProvider(primitive, provider, context) {
   // Note that minBounds and maxBounds can be set dynamically, so their uniforms aren't set here.
   uniforms.dimensions = Cartesian3.clone(
     provider.dimensions,
-    uniforms.dimensions
+    uniforms.dimensions,
   );
   primitive._paddingBefore = Cartesian3.clone(
     defaultValue(provider.paddingBefore, Cartesian3.ZERO),
-    primitive._paddingBefore
+    primitive._paddingBefore,
   );
   uniforms.paddingBefore = Cartesian3.clone(
     primitive._paddingBefore,
-    uniforms.paddingBefore
+    uniforms.paddingBefore,
   );
   primitive._paddingAfter = Cartesian3.clone(
     defaultValue(provider.paddingAfter, Cartesian3.ZERO),
-    primitive._paddingBefore
+    primitive._paddingBefore,
   );
   uniforms.paddingAfter = Cartesian3.clone(
     primitive._paddingAfter,
-    uniforms.paddingAfter
+    uniforms.paddingAfter,
   );
 
   // Create the VoxelTraversal, and set related uniforms
@@ -1338,23 +1309,23 @@ function initFromProvider(primitive, provider, context) {
 function checkTransformAndBounds(primitive, provider) {
   const shapeTransform = defaultValue(
     provider.shapeTransform,
-    Matrix4.IDENTITY
+    Matrix4.IDENTITY,
   );
   const globalTransform = defaultValue(
     provider.globalTransform,
-    Matrix4.IDENTITY
+    Matrix4.IDENTITY,
   );
 
   // Compound model matrix = global transform * model matrix * shape transform
   Matrix4.multiplyTransformation(
     globalTransform,
     primitive._exaggeratedModelMatrix,
-    primitive._compoundModelMatrix
+    primitive._compoundModelMatrix,
   );
   Matrix4.multiplyTransformation(
     primitive._compoundModelMatrix,
     shapeTransform,
-    primitive._compoundModelMatrix
+    primitive._compoundModelMatrix,
   );
   const numChanges =
     updateBound(primitive, "_compoundModelMatrix", "_compoundModelMatrixOld") +
@@ -1363,12 +1334,12 @@ function checkTransformAndBounds(primitive, provider) {
     updateBound(
       primitive,
       "_exaggeratedMinBounds",
-      "_exaggeratedMinBoundsOld"
+      "_exaggeratedMinBoundsOld",
     ) +
     updateBound(
       primitive,
       "_exaggeratedMaxBounds",
-      "_exaggeratedMaxBoundsOld"
+      "_exaggeratedMaxBoundsOld",
     ) +
     updateBound(primitive, "_minClippingBounds", "_minClippingBoundsOld") +
     updateBound(primitive, "_maxClippingBounds", "_maxClippingBoundsOld");
@@ -1409,7 +1380,7 @@ function updateShapeAndTransforms(primitive, shape, provider) {
     primitive._exaggeratedMinBounds,
     primitive._exaggeratedMaxBounds,
     primitive.minClippingBounds,
-    primitive.maxClippingBounds
+    primitive.maxClippingBounds,
   );
   if (!visible) {
     return false;
@@ -1418,11 +1389,11 @@ function updateShapeAndTransforms(primitive, shape, provider) {
   const transformPositionLocalToWorld = shape.shapeTransform;
   const transformPositionWorldToLocal = Matrix4.inverse(
     transformPositionLocalToWorld,
-    scratchTransformPositionWorldToLocal
+    scratchTransformPositionWorldToLocal,
   );
   const rotation = Matrix4.getRotation(
     transformPositionLocalToWorld,
-    scratchRotation
+    scratchRotation,
   );
   // Note that inverse(rotation) is the same as transpose(rotation)
   const scale = Matrix4.getScale(transformPositionLocalToWorld, scratchScale);
@@ -1430,32 +1401,32 @@ function updateShapeAndTransforms(primitive, shape, provider) {
   const localScale = Cartesian3.divideByScalar(
     scale,
     maximumScaleComponent,
-    scratchLocalScale
+    scratchLocalScale,
   );
   const rotationAndLocalScale = Matrix3.multiplyByScale(
     rotation,
     localScale,
-    scratchRotationAndLocalScale
+    scratchRotationAndLocalScale,
   );
 
   // Set member variables when the shape is dirty
   primitive._transformPositionWorldToUv = Matrix4.multiplyTransformation(
     transformPositionLocalToUv,
     transformPositionWorldToLocal,
-    primitive._transformPositionWorldToUv
+    primitive._transformPositionWorldToUv,
   );
   primitive._transformPositionUvToWorld = Matrix4.multiplyTransformation(
     transformPositionLocalToWorld,
     transformPositionUvToLocal,
-    primitive._transformPositionUvToWorld
+    primitive._transformPositionUvToWorld,
   );
   primitive._transformDirectionWorldToLocal = Matrix4.getMatrix3(
     transformPositionWorldToLocal,
-    primitive._transformDirectionWorldToLocal
+    primitive._transformDirectionWorldToLocal,
   );
   primitive._transformNormalLocalToWorld = Matrix3.inverseTranspose(
     rotationAndLocalScale,
-    primitive._transformNormalLocalToWorld
+    primitive._transformNormalLocalToWorld,
   );
 
   return true;
@@ -1482,7 +1453,7 @@ function setupTraversal(primitive, provider, context) {
         maximumTileCount,
         dimensions,
         provider.types,
-        provider.componentTypes
+        provider.componentTypes,
       )
     : undefined;
 
@@ -1495,7 +1466,7 @@ function setupTraversal(primitive, provider, context) {
     provider.types,
     provider.componentTypes,
     keyframeCount,
-    maximumTextureMemoryByteLength
+    maximumTextureMemoryByteLength,
   );
 }
 
@@ -1509,7 +1480,7 @@ function setTraversalUniforms(traversal, uniforms) {
   uniforms.octreeInternalNodeTexture = traversal.internalNodeTexture;
   uniforms.octreeInternalNodeTexelSizeUv = Cartesian2.clone(
     traversal.internalNodeTexelSizeUv,
-    uniforms.octreeInternalNodeTexelSizeUv
+    uniforms.octreeInternalNodeTexelSizeUv,
   );
   uniforms.octreeInternalNodeTilesPerRow = traversal.internalNodeTilesPerRow;
 
@@ -1523,23 +1494,23 @@ function setTraversalUniforms(traversal, uniforms) {
 
   uniforms.megatextureSliceDimensions = Cartesian2.clone(
     megatexture.sliceCountPerRegion,
-    uniforms.megatextureSliceDimensions
+    uniforms.megatextureSliceDimensions,
   );
   uniforms.megatextureTileDimensions = Cartesian2.clone(
     megatexture.regionCountPerMegatexture,
-    uniforms.megatextureTileDimensions
+    uniforms.megatextureTileDimensions,
   );
   uniforms.megatextureVoxelSizeUv = Cartesian2.clone(
     megatexture.voxelSizeUv,
-    uniforms.megatextureVoxelSizeUv
+    uniforms.megatextureVoxelSizeUv,
   );
   uniforms.megatextureSliceSizeUv = Cartesian2.clone(
     megatexture.sliceSizeUv,
-    uniforms.megatextureSliceSizeUv
+    uniforms.megatextureSliceSizeUv,
   );
   uniforms.megatextureTileSizeUv = Cartesian2.clone(
     megatexture.regionSizeUv,
-    uniforms.megatextureTileSizeUv
+    uniforms.megatextureTileSizeUv,
   );
 }
 
@@ -1553,7 +1524,7 @@ function setTraversalUniforms(traversal, uniforms) {
 function checkShapeDefines(primitive, shape) {
   const shapeDefines = shape.shaderDefines;
   const shapeDefinesChanged = Object.keys(shapeDefines).some(
-    (key) => shapeDefines[key] !== primitive._shapeDefinesOld[key]
+    (key) => shapeDefines[key] !== primitive._shapeDefinesOld[key],
   );
   if (shapeDefinesChanged) {
     primitive._shapeDefinesOld = clone(shapeDefines, true);
@@ -1595,11 +1566,11 @@ function getKeyframeLocation(timeIntervalCollection, clock) {
   // De-lerp between the start and end of the interval
   const totalSeconds = JulianDate.secondsDifference(
     timeInterval.stop,
-    timeInterval.start
+    timeInterval.start,
   );
   const secondsDifferenceStart = JulianDate.secondsDifference(
     date,
-    timeInterval.start
+    timeInterval.start,
   );
   const t = secondsDifferenceStart / totalSeconds;
 
@@ -1639,12 +1610,12 @@ function updateClippingPlanes(primitive, frameState) {
       Matrix4.multiplyTransformation(
         Matrix4.inverse(
           clippingPlanes.modelMatrix,
-          uniforms.clippingPlanesMatrix
+          uniforms.clippingPlanesMatrix,
         ),
         primitive._transformPositionUvToWorld,
-        uniforms.clippingPlanesMatrix
+        uniforms.clippingPlanesMatrix,
       ),
-      uniforms.clippingPlanesMatrix
+      uniforms.clippingPlanesMatrix,
     );
   }
 
@@ -1716,7 +1687,7 @@ const corners = new Array(
   new Cartesian4(-1.0, -1.0, +1.0, 1.0),
   new Cartesian4(+1.0, -1.0, +1.0, 1.0),
   new Cartesian4(-1.0, +1.0, +1.0, 1.0),
-  new Cartesian4(+1.0, +1.0, +1.0, 1.0)
+  new Cartesian4(+1.0, +1.0, +1.0, 1.0),
 );
 const vertexNeighborIndices = new Array(
   1,
@@ -1742,7 +1713,7 @@ const vertexNeighborIndices = new Array(
   7,
   3,
   5,
-  6
+  6,
 );
 
 const scratchCornersClipSpace = new Array(
@@ -1753,7 +1724,7 @@ const scratchCornersClipSpace = new Array(
   new Cartesian4(),
   new Cartesian4(),
   new Cartesian4(),
-  new Cartesian4()
+  new Cartesian4(),
 );
 
 /**
@@ -1775,17 +1746,17 @@ const scratchCornersClipSpace = new Array(
 function orientedBoundingBoxToNdcAabb(
   orientedBoundingBox,
   worldToProjection,
-  result
+  result,
 ) {
   const transformPositionLocalToWorld = Matrix4.fromRotationTranslation(
     orientedBoundingBox.halfAxes,
     orientedBoundingBox.center,
-    scratchTransformPositionLocalToWorld
+    scratchTransformPositionLocalToWorld,
   );
   const transformPositionLocalToProjection = Matrix4.multiply(
     worldToProjection,
     transformPositionLocalToWorld,
-    scratchTransformPositionLocalToProjection
+    scratchTransformPositionLocalToProjection,
   );
 
   let ndcMinX = +Number.MAX_VALUE;
@@ -1801,7 +1772,7 @@ function orientedBoundingBoxToNdcAabb(
     Matrix4.multiplyByVector(
       transformPositionLocalToProjection,
       corners[cornerIndex],
-      cornersClipSpace[cornerIndex]
+      cornersClipSpace[cornerIndex],
     );
   }
 
@@ -1833,7 +1804,7 @@ function orientedBoundingBoxToNdcAabb(
             position,
             neighborPosition,
             t,
-            scratchIntersect
+            scratchIntersect,
           );
           const intersectNdcX = intersect.x / intersect.w;
           const intersectNdcY = intersect.y / intersect.w;
@@ -1933,19 +1904,19 @@ function debugDraw(that, frameState) {
     Cartesian3.ZERO,
     polylineXAxis,
     Color.RED,
-    axisThickness
+    axisThickness,
   );
   makePolylineLineSegment(
     Cartesian3.ZERO,
     polylineYAxis,
     Color.LIME,
-    axisThickness
+    axisThickness,
   );
   makePolylineLineSegment(
     Cartesian3.ZERO,
     polylineZAxis,
     Color.BLUE,
-    axisThickness
+    axisThickness,
   );
 
   polylines.update(frameState);