@cesium/engine 1.1.0 → 2.1.0

package/Source/Shaders/FXAA3_11.glsl

@@ -48,8 +48,8 @@
 //       #define FxaaTexTop(t, p) texture2DLod(t, p, 0.0)
 //       #define FxaaTexOff(t, p, o, r) texture2DLod(t, p + (o * r), 0.0)
 //           with
-//       #define FxaaTexTop(t, p) texture2D(t, p)
-//       #define FxaaTexOff(t, p, o, r) texture2D(t, p + (o * r))
+//       #define FxaaTexTop(t, p) texture(t, p)
+//       #define FxaaTexOff(t, p, o, r) texture(t, p + (o * r))
 // * FXAA_QUALITY_PRESET is prepended in the javascript code. We may want to expose that setting in the future.
 // * The following parameters to FxaaPixelShader are unused and can be removed:
 //       fxaaConsolePosPos
@@ -269,8 +269,8 @@
 #define FxaaTex sampler2D
 
 #define FxaaSat(x) clamp(x, 0.0, 1.0)
-#define FxaaTexTop(t, p) texture2D(t, p)
-#define FxaaTexOff(t, p, o, r) texture2D(t, p + (o * r))
+#define FxaaTexTop(t, p) texture(t, p)
+#define FxaaTexOff(t, p, o, r) texture(t, p + (o * r))
 
 FxaaFloat FxaaLuma(FxaaFloat4 rgba) { return rgba.y; }
 

package/Source/Shaders/FXAA3_11.js

@@ -77,8 +77,8 @@ export default "/**\n\
 //       #define FxaaTexTop(t, p) texture2DLod(t, p, 0.0)\n\
 //       #define FxaaTexOff(t, p, o, r) texture2DLod(t, p + (o * r), 0.0)\n\
 //           with\n\
-//       #define FxaaTexTop(t, p) texture2D(t, p)\n\
-//       #define FxaaTexOff(t, p, o, r) texture2D(t, p + (o * r))\n\
+//       #define FxaaTexTop(t, p) texture(t, p)\n\
+//       #define FxaaTexOff(t, p, o, r) texture(t, p + (o * r))\n\
 // * FXAA_QUALITY_PRESET is prepended in the javascript code. We may want to expose that setting in the future.\n\
 // * The following parameters to FxaaPixelShader are unused and can be removed:\n\
 //       fxaaConsolePosPos\n\
@@ -298,8 +298,8 @@ export default "/**\n\
 #define FxaaTex sampler2D\n\
 \n\
 #define FxaaSat(x) clamp(x, 0.0, 1.0)\n\
-#define FxaaTexTop(t, p) texture2D(t, p)\n\
-#define FxaaTexOff(t, p, o, r) texture2D(t, p + (o * r))\n\
+#define FxaaTexTop(t, p) texture(t, p)\n\
+#define FxaaTexOff(t, p, o, r) texture(t, p + (o * r))\n\
 \n\
 FxaaFloat FxaaLuma(FxaaFloat4 rgba) { return rgba.y; }\n\
 \n\

package/Source/Shaders/GlobeFS.glsl

@@ -105,26 +105,26 @@ uniform float u_lambertDiffuseMultiplier;
 uniform float u_vertexShadowDarkness;
 #endif
 
-varying vec3 v_positionMC;
-varying vec3 v_positionEC;
-varying vec3 v_textureCoordinates;
-varying vec3 v_normalMC;
-varying vec3 v_normalEC;
+in vec3 v_positionMC;
+in vec3 v_positionEC;
+in vec3 v_textureCoordinates;
+in vec3 v_normalMC;
+in vec3 v_normalEC;
 
 #ifdef APPLY_MATERIAL
-varying float v_height;
-varying float v_slope;
-varying float v_aspect;
+in float v_height;
+in float v_slope;
+in float v_aspect;
 #endif
 
 #if defined(FOG) || defined(GROUND_ATMOSPHERE) || defined(UNDERGROUND_COLOR) || defined(TRANSLUCENT)
-varying float v_distance;
+in float v_distance;
 #endif
 
 #if defined(GROUND_ATMOSPHERE) || defined(FOG)
-varying vec3 v_atmosphereRayleighColor;
-varying vec3 v_atmosphereMieColor;
-varying float v_atmosphereOpacity;
+in vec3 v_atmosphereRayleighColor;
+in vec3 v_atmosphereMieColor;
+in float v_atmosphereOpacity;
 #endif
 
 #if defined(UNDERGROUND_COLOR) || defined(TRANSLUCENT)
@@ -195,7 +195,7 @@ vec4 sampleAndBlend(
     vec2 translation = textureCoordinateTranslationAndScale.xy;
     vec2 scale = textureCoordinateTranslationAndScale.zw;
     vec2 textureCoordinates = tileTextureCoordinates * scale + translation;
-    vec4 value = texture2D(textureToSample, textureCoordinates);
+    vec4 value = texture(textureToSample, textureCoordinates);
     vec3 color = value.rgb;
     float alpha = value.a;
 
@@ -376,7 +376,7 @@ void main()
     vec2 waterMaskTextureCoordinates = v_textureCoordinates.xy * waterMaskScale + waterMaskTranslation;
     waterMaskTextureCoordinates.y = 1.0 - waterMaskTextureCoordinates.y;
 
-    float mask = texture2D(u_waterMask, waterMaskTextureCoordinates).r;
+    float mask = texture(u_waterMask, waterMaskTextureCoordinates).r;
 
     if (mask > 0.0)
     {
@@ -545,7 +545,7 @@ void main()
     }
 #endif
     
-    gl_FragColor =  finalColor;
+    out_FragColor =  finalColor;
 }
 
 

package/Source/Shaders/GlobeFS.js

@@ -106,26 +106,26 @@ uniform float u_lambertDiffuseMultiplier;\n\
 uniform float u_vertexShadowDarkness;\n\
 #endif\n\
 \n\
-varying vec3 v_positionMC;\n\
-varying vec3 v_positionEC;\n\
-varying vec3 v_textureCoordinates;\n\
-varying vec3 v_normalMC;\n\
-varying vec3 v_normalEC;\n\
+in vec3 v_positionMC;\n\
+in vec3 v_positionEC;\n\
+in vec3 v_textureCoordinates;\n\
+in vec3 v_normalMC;\n\
+in vec3 v_normalEC;\n\
 \n\
 #ifdef APPLY_MATERIAL\n\
-varying float v_height;\n\
-varying float v_slope;\n\
-varying float v_aspect;\n\
+in float v_height;\n\
+in float v_slope;\n\
+in float v_aspect;\n\
 #endif\n\
 \n\
 #if defined(FOG) || defined(GROUND_ATMOSPHERE) || defined(UNDERGROUND_COLOR) || defined(TRANSLUCENT)\n\
-varying float v_distance;\n\
+in float v_distance;\n\
 #endif\n\
 \n\
 #if defined(GROUND_ATMOSPHERE) || defined(FOG)\n\
-varying vec3 v_atmosphereRayleighColor;\n\
-varying vec3 v_atmosphereMieColor;\n\
-varying float v_atmosphereOpacity;\n\
+in vec3 v_atmosphereRayleighColor;\n\
+in vec3 v_atmosphereMieColor;\n\
+in float v_atmosphereOpacity;\n\
 #endif\n\
 \n\
 #if defined(UNDERGROUND_COLOR) || defined(TRANSLUCENT)\n\
@@ -196,7 +196,7 @@ vec4 sampleAndBlend(\n\
     vec2 translation = textureCoordinateTranslationAndScale.xy;\n\
     vec2 scale = textureCoordinateTranslationAndScale.zw;\n\
     vec2 textureCoordinates = tileTextureCoordinates * scale + translation;\n\
-    vec4 value = texture2D(textureToSample, textureCoordinates);\n\
+    vec4 value = texture(textureToSample, textureCoordinates);\n\
     vec3 color = value.rgb;\n\
     float alpha = value.a;\n\
 \n\
@@ -377,7 +377,7 @@ void main()\n\
     vec2 waterMaskTextureCoordinates = v_textureCoordinates.xy * waterMaskScale + waterMaskTranslation;\n\
     waterMaskTextureCoordinates.y = 1.0 - waterMaskTextureCoordinates.y;\n\
 \n\
-    float mask = texture2D(u_waterMask, waterMaskTextureCoordinates).r;\n\
+    float mask = texture(u_waterMask, waterMaskTextureCoordinates).r;\n\
 \n\
     if (mask > 0.0)\n\
     {\n\
@@ -546,7 +546,7 @@ void main()\n\
     }\n\
 #endif\n\
     \n\
-    gl_FragColor =  finalColor;\n\
+    out_FragColor =  finalColor;\n\
 }\n\
 \n\
 \n\

package/Source/Shaders/GlobeVS.glsl

@@ -1,13 +1,13 @@
 #ifdef QUANTIZATION_BITS12
-attribute vec4 compressed0;
-attribute float compressed1;
+in vec4 compressed0;
+in float compressed1;
 #else
-attribute vec4 position3DAndHeight;
-attribute vec4 textureCoordAndEncodedNormals;
+in vec4 position3DAndHeight;
+in vec4 textureCoordAndEncodedNormals;
 #endif
 
 #ifdef GEODETIC_SURFACE_NORMALS
-attribute vec3 geodeticSurfaceNormal;
+in vec3 geodeticSurfaceNormal;
 #endif
 
 #ifdef EXAGGERATION
@@ -23,27 +23,27 @@ uniform vec4 u_tileRectangle;
 uniform vec2 u_southAndNorthLatitude;
 uniform vec2 u_southMercatorYAndOneOverHeight;
 
-varying vec3 v_positionMC;
-varying vec3 v_positionEC;
+out vec3 v_positionMC;
+out vec3 v_positionEC;
 
-varying vec3 v_textureCoordinates;
-varying vec3 v_normalMC;
-varying vec3 v_normalEC;
+out vec3 v_textureCoordinates;
+out vec3 v_normalMC;
+out vec3 v_normalEC;
 
 #ifdef APPLY_MATERIAL
-varying float v_slope;
-varying float v_aspect;
-varying float v_height;
+out float v_slope;
+out float v_aspect;
+out float v_height;
 #endif
 
 #if defined(FOG) || defined(GROUND_ATMOSPHERE) || defined(UNDERGROUND_COLOR) || defined(TRANSLUCENT)
-varying float v_distance;
+out float v_distance;
 #endif
 
 #if defined(FOG) || defined(GROUND_ATMOSPHERE)
-varying vec3 v_atmosphereRayleighColor;
-varying vec3 v_atmosphereMieColor;
-varying float v_atmosphereOpacity;
+out vec3 v_atmosphereRayleighColor;
+out vec3 v_atmosphereMieColor;
+out float v_atmosphereOpacity;
 #endif
 
 // These functions are generated at runtime.

package/Source/Shaders/GlobeVS.js

@@ -1,14 +1,14 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "#ifdef QUANTIZATION_BITS12\n\
-attribute vec4 compressed0;\n\
-attribute float compressed1;\n\
+in vec4 compressed0;\n\
+in float compressed1;\n\
 #else\n\
-attribute vec4 position3DAndHeight;\n\
-attribute vec4 textureCoordAndEncodedNormals;\n\
+in vec4 position3DAndHeight;\n\
+in vec4 textureCoordAndEncodedNormals;\n\
 #endif\n\
 \n\
 #ifdef GEODETIC_SURFACE_NORMALS\n\
-attribute vec3 geodeticSurfaceNormal;\n\
+in vec3 geodeticSurfaceNormal;\n\
 #endif\n\
 \n\
 #ifdef EXAGGERATION\n\
@@ -24,27 +24,27 @@ uniform vec4 u_tileRectangle;\n\
 uniform vec2 u_southAndNorthLatitude;\n\
 uniform vec2 u_southMercatorYAndOneOverHeight;\n\
 \n\
-varying vec3 v_positionMC;\n\
-varying vec3 v_positionEC;\n\
+out vec3 v_positionMC;\n\
+out vec3 v_positionEC;\n\
 \n\
-varying vec3 v_textureCoordinates;\n\
-varying vec3 v_normalMC;\n\
-varying vec3 v_normalEC;\n\
+out vec3 v_textureCoordinates;\n\
+out vec3 v_normalMC;\n\
+out vec3 v_normalEC;\n\
 \n\
 #ifdef APPLY_MATERIAL\n\
-varying float v_slope;\n\
-varying float v_aspect;\n\
-varying float v_height;\n\
+out float v_slope;\n\
+out float v_aspect;\n\
+out float v_height;\n\
 #endif\n\
 \n\
 #if defined(FOG) || defined(GROUND_ATMOSPHERE) || defined(UNDERGROUND_COLOR) || defined(TRANSLUCENT)\n\
-varying float v_distance;\n\
+out float v_distance;\n\
 #endif\n\
 \n\
 #if defined(FOG) || defined(GROUND_ATMOSPHERE)\n\
-varying vec3 v_atmosphereRayleighColor;\n\
-varying vec3 v_atmosphereMieColor;\n\
-varying float v_atmosphereOpacity;\n\
+out vec3 v_atmosphereRayleighColor;\n\
+out vec3 v_atmosphereMieColor;\n\
+out float v_atmosphereOpacity;\n\
 #endif\n\
 \n\
 // These functions are generated at runtime.\n\

package/Source/Shaders/Materials/AspectRampMaterial.glsl

@@ -3,7 +3,7 @@ uniform sampler2D image;
 czm_material czm_getMaterial(czm_materialInput materialInput)
 {
     czm_material material = czm_getDefaultMaterial(materialInput);
-    vec4 rampColor = texture2D(image, vec2(materialInput.aspect / (2.0 * czm_pi), 0.5));
+    vec4 rampColor = texture(image, vec2(materialInput.aspect / (2.0 * czm_pi), 0.5));
     rampColor = czm_gammaCorrect(rampColor);
     material.diffuse = rampColor.rgb;
     material.alpha = rampColor.a;

package/Source/Shaders/Materials/AspectRampMaterial.js

@@ -4,7 +4,7 @@ export default "uniform sampler2D image;\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
     czm_material material = czm_getDefaultMaterial(materialInput);\n\
-    vec4 rampColor = texture2D(image, vec2(materialInput.aspect / (2.0 * czm_pi), 0.5));\n\
+    vec4 rampColor = texture(image, vec2(materialInput.aspect / (2.0 * czm_pi), 0.5));\n\
     rampColor = czm_gammaCorrect(rampColor);\n\
     material.diffuse = rampColor.rgb;\n\
     material.alpha = rampColor.a;\n\

package/Source/Shaders/Materials/BumpMapMaterial.glsl

@@ -9,15 +9,15 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
     vec2 st = materialInput.st;
 
     vec2 centerPixel = fract(repeat * st);
-    float centerBump = texture2D(image, centerPixel).channel;
+    float centerBump = texture(image, centerPixel).channel;
 
     float imageWidth = float(imageDimensions.x);
     vec2 rightPixel = fract(repeat * (st + vec2(1.0 / imageWidth, 0.0)));
-    float rightBump = texture2D(image, rightPixel).channel;
+    float rightBump = texture(image, rightPixel).channel;
 
     float imageHeight = float(imageDimensions.y);
     vec2 leftPixel = fract(repeat * (st + vec2(0.0, 1.0 / imageHeight)));
-    float topBump = texture2D(image, leftPixel).channel;
+    float topBump = texture(image, leftPixel).channel;
 
     vec3 normalTangentSpace = normalize(vec3(centerBump - rightBump, centerBump - topBump, clamp(1.0 - strength, 0.1, 1.0)));
     vec3 normalEC = materialInput.tangentToEyeMatrix * normalTangentSpace;

package/Source/Shaders/Materials/BumpMapMaterial.js

@@ -10,15 +10,15 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
     vec2 st = materialInput.st;\n\
 \n\
     vec2 centerPixel = fract(repeat * st);\n\
-    float centerBump = texture2D(image, centerPixel).channel;\n\
+    float centerBump = texture(image, centerPixel).channel;\n\
 \n\
     float imageWidth = float(imageDimensions.x);\n\
     vec2 rightPixel = fract(repeat * (st + vec2(1.0 / imageWidth, 0.0)));\n\
-    float rightBump = texture2D(image, rightPixel).channel;\n\
+    float rightBump = texture(image, rightPixel).channel;\n\
 \n\
     float imageHeight = float(imageDimensions.y);\n\
     vec2 leftPixel = fract(repeat * (st + vec2(0.0, 1.0 / imageHeight)));\n\
-    float topBump = texture2D(image, leftPixel).channel;\n\
+    float topBump = texture(image, leftPixel).channel;\n\
 \n\
     vec3 normalTangentSpace = normalize(vec3(centerBump - rightBump, centerBump - topBump, clamp(1.0 - strength, 0.1, 1.0)));\n\
     vec3 normalEC = materialInput.tangentToEyeMatrix * normalTangentSpace;\n\

package/Source/Shaders/Materials/ElevationBandMaterial.glsl

@@ -7,9 +7,9 @@ float getHeight(int idx, float invTexSize)
 {
     vec2 uv = vec2((float(idx) + 0.5) * invTexSize, 0.5);
 #ifdef OES_texture_float
-    return texture2D(heights, uv).x;
+    return texture(heights, uv).x;
 #else
-    return czm_unpackFloat(texture2D(heights, uv));
+    return czm_unpackFloat(texture(heights, uv));
 #endif
 }
 
@@ -58,7 +58,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
 
     float lerper = heightBelow == heightAbove ? 1.0 : (height - heightBelow) / (heightAbove - heightBelow);
     vec2 colorUv = vec2(invTexSize * (float(idxBelow) + 0.5 + lerper), 0.5);
-    vec4 color = texture2D(colors, colorUv);
+    vec4 color = texture(colors, colorUv);
 
     // undo preumultiplied alpha
     if (color.a > 0.0) 

package/Source/Shaders/Materials/ElevationBandMaterial.js

@@ -8,9 +8,9 @@ float getHeight(int idx, float invTexSize)\n\
 {\n\
     vec2 uv = vec2((float(idx) + 0.5) * invTexSize, 0.5);\n\
 #ifdef OES_texture_float\n\
-    return texture2D(heights, uv).x;\n\
+    return texture(heights, uv).x;\n\
 #else\n\
-    return czm_unpackFloat(texture2D(heights, uv));\n\
+    return czm_unpackFloat(texture(heights, uv));\n\
 #endif\n\
 }\n\
 \n\
@@ -59,7 +59,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 \n\
     float lerper = heightBelow == heightAbove ? 1.0 : (height - heightBelow) / (heightAbove - heightBelow);\n\
     vec2 colorUv = vec2(invTexSize * (float(idxBelow) + 0.5 + lerper), 0.5);\n\
-    vec4 color = texture2D(colors, colorUv);\n\
+    vec4 color = texture(colors, colorUv);\n\
 \n\
     // undo preumultiplied alpha\n\
     if (color.a > 0.0) \n\

package/Source/Shaders/Materials/ElevationContourMaterial.glsl

@@ -12,12 +12,13 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
 
     float distanceToContour = mod(materialInput.height, spacing);
 
-#ifdef GL_OES_standard_derivatives
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))
     float dxc = abs(dFdx(materialInput.height));
     float dyc = abs(dFdy(materialInput.height));
     float dF = max(dxc, dyc) * czm_pixelRatio * width;
     float alpha = (distanceToContour < dF) ? 1.0 : 0.0;
 #else
+    // If no derivatives available (IE 10?), use pixel ratio
     float alpha = (distanceToContour < (czm_pixelRatio * width)) ? 1.0 : 0.0;
 #endif
 

package/Source/Shaders/Materials/ElevationContourMaterial.js

@@ -13,12 +13,13 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 \n\
     float distanceToContour = mod(materialInput.height, spacing);\n\
 \n\
-#ifdef GL_OES_standard_derivatives\n\
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))\n\
     float dxc = abs(dFdx(materialInput.height));\n\
     float dyc = abs(dFdy(materialInput.height));\n\
     float dF = max(dxc, dyc) * czm_pixelRatio * width;\n\
     float alpha = (distanceToContour < dF) ? 1.0 : 0.0;\n\
 #else\n\
+    // If no derivatives available (IE 10?), use pixel ratio\n\
     float alpha = (distanceToContour < (czm_pixelRatio * width)) ? 1.0 : 0.0;\n\
 #endif\n\
 \n\

package/Source/Shaders/Materials/ElevationRampMaterial.glsl

@@ -6,7 +6,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
 {
     czm_material material = czm_getDefaultMaterial(materialInput);
     float scaledHeight = clamp((materialInput.height - minimumHeight) / (maximumHeight - minimumHeight), 0.0, 1.0);
-    vec4 rampColor = texture2D(image, vec2(scaledHeight, 0.5));
+    vec4 rampColor = texture(image, vec2(scaledHeight, 0.5));
     rampColor = czm_gammaCorrect(rampColor);
     material.diffuse = rampColor.rgb;
     material.alpha = rampColor.a;

package/Source/Shaders/Materials/ElevationRampMaterial.js

@@ -7,7 +7,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
     czm_material material = czm_getDefaultMaterial(materialInput);\n\
     float scaledHeight = clamp((materialInput.height - minimumHeight) / (maximumHeight - minimumHeight), 0.0, 1.0);\n\
-    vec4 rampColor = texture2D(image, vec2(scaledHeight, 0.5));\n\
+    vec4 rampColor = texture(image, vec2(scaledHeight, 0.5));\n\
     rampColor = czm_gammaCorrect(rampColor);\n\
     material.diffuse = rampColor.rgb;\n\
     material.alpha = rampColor.a;\n\

package/Source/Shaders/Materials/GridMaterial.glsl

@@ -20,8 +20,9 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
     scaledHeight = abs(scaledHeight - floor(scaledHeight + 0.5));
 
     float value;
-#ifdef GL_OES_standard_derivatives
+
     // Fuzz Factor - Controls blurriness of lines
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))
     const float fuzz = 1.2;
     vec2 thickness = (lineThickness * czm_pixelRatio) - 1.0;
 
@@ -33,7 +34,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
         smoothstep(dF.s * thickness.s, dF.s * (fuzz + thickness.s), scaledWidth),
         smoothstep(dF.t * thickness.t, dF.t * (fuzz + thickness.t), scaledHeight));
 #else
-    // Fuzz Factor - Controls blurriness of lines
+    // If no derivatives available (IE 10?), revert to view-dependent fuzz
     const float fuzz = 0.05;
 
     vec2 range = 0.5 - (lineThickness * 0.05);

package/Source/Shaders/Materials/GridMaterial.js

@@ -21,8 +21,9 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
     scaledHeight = abs(scaledHeight - floor(scaledHeight + 0.5));\n\
 \n\
     float value;\n\
-#ifdef GL_OES_standard_derivatives\n\
+\n\
     // Fuzz Factor - Controls blurriness of lines\n\
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))\n\
     const float fuzz = 1.2;\n\
     vec2 thickness = (lineThickness * czm_pixelRatio) - 1.0;\n\
 \n\
@@ -34,7 +35,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
         smoothstep(dF.s * thickness.s, dF.s * (fuzz + thickness.s), scaledWidth),\n\
         smoothstep(dF.t * thickness.t, dF.t * (fuzz + thickness.t), scaledHeight));\n\
 #else\n\
-    // Fuzz Factor - Controls blurriness of lines\n\
+    // If no derivatives available (IE 10?), revert to view-dependent fuzz\n\
     const float fuzz = 0.05;\n\
 \n\
     vec2 range = 0.5 - (lineThickness * 0.05);\n\

package/Source/Shaders/Materials/NormalMapMaterial.glsl

@@ -6,7 +6,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
 {
     czm_material material = czm_getDefaultMaterial(materialInput);
     
-    vec4 textureValue = texture2D(image, fract(repeat * materialInput.st));
+    vec4 textureValue = texture(image, fract(repeat * materialInput.st));
     vec3 normalTangentSpace = textureValue.channels;
     normalTangentSpace.xy = normalTangentSpace.xy * 2.0 - 1.0;
     normalTangentSpace.z = clamp(1.0 - strength, 0.1, 1.0);

package/Source/Shaders/Materials/NormalMapMaterial.js

@@ -7,7 +7,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
     czm_material material = czm_getDefaultMaterial(materialInput);\n\
     \n\
-    vec4 textureValue = texture2D(image, fract(repeat * materialInput.st));\n\
+    vec4 textureValue = texture(image, fract(repeat * materialInput.st));\n\
     vec3 normalTangentSpace = textureValue.channels;\n\
     normalTangentSpace.xy = normalTangentSpace.xy * 2.0 - 1.0;\n\
     normalTangentSpace.z = clamp(1.0 - strength, 0.1, 1.0);\n\

package/Source/Shaders/Materials/PolylineArrowMaterial.glsl

@@ -16,10 +16,11 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
 
     vec2 st = materialInput.st;
 
-#ifdef GL_OES_standard_derivatives
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))
     float base = 1.0 - abs(fwidth(st.s)) * 10.0 * czm_pixelRatio;
 #else
-    float base = 0.975; // 2.5% of the line will be the arrow head
+     // If no derivatives available (IE 10?), 2.5% of the line will be the arrow head
+    float base = 0.975;
 #endif
 
     vec2 center = vec2(1.0, 0.5);

package/Source/Shaders/Materials/PolylineArrowMaterial.js

@@ -17,10 +17,11 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 \n\
     vec2 st = materialInput.st;\n\
 \n\
-#ifdef GL_OES_standard_derivatives\n\
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))\n\
     float base = 1.0 - abs(fwidth(st.s)) * 10.0 * czm_pixelRatio;\n\
 #else\n\
-    float base = 0.975; // 2.5% of the line will be the arrow head\n\
+     // If no derivatives available (IE 10?), 2.5% of the line will be the arrow head\n\
+    float base = 0.975;\n\
 #endif\n\
 \n\
     vec2 center = vec2(1.0, 0.5);\n\

package/Source/Shaders/Materials/PolylineDashMaterial.glsl

@@ -2,7 +2,7 @@ uniform vec4 color;
 uniform vec4 gapColor;
 uniform float dashLength;
 uniform float dashPattern;
-varying float v_polylineAngle;
+in float v_polylineAngle;
 
 const float maskLength = 16.0;
 

package/Source/Shaders/Materials/PolylineDashMaterial.js

@@ -3,7 +3,7 @@ export default "uniform vec4 color;\n\
 uniform vec4 gapColor;\n\
 uniform float dashLength;\n\
 uniform float dashPattern;\n\
-varying float v_polylineAngle;\n\
+in float v_polylineAngle;\n\
 \n\
 const float maskLength = 16.0;\n\
 \n\

package/Source/Shaders/Materials/PolylineOutlineMaterial.glsl

@@ -2,7 +2,7 @@ uniform vec4 color;
 uniform vec4 outlineColor;
 uniform float outlineWidth;
 
-varying float v_width;
+in float v_width;
 
 czm_material czm_getMaterial(czm_materialInput materialInput)
 {

package/Source/Shaders/Materials/PolylineOutlineMaterial.js

@@ -3,7 +3,7 @@ export default "uniform vec4 color;\n\
 uniform vec4 outlineColor;\n\
 uniform float outlineWidth;\n\
 \n\
-varying float v_width;\n\
+in float v_width;\n\
 \n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\

package/Source/Shaders/Materials/SlopeRampMaterial.glsl

@@ -3,7 +3,7 @@ uniform sampler2D image;
 czm_material czm_getMaterial(czm_materialInput materialInput)
 {
     czm_material material = czm_getDefaultMaterial(materialInput);
-    vec4 rampColor = texture2D(image, vec2(materialInput.slope / (czm_pi / 2.0), 0.5));
+    vec4 rampColor = texture(image, vec2(materialInput.slope / (czm_pi / 2.0), 0.5));
     rampColor = czm_gammaCorrect(rampColor);
     material.diffuse = rampColor.rgb;
     material.alpha = rampColor.a;

package/Source/Shaders/Materials/SlopeRampMaterial.js

@@ -4,7 +4,7 @@ export default "uniform sampler2D image;\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
     czm_material material = czm_getDefaultMaterial(materialInput);\n\
-    vec4 rampColor = texture2D(image, vec2(materialInput.slope / (czm_pi / 2.0), 0.5));\n\
+    vec4 rampColor = texture(image, vec2(materialInput.slope / (czm_pi / 2.0), 0.5));\n\
     rampColor = czm_gammaCorrect(rampColor);\n\
     material.diffuse = rampColor.rgb;\n\
     material.alpha = rampColor.a;\n\

package/Source/Shaders/Materials/Water.glsl

@@ -20,7 +20,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
     // fade is a function of the distance from the fragment and the frequency of the waves
     float fade = max(1.0, (length(materialInput.positionToEyeEC) / 10000000000.0) * frequency * fadeFactor);
 
-    float specularMapValue = texture2D(specularMap, materialInput.st).r;
+    float specularMapValue = texture(specularMap, materialInput.st).r;
 
     // note: not using directional motion at this time, just set the angle to 0.0;
     vec4 noise = czm_getWaterNoise(normalMap, materialInput.st * frequency, time, 0.0);

package/Source/Shaders/Materials/Water.js

@@ -21,7 +21,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
     // fade is a function of the distance from the fragment and the frequency of the waves\n\
     float fade = max(1.0, (length(materialInput.positionToEyeEC) / 10000000000.0) * frequency * fadeFactor);\n\
 \n\
-    float specularMapValue = texture2D(specularMap, materialInput.st).r;\n\
+    float specularMapValue = texture(specularMap, materialInput.st).r;\n\
 \n\
     // note: not using directional motion at this time, just set the angle to 0.0;\n\
     vec4 noise = czm_getWaterNoise(normalMap, materialInput.st * frequency, time, 0.0);\n\