@cesium/engine 14.0.0 → 16.0.0

package/Source/Scene/WebMapServiceImageryProvider.js

@@ -1,4 +1,4 @@
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import GeographicTilingScheme from "../Core/GeographicTilingScheme.js";
@@ -101,7 +101,7 @@ const excludesReverseAxis = [
  * viewer.imageryLayers.add(imageryLayer);
  */
 function WebMapServiceImageryProvider(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
 
   //>>includeStart('debug', pragmas.debug);
   if (!defined(options.url)) {
@@ -129,10 +129,7 @@ function WebMapServiceImageryProvider(options) {
   this._defaultMinificationFilter = undefined;
   this._defaultMagnificationFilter = undefined;
 
-  this._getFeatureInfoUrl = defaultValue(
-    options.getFeatureInfoUrl,
-    options.url,
-  );
+  this._getFeatureInfoUrl = options.getFeatureInfoUrl ?? options.url;
 
   const resource = Resource.createIfNeeded(options.url);
   const pickFeatureResource = Resource.createIfNeeded(this._getFeatureInfoUrl);
@@ -185,13 +182,12 @@ function WebMapServiceImageryProvider(options) {
     // Use CRS with 1.3.0 and going forward.
     // For GeographicTilingScheme, use CRS:84 vice EPSG:4326 to specify lon, lat (x, y) ordering for
     // bbox requests.
-    parameters.crs = defaultValue(
-      options.crs,
-      options.tilingScheme &&
-        options.tilingScheme.projection instanceof WebMercatorProjection
+    parameters.crs =
+      options.crs ??
+      (options.tilingScheme &&
+      options.tilingScheme.projection instanceof WebMercatorProjection
         ? "EPSG:3857"
-        : "CRS:84",
-    );
+        : "CRS:84");
 
     // The axis order in previous versions of the WMS specifications was to always use easting (x or lon ) and northing (y or
     // lat). WMS 1.3.0 specifies that, depending on the particular CRS, the x axis may or may not be oriented West-to-East,
@@ -213,13 +209,12 @@ function WebMapServiceImageryProvider(options) {
     }
   } else {
     // SRS for WMS 1.1.0 or 1.1.1.
-    parameters.srs = defaultValue(
-      options.srs,
-      options.tilingScheme &&
-        options.tilingScheme.projection instanceof WebMercatorProjection
+    parameters.srs =
+      options.srs ??
+      (options.tilingScheme &&
+      options.tilingScheme.projection instanceof WebMercatorProjection
         ? "EPSG:3857"
-        : "EPSG:4326",
-    );
+        : "EPSG:4326");
   }
 
   resource.setQueryParameters(parameters, true);
@@ -247,10 +242,9 @@ function WebMapServiceImageryProvider(options) {
   this._tileProvider = new UrlTemplateImageryProvider({
     url: resource,
     pickFeaturesUrl: pickFeatureResource,
-    tilingScheme: defaultValue(
-      options.tilingScheme,
+    tilingScheme:
+      options.tilingScheme ??
       new GeographicTilingScheme({ ellipsoid: options.ellipsoid }),
-    ),
     rectangle: options.rectangle,
     tileWidth: options.tileWidth,
     tileHeight: options.tileHeight,
@@ -259,10 +253,9 @@ function WebMapServiceImageryProvider(options) {
     subdomains: options.subdomains,
     tileDiscardPolicy: options.tileDiscardPolicy,
     credit: options.credit,
-    getFeatureInfoFormats: defaultValue(
-      options.getFeatureInfoFormats,
+    getFeatureInfoFormats:
+      options.getFeatureInfoFormats ??
       WebMapServiceImageryProvider.DefaultGetFeatureInfoFormats,
-    ),
     enablePickFeatures: options.enablePickFeatures,
   });
 }

package/Source/Scene/WebMapTileServiceImageryProvider.js

@@ -1,6 +1,6 @@
 import combine from "../Core/combine.js";
 import Credit from "../Core/Credit.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import Event from "../Core/Event.js";
@@ -114,7 +114,7 @@ const defaultParameters = Object.freeze({
  * @see UrlTemplateImageryProvider
  */
 function WebMapTileServiceImageryProvider(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
 
   //>>includeStart('debug', pragmas.debug);
   if (!defined(options.url)) {
@@ -176,22 +176,19 @@ function WebMapTileServiceImageryProvider(options) {
   this._style = style;
   this._tileMatrixSetID = tileMatrixSetID;
   this._tileMatrixLabels = options.tileMatrixLabels;
-  this._format = defaultValue(options.format, "image/jpeg");
+  this._format = options.format ?? "image/jpeg";
   this._tileDiscardPolicy = options.tileDiscardPolicy;
 
   this._tilingScheme = defined(options.tilingScheme)
     ? options.tilingScheme
     : new WebMercatorTilingScheme({ ellipsoid: options.ellipsoid });
-  this._tileWidth = defaultValue(options.tileWidth, 256);
-  this._tileHeight = defaultValue(options.tileHeight, 256);
+  this._tileWidth = options.tileWidth ?? 256;
+  this._tileHeight = options.tileHeight ?? 256;
 
-  this._minimumLevel = defaultValue(options.minimumLevel, 0);
+  this._minimumLevel = options.minimumLevel ?? 0;
   this._maximumLevel = options.maximumLevel;
 
-  this._rectangle = defaultValue(
-    options.rectangle,
-    this._tilingScheme.rectangle,
-  );
+  this._rectangle = options.rectangle ?? this._tilingScheme.rectangle;
   this._dimensions = options.dimensions;
 
   const that = this;

package/Source/Scene/createElevationBandMaterial.js

@@ -2,7 +2,7 @@ import Cartesian4 from "../Core/Cartesian4.js";
 import CesiumMath from "../Core/Math.js";
 import Check from "../Core/Check.js";
 import Color from "../Core/Color.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import mergeSort from "../Core/mergeSort.js";
@@ -159,8 +159,8 @@ function preprocess(layers) {
       });
     }
 
-    let extendDownwards = defaultValue(layer.extendDownwards, false);
-    let extendUpwards = defaultValue(layer.extendUpwards, false);
+    let extendDownwards = layer.extendDownwards ?? false;
+    let extendUpwards = layer.extendUpwards ?? false;
 
     // Interpret a single entry to extend all the way up and down.
     if (entries.length === 1 && !extendDownwards && !extendUpwards) {
@@ -462,7 +462,7 @@ function createLayeredEntries(layers) {
  * });
  */
 function createElevationBandMaterial(options) {
-  const { scene, layers } = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  const { scene, layers } = options ?? Frozen.EMPTY_OBJECT;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.scene", scene);

package/Source/Scene/createGooglePhotorealistic3DTileset.js

@@ -1,6 +1,6 @@
 import Cesium3DTileset from "./Cesium3DTileset.js";
 import Check from "../Core/Check.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import IonResource from "../Core/IonResource.js";
 import GoogleMaps from "../Core/GoogleMaps.js";
@@ -58,21 +58,13 @@ import oneTimeWarning from "../Core/oneTimeWarning.js";
  * }
  */
 async function createGooglePhotorealistic3DTileset(apiOptions, tilesetOptions) {
-  tilesetOptions = defaultValue(tilesetOptions, {});
-  tilesetOptions.cacheBytes = defaultValue(
-    tilesetOptions.cacheBytes,
-    1536 * 1024 * 1024,
-  );
-  tilesetOptions.maximumCacheOverflowBytes = defaultValue(
-    tilesetOptions.maximumCacheOverflowBytes,
-    1024 * 1024 * 1024,
-  );
-  tilesetOptions.enableCollision = defaultValue(
-    tilesetOptions.enableCollision,
-    true,
-  );
+  tilesetOptions = tilesetOptions ?? {};
+  tilesetOptions.cacheBytes = tilesetOptions.cacheBytes ?? 1536 * 1024 * 1024;
+  tilesetOptions.maximumCacheOverflowBytes =
+    tilesetOptions.maximumCacheOverflowBytes ?? 1024 * 1024 * 1024;
+  tilesetOptions.enableCollision = tilesetOptions.enableCollision ?? true;
 
-  apiOptions = defaultValue(apiOptions, defaultValue.EMPTY_OBJECT);
+  apiOptions = apiOptions ?? Frozen.EMPTY_OBJECT;
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("apiOptions", apiOptions);
   //>>includeEnd('debug');
@@ -84,7 +76,7 @@ async function createGooglePhotorealistic3DTileset(apiOptions, tilesetOptions) {
     );
   }
 
-  const key = defaultValue(apiOptions.key, GoogleMaps.defaultApiKey);
+  const key = apiOptions.key ?? GoogleMaps.defaultApiKey;
   if (!defined(key)) {
     return requestCachedIonTileset(tilesetOptions);
   }

package/Source/Scene/createOsmBuildingsAsync.js

@@ -1,5 +1,5 @@
 import Color from "../Core/Color.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import Cesium3DTileset from "./Cesium3DTileset.js";
 import Cesium3DTileStyle from "./Cesium3DTileStyle.js";
@@ -60,15 +60,12 @@ import Cesium3DTileStyle from "./Cesium3DTileStyle.js";
 async function createOsmBuildingsAsync(options) {
   const tileset = await Cesium3DTileset.fromIonAssetId(96188, options);
 
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
 
   let style = options.style;
 
   if (!defined(style)) {
-    const color = defaultValue(
-      options.defaultColor,
-      Color.WHITE,
-    ).toCssColorString();
+    const color = (options.defaultColor ?? Color.WHITE).toCssColorString();
     style = new Cesium3DTileStyle({
       color: `Boolean(\${feature['cesium#color']}) ? color(\${feature['cesium#color']}) : ${color}`,
     });

package/Source/Scene/createTangentSpaceDebugPrimitive.js

@@ -1,5 +1,5 @@
 import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import GeometryInstance from "../Core/GeometryInstance.js";
@@ -30,7 +30,7 @@ import Primitive from "./Primitive.js";
  * }));
  */
 function createTangentSpaceDebugPrimitive(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
   const instances = [];
   let geometry = options.geometry;
 
@@ -47,10 +47,8 @@ function createTangentSpaceDebugPrimitive(options) {
   }
 
   const attributes = geometry.attributes;
-  const modelMatrix = Matrix4.clone(
-    defaultValue(options.modelMatrix, Matrix4.IDENTITY),
-  );
-  const length = defaultValue(options.length, 10000.0);
+  const modelMatrix = Matrix4.clone(options.modelMatrix ?? Matrix4.IDENTITY);
+  const length = options.length ?? 10000.0;
 
   if (defined(attributes.normal)) {
     instances.push(

package/Source/Scene/createWorldImageryAsync.js

@@ -1,4 +1,4 @@
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import IonImageryProvider from "./IonImageryProvider.js";
 import IonWorldImageryStyle from "./IonWorldImageryStyle.js";
 
@@ -32,8 +32,8 @@ import IonWorldImageryStyle from "./IonWorldImageryStyle.js";
  * }
  */
 function createWorldImageryAsync(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const style = defaultValue(options.style, IonWorldImageryStyle.AERIAL);
+  options = options ?? Frozen.EMPTY_OBJECT;
+  const style = options.style ?? IonWorldImageryStyle.AERIAL;
   return IonImageryProvider.fromAssetId(style);
 }
 export default createWorldImageryAsync;

package/Source/Scene/findContentMetadata.js

@@ -1,5 +1,5 @@
 import ContentMetadata from "./ContentMetadata.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import hasExtension from "./hasExtension.js";
 import oneTimeWarning from "../Core/oneTimeWarning.js";
@@ -34,10 +34,7 @@ function findContentMetadata(tileset, contentHeader) {
     return undefined;
   }
 
-  const classes = defaultValue(
-    tileset.schema.classes,
-    defaultValue.EMPTY_OBJECT,
-  );
+  const classes = tileset.schema.classes ?? Frozen.EMPTY_OBJECT;
   if (defined(metadataJson.class)) {
     const contentClass = classes[metadataJson.class];
     return new ContentMetadata({

package/Source/Scene/findTileMetadata.js

@@ -1,4 +1,4 @@
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import hasExtension from "./hasExtension.js";
 import TileMetadata from "./TileMetadata.js";
@@ -36,10 +36,7 @@ function findTileMetadata(tileset, tileHeader) {
     return undefined;
   }
 
-  const classes = defaultValue(
-    tileset.schema.classes,
-    defaultValue.EMPTY_OBJECT,
-  );
+  const classes = tileset.schema.classes ?? Frozen.EMPTY_OBJECT;
   if (defined(metadataJson.class)) {
     const tileClass = classes[metadataJson.class];
     return new TileMetadata({

package/Source/Scene/parseBatchTable.js

@@ -1,7 +1,6 @@
 import Check from "../Core/Check.js";
 import ComponentDatatype from "../Core/ComponentDatatype.js";
 import defined from "../Core/defined.js";
-import defaultValue from "../Core/defaultValue.js";
 import deprecationWarning from "../Core/deprecationWarning.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import RuntimeError from "../Core/RuntimeError.js";
@@ -45,10 +44,7 @@ function parseBatchTable(options) {
   const featureCount = options.count;
   const batchTable = options.batchTable;
   const binaryBody = options.binaryBody;
-  const parseAsPropertyAttributes = defaultValue(
-    options.parseAsPropertyAttributes,
-    false,
-  );
+  const parseAsPropertyAttributes = options.parseAsPropertyAttributes ?? false;
   const customAttributeOutput = options.customAttributeOutput;
 
   //>>includeStart('debug', pragmas.debug);

package/Source/Scene/parseFeatureMetadataLegacy.js

@@ -1,6 +1,6 @@
 import Check from "../Core/Check.js";
 import combine from "../Core/combine.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import PropertyTable from "./PropertyTable.js";
 import PropertyTexture from "./PropertyTexture.js";
@@ -21,7 +21,7 @@ import MetadataTable from "./MetadataTable.js";
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.
  */
 function parseFeatureMetadataLegacy(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
   const extension = options.extension;
 
   // The calling code is responsible for loading the schema.

package/Source/Scene/parseStructuralMetadata.js

@@ -1,5 +1,5 @@
 import Check from "../Core/Check.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import PropertyTable from "./PropertyTable.js";
 import PropertyTexture from "./PropertyTexture.js";
@@ -21,7 +21,7 @@ import MetadataTable from "./MetadataTable.js";
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.
  */
 function parseStructuralMetadata(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
   const extension = options.extension;
 
   // The calling code is responsible for loading the schema.

package/Source/Scene/processVoxelProperties.js

@@ -310,6 +310,9 @@ function processVoxelProperties(renderResources, primitive) {
         const glslField = getGlslField(type, j);
         const minimumValue = minimumValues[i][j];
         const maximumValue = maximumValues[i][j];
+        if (!defined(minimumValue) || !defined(maximumValue)) {
+          continue;
+        }
         shaderBuilder.addFunctionLines(functionId, [
           `${statisticsFieldName}.${name}.min${glslField} = ${getGlslNumberAsFloat(
             minimumValue,

package/Source/Shaders/GlobeFS.glsl

@@ -285,7 +285,16 @@ vec3 computeEllipsoidPosition()
     vec2 xy = gl_FragCoord.xy / czm_viewport.zw * 2.0 - vec2(1.0);
     xy *= czm_viewport.zw * mpp * 0.5;
 
-    vec3 direction = normalize(vec3(xy, -czm_currentFrustum.x));
+    vec3 direction;
+    if (czm_orthographicIn3D == 1.0)
+    {
+        direction = vec3(0.0, 0.0, -1.0);
+    }
+    else
+    {
+        direction = normalize(vec3(xy, -czm_currentFrustum.x));
+    }
+
     czm_ray ray = czm_ray(vec3(0.0), direction);
 
     vec3 ellipsoid_center = czm_view[3].xyz;

package/Source/Shaders/GlobeFS.js

@@ -286,7 +286,16 @@ vec3 computeEllipsoidPosition()\n\
     vec2 xy = gl_FragCoord.xy / czm_viewport.zw * 2.0 - vec2(1.0);\n\
     xy *= czm_viewport.zw * mpp * 0.5;\n\
 \n\
-    vec3 direction = normalize(vec3(xy, -czm_currentFrustum.x));\n\
+    vec3 direction;\n\
+    if (czm_orthographicIn3D == 1.0)\n\
+    {\n\
+        direction = vec3(0.0, 0.0, -1.0);\n\
+    }\n\
+    else\n\
+    {\n\
+        direction = normalize(vec3(xy, -czm_currentFrustum.x));\n\
+    }\n\
+\n\
     czm_ray ray = czm_ray(vec3(0.0), direction);\n\
 \n\
     vec3 ellipsoid_center = czm_view[3].xyz;\n\

package/Source/Shaders/Voxels/Megatexture.glsl

@@ -12,12 +12,6 @@ uniform vec2 u_megatextureVoxelSizeUv;
 uniform vec2 u_megatextureSliceSizeUv;
 uniform vec2 u_megatextureTileSizeUv;
 
-uniform ivec3 u_dimensions; // does not include padding
-#if defined(PADDING)
-    uniform ivec3 u_paddingBefore;
-    uniform ivec3 u_paddingAfter;
-#endif
-
 // Integer min, max, clamp: For WebGL1 only
 int intMin(int a, int b) {
     return a <= b ? a : b;
@@ -72,14 +66,8 @@ vec2 index1DTo2DTexcoord(int index, ivec2 dimensions, vec2 uvScale)
 
 Properties getPropertiesFromMegatexture(in SampleData sampleData) {
     int tileIndex = sampleData.megatextureIndex;
-    vec3 voxelCoord = sampleData.tileUv * vec3(u_dimensions);
-    ivec3 voxelDimensions = u_dimensions;
-
-    #if defined(PADDING)
-        voxelDimensions += u_paddingBefore + u_paddingAfter;
-        voxelCoord += vec3(u_paddingBefore);
-    #endif
 
+    vec3 voxelCoord = sampleData.inputCoordinate;
     #if defined(NEAREST_SAMPLING)
         // Round to the center of the nearest voxel
         voxelCoord = floor(voxelCoord) + vec3(0.5);
@@ -91,11 +79,11 @@ Properties getPropertiesFromMegatexture(in SampleData sampleData) {
     // Slice location
     float slice = voxelCoord.z - 0.5;
     int sliceIndex = int(floor(slice));
-    int sliceIndex0 = intClamp(sliceIndex, 0, voxelDimensions.z - 1);
+    int sliceIndex0 = intClamp(sliceIndex, 0, u_inputDimensions.z - 1);
     vec2 sliceUvOffset0 = index1DTo2DTexcoord(sliceIndex0, u_megatextureSliceDimensions, u_megatextureSliceSizeUv);
 
     // Voxel location
-    vec2 voxelUvOffset = clamp(voxelCoord.xy, vec2(0.5), vec2(voxelDimensions.xy) - vec2(0.5)) * u_megatextureVoxelSizeUv;
+    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;
@@ -104,7 +92,7 @@ Properties getPropertiesFromMegatexture(in SampleData sampleData) {
         return getPropertiesFromMegatextureAtUv(uv0);
     #else
         float sliceLerp = fract(slice);
-        int sliceIndex1 = intMin(sliceIndex + 1, voxelDimensions.z - 1);
+        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);

package/Source/Shaders/Voxels/Megatexture.js

@@ -13,12 +13,6 @@ uniform vec2 u_megatextureVoxelSizeUv;\n\
 uniform vec2 u_megatextureSliceSizeUv;\n\
 uniform vec2 u_megatextureTileSizeUv;\n\
 \n\
-uniform ivec3 u_dimensions; // does not include padding\n\
-#if defined(PADDING)\n\
-    uniform ivec3 u_paddingBefore;\n\
-    uniform ivec3 u_paddingAfter;\n\
-#endif\n\
-\n\
 // Integer min, max, clamp: For WebGL1 only\n\
 int intMin(int a, int b) {\n\
     return a <= b ? a : b;\n\
@@ -73,14 +67,8 @@ vec2 index1DTo2DTexcoord(int index, ivec2 dimensions, vec2 uvScale)\n\
 \n\
 Properties getPropertiesFromMegatexture(in SampleData sampleData) {\n\
     int tileIndex = sampleData.megatextureIndex;\n\
-    vec3 voxelCoord = sampleData.tileUv * vec3(u_dimensions);\n\
-    ivec3 voxelDimensions = u_dimensions;\n\
-\n\
-    #if defined(PADDING)\n\
-        voxelDimensions += u_paddingBefore + u_paddingAfter;\n\
-        voxelCoord += vec3(u_paddingBefore);\n\
-    #endif\n\
 \n\
+    vec3 voxelCoord = sampleData.inputCoordinate;\n\
     #if defined(NEAREST_SAMPLING)\n\
         // Round to the center of the nearest voxel\n\
         voxelCoord = floor(voxelCoord) + vec3(0.5);\n\
@@ -92,11 +80,11 @@ Properties getPropertiesFromMegatexture(in SampleData sampleData) {\n\
     // Slice location\n\
     float slice = voxelCoord.z - 0.5;\n\
     int sliceIndex = int(floor(slice));\n\
-    int sliceIndex0 = intClamp(sliceIndex, 0, voxelDimensions.z - 1);\n\
+    int sliceIndex0 = intClamp(sliceIndex, 0, u_inputDimensions.z - 1);\n\
     vec2 sliceUvOffset0 = index1DTo2DTexcoord(sliceIndex0, u_megatextureSliceDimensions, u_megatextureSliceSizeUv);\n\
 \n\
     // Voxel location\n\
-    vec2 voxelUvOffset = clamp(voxelCoord.xy, vec2(0.5), vec2(voxelDimensions.xy) - vec2(0.5)) * u_megatextureVoxelSizeUv;\n\
+    vec2 voxelUvOffset = clamp(voxelCoord.xy, vec2(0.5), vec2(u_inputDimensions.xy) - vec2(0.5)) * u_megatextureVoxelSizeUv;\n\
 \n\
     // Final location in the megatexture\n\
     vec2 uv0 = tileUvOffset + sliceUvOffset0 + voxelUvOffset;\n\
@@ -105,7 +93,7 @@ Properties getPropertiesFromMegatexture(in SampleData sampleData) {\n\
         return getPropertiesFromMegatextureAtUv(uv0);\n\
     #else\n\
         float sliceLerp = fract(slice);\n\
-        int sliceIndex1 = intMin(sliceIndex + 1, voxelDimensions.z - 1);\n\
+        int sliceIndex1 = intMin(sliceIndex + 1, u_inputDimensions.z - 1);\n\
         vec2 sliceUvOffset1 = index1DTo2DTexcoord(sliceIndex1, u_megatextureSliceDimensions, u_megatextureSliceSizeUv);\n\
         vec2 uv1 = tileUvOffset + sliceUvOffset1 + voxelUvOffset;\n\
         Properties properties0 = getPropertiesFromMegatextureAtUv(uv0);\n\

package/Source/Shaders/Voxels/Octree.glsl

@@ -13,6 +13,11 @@ uniform sampler2D u_octreeLeafNodeTexture;
 uniform vec2 u_octreeLeafNodeTexelSizeUv;
 uniform int u_octreeLeafNodeTilesPerRow;
 #endif
+uniform ivec3 u_dimensions; // does not include padding, and is in the z-up orientation
+uniform ivec3 u_inputDimensions; // includes padding, and is in the orientation of the input data
+#if defined(PADDING)
+    uniform ivec3 u_paddingBefore;
+#endif
 
 struct OctreeNodeData {
     int data;
@@ -28,6 +33,7 @@ struct SampleData {
     int megatextureIndex;
     ivec4 tileCoords;
     vec3 tileUv;
+    vec3 inputCoordinate;
     #if (SAMPLE_COUNT > 1)
         float weight;
     #endif
@@ -88,6 +94,37 @@ vec3 getClampedTileUv(in vec3 shapePosition, in ivec4 octreeCoords) {
     return clamp(tileUv, vec3(0.0), vec3(1.0));
 }
 
+void addSampleCoordinates(in vec3 shapePosition, inout SampleData sampleData) {
+    vec3 tileUv = getClampedTileUv(shapePosition, sampleData.tileCoords);
+
+    vec3 inputCoordinate = tileUv * vec3(u_dimensions);
+#if defined(PADDING)
+    inputCoordinate += vec3(u_paddingBefore);
+#endif
+#if defined(Y_UP_METADATA_ORDER)
+#if defined(SHAPE_BOX)
+    float inputY = inputCoordinate.y;
+    inputCoordinate.y = float(u_inputDimensions.y) - inputCoordinate.z;
+    inputCoordinate.z = inputY;
+#elif defined(SHAPE_CYLINDER)
+    float angle = inputCoordinate.y;
+    float height = inputCoordinate.z;
+    #if (!defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE))
+    // Account for the different 0-angle convention in glTF vs 3DTiles
+    if (sampleData.tileCoords.w == 0) {
+        float angleCount = float(u_inputDimensions.z);
+        angle = mod(angle + angleCount / 2.0, angleCount);
+    }
+    #endif
+    inputCoordinate.y = height;
+    inputCoordinate.z = angle;
+#endif
+#endif
+
+    sampleData.tileUv = tileUv;
+    sampleData.inputCoordinate = inputCoordinate;
+}
+
 void getOctreeLeafSampleData(in OctreeNodeData data, in ivec4 octreeCoords, out SampleData sampleData) {
     sampleData.megatextureIndex = data.data;
     sampleData.tileCoords = (data.flag == OCTREE_FLAG_PACKED_LEAF_FROM_PARENT)
@@ -172,11 +209,11 @@ void traverseOctreeFromBeginning(in vec3 shapePosition, out TraversalData traver
 
     #if (SAMPLE_COUNT == 1)
         getOctreeLeafSampleData(nodeData, traversalData.octreeCoords, sampleDatas[0]);
-        sampleDatas[0].tileUv = getClampedTileUv(shapePosition, sampleDatas[0].tileCoords);
+        addSampleCoordinates(shapePosition, sampleDatas[0]);
     #else
         getOctreeLeafSampleDatas(nodeData, traversalData.octreeCoords, sampleDatas);
-        sampleDatas[0].tileUv = getClampedTileUv(shapePosition, sampleDatas[0].tileCoords);
-        sampleDatas[1].tileUv = getClampedTileUv(shapePosition, sampleDatas[1].tileCoords);
+        addSampleCoordinates(shapePosition, sampleDatas[0]);
+        addSampleCoordinates(shapePosition, sampleDatas[1]);
     #endif
 }
 
@@ -194,7 +231,7 @@ bool insideTile(in vec3 shapePosition, in ivec4 octreeCoords) {
 void traverseOctreeFromExisting(in vec3 shapePosition, inout TraversalData traversalData, inout SampleData sampleDatas[SAMPLE_COUNT]) {
     if (insideTile(shapePosition, traversalData.octreeCoords)) {
         for (int i = 0; i < SAMPLE_COUNT; i++) {
-            sampleDatas[0].tileUv = getClampedTileUv(shapePosition, sampleDatas[0].tileCoords);
+            addSampleCoordinates(shapePosition, sampleDatas[i]);
         }
         return;
     }
@@ -216,10 +253,10 @@ void traverseOctreeFromExisting(in vec3 shapePosition, inout TraversalData trave
 
     #if (SAMPLE_COUNT == 1)
         getOctreeLeafSampleData(nodeData, traversalData.octreeCoords, sampleDatas[0]);
-        sampleDatas[0].tileUv = getClampedTileUv(shapePosition, sampleDatas[0].tileCoords);
+        addSampleCoordinates(shapePosition, sampleDatas[0]);
     #else
         getOctreeLeafSampleDatas(nodeData, traversalData.octreeCoords, sampleDatas);
-        sampleDatas[0].tileUv = getClampedTileUv(shapePosition, sampleDatas[0].tileCoords);
-        sampleDatas[1].tileUv = getClampedTileUv(shapePosition, sampleDatas[1].tileCoords);
+        addSampleCoordinates(shapePosition, sampleDatas[0]);
+        addSampleCoordinates(shapePosition, sampleDatas[1]);
     #endif
 }