@cesium/engine 14.0.0 → 15.0.0

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(GLTF_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
 }

package/Source/Shaders/Voxels/Octree.js

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

package/Source/Shaders/Voxels/VoxelFS.glsl

@@ -100,21 +100,15 @@ vec2 packFloatToVec2(float value) {
     return vec2(highBits, lowBits);
 }
 
-int getSampleIndex(in vec3 tileUv) {
-    ivec3 voxelDimensions = u_dimensions;
-    vec3 sampleCoordinate = tileUv * vec3(voxelDimensions);
-    // tileUv = 1.0 is a valid coordinate but sampleIndex = voxelDimensions is not.
-    // (tileUv = 1.0 corresponds to the last sample, at index = voxelDimensions - 1).
+int getSampleIndex(in SampleData sampleData) {
+    // tileUv = 1.0 is a valid coordinate but sampleIndex = u_inputDimensions is not.
+    // (tileUv = 1.0 corresponds to the far edge of the last sample, at index = u_inputDimensions - 1).
     // Clamp to [0, voxelDimensions - 0.5) to avoid numerical error before flooring
-    vec3 maxCoordinate = vec3(voxelDimensions) - vec3(0.5);
-    sampleCoordinate = clamp(sampleCoordinate, vec3(0.0), maxCoordinate);
-    ivec3 sampleIndex = ivec3(floor(sampleCoordinate));
-    #if defined(PADDING)
-        voxelDimensions += u_paddingBefore + u_paddingAfter;
-        sampleIndex += u_paddingBefore;
-    #endif
+    vec3 maxCoordinate = vec3(u_inputDimensions) - vec3(0.5);
+    vec3 inputCoordinate = clamp(sampleData.inputCoordinate, vec3(0.0), maxCoordinate);
+    ivec3 sampleIndex = ivec3(floor(inputCoordinate));
     // Convert to a 1D index for lookup in a 1D data array
-    return sampleIndex.x + voxelDimensions.x * (sampleIndex.y + voxelDimensions.y * sampleIndex.z);
+    return sampleIndex.x + u_inputDimensions.x * (sampleIndex.y + u_inputDimensions.y * sampleIndex.z);
 }
 
 void main()
@@ -181,7 +175,7 @@ void main()
         fragmentInput.voxel.travelDistance = step.w;
         fragmentInput.voxel.stepCount = stepCount;
         fragmentInput.voxel.tileIndex = sampleDatas[0].megatextureIndex;
-        fragmentInput.voxel.sampleIndex = getSampleIndex(sampleDatas[0].tileUv);
+        fragmentInput.voxel.sampleIndex = getSampleIndex(sampleDatas[0]);
 
         // Run the custom shader
         czm_modelMaterial materialOutput;
@@ -250,7 +244,7 @@ void main()
             discard;
         }
         vec2 megatextureId = packIntToVec2(sampleDatas[0].megatextureIndex);
-        vec2 sampleIndex = packIntToVec2(getSampleIndex(sampleDatas[0].tileUv));
+        vec2 sampleIndex = packIntToVec2(getSampleIndex(sampleDatas[0]));
         out_FragColor = vec4(megatextureId, sampleIndex);
     #else
         out_FragColor = colorAccum;

package/Source/Shaders/Voxels/VoxelFS.js

@@ -101,21 +101,15 @@ vec2 packFloatToVec2(float value) {\n\
     return vec2(highBits, lowBits);\n\
 }\n\
 \n\
-int getSampleIndex(in vec3 tileUv) {\n\
-    ivec3 voxelDimensions = u_dimensions;\n\
-    vec3 sampleCoordinate = tileUv * vec3(voxelDimensions);\n\
-    // tileUv = 1.0 is a valid coordinate but sampleIndex = voxelDimensions is not.\n\
-    // (tileUv = 1.0 corresponds to the last sample, at index = voxelDimensions - 1).\n\
+int getSampleIndex(in SampleData sampleData) {\n\
+    // tileUv = 1.0 is a valid coordinate but sampleIndex = u_inputDimensions is not.\n\
+    // (tileUv = 1.0 corresponds to the far edge of the last sample, at index = u_inputDimensions - 1).\n\
     // Clamp to [0, voxelDimensions - 0.5) to avoid numerical error before flooring\n\
-    vec3 maxCoordinate = vec3(voxelDimensions) - vec3(0.5);\n\
-    sampleCoordinate = clamp(sampleCoordinate, vec3(0.0), maxCoordinate);\n\
-    ivec3 sampleIndex = ivec3(floor(sampleCoordinate));\n\
-    #if defined(PADDING)\n\
-        voxelDimensions += u_paddingBefore + u_paddingAfter;\n\
-        sampleIndex += u_paddingBefore;\n\
-    #endif\n\
+    vec3 maxCoordinate = vec3(u_inputDimensions) - vec3(0.5);\n\
+    vec3 inputCoordinate = clamp(sampleData.inputCoordinate, vec3(0.0), maxCoordinate);\n\
+    ivec3 sampleIndex = ivec3(floor(inputCoordinate));\n\
     // Convert to a 1D index for lookup in a 1D data array\n\
-    return sampleIndex.x + voxelDimensions.x * (sampleIndex.y + voxelDimensions.y * sampleIndex.z);\n\
+    return sampleIndex.x + u_inputDimensions.x * (sampleIndex.y + u_inputDimensions.y * sampleIndex.z);\n\
 }\n\
 \n\
 void main()\n\
@@ -182,7 +176,7 @@ void main()\n\
         fragmentInput.voxel.travelDistance = step.w;\n\
         fragmentInput.voxel.stepCount = stepCount;\n\
         fragmentInput.voxel.tileIndex = sampleDatas[0].megatextureIndex;\n\
-        fragmentInput.voxel.sampleIndex = getSampleIndex(sampleDatas[0].tileUv);\n\
+        fragmentInput.voxel.sampleIndex = getSampleIndex(sampleDatas[0]);\n\
 \n\
         // Run the custom shader\n\
         czm_modelMaterial materialOutput;\n\
@@ -251,7 +245,7 @@ void main()\n\
             discard;\n\
         }\n\
         vec2 megatextureId = packIntToVec2(sampleDatas[0].megatextureIndex);\n\
-        vec2 sampleIndex = packIntToVec2(getSampleIndex(sampleDatas[0].tileUv));\n\
+        vec2 sampleIndex = packIntToVec2(getSampleIndex(sampleDatas[0]));\n\
         out_FragColor = vec4(megatextureId, sampleIndex);\n\
     #else\n\
         out_FragColor = colorAccum;\n\

package/Source/Shaders/Voxels/convertUvToCylinder.glsl

@@ -37,7 +37,7 @@ PointJacobianT convertUvToShapeSpaceDerivative(in vec3 positionUv) {
     float angle = atan(position.y, position.x);
     vec3 east = normalize(vec3(-position.y, position.x, 0.0));
 
-    vec3 point = vec3(radius, height, angle);
+    vec3 point = vec3(radius, angle, height);
     mat3 jacobianT = mat3(radial, z, east / length(position.xy));
     return PointJacobianT(point, jacobianT);
 }
@@ -48,12 +48,7 @@ vec3 convertShapeToShapeUvSpace(in vec3 positionShape) {
         radius = radius * u_cylinderUvToShapeUvRadius.x + u_cylinderUvToShapeUvRadius.y;
     #endif
 
-    float height = positionShape.y;
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)
-        height = height * u_cylinderUvToShapeUvHeight.x + u_cylinderUvToShapeUvHeight.y;
-    #endif
-
-    float angle = (positionShape.z + czm_pi) / czm_twoPi;
+    float angle = (positionShape.y + czm_pi) / czm_twoPi;
     #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)
         #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_MAX_REVERSED)
             // Comparing against u_cylinderShapeUvAngleMinMax has precision problems. u_cylinderShapeUvAngleRangeZeroMid is more conservative.
@@ -70,7 +65,12 @@ vec3 convertShapeToShapeUvSpace(in vec3 positionShape) {
         angle = angle * u_cylinderUvToShapeUvAngle.x + u_cylinderUvToShapeUvAngle.y;
     #endif
 
-    return vec3(radius, height, angle);
+    float height = positionShape.z;
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)
+        height = height * u_cylinderUvToShapeUvHeight.x + u_cylinderUvToShapeUvHeight.y;
+    #endif
+
+    return vec3(radius, angle, height);
 }
 
 PointJacobianT convertUvToShapeUvSpaceDerivative(in vec3 positionUv) {
@@ -85,15 +85,15 @@ vec3 scaleShapeUvToShapeSpace(in vec3 shapeUv) {
         radius /= u_cylinderUvToShapeUvRadius.x;
     #endif
 
-    float height = shapeUv.y;
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)
-        height /= u_cylinderUvToShapeUvHeight.x;
-    #endif
-
-    float angle = shapeUv.z * czm_twoPi;
+    float angle = shapeUv.y * czm_twoPi;
     #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)
         angle /= u_cylinderUvToShapeUvAngle.x;
     #endif
 
-    return vec3(radius, height, angle);
+    float height = shapeUv.z;
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)
+        height /= u_cylinderUvToShapeUvHeight.x;
+    #endif
+
+    return vec3(radius, angle, height);
 }

package/Source/Shaders/Voxels/convertUvToCylinder.js

@@ -38,7 +38,7 @@ PointJacobianT convertUvToShapeSpaceDerivative(in vec3 positionUv) {\n\
     float angle = atan(position.y, position.x);\n\
     vec3 east = normalize(vec3(-position.y, position.x, 0.0));\n\
 \n\
-    vec3 point = vec3(radius, height, angle);\n\
+    vec3 point = vec3(radius, angle, height);\n\
     mat3 jacobianT = mat3(radial, z, east / length(position.xy));\n\
     return PointJacobianT(point, jacobianT);\n\
 }\n\
@@ -49,12 +49,7 @@ vec3 convertShapeToShapeUvSpace(in vec3 positionShape) {\n\
         radius = radius * u_cylinderUvToShapeUvRadius.x + u_cylinderUvToShapeUvRadius.y;\n\
     #endif\n\
 \n\
-    float height = positionShape.y;\n\
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)\n\
-        height = height * u_cylinderUvToShapeUvHeight.x + u_cylinderUvToShapeUvHeight.y;\n\
-    #endif\n\
-\n\
-    float angle = (positionShape.z + czm_pi) / czm_twoPi;\n\
+    float angle = (positionShape.y + czm_pi) / czm_twoPi;\n\
     #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)\n\
         #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_MAX_REVERSED)\n\
             // Comparing against u_cylinderShapeUvAngleMinMax has precision problems. u_cylinderShapeUvAngleRangeZeroMid is more conservative.\n\
@@ -71,7 +66,12 @@ vec3 convertShapeToShapeUvSpace(in vec3 positionShape) {\n\
         angle = angle * u_cylinderUvToShapeUvAngle.x + u_cylinderUvToShapeUvAngle.y;\n\
     #endif\n\
 \n\
-    return vec3(radius, height, angle);\n\
+    float height = positionShape.z;\n\
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)\n\
+        height = height * u_cylinderUvToShapeUvHeight.x + u_cylinderUvToShapeUvHeight.y;\n\
+    #endif\n\
+\n\
+    return vec3(radius, angle, height);\n\
 }\n\
 \n\
 PointJacobianT convertUvToShapeUvSpaceDerivative(in vec3 positionUv) {\n\
@@ -86,16 +86,16 @@ vec3 scaleShapeUvToShapeSpace(in vec3 shapeUv) {\n\
         radius /= u_cylinderUvToShapeUvRadius.x;\n\
     #endif\n\
 \n\
-    float height = shapeUv.y;\n\
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)\n\
-        height /= u_cylinderUvToShapeUvHeight.x;\n\
-    #endif\n\
-\n\
-    float angle = shapeUv.z * czm_twoPi;\n\
+    float angle = shapeUv.y * czm_twoPi;\n\
     #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)\n\
         angle /= u_cylinderUvToShapeUvAngle.x;\n\
     #endif\n\
 \n\
-    return vec3(radius, height, angle);\n\
+    float height = shapeUv.z;\n\
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)\n\
+        height /= u_cylinderUvToShapeUvHeight.x;\n\
+    #endif\n\
+\n\
+    return vec3(radius, angle, height);\n\
 }\n\
 ";