@cesium/engine 1.0.0 → 2.0.0

package/Source/Shaders/BillboardCollectionVS.glsl

@@ -1,36 +1,36 @@
 #ifdef INSTANCED
-attribute vec2 direction;
+in vec2 direction;
 #endif
-attribute vec4 positionHighAndScale;
-attribute vec4 positionLowAndRotation;
-attribute vec4 compressedAttribute0;                       // pixel offset, translate, horizontal origin, vertical origin, show, direction, texture coordinates (texture offset)
-attribute vec4 compressedAttribute1;                       // aligned axis, translucency by distance, image width
-attribute vec4 compressedAttribute2;                       // label horizontal origin, image height, color, pick color, size in meters, valid aligned axis, 13 bits free
-attribute vec4 eyeOffset;                                  // eye offset in meters, 4 bytes free (texture range)
-attribute vec4 scaleByDistance;                            // near, nearScale, far, farScale
-attribute vec4 pixelOffsetScaleByDistance;                 // near, nearScale, far, farScale
-attribute vec4 compressedAttribute3;                       // distance display condition near, far, disableDepthTestDistance, dimensions
-attribute vec2 sdf;                                        // sdf outline color (rgb) and width (w)
+in vec4 positionHighAndScale;
+in vec4 positionLowAndRotation;
+in vec4 compressedAttribute0;                       // pixel offset, translate, horizontal origin, vertical origin, show, direction, texture coordinates (texture offset)
+in vec4 compressedAttribute1;                       // aligned axis, translucency by distance, image width
+in vec4 compressedAttribute2;                       // label horizontal origin, image height, color, pick color, size in meters, valid aligned axis, 13 bits free
+in vec4 eyeOffset;                                  // eye offset in meters, 4 bytes free (texture range)
+in vec4 scaleByDistance;                            // near, nearScale, far, farScale
+in vec4 pixelOffsetScaleByDistance;                 // near, nearScale, far, farScale
+in vec4 compressedAttribute3;                       // distance display condition near, far, disableDepthTestDistance, dimensions
+in vec2 sdf;                                        // sdf outline color (rgb) and width (w)
 #if defined(VERTEX_DEPTH_CHECK) || defined(FRAGMENT_DEPTH_CHECK)
-attribute vec4 textureCoordinateBoundsOrLabelTranslate;    // the min and max x and y values for the texture coordinates
+in vec4 textureCoordinateBoundsOrLabelTranslate;    // the min and max x and y values for the texture coordinates
 #endif
 #ifdef VECTOR_TILE
-attribute float a_batchId;
+in float a_batchId;
 #endif
 
-varying vec2 v_textureCoordinates;
+out vec2 v_textureCoordinates;
 #ifdef FRAGMENT_DEPTH_CHECK
-varying vec4 v_textureCoordinateBounds;
-varying vec4 v_originTextureCoordinateAndTranslate;
-varying vec4 v_compressed;                                 // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize
-varying mat2 v_rotationMatrix;
+out vec4 v_textureCoordinateBounds;
+out vec4 v_originTextureCoordinateAndTranslate;
+out vec4 v_compressed;                                 // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize
+out mat2 v_rotationMatrix;
 #endif
 
-varying vec4 v_pickColor;
-varying vec4 v_color;
+out vec4 v_pickColor;
+out vec4 v_color;
 #ifdef SDF
-varying vec4 v_outlineColor;
-varying float v_outlineWidth;
+out vec4 v_outlineColor;
+out float v_outlineWidth;
 #endif
 
 const float UPPER_BOUND = 32768.0;
@@ -67,7 +67,7 @@ vec4 addScreenSpaceOffset(vec4 positionEC, vec2 imageSize, float scale, vec2 dir
         float angle = rotation;
         if (validAlignedAxis)
         {
-            vec4 projectedAlignedAxis = czm_modelViewProjection * vec4(alignedAxis, 0.0);
+            vec4 projectedAlignedAxis = czm_modelView3D * vec4(alignedAxis, 0.0);
             angle += sign(-projectedAlignedAxis.x) * acos(sign(projectedAlignedAxis.y) * (projectedAlignedAxis.y * projectedAlignedAxis.y) /
                     (projectedAlignedAxis.x * projectedAlignedAxis.x + projectedAlignedAxis.y * projectedAlignedAxis.y));
         }
@@ -95,7 +95,7 @@ float getGlobeDepth(vec4 positionEC)
 {
     vec4 posWC = czm_eyeToWindowCoordinates(positionEC);
 
-    float globeDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, posWC.xy / czm_viewport.zw));
+    float globeDepth = czm_unpackDepth(texture(czm_globeDepthTexture, posWC.xy / czm_viewport.zw));
 
     if (globeDepth == 0.0)
     {

package/Source/Shaders/BillboardCollectionVS.js

@@ -1,37 +1,37 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "#ifdef INSTANCED\n\
-attribute vec2 direction;\n\
+in vec2 direction;\n\
 #endif\n\
-attribute vec4 positionHighAndScale;\n\
-attribute vec4 positionLowAndRotation;\n\
-attribute vec4 compressedAttribute0;                       // pixel offset, translate, horizontal origin, vertical origin, show, direction, texture coordinates (texture offset)\n\
-attribute vec4 compressedAttribute1;                       // aligned axis, translucency by distance, image width\n\
-attribute vec4 compressedAttribute2;                       // label horizontal origin, image height, color, pick color, size in meters, valid aligned axis, 13 bits free\n\
-attribute vec4 eyeOffset;                                  // eye offset in meters, 4 bytes free (texture range)\n\
-attribute vec4 scaleByDistance;                            // near, nearScale, far, farScale\n\
-attribute vec4 pixelOffsetScaleByDistance;                 // near, nearScale, far, farScale\n\
-attribute vec4 compressedAttribute3;                       // distance display condition near, far, disableDepthTestDistance, dimensions\n\
-attribute vec2 sdf;                                        // sdf outline color (rgb) and width (w)\n\
+in vec4 positionHighAndScale;\n\
+in vec4 positionLowAndRotation;\n\
+in vec4 compressedAttribute0;                       // pixel offset, translate, horizontal origin, vertical origin, show, direction, texture coordinates (texture offset)\n\
+in vec4 compressedAttribute1;                       // aligned axis, translucency by distance, image width\n\
+in vec4 compressedAttribute2;                       // label horizontal origin, image height, color, pick color, size in meters, valid aligned axis, 13 bits free\n\
+in vec4 eyeOffset;                                  // eye offset in meters, 4 bytes free (texture range)\n\
+in vec4 scaleByDistance;                            // near, nearScale, far, farScale\n\
+in vec4 pixelOffsetScaleByDistance;                 // near, nearScale, far, farScale\n\
+in vec4 compressedAttribute3;                       // distance display condition near, far, disableDepthTestDistance, dimensions\n\
+in vec2 sdf;                                        // sdf outline color (rgb) and width (w)\n\
 #if defined(VERTEX_DEPTH_CHECK) || defined(FRAGMENT_DEPTH_CHECK)\n\
-attribute vec4 textureCoordinateBoundsOrLabelTranslate;    // the min and max x and y values for the texture coordinates\n\
+in vec4 textureCoordinateBoundsOrLabelTranslate;    // the min and max x and y values for the texture coordinates\n\
 #endif\n\
 #ifdef VECTOR_TILE\n\
-attribute float a_batchId;\n\
+in float a_batchId;\n\
 #endif\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+out vec2 v_textureCoordinates;\n\
 #ifdef FRAGMENT_DEPTH_CHECK\n\
-varying vec4 v_textureCoordinateBounds;\n\
-varying vec4 v_originTextureCoordinateAndTranslate;\n\
-varying vec4 v_compressed;                                 // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize\n\
-varying mat2 v_rotationMatrix;\n\
+out vec4 v_textureCoordinateBounds;\n\
+out vec4 v_originTextureCoordinateAndTranslate;\n\
+out vec4 v_compressed;                                 // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize\n\
+out mat2 v_rotationMatrix;\n\
 #endif\n\
 \n\
-varying vec4 v_pickColor;\n\
-varying vec4 v_color;\n\
+out vec4 v_pickColor;\n\
+out vec4 v_color;\n\
 #ifdef SDF\n\
-varying vec4 v_outlineColor;\n\
-varying float v_outlineWidth;\n\
+out vec4 v_outlineColor;\n\
+out float v_outlineWidth;\n\
 #endif\n\
 \n\
 const float UPPER_BOUND = 32768.0;\n\
@@ -68,7 +68,7 @@ vec4 addScreenSpaceOffset(vec4 positionEC, vec2 imageSize, float scale, vec2 dir
         float angle = rotation;\n\
         if (validAlignedAxis)\n\
         {\n\
-            vec4 projectedAlignedAxis = czm_modelViewProjection * vec4(alignedAxis, 0.0);\n\
+            vec4 projectedAlignedAxis = czm_modelView3D * vec4(alignedAxis, 0.0);\n\
             angle += sign(-projectedAlignedAxis.x) * acos(sign(projectedAlignedAxis.y) * (projectedAlignedAxis.y * projectedAlignedAxis.y) /\n\
                     (projectedAlignedAxis.x * projectedAlignedAxis.x + projectedAlignedAxis.y * projectedAlignedAxis.y));\n\
         }\n\
@@ -96,7 +96,7 @@ float getGlobeDepth(vec4 positionEC)\n\
 {\n\
     vec4 posWC = czm_eyeToWindowCoordinates(positionEC);\n\
 \n\
-    float globeDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, posWC.xy / czm_viewport.zw));\n\
+    float globeDepth = czm_unpackDepth(texture(czm_globeDepthTexture, posWC.xy / czm_viewport.zw));\n\
 \n\
     if (globeDepth == 0.0)\n\
     {\n\

package/Source/Shaders/BrdfLutGeneratorFS.glsl

@@ -1,4 +1,4 @@
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 const float M_PI = 3.141592653589793;
 
 float vdcRadicalInverse(int i)
@@ -79,5 +79,5 @@ vec2 integrateBrdf(float roughness, float NdotV)
 
 void main()
 {
-    gl_FragColor = vec4(integrateBrdf(v_textureCoordinates.y, v_textureCoordinates.x), 0.0, 1.0);
+    out_FragColor = vec4(integrateBrdf(v_textureCoordinates.y, v_textureCoordinates.x), 0.0, 1.0);
 }

package/Source/Shaders/BrdfLutGeneratorFS.js

@@ -1,5 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec2 v_textureCoordinates;\n\
+export default "in vec2 v_textureCoordinates;\n\
 const float M_PI = 3.141592653589793;\n\
 \n\
 float vdcRadicalInverse(int i)\n\
@@ -80,6 +80,6 @@ vec2 integrateBrdf(float roughness, float NdotV)\n\
 \n\
 void main()\n\
 {\n\
-    gl_FragColor = vec4(integrateBrdf(v_textureCoordinates.y, v_textureCoordinates.x), 0.0, 1.0);\n\
+    out_FragColor = vec4(integrateBrdf(v_textureCoordinates.y, v_textureCoordinates.x), 0.0, 1.0);\n\
 }\n\
 ";

package/Source/Shaders/Builtin/Constants/passOverlay.glsl

@@ -6,4 +6,4 @@
  *
  * @see czm_pass
  */
-const float czm_passOverlay = 9.0;
+const float czm_passOverlay = 10.0;

package/Source/Shaders/Builtin/Constants/passOverlay.js

@@ -7,5 +7,5 @@ export default "/**\n\
  *\n\
  * @see czm_pass\n\
  */\n\
-const float czm_passOverlay = 9.0;\n\
+const float czm_passOverlay = 10.0;\n\
 ";

package/Source/Shaders/Builtin/Constants/passVoxels.glsl

@@ -0,0 +1,9 @@
+/**
+ * The automatic GLSL constant for {@link Pass#VOXELS}
+ *
+ * @name czm_passVoxels
+ * @glslConstant
+ *
+ * @see czm_pass
+ */
+const float czm_passVoxels = 9.0;

package/Source/Shaders/Builtin/Constants/passVoxels.js

@@ -0,0 +1,11 @@
+//This file is automatically rebuilt by the Cesium build process.
+export default "/**\n\
+ * The automatic GLSL constant for {@link Pass#VOXELS}\n\
+ *\n\
+ * @name czm_passVoxels\n\
+ * @glslConstant\n\
+ *\n\
+ * @see czm_pass\n\
+ */\n\
+const float czm_passVoxels = 9.0;\n\
+";

package/Source/Shaders/Builtin/CzmBuiltins.js

@@ -22,6 +22,7 @@ import czm_passOpaque from './Constants/passOpaque.js'
 import czm_passOverlay from './Constants/passOverlay.js'
 import czm_passTerrainClassification from './Constants/passTerrainClassification.js'
 import czm_passTranslucent from './Constants/passTranslucent.js'
+import czm_passVoxels from './Constants/passVoxels.js'
 import czm_pi from './Constants/pi.js'
 import czm_piOverFour from './Constants/piOverFour.js'
 import czm_piOverSix from './Constants/piOverSix.js'
@@ -45,6 +46,12 @@ import czm_pbrParameters from './Structs/pbrParameters.js'
 import czm_ray from './Structs/ray.js'
 import czm_raySegment from './Structs/raySegment.js'
 import czm_shadowParameters from './Structs/shadowParameters.js'
+import czm_HSBToRGB from './Functions/HSBToRGB.js'
+import czm_HSLToRGB from './Functions/HSLToRGB.js'
+import czm_RGBToHSB from './Functions/RGBToHSB.js'
+import czm_RGBToHSL from './Functions/RGBToHSL.js'
+import czm_RGBToXYZ from './Functions/RGBToXYZ.js'
+import czm_XYZToRGB from './Functions/XYZToRGB.js'
 import czm_acesTonemapping from './Functions/acesTonemapping.js'
 import czm_alphaWeight from './Functions/alphaWeight.js'
 import czm_antialias from './Functions/antialias.js'
@@ -75,15 +82,13 @@ import czm_getDefaultMaterial from './Functions/getDefaultMaterial.js'
 import czm_getLambertDiffuse from './Functions/getLambertDiffuse.js'
 import czm_getSpecular from './Functions/getSpecular.js'
 import czm_getWaterNoise from './Functions/getWaterNoise.js'
-import czm_HSBToRGB from './Functions/HSBToRGB.js'
-import czm_HSLToRGB from './Functions/HSLToRGB.js'
 import czm_hue from './Functions/hue.js'
 import czm_inverseGamma from './Functions/inverseGamma.js'
 import czm_isEmpty from './Functions/isEmpty.js'
 import czm_isFull from './Functions/isFull.js'
 import czm_latitudeToWebMercatorFraction from './Functions/latitudeToWebMercatorFraction.js'
-import czm_linearToSrgb from './Functions/linearToSrgb.js'
 import czm_lineDistance from './Functions/lineDistance.js'
+import czm_linearToSrgb from './Functions/linearToSrgb.js'
 import czm_luminance from './Functions/luminance.js'
 import czm_metersPerPixel from './Functions/metersPerPixel.js'
 import czm_modelToWindowCoordinates from './Functions/modelToWindowCoordinates.js'
@@ -102,9 +107,6 @@ import czm_raySphereIntersectionInterval from './Functions/raySphereIntersection
 import czm_readDepth from './Functions/readDepth.js'
 import czm_readNonPerspective from './Functions/readNonPerspective.js'
 import czm_reverseLogDepth from './Functions/reverseLogDepth.js'
-import czm_RGBToHSB from './Functions/RGBToHSB.js'
-import czm_RGBToHSL from './Functions/RGBToHSL.js'
-import czm_RGBToXYZ from './Functions/RGBToXYZ.js'
 import czm_round from './Functions/round.js'
 import czm_sampleOctahedralProjection from './Functions/sampleOctahedralProjection.js'
 import czm_saturation from './Functions/saturation.js'
@@ -114,6 +116,7 @@ import czm_signNotZero from './Functions/signNotZero.js'
 import czm_sphericalHarmonics from './Functions/sphericalHarmonics.js'
 import czm_srgbToLinear from './Functions/srgbToLinear.js'
 import czm_tangentToEyeSpaceMatrix from './Functions/tangentToEyeSpaceMatrix.js'
+import czm_textureCube from './Functions/textureCube.js'
 import czm_transformPlane from './Functions/transformPlane.js'
 import czm_translateRelativeToEye from './Functions/translateRelativeToEye.js'
 import czm_translucentPhong from './Functions/translucentPhong.js'
@@ -127,7 +130,6 @@ import czm_windowToEyeCoordinates from './Functions/windowToEyeCoordinates.js'
 import czm_writeDepthClamp from './Functions/writeDepthClamp.js'
 import czm_writeLogDepth from './Functions/writeLogDepth.js'
 import czm_writeNonPerspective from './Functions/writeNonPerspective.js'
-import czm_XYZToRGB from './Functions/XYZToRGB.js'
 
 export default {
     czm_degreesPerRadian : czm_degreesPerRadian,
@@ -153,6 +155,7 @@ export default {
     czm_passOverlay : czm_passOverlay,
     czm_passTerrainClassification : czm_passTerrainClassification,
     czm_passTranslucent : czm_passTranslucent,
+    czm_passVoxels : czm_passVoxels,
     czm_pi : czm_pi,
     czm_piOverFour : czm_piOverFour,
     czm_piOverSix : czm_piOverSix,
@@ -176,6 +179,12 @@ export default {
     czm_ray : czm_ray,
     czm_raySegment : czm_raySegment,
     czm_shadowParameters : czm_shadowParameters,
+    czm_HSBToRGB : czm_HSBToRGB,
+    czm_HSLToRGB : czm_HSLToRGB,
+    czm_RGBToHSB : czm_RGBToHSB,
+    czm_RGBToHSL : czm_RGBToHSL,
+    czm_RGBToXYZ : czm_RGBToXYZ,
+    czm_XYZToRGB : czm_XYZToRGB,
     czm_acesTonemapping : czm_acesTonemapping,
     czm_alphaWeight : czm_alphaWeight,
     czm_antialias : czm_antialias,
@@ -206,15 +215,13 @@ export default {
     czm_getLambertDiffuse : czm_getLambertDiffuse,
     czm_getSpecular : czm_getSpecular,
     czm_getWaterNoise : czm_getWaterNoise,
-    czm_HSBToRGB : czm_HSBToRGB,
-    czm_HSLToRGB : czm_HSLToRGB,
     czm_hue : czm_hue,
     czm_inverseGamma : czm_inverseGamma,
     czm_isEmpty : czm_isEmpty,
     czm_isFull : czm_isFull,
     czm_latitudeToWebMercatorFraction : czm_latitudeToWebMercatorFraction,
-    czm_linearToSrgb : czm_linearToSrgb,
     czm_lineDistance : czm_lineDistance,
+    czm_linearToSrgb : czm_linearToSrgb,
     czm_luminance : czm_luminance,
     czm_metersPerPixel : czm_metersPerPixel,
     czm_modelToWindowCoordinates : czm_modelToWindowCoordinates,
@@ -233,9 +240,6 @@ export default {
     czm_readDepth : czm_readDepth,
     czm_readNonPerspective : czm_readNonPerspective,
     czm_reverseLogDepth : czm_reverseLogDepth,
-    czm_RGBToHSB : czm_RGBToHSB,
-    czm_RGBToHSL : czm_RGBToHSL,
-    czm_RGBToXYZ : czm_RGBToXYZ,
     czm_round : czm_round,
     czm_sampleOctahedralProjection : czm_sampleOctahedralProjection,
     czm_saturation : czm_saturation,
@@ -245,6 +249,7 @@ export default {
     czm_sphericalHarmonics : czm_sphericalHarmonics,
     czm_srgbToLinear : czm_srgbToLinear,
     czm_tangentToEyeSpaceMatrix : czm_tangentToEyeSpaceMatrix,
+    czm_textureCube : czm_textureCube,
     czm_transformPlane : czm_transformPlane,
     czm_translateRelativeToEye : czm_translateRelativeToEye,
     czm_translucentPhong : czm_translucentPhong,
@@ -257,6 +262,5 @@ export default {
     czm_windowToEyeCoordinates : czm_windowToEyeCoordinates,
     czm_writeDepthClamp : czm_writeDepthClamp,
     czm_writeLogDepth : czm_writeLogDepth,
-    czm_writeNonPerspective : czm_writeNonPerspective,
-    czm_XYZToRGB : czm_XYZToRGB
+    czm_writeNonPerspective : czm_writeNonPerspective
 };

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

@@ -1,6 +1,6 @@
 // emulated noperspective
-#if defined(GL_EXT_frag_depth) && !defined(LOG_DEPTH)
-varying float v_WindowZ;
+#if (__VERSION__ == 300 || defined(GL_EXT_frag_depth)) && !defined(LOG_DEPTH)
+out float v_WindowZ;
 #endif
 
 /**
@@ -36,7 +36,7 @@ varying float v_WindowZ;
 vec4 czm_depthClamp(vec4 coords)
 {
 #ifndef LOG_DEPTH
-#ifdef GL_EXT_frag_depth
+#if __VERSION__ == 300 || defined(GL_EXT_frag_depth)
     v_WindowZ = (0.5 * (coords.z / coords.w) + 0.5) * coords.w;
     coords.z = 0.0;
 #else

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

@@ -1,7 +1,7 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "// emulated noperspective\n\
-#if defined(GL_EXT_frag_depth) && !defined(LOG_DEPTH)\n\
-varying float v_WindowZ;\n\
+#if (__VERSION__ == 300 || defined(GL_EXT_frag_depth)) && !defined(LOG_DEPTH)\n\
+out float v_WindowZ;\n\
 #endif\n\
 \n\
 /**\n\
@@ -37,7 +37,7 @@ varying float v_WindowZ;\n\
 vec4 czm_depthClamp(vec4 coords)\n\
 {\n\
 #ifndef LOG_DEPTH\n\
-#ifdef GL_EXT_frag_depth\n\
+#if __VERSION__ == 300 || defined(GL_EXT_frag_depth)\n\
     v_WindowZ = (0.5 * (coords.z / coords.w) + 0.5) * coords.w;\n\
     coords.z = 0.0;\n\
 #else\n\

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

@@ -27,10 +27,10 @@ vec4 czm_getWaterNoise(sampler2D normalMap, vec2 uv, float time, float angleInRa
     uv1 = fract(uv1);
     uv2 = fract(uv2);
     uv3 = fract(uv3);
-    vec4 noise = (texture2D(normalMap, uv0)) +
-                 (texture2D(normalMap, uv1)) +
-                 (texture2D(normalMap, uv2)) +
-                 (texture2D(normalMap, uv3));
+    vec4 noise = (texture(normalMap, uv0)) +
+                 (texture(normalMap, uv1)) +
+                 (texture(normalMap, uv2)) +
+                 (texture(normalMap, uv3));
 
     // average and scale to between -1 and 1
     return ((noise / 4.0) - 0.5) * 2.0;

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

@@ -28,10 +28,10 @@ vec4 czm_getWaterNoise(sampler2D normalMap, vec2 uv, float time, float angleInRa
     uv1 = fract(uv1);\n\
     uv2 = fract(uv2);\n\
     uv3 = fract(uv3);\n\
-    vec4 noise = (texture2D(normalMap, uv0)) +\n\
-                 (texture2D(normalMap, uv1)) +\n\
-                 (texture2D(normalMap, uv2)) +\n\
-                 (texture2D(normalMap, uv3));\n\
+    vec4 noise = (texture(normalMap, uv0)) +\n\
+                 (texture(normalMap, uv1)) +\n\
+                 (texture(normalMap, uv2)) +\n\
+                 (texture(normalMap, uv3));\n\
 \n\
     // average and scale to between -1 and 1\n\
     return ((noise / 4.0) - 0.5) * 2.0;\n\

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

@@ -23,7 +23,7 @@ float czm_private_getSpecularOfMaterial(vec3 lightDirectionEC, vec3 toEyeEC, czm
  * vec3 positionToEyeEC = // ...
  * czm_material material = // ...
  * vec3 lightDirectionEC = // ...
- * gl_FragColor = czm_phong(normalize(positionToEyeEC), material, lightDirectionEC);
+ * out_FragColor = czm_phong(normalize(positionToEyeEC), material, lightDirectionEC);
  *
  * @see czm_getMaterial
  */

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

@@ -24,7 +24,7 @@ float czm_private_getSpecularOfMaterial(vec3 lightDirectionEC, vec3 toEyeEC, czm
  * vec3 positionToEyeEC = // ...\n\
  * czm_material material = // ...\n\
  * vec3 lightDirectionEC = // ...\n\
- * gl_FragColor = czm_phong(normalize(positionToEyeEC), material, lightDirectionEC);\n\
+ * out_FragColor = czm_phong(normalize(positionToEyeEC), material, lightDirectionEC);\n\
  *\n\
  * @see czm_getMaterial\n\
  */\n\

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

@@ -1,4 +1,4 @@
 float czm_readDepth(sampler2D depthTexture, vec2 texCoords)
 {
-    return czm_reverseLogDepth(texture2D(depthTexture, texCoords).r);
+    return czm_reverseLogDepth(texture(depthTexture, texCoords).r);
 }

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

@@ -1,6 +1,6 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "float czm_readDepth(sampler2D depthTexture, vec2 texCoords)\n\
 {\n\
-    return czm_reverseLogDepth(texture2D(depthTexture, texCoords).r);\n\
+    return czm_reverseLogDepth(texture(depthTexture, texCoords).r);\n\
 }\n\
 ";

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

@@ -32,10 +32,10 @@ vec3 czm_sampleOctahedralProjectionWithFiltering(sampler2D projectedMap, vec2 te
 
     // Do bilinear filtering
     #ifndef OES_texture_float_linear
-        vec3 color1 = texture2D(projectedMap, coord + vec2(0.0, pixel.y)).rgb;
-        vec3 color2 = texture2D(projectedMap, coord + vec2(pixel.x, 0.0)).rgb;
-        vec3 color3 = texture2D(projectedMap, coord + pixel).rgb;
-        vec3 color4 = texture2D(projectedMap, coord).rgb;
+        vec3 color1 = texture(projectedMap, coord + vec2(0.0, pixel.y)).rgb;
+        vec3 color2 = texture(projectedMap, coord + vec2(pixel.x, 0.0)).rgb;
+        vec3 color3 = texture(projectedMap, coord + pixel).rgb;
+        vec3 color4 = texture(projectedMap, coord).rgb;
 
         vec2 texturePosition = coord * textureSize;
 
@@ -47,7 +47,7 @@ vec3 czm_sampleOctahedralProjectionWithFiltering(sampler2D projectedMap, vec2 te
 
         vec3 color = mix(average1, average2, fv);
     #else
-        vec3 color = texture2D(projectedMap, coord).rgb;
+        vec3 color = texture(projectedMap, coord).rgb;
     #endif
 
     return color;

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

@@ -33,10 +33,10 @@ vec3 czm_sampleOctahedralProjectionWithFiltering(sampler2D projectedMap, vec2 te
 \n\
     // Do bilinear filtering\n\
     #ifndef OES_texture_float_linear\n\
-        vec3 color1 = texture2D(projectedMap, coord + vec2(0.0, pixel.y)).rgb;\n\
-        vec3 color2 = texture2D(projectedMap, coord + vec2(pixel.x, 0.0)).rgb;\n\
-        vec3 color3 = texture2D(projectedMap, coord + pixel).rgb;\n\
-        vec3 color4 = texture2D(projectedMap, coord).rgb;\n\
+        vec3 color1 = texture(projectedMap, coord + vec2(0.0, pixel.y)).rgb;\n\
+        vec3 color2 = texture(projectedMap, coord + vec2(pixel.x, 0.0)).rgb;\n\
+        vec3 color3 = texture(projectedMap, coord + pixel).rgb;\n\
+        vec3 color4 = texture(projectedMap, coord).rgb;\n\
 \n\
         vec2 texturePosition = coord * textureSize;\n\
 \n\
@@ -48,7 +48,7 @@ vec3 czm_sampleOctahedralProjectionWithFiltering(sampler2D projectedMap, vec2 te
 \n\
         vec3 color = mix(average1, average2, fv);\n\
     #else\n\
-        vec3 color = texture2D(projectedMap, coord).rgb;\n\
+        vec3 color = texture(projectedMap, coord).rgb;\n\
     #endif\n\
 \n\
     return color;\n\

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

@@ -1,15 +1,15 @@
 
 float czm_sampleShadowMap(highp samplerCube shadowMap, vec3 d)
 {
-    return czm_unpackDepth(textureCube(shadowMap, d));
+    return czm_unpackDepth(czm_textureCube(shadowMap, d));
 }
 
 float czm_sampleShadowMap(highp sampler2D shadowMap, vec2 uv)
 {
 #ifdef USE_SHADOW_DEPTH_TEXTURE
-    return texture2D(shadowMap, uv).r;
+    return texture(shadowMap, uv).r;
 #else
-    return czm_unpackDepth(texture2D(shadowMap, uv));
+    return czm_unpackDepth(texture(shadowMap, uv));
 #endif
 }
 

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

@@ -2,15 +2,15 @@
 export default "\n\
 float czm_sampleShadowMap(highp samplerCube shadowMap, vec3 d)\n\
 {\n\
-    return czm_unpackDepth(textureCube(shadowMap, d));\n\
+    return czm_unpackDepth(czm_textureCube(shadowMap, d));\n\
 }\n\
 \n\
 float czm_sampleShadowMap(highp sampler2D shadowMap, vec2 uv)\n\
 {\n\
 #ifdef USE_SHADOW_DEPTH_TEXTURE\n\
-    return texture2D(shadowMap, uv).r;\n\
+    return texture(shadowMap, uv).r;\n\
 #else\n\
-    return czm_unpackDepth(texture2D(shadowMap, uv));\n\
+    return czm_unpackDepth(texture(shadowMap, uv));\n\
 #endif\n\
 }\n\
 \n\

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

@@ -12,7 +12,7 @@
  *
  * @example
  * mat3 tangentToEye = czm_tangentToEyeSpaceMatrix(normalEC, tangentEC, bitangentEC);
- * vec3 normal = tangentToEye * texture2D(normalMap, st).xyz;
+ * vec3 normal = tangentToEye * texture(normalMap, st).xyz;
  */
 mat3 czm_tangentToEyeSpaceMatrix(vec3 normalEC, vec3 tangentEC, vec3 bitangentEC)
 {

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

@@ -13,7 +13,7 @@ export default "/**\n\
  *\n\
  * @example\n\
  * mat3 tangentToEye = czm_tangentToEyeSpaceMatrix(normalEC, tangentEC, bitangentEC);\n\
- * vec3 normal = tangentToEye * texture2D(normalMap, st).xyz;\n\
+ * vec3 normal = tangentToEye * texture(normalMap, st).xyz;\n\
  */\n\
 mat3 czm_tangentToEyeSpaceMatrix(vec3 normalEC, vec3 tangentEC, vec3 bitangentEC)\n\
 {\n\

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

@@ -0,0 +1,17 @@
+/**
+ * A wrapper around the texture (WebGL2) / textureCube (WebGL1)
+ * function to allow for WebGL 1 support.
+ * 
+ * @name czm_textureCube
+ * @glslFunction
+ *
+ * @param {samplerCube} sampler The sampler.
+ * @param {vec3} p The coordinates to sample the texture at.
+ */
+vec4 czm_textureCube(samplerCube sampler, vec3 p) {
+#if __VERSION__ == 300
+    return texture(sampler, p);
+#else  
+    return textureCube(sampler, p);
+#endif
+}

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

@@ -0,0 +1,18 @@
+//This file is automatically rebuilt by the Cesium build process.
+export default "/**\n\
+ * A wrapper around the texture (WebGL2) / textureCube (WebGL1)\n\
+ * function to allow for WebGL 1 support.\n\
+ * \n\
+ * @name czm_textureCube\n\
+ * @glslFunction\n\
+ *\n\
+ * @param {samplerCube} sampler The sampler.\n\
+ * @param {vec3} p The coordinates to sample the texture at.\n\
+ */\n\
+vec4 czm_textureCube(samplerCube sampler, vec3 p) {\n\
+#if __VERSION__ == 300\n\
+    return texture(sampler, p);\n\
+#else  \n\
+    return textureCube(sampler, p);\n\
+#endif\n\
+}";

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

@@ -17,8 +17,8 @@
  * @returns {vec3} The position translated to be relative to the camera's position.
  *
  * @example
- * attribute vec3 positionHigh;
- * attribute vec3 positionLow;
+ * in vec3 positionHigh;
+ * in vec3 positionLow;
  *
  * void main()
  * {

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

@@ -18,8 +18,8 @@ export default "/**\n\
  * @returns {vec3} The position translated to be relative to the camera's position.\n\
  *\n\
  * @example\n\
- * attribute vec3 positionHigh;\n\
- * attribute vec3 positionLow;\n\
+ * in vec3 positionHigh;\n\
+ * in vec3 positionLow;\n\
  *\n\
  * void main()\n\
  * {\n\

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

@@ -1,8 +1,8 @@
 #ifdef LOG_DEPTH
 // 1.0 at the near plane, increasing linearly from there.
-varying float v_depthFromNearPlusOne;
+out float v_depthFromNearPlusOne;
 #ifdef SHADOW_MAP
-varying vec3 v_logPositionEC;
+out vec3 v_logPositionEC;
 #endif
 #endif