@cesium/engine 1.1.0 → 2.0.0

package/Source/Shaders/Vector3DTileClampedPolylinesFS.glsl

@@ -1,22 +1,18 @@
-#ifdef GL_EXT_frag_depth
-#extension GL_EXT_frag_depth : enable
-#endif
-
-varying vec4 v_startPlaneEC;
-varying vec4 v_endPlaneEC;
-varying vec4 v_rightPlaneEC;
-varying float v_halfWidth;
-varying vec3 v_volumeUpEC;
+in vec4 v_startPlaneEC;
+in vec4 v_endPlaneEC;
+in vec4 v_rightPlaneEC;
+in float v_halfWidth;
+in vec3 v_volumeUpEC;
 
 uniform vec4 u_highlightColor;
 void main()
 {
-    float logDepthOrDepth = czm_branchFreeTernary(czm_sceneMode == czm_sceneMode2D, gl_FragCoord.z, czm_unpackDepth(texture2D(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw)));
+    float logDepthOrDepth = czm_branchFreeTernary(czm_sceneMode == czm_sceneMode2D, gl_FragCoord.z, czm_unpackDepth(texture(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw)));
 
     // Discard for sky
     if (logDepthOrDepth == 0.0) {
 #ifdef DEBUG_SHOW_VOLUME
-        gl_FragColor = vec4(0.0, 0.0, 1.0, 0.5);
+        out_FragColor = vec4(0.0, 0.0, 1.0, 0.5);
         return;
 #else // DEBUG_SHOW_VOLUME
         discard;
@@ -40,13 +36,13 @@ void main()
 
     if (abs(widthwiseDistance) > halfMaxWidth || distanceFromStart < 0.0 || distanceFromEnd < 0.0) {
 #ifdef DEBUG_SHOW_VOLUME
-        gl_FragColor = vec4(logDepthOrDepth, 0.0, 0.0, 0.5);
+        out_FragColor = vec4(logDepthOrDepth, 0.0, 0.0, 0.5);
         return;
 #else // DEBUG_SHOW_VOLUME
         discard;
 #endif // DEBUG_SHOW_VOLUME
     }
-    gl_FragColor = u_highlightColor;
+    out_FragColor = u_highlightColor;
 
     czm_writeDepthClamp();
 }

package/Source/Shaders/Vector3DTileClampedPolylinesFS.js

@@ -1,23 +1,19 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "#ifdef GL_EXT_frag_depth\n\
-#extension GL_EXT_frag_depth : enable\n\
-#endif\n\
-\n\
-varying vec4 v_startPlaneEC;\n\
-varying vec4 v_endPlaneEC;\n\
-varying vec4 v_rightPlaneEC;\n\
-varying float v_halfWidth;\n\
-varying vec3 v_volumeUpEC;\n\
+export default "in vec4 v_startPlaneEC;\n\
+in vec4 v_endPlaneEC;\n\
+in vec4 v_rightPlaneEC;\n\
+in float v_halfWidth;\n\
+in vec3 v_volumeUpEC;\n\
 \n\
 uniform vec4 u_highlightColor;\n\
 void main()\n\
 {\n\
-    float logDepthOrDepth = czm_branchFreeTernary(czm_sceneMode == czm_sceneMode2D, gl_FragCoord.z, czm_unpackDepth(texture2D(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw)));\n\
+    float logDepthOrDepth = czm_branchFreeTernary(czm_sceneMode == czm_sceneMode2D, gl_FragCoord.z, czm_unpackDepth(texture(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw)));\n\
 \n\
     // Discard for sky\n\
     if (logDepthOrDepth == 0.0) {\n\
 #ifdef DEBUG_SHOW_VOLUME\n\
-        gl_FragColor = vec4(0.0, 0.0, 1.0, 0.5);\n\
+        out_FragColor = vec4(0.0, 0.0, 1.0, 0.5);\n\
         return;\n\
 #else // DEBUG_SHOW_VOLUME\n\
         discard;\n\
@@ -41,13 +37,13 @@ void main()\n\
 \n\
     if (abs(widthwiseDistance) > halfMaxWidth || distanceFromStart < 0.0 || distanceFromEnd < 0.0) {\n\
 #ifdef DEBUG_SHOW_VOLUME\n\
-        gl_FragColor = vec4(logDepthOrDepth, 0.0, 0.0, 0.5);\n\
+        out_FragColor = vec4(logDepthOrDepth, 0.0, 0.0, 0.5);\n\
         return;\n\
 #else // DEBUG_SHOW_VOLUME\n\
         discard;\n\
 #endif // DEBUG_SHOW_VOLUME\n\
     }\n\
-    gl_FragColor = u_highlightColor;\n\
+    out_FragColor = u_highlightColor;\n\
 \n\
     czm_writeDepthClamp();\n\
 }\n\

package/Source/Shaders/Vector3DTileClampedPolylinesVS.glsl

@@ -1,19 +1,19 @@
-attribute vec3 startEllipsoidNormal;
-attribute vec3 endEllipsoidNormal;
-attribute vec4 startPositionAndHeight;
-attribute vec4 endPositionAndHeight;
-attribute vec4 startFaceNormalAndVertexCorner;
-attribute vec4 endFaceNormalAndHalfWidth;
-attribute float a_batchId;
+in vec3 startEllipsoidNormal;
+in vec3 endEllipsoidNormal;
+in vec4 startPositionAndHeight;
+in vec4 endPositionAndHeight;
+in vec4 startFaceNormalAndVertexCorner;
+in vec4 endFaceNormalAndHalfWidth;
+in float a_batchId;
 
 uniform mat4 u_modifiedModelView;
 uniform vec2 u_minimumMaximumVectorHeights;
 
-varying vec4 v_startPlaneEC;
-varying vec4 v_endPlaneEC;
-varying vec4 v_rightPlaneEC;
-varying float v_halfWidth;
-varying vec3 v_volumeUpEC;
+out vec4 v_startPlaneEC;
+out vec4 v_endPlaneEC;
+out vec4 v_rightPlaneEC;
+out float v_halfWidth;
+out vec3 v_volumeUpEC;
 
 void main()
 {

package/Source/Shaders/Vector3DTileClampedPolylinesVS.js

@@ -1,20 +1,20 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 startEllipsoidNormal;\n\
-attribute vec3 endEllipsoidNormal;\n\
-attribute vec4 startPositionAndHeight;\n\
-attribute vec4 endPositionAndHeight;\n\
-attribute vec4 startFaceNormalAndVertexCorner;\n\
-attribute vec4 endFaceNormalAndHalfWidth;\n\
-attribute float a_batchId;\n\
+export default "in vec3 startEllipsoidNormal;\n\
+in vec3 endEllipsoidNormal;\n\
+in vec4 startPositionAndHeight;\n\
+in vec4 endPositionAndHeight;\n\
+in vec4 startFaceNormalAndVertexCorner;\n\
+in vec4 endFaceNormalAndHalfWidth;\n\
+in float a_batchId;\n\
 \n\
 uniform mat4 u_modifiedModelView;\n\
 uniform vec2 u_minimumMaximumVectorHeights;\n\
 \n\
-varying vec4 v_startPlaneEC;\n\
-varying vec4 v_endPlaneEC;\n\
-varying vec4 v_rightPlaneEC;\n\
-varying float v_halfWidth;\n\
-varying vec3 v_volumeUpEC;\n\
+out vec4 v_startPlaneEC;\n\
+out vec4 v_endPlaneEC;\n\
+out vec4 v_rightPlaneEC;\n\
+out float v_halfWidth;\n\
+out vec3 v_volumeUpEC;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Vector3DTilePolylinesVS.glsl

@@ -1,8 +1,8 @@
-attribute vec4 currentPosition;
-attribute vec4 previousPosition;
-attribute vec4 nextPosition;
-attribute vec2 expandAndWidth;
-attribute float a_batchId;
+in vec4 currentPosition;
+in vec4 previousPosition;
+in vec4 nextPosition;
+in vec2 expandAndWidth;
+in float a_batchId;
 
 uniform mat4 u_modifiedModelView;
 

package/Source/Shaders/Vector3DTilePolylinesVS.js

@@ -1,9 +1,9 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec4 currentPosition;\n\
-attribute vec4 previousPosition;\n\
-attribute vec4 nextPosition;\n\
-attribute vec2 expandAndWidth;\n\
-attribute float a_batchId;\n\
+export default "in vec4 currentPosition;\n\
+in vec4 previousPosition;\n\
+in vec4 nextPosition;\n\
+in vec2 expandAndWidth;\n\
+in float a_batchId;\n\
 \n\
 uniform mat4 u_modifiedModelView;\n\
 \n\

package/Source/Shaders/VectorTileVS.glsl

@@ -1,5 +1,5 @@
-attribute vec3 position;
-attribute float a_batchId;
+in vec3 position;
+in float a_batchId;
 
 uniform mat4 u_modifiedModelViewProjection;
 

package/Source/Shaders/VectorTileVS.js

@@ -1,6 +1,6 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position;\n\
-attribute float a_batchId;\n\
+export default "in vec3 position;\n\
+in float a_batchId;\n\
 \n\
 uniform mat4 u_modifiedModelViewProjection;\n\
 \n\

package/Source/Shaders/ViewportQuadFS.glsl

@@ -1,5 +1,5 @@
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
@@ -12,5 +12,5 @@ void main()
     
     czm_material material = czm_getMaterial(materialInput);
 
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);
 }

package/Source/Shaders/ViewportQuadFS.js

@@ -1,6 +1,6 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "\n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main()\n\
 {\n\
@@ -13,6 +13,6 @@ void main()\n\
     \n\
     czm_material material = czm_getMaterial(materialInput);\n\
 \n\
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
 }\n\
 ";

package/Source/Shaders/ViewportQuadVS.glsl

@@ -1,7 +1,7 @@
-attribute vec4 position;
-attribute vec2 textureCoordinates;
+in vec4 position;
+in vec2 textureCoordinates;
 
-varying vec2 v_textureCoordinates;
+out vec2 v_textureCoordinates;
 
 void main() 
 {

package/Source/Shaders/ViewportQuadVS.js

@@ -1,8 +1,8 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec4 position;\n\
-attribute vec2 textureCoordinates;\n\
+export default "in vec4 position;\n\
+in vec2 textureCoordinates;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+out vec2 v_textureCoordinates;\n\
 \n\
 void main() \n\
 {\n\

package/Source/Shaders/Voxels/IntersectDepth.glsl

@@ -8,7 +8,7 @@
 uniform mat4 u_transformPositionViewToUv;
 
 void intersectDepth(vec2 screenCoord, Ray ray, inout Intersections ix) {
-    float logDepthOrDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, screenCoord));
+    float logDepthOrDepth = czm_unpackDepth(texture(czm_globeDepthTexture, screenCoord));
     if (logDepthOrDepth != 0.0) {
         // Calculate how far the ray must travel before it hits the depth buffer.
         vec4 eyeCoordinateDepth = czm_screenToEyeCoordinates(screenCoord, logDepthOrDepth);

package/Source/Shaders/Voxels/IntersectDepth.js

@@ -9,7 +9,7 @@ export default "// See IntersectionUtils.glsl for the definitions of Ray, Inters
 uniform mat4 u_transformPositionViewToUv;\n\
 \n\
 void intersectDepth(vec2 screenCoord, Ray ray, inout Intersections ix) {\n\
-    float logDepthOrDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, screenCoord));\n\
+    float logDepthOrDepth = czm_unpackDepth(texture(czm_globeDepthTexture, screenCoord));\n\
     if (logDepthOrDepth != 0.0) {\n\
         // Calculate how far the ray must travel before it hits the depth buffer.\n\
         vec4 eyeCoordinateDepth = czm_screenToEyeCoordinates(screenCoord, logDepthOrDepth);\n\

package/Source/Shaders/Voxels/IntersectEllipsoid.glsl

@@ -14,6 +14,7 @@
 #define ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_UNDER_HALF
 #define ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_EQUAL_HALF
 #define ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_OVER_HALF
+#define ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_MAX
 #define ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_MIN
 #define ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_FLAT
 #define ELLIPSOID_INTERSECTION_INDEX_LONGITUDE
@@ -29,6 +30,9 @@
 #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_UNDER_HALF) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_OVER_HALF) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MAX_UNDER_HALF) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MAX_OVER_HALF)
     uniform vec2 u_ellipsoidRenderLatitudeCosSqrHalfMinMax;
 #endif
+#if defined(ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_MAX)
+    uniform float u_ellipsoidInverseOuterScaleUv;
+#endif
 #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_MIN)
     uniform float u_ellipsoidInverseInnerScaleUv;
 #endif
@@ -230,8 +234,14 @@ void intersectShape(in Ray ray, inout Intersections ix) {
     ray.pos = ray.pos * 2.0 - 1.0;
     ray.dir *= 2.0;
 
+    #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_MAX)
+        Ray outerRay = Ray(ray.pos * u_ellipsoidInverseOuterScaleUv, ray.dir * u_ellipsoidInverseOuterScaleUv);
+    #else
+        Ray outerRay = ray;
+    #endif
+
     // Outer ellipsoid
-    vec2 outerIntersect = intersectUnitSphereUnnormalizedDirection(ray);
+    vec2 outerIntersect = intersectUnitSphereUnnormalizedDirection(outerRay);
     setIntersectionPair(ix, ELLIPSOID_INTERSECTION_INDEX_HEIGHT_MAX, outerIntersect);
 
     // Exit early if the outer ellipsoid was missed.
@@ -287,7 +297,7 @@ void intersectShape(in Ray ray, inout Intersections ix) {
 
     // Flip the ray because the intersection function expects a cone growing towards +Z.
     #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_UNDER_HALF) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_EQUAL_HALF) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MAX_UNDER_HALF)
-        Ray flippedRay = ray;
+        Ray flippedRay = outerRay;
         flippedRay.dir.z *= -1.0;
         flippedRay.pos.z *= -1.0;
     #endif

package/Source/Shaders/Voxels/IntersectEllipsoid.js

@@ -15,6 +15,7 @@ export default "// See IntersectionUtils.glsl for the definitions of Ray, Inters
 #define ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_UNDER_HALF\n\
 #define ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_EQUAL_HALF\n\
 #define ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_OVER_HALF\n\
+#define ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_MAX\n\
 #define ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_MIN\n\
 #define ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_FLAT\n\
 #define ELLIPSOID_INTERSECTION_INDEX_LONGITUDE\n\
@@ -30,6 +31,9 @@ export default "// See IntersectionUtils.glsl for the definitions of Ray, Inters
 #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_UNDER_HALF) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_OVER_HALF) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MAX_UNDER_HALF) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MAX_OVER_HALF)\n\
     uniform vec2 u_ellipsoidRenderLatitudeCosSqrHalfMinMax;\n\
 #endif\n\
+#if defined(ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_MAX)\n\
+    uniform float u_ellipsoidInverseOuterScaleUv;\n\
+#endif\n\
 #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_MIN)\n\
     uniform float u_ellipsoidInverseInnerScaleUv;\n\
 #endif\n\
@@ -230,9 +234,15 @@ void intersectShape(in Ray ray, inout Intersections ix) {\n\
     // Direction is scaled as well to be in sync with position.\n\
     ray.pos = ray.pos * 2.0 - 1.0;\n\
     ray.dir *= 2.0;\n\
+\n\
+    #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_MAX)\n\
+        Ray outerRay = Ray(ray.pos * u_ellipsoidInverseOuterScaleUv, ray.dir * u_ellipsoidInverseOuterScaleUv);\n\
+    #else\n\
+        Ray outerRay = ray;\n\
+    #endif\n\
 \n\
     // Outer ellipsoid\n\
-    vec2 outerIntersect = intersectUnitSphereUnnormalizedDirection(ray);\n\
+    vec2 outerIntersect = intersectUnitSphereUnnormalizedDirection(outerRay);\n\
     setIntersectionPair(ix, ELLIPSOID_INTERSECTION_INDEX_HEIGHT_MAX, outerIntersect);\n\
 \n\
     // Exit early if the outer ellipsoid was missed.\n\
@@ -288,7 +298,7 @@ void intersectShape(in Ray ray, inout Intersections ix) {\n\
 \n\
     // Flip the ray because the intersection function expects a cone growing towards +Z.\n\
     #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_UNDER_HALF) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MIN_EQUAL_HALF) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MAX_UNDER_HALF)\n\
-        Ray flippedRay = ray;\n\
+        Ray flippedRay = outerRay;\n\
         flippedRay.dir.z *= -1.0;\n\
         flippedRay.pos.z *= -1.0;\n\
     #endif\n\

package/Source/Shaders/Voxels/Megatexture.glsl

@@ -83,7 +83,7 @@ Properties getPropertiesFromMegatexture(in SampleData sampleData) {
 
     #if defined(NEAREST_SAMPLING)
         // Round to the center of the nearest voxel
-        voxelCoord = floor(voxelCoord + vec3(0.5));
+        voxelCoord = floor(voxelCoord) + vec3(0.5);
     #endif
 
     // Tile location

package/Source/Shaders/Voxels/Megatexture.js

@@ -84,7 +84,7 @@ Properties getPropertiesFromMegatexture(in SampleData sampleData) {\n\
 \n\
     #if defined(NEAREST_SAMPLING)\n\
         // Round to the center of the nearest voxel\n\
-        voxelCoord = floor(voxelCoord + vec3(0.5));\n\
+        voxelCoord = floor(voxelCoord) + vec3(0.5);\n\
     #endif\n\
 \n\
     // Tile location\n\

package/Source/Shaders/Voxels/Octree.glsl

@@ -49,7 +49,7 @@ float normU8x2_toFloat(in vec2 value) {
 }
 
 OctreeNodeData getOctreeNodeData(in vec2 octreeUv) {
-    vec4 texData = texture2D(u_octreeInternalNodeTexture, octreeUv);
+    vec4 texData = texture(u_octreeInternalNodeTexture, octreeUv);
 
     OctreeNodeData data;
     data.data = normU8x2_toInt(texData.xy);
@@ -69,7 +69,7 @@ int getOctreeParentIndex(in int octreeIndex) {
     int octreeCoordX = intMod(octreeIndex, u_octreeInternalNodeTilesPerRow) * 9;
     int octreeCoordY = octreeIndex / u_octreeInternalNodeTilesPerRow;
     vec2 octreeUv = u_octreeInternalNodeTexelSizeUv * vec2(float(octreeCoordX) + 0.5, float(octreeCoordY) + 0.5);
-    vec4 parentData = texture2D(u_octreeInternalNodeTexture, octreeUv);
+    vec4 parentData = texture(u_octreeInternalNodeTexture, octreeUv);
     int parentOctreeIndex = normU8x2_toInt(parentData.xy);
     return parentOctreeIndex;
 }
@@ -106,8 +106,8 @@ void getOctreeLeafSampleDatas(in OctreeNodeData data, out SampleData sampleData0
 
     vec2 leafUv0 = u_octreeLeafNodeTexelSizeUv * vec2(leafCoordXStart + 0.0, leafCoordY);
     vec2 leafUv1 = u_octreeLeafNodeTexelSizeUv * vec2(leafCoordXStart + 1.0, leafCoordY);
-    vec4 leafData0 = texture2D(u_octreeLeafNodeTexture, leafUv0);
-    vec4 leafData1 = texture2D(u_octreeLeafNodeTexture, leafUv1);
+    vec4 leafData0 = texture(u_octreeLeafNodeTexture, leafUv0);
+    vec4 leafData1 = texture(u_octreeLeafNodeTexture, leafUv1);
 
     float lerp = normU8x2_toFloat(leafData0.xy);
 

package/Source/Shaders/Voxels/Octree.js

@@ -50,7 +50,7 @@ float normU8x2_toFloat(in vec2 value) {\n\
 }\n\
 \n\
 OctreeNodeData getOctreeNodeData(in vec2 octreeUv) {\n\
-    vec4 texData = texture2D(u_octreeInternalNodeTexture, octreeUv);\n\
+    vec4 texData = texture(u_octreeInternalNodeTexture, octreeUv);\n\
 \n\
     OctreeNodeData data;\n\
     data.data = normU8x2_toInt(texData.xy);\n\
@@ -70,7 +70,7 @@ int getOctreeParentIndex(in int octreeIndex) {\n\
     int octreeCoordX = intMod(octreeIndex, u_octreeInternalNodeTilesPerRow) * 9;\n\
     int octreeCoordY = octreeIndex / u_octreeInternalNodeTilesPerRow;\n\
     vec2 octreeUv = u_octreeInternalNodeTexelSizeUv * vec2(float(octreeCoordX) + 0.5, float(octreeCoordY) + 0.5);\n\
-    vec4 parentData = texture2D(u_octreeInternalNodeTexture, octreeUv);\n\
+    vec4 parentData = texture(u_octreeInternalNodeTexture, octreeUv);\n\
     int parentOctreeIndex = normU8x2_toInt(parentData.xy);\n\
     return parentOctreeIndex;\n\
 }\n\
@@ -107,8 +107,8 @@ void getOctreeLeafSampleDatas(in OctreeNodeData data, out SampleData sampleData0
 \n\
     vec2 leafUv0 = u_octreeLeafNodeTexelSizeUv * vec2(leafCoordXStart + 0.0, leafCoordY);\n\
     vec2 leafUv1 = u_octreeLeafNodeTexelSizeUv * vec2(leafCoordXStart + 1.0, leafCoordY);\n\
-    vec4 leafData0 = texture2D(u_octreeLeafNodeTexture, leafUv0);\n\
-    vec4 leafData1 = texture2D(u_octreeLeafNodeTexture, leafUv1);\n\
+    vec4 leafData0 = texture(u_octreeLeafNodeTexture, leafUv0);\n\
+    vec4 leafData1 = texture(u_octreeLeafNodeTexture, leafUv1);\n\
 \n\
     float lerp = normU8x2_toFloat(leafData0.xy);\n\
 \n\

package/Source/Shaders/Voxels/VoxelFS.glsl

@@ -143,8 +143,8 @@ void main()
         if (colorAccum.a == 0.0) {
             discard;
         }
-        gl_FragColor = u_pickColor;
+        out_FragColor = u_pickColor;
     #else
-        gl_FragColor = colorAccum;
+        out_FragColor = colorAccum;
     #endif
 }

package/Source/Shaders/Voxels/VoxelFS.js

@@ -144,9 +144,9 @@ void main()\n\
         if (colorAccum.a == 0.0) {\n\
             discard;\n\
         }\n\
-        gl_FragColor = u_pickColor;\n\
+        out_FragColor = u_pickColor;\n\
     #else\n\
-        gl_FragColor = colorAccum;\n\
+        out_FragColor = colorAccum;\n\
     #endif\n\
 }\n\
 ";

package/Source/Shaders/Voxels/VoxelVS.glsl

@@ -1,4 +1,4 @@
-attribute vec2 position;
+in vec2 position;
 
 uniform vec4 u_ndcSpaceAxisAlignedBoundingBox;
 

package/Source/Shaders/Voxels/VoxelVS.js

@@ -1,5 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec2 position;\n\
+export default "in vec2 position;\n\
 \n\
 uniform vec4 u_ndcSpaceAxisAlignedBoundingBox;\n\
 \n\

package/Source/Shaders/Voxels/convertUvToCylinder.glsl

@@ -1,8 +1,4 @@
 /* Cylinder defines (set in Scene/VoxelCylinderShape.js)
-#define CYLINDER_HAS_RENDER_BOUNDS_RADIUS_FLAT
-#define CYLINDER_HAS_RENDER_BOUNDS_HEIGHT_FLAT
-#define CYLINDER_HAS_RENDER_BOUNDS_ANGLE_RANGE_EQUAL_ZERO
-
 #define CYLINDER_HAS_SHAPE_BOUNDS_RADIUS
 #define CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT
 #define CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT
@@ -34,8 +30,8 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
     vec3 positionLocal = positionUv * 2.0 - 1.0; // [-1,+1]
 
     // Compute radius
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT) || defined(CYLINDER_HAS_RENDER_BOUNDS_RADIUS_FLAT)
-        float radius = length(positionLocal.xy); // [0,1]
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT)
+        float radius = 1.0;
     #else
         float radius = length(positionLocal.xy); // [0,1]
         #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS)
@@ -44,8 +40,8 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
     #endif
 
     // Compute height
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT_FLAT) || defined(CYLINDER_HAS_RENDER_BOUNDS_HEIGHT_FLAT)
-        float height = positionUv.z; // [0,1]
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT_FLAT)
+        float height = 1.0;
     #else
         float height = positionUv.z; // [0,1]
         #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)
@@ -54,7 +50,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
     #endif
 
     // Compute angle
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_RANGE_EQUAL_ZERO) || defined(CYLINDER_HAS_RENDER_BOUNDS_ANGLE_RANGE_EQUAL_ZERO)
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_RANGE_EQUAL_ZERO)
         float angle = 1.0;
     #else
         float angle = (atan(positionLocal.y, positionLocal.x) + czm_pi) / czm_twoPi; // [0,1]

package/Source/Shaders/Voxels/convertUvToCylinder.js

@@ -1,9 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "/* Cylinder defines (set in Scene/VoxelCylinderShape.js)\n\
-#define CYLINDER_HAS_RENDER_BOUNDS_RADIUS_FLAT\n\
-#define CYLINDER_HAS_RENDER_BOUNDS_HEIGHT_FLAT\n\
-#define CYLINDER_HAS_RENDER_BOUNDS_ANGLE_RANGE_EQUAL_ZERO\n\
-\n\
 #define CYLINDER_HAS_SHAPE_BOUNDS_RADIUS\n\
 #define CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT\n\
 #define CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT\n\
@@ -35,8 +31,8 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {\n\
     vec3 positionLocal = positionUv * 2.0 - 1.0; // [-1,+1]\n\
 \n\
     // Compute radius\n\
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT) || defined(CYLINDER_HAS_RENDER_BOUNDS_RADIUS_FLAT)\n\
-        float radius = length(positionLocal.xy); // [0,1]\n\
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT)\n\
+        float radius = 1.0;\n\
     #else\n\
         float radius = length(positionLocal.xy); // [0,1]\n\
         #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS)\n\
@@ -45,8 +41,8 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {\n\
     #endif\n\
 \n\
     // Compute height\n\
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT_FLAT) || defined(CYLINDER_HAS_RENDER_BOUNDS_HEIGHT_FLAT)\n\
-        float height = positionUv.z; // [0,1]\n\
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT_FLAT)\n\
+        float height = 1.0;\n\
     #else\n\
         float height = positionUv.z; // [0,1]\n\
         #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)\n\
@@ -55,7 +51,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {\n\
     #endif\n\
 \n\
     // Compute angle\n\
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_RANGE_EQUAL_ZERO) || defined(CYLINDER_HAS_RENDER_BOUNDS_ANGLE_RANGE_EQUAL_ZERO)\n\
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_RANGE_EQUAL_ZERO)\n\
         float angle = 1.0;\n\
     #else\n\
         float angle = (atan(positionLocal.y, positionLocal.x) + czm_pi) / czm_twoPi; // [0,1]\n\

package/Source/Shaders/Voxels/convertUvToEllipsoid.glsl

@@ -1,14 +1,11 @@
 /* Ellipsoid defines (set in Scene/VoxelEllipsoidShape.js)
-#define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO
 #define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MIN_DISCONTINUITY
 #define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MAX_DISCONTINUITY
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_MIN_MAX_REVERSED
-#define ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO
-#define ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_FLAT
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_MIN
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_FLAT
 #define ELLIPSOID_IS_SPHERE
@@ -69,7 +66,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
     #endif
 
     // Compute longitude
-    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO)
+    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO)
         float longitude = 1.0;
     #else
         float longitude = (atan(normal.y, normal.x) + czm_pi) / czm_twoPi;
@@ -94,7 +91,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
     #endif
 
     // Compute latitude
-    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO)
+    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO)
         float latitude = 1.0;
     #else
         float latitude = (asin(normal.z) + czm_piOverTwo) / czm_pi;
@@ -104,7 +101,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
     #endif
 
     // Compute height
-    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_FLAT) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_FLAT)
+    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_FLAT)
         // TODO: This breaks down when minBounds == maxBounds. To fix it, this
         // function would have to know if ray is intersecting the front or back of the shape
         // and set the shape space position to 1 (front) or 0 (back) accordingly.