@cesium/engine 22.2.0 → 22.3.0

package/Source/Scene/PolylineColorAppearance.js

@@ -1,18 +1,13 @@
 import Frozen from "../Core/Frozen.js";
-import FeatureDetection from "../Core/FeatureDetection.js";
 import VertexFormat from "../Core/VertexFormat.js";
 import PerInstanceFlatColorAppearanceFS from "../Shaders/Appearances/PerInstanceFlatColorAppearanceFS.js";
 import PolylineColorAppearanceVS from "../Shaders/Appearances/PolylineColorAppearanceVS.js";
 import PolylineCommon from "../Shaders/PolylineCommon.js";
 import Appearance from "./Appearance.js";
 
-let defaultVertexShaderSource = `${PolylineCommon}\n${PolylineColorAppearanceVS}`;
+const defaultVertexShaderSource = `#define CLIP_POLYLINE \n${PolylineCommon}\n${PolylineColorAppearanceVS}`;
 const defaultFragmentShaderSource = PerInstanceFlatColorAppearanceFS;
 
-if (!FeatureDetection.isInternetExplorer()) {
-  defaultVertexShaderSource = `#define CLIP_POLYLINE \n${defaultVertexShaderSource}`;
-}
-
 /**
  * An appearance for {@link GeometryInstance} instances with color attributes and
  * {@link PolylineGeometry} or {@link GroundPolylineGeometry}.

package/Source/Scene/PolylineMaterialAppearance.js

@@ -1,6 +1,5 @@
 import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
-import FeatureDetection from "../Core/FeatureDetection.js";
 import VertexFormat from "../Core/VertexFormat.js";
 import PolylineMaterialAppearanceVS from "../Shaders/Appearances/PolylineMaterialAppearanceVS.js";
 import PolylineCommon from "../Shaders/PolylineCommon.js";
@@ -8,13 +7,9 @@ import PolylineFS from "../Shaders/PolylineFS.js";
 import Appearance from "./Appearance.js";
 import Material from "./Material.js";
 
-let defaultVertexShaderSource = `${PolylineCommon}\n${PolylineMaterialAppearanceVS}`;
+const defaultVertexShaderSource = `#define CLIP_POLYLINE \n${PolylineCommon}\n${PolylineMaterialAppearanceVS}`;
 const defaultFragmentShaderSource = PolylineFS;
 
-if (!FeatureDetection.isInternetExplorer()) {
-  defaultVertexShaderSource = `#define CLIP_POLYLINE \n${defaultVertexShaderSource}`;
-}
-
 /**
  * An appearance for {@link PolylineGeometry} that supports shading with materials.
  *

package/Source/Scene/PostProcessStageCollection.js

@@ -303,7 +303,7 @@ Object.defineProperties(PostProcessStageCollection.prototype, {
 
   /**
    * Specifies the tonemapping algorithm used when rendering with high dynamic range.
-   * {@link https://sandcastle.cesium.com/?src=High%20Dynamic%20Range.html|Sandcastle Demo}
+   * {@link https://sandcastle.cesium.com/?id=high-dynamic-range|Sandcastle Demo}
    *
    * @example viewer.scene.postProcessStages.tonemapper = Cesium.Tonemapper.ACES;
    *

package/Source/Scene/QuadtreePrimitive.js

@@ -77,6 +77,7 @@ function QuadtreePrimitive(options) {
   const tilingScheme = this._tileProvider.tilingScheme;
   const ellipsoid = tilingScheme.ellipsoid;
 
+  this._tilesRenderedThisFrame = new Set(); // collect all tiles selected to render (useful when multiple render calls are made in a single frame (as in 2D mode))
   this._tilesToRender = [];
   this._tileLoadQueueHigh = []; // high priority tiles are preventing refinement
   this._tileLoadQueueMedium = []; // medium priority tiles are being rendered
@@ -256,9 +257,9 @@ QuadtreePrimitive.prototype.forEachLoadedTile = function (tileFunction) {
  *        function is passed a reference to the tile as its only parameter.
  */
 QuadtreePrimitive.prototype.forEachRenderedTile = function (tileFunction) {
-  const tilesRendered = this._tilesToRender;
-  for (let i = 0, len = tilesRendered.length; i < len; ++i) {
-    tileFunction(tilesRendered[i]);
+  const tilesRendered = this._tilesRenderedThisFrame;
+  for (const tile of tilesRendered) {
+    tileFunction(tile);
   }
 };
 
@@ -347,6 +348,7 @@ QuadtreePrimitive.prototype.beginFrame = function (frameState) {
   }
 
   this._tileReplacementQueue.markStartOfRenderFrame();
+  this._tilesRenderedThisFrame.clear();
 };
 
 /**
@@ -1303,6 +1305,7 @@ function screenSpaceError2D(primitive, frameState, tile) {
 
 function addTileToRenderList(primitive, tile) {
   primitive._tilesToRender.push(tile);
+  primitive._tilesRenderedThisFrame.add(tile);
 }
 
 function processTileLoadQueue(primitive, frameState) {

package/Source/Scene/ShadowMap.js

@@ -76,7 +76,7 @@ import ShadowMapShader from "./ShadowMapShader.js";
  *
  * @exception {DeveloperError} Only one or four cascades are supported.
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Shadows.html|Cesium Sandcastle Shadows Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=shadows|Cesium Sandcastle Shadows Demo}
  */
 function ShadowMap(options) {
   options = options ?? Frozen.EMPTY_OBJECT;
@@ -145,7 +145,6 @@ function ShadowMap(options) {
   // Re-enable once https://github.com/CesiumGS/cesium/issues/4560 is resolved.
   let polygonOffsetSupported = true;
   if (
-    FeatureDetection.isInternetExplorer() ||
     FeatureDetection.isEdge() ||
     ((FeatureDetection.isChrome() || FeatureDetection.isFirefox()) &&
       FeatureDetection.isWindows() &&

package/Source/Scene/Vector3DTileClampedPolylines.js

@@ -6,7 +6,6 @@ import ComponentDatatype from "../Core/ComponentDatatype.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import Ellipsoid from "../Core/Ellipsoid.js";
-import FeatureDetection from "../Core/FeatureDetection.js";
 import IndexDatatype from "../Core/IndexDatatype.js";
 import OrientedBoundingBox from "../Core/OrientedBoundingBox.js";
 import Matrix4 from "../Core/Matrix4.js";
@@ -557,10 +556,7 @@ function createShaders(primitive, context) {
   )(Vector3DTileClampedPolylinesFS);
 
   const vs = new ShaderSource({
-    defines: [
-      "VECTOR_TILE",
-      !FeatureDetection.isInternetExplorer() ? "CLIP_POLYLINE" : "",
-    ],
+    defines: ["VECTOR_TILE", "CLIP_POLYLINE"],
     sources: [PolylineCommon, vsSource],
   });
   const fs = new ShaderSource({

package/Source/Scene/Vector3DTilePolylines.js

@@ -4,7 +4,6 @@ import ComponentDatatype from "../Core/ComponentDatatype.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import Ellipsoid from "../Core/Ellipsoid.js";
-import FeatureDetection from "../Core/FeatureDetection.js";
 import IndexDatatype from "../Core/IndexDatatype.js";
 import Matrix4 from "../Core/Matrix4.js";
 import Rectangle from "../Core/Rectangle.js";
@@ -456,10 +455,7 @@ function createShaders(primitive, context) {
   )(PolylineFS);
 
   const vs = new ShaderSource({
-    defines: [
-      "VECTOR_TILE",
-      !FeatureDetection.isInternetExplorer() ? "CLIP_POLYLINE" : "",
-    ],
+    defines: ["VECTOR_TILE", "CLIP_POLYLINE"],
     sources: [PolylineCommon, vsSource],
   });
   const fs = new ShaderSource({

package/Source/Scene/VoxelPrimitive.js

@@ -405,11 +405,7 @@ function VoxelPrimitive(options) {
     octreeLeafNodeTilesPerRow: 0,
     octreeLeafNodeTexelSizeUv: new Cartesian2(),
     megatextureTextures: [],
-    megatextureSliceDimensions: new Cartesian2(),
-    megatextureTileDimensions: new Cartesian2(),
-    megatextureVoxelSizeUv: new Cartesian2(),
-    megatextureSliceSizeUv: new Cartesian2(),
-    megatextureTileSizeUv: new Cartesian2(),
+    megatextureTileCounts: new Cartesian3(),
     dimensions: new Cartesian3(),
     inputDimensions: new Cartesian3(),
     paddingBefore: new Cartesian3(),
@@ -855,10 +851,7 @@ Object.defineProperties(VoxelPrimitive.prototype, {
       Check.typeOf.bool("nearestSampling", nearestSampling);
       //>>includeEnd('debug');
 
-      if (this._nearestSampling !== nearestSampling) {
-        this._nearestSampling = nearestSampling;
-        this._shaderDirty = true;
-      }
+      this._nearestSampling = nearestSampling;
     },
   },
 
@@ -1282,6 +1275,7 @@ VoxelPrimitive.prototype.update = function (frameState) {
   );
   uniforms.stepSize = this._stepSizeMultiplier;
 
+  updateNearestSampling(this);
   updateRenderBoundPlanes(this, frameState);
 
   // Render the primitive
@@ -1294,6 +1288,13 @@ VoxelPrimitive.prototype.update = function (frameState) {
   frameState.commandList.push(command);
 };
 
+function updateNearestSampling(primitive) {
+  const { megatextures } = primitive._traversal;
+  for (let i = 0; i < megatextures.length; ++i) {
+    megatextures[i].nearestSampling = primitive._nearestSampling;
+  }
+}
+
 function updateRenderBoundPlanes(primitive, frameState) {
   const uniforms = primitive._uniforms;
   const { renderBoundPlanes } = primitive._shape;
@@ -1689,33 +1690,15 @@ function setTraversalUniforms(traversal, uniforms) {
   );
   uniforms.octreeInternalNodeTilesPerRow = traversal.internalNodeTilesPerRow;
 
-  const megatextures = traversal.megatextures;
+  const { megatextures } = traversal;
   const megatexture = megatextures[0];
-  const megatextureLength = megatextures.length;
-  uniforms.megatextureTextures = new Array(megatextureLength);
-  for (let i = 0; i < megatextureLength; i++) {
+  uniforms.megatextureTextures = new Array(megatextures.length);
+  for (let i = 0; i < megatextures.length; i++) {
     uniforms.megatextureTextures[i] = megatextures[i].texture;
   }
-
-  uniforms.megatextureSliceDimensions = Cartesian2.clone(
-    megatexture.sliceCountPerRegion,
-    uniforms.megatextureSliceDimensions,
-  );
-  uniforms.megatextureTileDimensions = Cartesian2.clone(
-    megatexture.regionCountPerMegatexture,
-    uniforms.megatextureTileDimensions,
-  );
-  uniforms.megatextureVoxelSizeUv = Cartesian2.clone(
-    megatexture.voxelSizeUv,
-    uniforms.megatextureVoxelSizeUv,
-  );
-  uniforms.megatextureSliceSizeUv = Cartesian2.clone(
-    megatexture.sliceSizeUv,
-    uniforms.megatextureSliceSizeUv,
-  );
-  uniforms.megatextureTileSizeUv = Cartesian2.clone(
-    megatexture.regionSizeUv,
-    uniforms.megatextureTileSizeUv,
+  uniforms.megatextureTileCounts = Cartesian3.clone(
+    megatexture.tileCounts,
+    uniforms.megatextureTileCounts,
   );
 }
 

package/Source/Scene/VoxelRenderResources.js

@@ -62,7 +62,7 @@ function VoxelRenderResources(primitive) {
   // The reason this uniform is added by shader builder is because some of the
   // dynamically generated shader code reads from it.
   shaderBuilder.addUniform(
-    "sampler2D",
+    "sampler3D",
     "u_megatextureTextures[METADATA_COUNT]",
     ShaderDestination.FRAGMENT,
   );
@@ -241,13 +241,6 @@ function VoxelRenderResources(primitive) {
       ShaderDestination.FRAGMENT,
     );
   }
-  if (primitive._nearestSampling) {
-    shaderBuilder.addDefine(
-      "NEAREST_SAMPLING",
-      undefined,
-      ShaderDestination.FRAGMENT,
-    );
-  }
   const traversal = primitive._traversal;
   shaderBuilder.addDefine(
     "SAMPLE_COUNT",

package/Source/Scene/VoxelTraversal.js

@@ -1,5 +1,4 @@
 import Cartesian2 from "../Core/Cartesian2.js";
-import Cartesian3 from "../Core/Cartesian3.js";
 import CesiumMath from "../Core/Math.js";
 import CullingVolume from "../Core/CullingVolume.js";
 import defined from "../Core/defined.js";
@@ -16,7 +15,6 @@ import SpatialNode from "./SpatialNode.js";
 import Texture from "../Renderer/Texture.js";
 import TextureMagnificationFilter from "../Renderer/TextureMagnificationFilter.js";
 import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js";
-import VoxelMetadataOrder from "./VoxelMetadataOrder.js";
 
 /**
  * Handles tileset traversal, tile requests, and GPU resources. Intended to be
@@ -28,7 +26,7 @@ import VoxelMetadataOrder from "./VoxelMetadataOrder.js";
  * @param {VoxelPrimitive} primitive The voxel primitive for which this traversal will be used.
  * @param {Context} context The context in which to create GPU resources.
  * @param {number} keyframeCount The number of keyframes in the tileset.
- * @param {number} [maximumTextureMemoryByteLength] The maximum amount of memory to use for textures.
+ * @param {number} [maximumTextureMemoryByteLength=536870912] The maximum amount of memory to use for textures.
  *
  * @private
  */
@@ -38,32 +36,16 @@ function VoxelTraversal(
   keyframeCount,
   maximumTextureMemoryByteLength,
 ) {
-  const { provider, dimensions, paddingBefore, paddingAfter } = primitive;
-  const { types, componentTypes, metadataOrder } = provider;
+  const { provider, dimensions, inputDimensions } = primitive;
+  const { types, componentTypes } = provider;
 
-  const inputDimensions = Cartesian3.add(
-    dimensions,
-    paddingBefore,
-    new Cartesian3(),
-  );
-  Cartesian3.add(inputDimensions, paddingAfter, inputDimensions);
-
-  if (metadataOrder === VoxelMetadataOrder.Y_UP) {
-    const inputDimensionsY = inputDimensions.y;
-    inputDimensions.y = inputDimensions.z;
-    inputDimensions.z = inputDimensionsY;
-  }
-
-  if (
-    !defined(maximumTextureMemoryByteLength) &&
-    defined(provider.maximumTileCount)
-  ) {
-    maximumTextureMemoryByteLength = getApproximateTextureMemoryByteLength(
-      provider.maximumTileCount,
-      inputDimensions,
-      types,
-      componentTypes,
+  if (defined(maximumTextureMemoryByteLength)) {
+    maximumTextureMemoryByteLength = Math.min(
+      Math.max(0, maximumTextureMemoryByteLength),
+      512 * 1024 * 1024,
     );
+  } else {
+    maximumTextureMemoryByteLength = 128 * 1024 * 1024;
   }
 
   /**
@@ -84,7 +66,12 @@ function VoxelTraversal(
    */
   this.megatextures = new Array(types.length);
 
-  // TODO make sure to split the maximumTextureMemoryByteLength across all the megatextures
+  const providerTileCount = defined(provider.maximumTileCount)
+    ? provider.maximumTileCount
+    : defined(provider.availableLevels)
+      ? (8 ** provider.availableLevels - 1) / 7
+      : undefined;
+
   for (let i = 0; i < types.length; i++) {
     const type = types[i];
     const componentCount = MetadataType.getComponentCount(type);
@@ -96,6 +83,7 @@ function VoxelTraversal(
       componentCount,
       componentType,
       maximumTextureMemoryByteLength,
+      providerTileCount,
     );
 
     this.textureMemoryByteLength +=
@@ -1228,37 +1216,4 @@ function copyToLeafNodeTexture(data, texelsPerTile, tilesPerRow, texture) {
   texture.copyFrom(copyOptions);
 }
 
-/**
- * @param {number} tileCount
- * @param {Cartesian3} dimensions
- * @param {MetadataType[]} types
- * @param {MetadataComponentType[]} componentTypes
- * @private
- */
-function getApproximateTextureMemoryByteLength(
-  tileCount,
-  dimensions,
-  types,
-  componentTypes,
-) {
-  let textureMemoryByteLength = 0;
-
-  const length = types.length;
-  for (let i = 0; i < length; i++) {
-    const type = types[i];
-    const componentType = componentTypes[i];
-    const componentCount = MetadataType.getComponentCount(type);
-
-    textureMemoryByteLength +=
-      Megatexture.getApproximateTextureMemoryByteLength(
-        tileCount,
-        dimensions,
-        componentCount,
-        componentType,
-      );
-  }
-
-  return textureMemoryByteLength;
-}
-
 export default VoxelTraversal;

package/Source/Scene/WebMapTileServiceImageryProvider.js

@@ -51,7 +51,7 @@ const defaultParameters = Object.freeze({
  *
  * @param {WebMapTileServiceImageryProvider.ConstructorOptions} options Object describing initialization options
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Web%20Map%20Tile%20Service%20with%20Time.html|Cesium Sandcastle Web Map Tile Service with Time Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=web-map-tile-service-with-time|Cesium Sandcastle Web Map Tile Service with Time Demo}
  *
  * @example
  * // Example 1. USGS shaded relief tiles (KVP)

package/Source/Scene/createElevationBandMaterial.js

@@ -435,7 +435,7 @@ function createLayeredEntries(layers) {
  * @param {createElevationBandMaterialBand[]} options.layers A list of bands ordered from lowest to highest precedence.
  * @returns {Material} A new {@link Material} instance.
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Elevation%20Band%20Material.html|Cesium Sandcastle Elevation Band Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=elevation-band-material|Cesium Sandcastle Elevation Band Demo}
  *
  * @example
  * scene.globe.material = Cesium.createElevationBandMaterial({

package/Source/Scene/processVoxelProperties.js

@@ -294,7 +294,7 @@ function processVoxelProperties(renderResources, primitive) {
     const functionId = "getPropertiesFromMegatextureAtUv";
     shaderBuilder.addFunction(
       functionId,
-      `${propertiesStructName} getPropertiesFromMegatextureAtUv(vec2 texcoord)`,
+      `${propertiesStructName} getPropertiesFromMegatextureAtUv(vec3 texcoord)`,
       ShaderDestination.FRAGMENT,
     );
     shaderBuilder.addFunctionLines(functionId, [

package/Source/Shaders/Builtin/Functions/columbusViewMorph.glsl

@@ -7,6 +7,13 @@
 vec4 czm_columbusViewMorph(vec4 position2D, vec4 position3D, float time)
 {
     // Just linear for now.
-    vec3 p = mix(position2D.xyz, position3D.xyz, time);
+    // We're manually doing the equivalent of a `mix` here because, some GPUs
+    // (NVidia GeForce 3070 Ti and Intel Arc A750, to name two), `mix` seems to
+    // use an alternate formulation that introduces jitter even when `time` is
+    // 0.0 or 1.0. That is, the value of `p` won't be exactly `position2D.xyz`
+    // when `time` is 0.0 and it won't be exactly `position3D.xyz` when `time` is
+    // 1.0. The "textbook" formulation here, while probably a bit slower,
+    // does not have this problem.
+    vec3 p = position2D.xyz * (1.0 - time) + position3D.xyz * time;
     return vec4(p, 1.0);
 }

package/Source/Shaders/Builtin/Functions/columbusViewMorph.js

@@ -8,7 +8,14 @@ export default "/**\n\
 vec4 czm_columbusViewMorph(vec4 position2D, vec4 position3D, float time)\n\
 {\n\
     // Just linear for now.\n\
-    vec3 p = mix(position2D.xyz, position3D.xyz, time);\n\
+    // We're manually doing the equivalent of a `mix` here because, some GPUs\n\
+    // (NVidia GeForce 3070 Ti and Intel Arc A750, to name two), `mix` seems to\n\
+    // use an alternate formulation that introduces jitter even when `time` is\n\
+    // 0.0 or 1.0. That is, the value of `p` won't be exactly `position2D.xyz`\n\
+    // when `time` is 0.0 and it won't be exactly `position3D.xyz` when `time` is\n\
+    // 1.0. The \"textbook\" formulation here, while probably a bit slower,\n\
+    // does not have this problem.\n\
+    vec3 p = position2D.xyz * (1.0 - time) + position3D.xyz * time;\n\
     return vec4(p, 1.0);\n\
 }\n\
 ";

package/Source/Shaders/Model/ModelFS.glsl

@@ -29,6 +29,14 @@ SelectedFeature selectedFeature;
 
 void main()
 {
+    #ifdef PRIMITIVE_TYPE_POINTS
+    // Render points as circles
+    float distanceToCenter = length(gl_PointCoord - vec2(0.5));
+    if (distanceToCenter > 0.5) {
+        discard;
+    }
+    #endif
+
     #ifdef HAS_POINT_CLOUD_SHOW_STYLE
         if (v_pointCloudShow == 0.0)
         {

package/Source/Shaders/Model/ModelFS.js

@@ -30,6 +30,14 @@ SelectedFeature selectedFeature;\n\
 \n\
 void main()\n\
 {\n\
+    #ifdef PRIMITIVE_TYPE_POINTS\n\
+    // Render points as circles\n\
+    float distanceToCenter = length(gl_PointCoord - vec2(0.5));\n\
+    if (distanceToCenter > 0.5) {\n\
+        discard;\n\
+    }\n\
+    #endif\n\
+\n\
     #ifdef HAS_POINT_CLOUD_SHOW_STYLE\n\
         if (v_pointCloudShow == 0.0)\n\
         {\n\

package/Source/Shaders/Model/ModelVS.glsl

@@ -142,6 +142,8 @@ void main()
         gl_PointSize = vsOutput.pointSize;
         #elif defined(HAS_POINT_CLOUD_POINT_SIZE_STYLE) || defined(HAS_POINT_CLOUD_ATTENUATION)
         gl_PointSize = pointCloudPointSizeStylingStage(attributes, metadata);
+        #elif defined(HAS_POINT_DIAMETER)
+        gl_PointSize = u_pointDiameter;
         #else
         gl_PointSize = 1.0;
         #endif

package/Source/Shaders/Model/ModelVS.js

@@ -143,6 +143,8 @@ void main()\n\
         gl_PointSize = vsOutput.pointSize;\n\
         #elif defined(HAS_POINT_CLOUD_POINT_SIZE_STYLE) || defined(HAS_POINT_CLOUD_ATTENUATION)\n\
         gl_PointSize = pointCloudPointSizeStylingStage(attributes, metadata);\n\
+        #elif defined(HAS_POINT_DIAMETER)\n\
+        gl_PointSize = u_pointDiameter;\n\
         #else\n\
         gl_PointSize = 1.0;\n\
         #endif\n\

package/Source/Shaders/Voxels/IntersectionUtils.glsl

@@ -135,7 +135,7 @@ RayShapeIntersection nextIntersection(inout Intersections ix) {
         surfaceIntersection = ix.intersections[i];
         int intersectionType = int(length(surfaceIntersection.xyz) - 0.5);
         bool currShapeIsPositive = intersectionType < 2;
-        bool enter = intMod(intersectionType, 2) == 0;
+        bool enter = intersectionType % 2 == 0;
 
         ix.surroundCount += enter ? +1 : -1;
         ix.surroundIsPositive = currShapeIsPositive ? enter : ix.surroundIsPositive;

package/Source/Shaders/Voxels/IntersectionUtils.js

@@ -136,7 +136,7 @@ RayShapeIntersection nextIntersection(inout Intersections ix) {\n\
         surfaceIntersection = ix.intersections[i];\n\
         int intersectionType = int(length(surfaceIntersection.xyz) - 0.5);\n\
         bool currShapeIsPositive = intersectionType < 2;\n\
-        bool enter = intMod(intersectionType, 2) == 0;\n\
+        bool enter = intersectionType % 2 == 0;\n\
 \n\
         ix.surroundCount += enter ? +1 : -1;\n\
         ix.surroundIsPositive = currShapeIsPositive ? enter : ix.surroundIsPositive;\n\

package/Source/Shaders/Voxels/Megatexture.glsl

@@ -1,104 +1,36 @@
-// See Octree.glsl for the definitions of SampleData and intMod
+// See Octree.glsl for the definitions of SampleData
 
 /* Megatexture defines (set in Scene/VoxelRenderResources.js)
 #define SAMPLE_COUNT ###
-#define NEAREST_SAMPLING
 #define PADDING
 */
 
-uniform ivec2 u_megatextureSliceDimensions; // number of slices per tile, in two dimensions
-uniform ivec2 u_megatextureTileDimensions; // number of tiles per megatexture, in two dimensions
-uniform vec2 u_megatextureVoxelSizeUv;
-uniform vec2 u_megatextureSliceSizeUv;
-uniform vec2 u_megatextureTileSizeUv;
+uniform ivec3 u_megatextureTileCounts; // number of tiles in the megatexture, along each axis
 
-// Integer min, max, clamp: For WebGL1 only
-int intMin(int a, int b) {
-    return a <= b ? a : b;
-}
-int intMax(int a, int b) {
-    return a >= b ? a : b;
-}
-int intClamp(int v, int minVal, int maxVal) {
-    return intMin(intMax(v, minVal), maxVal);
-}
-
-vec2 index1DTo2DTexcoord(int index, ivec2 dimensions, vec2 uvScale)
+vec3 index1DTo3DTexCoord(int index)
 {
-    int indexX = intMod(index, dimensions.x);
-    int indexY = index / dimensions.x;
-    return vec2(indexX, indexY) * uvScale;
+    int tilesPerZ = u_megatextureTileCounts.x * u_megatextureTileCounts.y;
+    int iz = index / tilesPerZ;
+    int remainder = index - iz * tilesPerZ;
+    int iy = remainder / u_megatextureTileCounts.x;
+    int ix = remainder - iy * u_megatextureTileCounts.x;
+    return vec3(ix, iy, iz) / vec3(u_megatextureTileCounts);
 }
 
-/*
-    How is 3D data stored in a 2D megatexture?
-
-    In this example there is only one loaded tile and it has 2x2x2 voxels (8 voxels total).
-    The data is sliced by Z. The data at Z = 0 is placed in texels (0,0), (0,1), (1,0), (1,1) and
-    the data at Z = 1 is placed in texels (2,0), (2,1), (3,0), (3,1).
-    Note that there could be empty space in the megatexture because it's a power of two.
-
-      0   1   2   3
-    +---+---+---+---+
-    |   |   |   |   | 3
-    +---+---+---+---+
-    |   |   |   |   | 2
-    +-------+-------+
-    |010|110|011|111| 1
-    |--- ---|--- ---|
-    |000|100|001|101| 0
-    +-------+-------+
-
-    When doing linear interpolation the megatexture needs to be sampled twice: once for
-    the Z slice above the voxel coordinate and once for the slice below. The two slices
-    are interpolated with fract(coord.z - 0.5). For example, a Z coordinate of 1.0 is
-    halfway between two Z slices so the interpolation factor is 0.5. Below is a side view
-    of the 3D voxel grid with voxel coordinates on the left side.
-
-    2 +---+
-      |001|
-    1 +-z-+
-      |000|
-    0 +---+
-
-    When doing nearest neighbor the megatexture only needs to be sampled once at the closest Z slice.
-*/
-
 Properties getPropertiesFromMegatexture(in SampleData sampleData) {
     int tileIndex = sampleData.megatextureIndex;
 
     vec3 voxelCoord = sampleData.inputCoordinate;
-    #if defined(NEAREST_SAMPLING)
-        // Round to the center of the nearest voxel
-        voxelCoord = floor(voxelCoord) + vec3(0.5);
-    #endif
 
-    // Tile location
-    vec2 tileUvOffset = index1DTo2DTexcoord(tileIndex, u_megatextureTileDimensions, u_megatextureTileSizeUv);
-
-    // Slice location
-    float slice = voxelCoord.z - 0.5;
-    int sliceIndex = int(floor(slice));
-    int sliceIndex0 = intClamp(sliceIndex, 0, u_inputDimensions.z - 1);
-    vec2 sliceUvOffset0 = index1DTo2DTexcoord(sliceIndex0, u_megatextureSliceDimensions, u_megatextureSliceSizeUv);
+    // UV coordinate of the lower corner of the tile in the megatexture
+    vec3 tileUvOffset = index1DTo3DTexCoord(tileIndex);
 
     // Voxel location
-    vec2 voxelUvOffset = clamp(voxelCoord.xy, vec2(0.5), vec2(u_inputDimensions.xy) - vec2(0.5)) * u_megatextureVoxelSizeUv;
-
-    // Final location in the megatexture
-    vec2 uv0 = tileUvOffset + sliceUvOffset0 + voxelUvOffset;
+    vec3 tileDimensions = vec3(u_inputDimensions);
+    vec3 clampedVoxelCoord = clamp(voxelCoord, vec3(0.5), tileDimensions - vec3(0.5));
+    vec3 voxelUv = clampedVoxelCoord / tileDimensions / vec3(u_megatextureTileCounts);
 
-    #if defined(NEAREST_SAMPLING)
-        return getPropertiesFromMegatextureAtUv(uv0);
-    #else
-        float sliceLerp = fract(slice);
-        int sliceIndex1 = intMin(sliceIndex + 1, u_inputDimensions.z - 1);
-        vec2 sliceUvOffset1 = index1DTo2DTexcoord(sliceIndex1, u_megatextureSliceDimensions, u_megatextureSliceSizeUv);
-        vec2 uv1 = tileUvOffset + sliceUvOffset1 + voxelUvOffset;
-        Properties properties0 = getPropertiesFromMegatextureAtUv(uv0);
-        Properties properties1 = getPropertiesFromMegatextureAtUv(uv1);
-        return mixProperties(properties0, properties1, sliceLerp);
-    #endif
+    return getPropertiesFromMegatextureAtUv(tileUvOffset + voxelUv);
 }
 
 // Convert an array of sample datas to a final weighted properties.