@cesium/engine 1.0.0 → 2.0.0

package/Source/Shaders/CloudNoiseFS.glsl

@@ -1,10 +1,7 @@
 uniform vec3 u_noiseTextureDimensions;
 uniform float u_noiseDetail;
 uniform vec3 u_noiseOffset;
-varying vec2 v_position;
-
-float textureSliceWidth = u_noiseTextureDimensions.x;
-float inverseNoiseTextureRows = u_noiseTextureDimensions.z;
+in vec2 v_position;
 
 float wrap(float value, float rangeLength) {
     if(value < 0.0) {
@@ -30,6 +27,7 @@ vec3 random3(vec3 p) {
 // Frequency corresponds to cell size.
 // The higher the frequency, the smaller the cell size.
 vec3 getWorleyCellPoint(vec3 centerCell, vec3 offset, float freq) {
+    float textureSliceWidth = u_noiseTextureDimensions.x;
     vec3 cell = centerCell + offset;
     cell = wrapVec(cell, textureSliceWidth / u_noiseDetail);
     cell += floor(u_noiseOffset / u_noiseDetail);
@@ -78,6 +76,8 @@ float worleyFBMNoise(vec3 p, float octaves, float scale) {
 }
 
 void main() {
+    float textureSliceWidth = u_noiseTextureDimensions.x;
+    float inverseNoiseTextureRows = u_noiseTextureDimensions.z;
     float x = mod(v_position.x, textureSliceWidth);
     float y = mod(v_position.y, textureSliceWidth);
     float sliceRow = floor(v_position.y / textureSliceWidth);
@@ -88,5 +88,5 @@ void main() {
     float worley0 = clamp(worleyFBMNoise(position, 3.0, 1.0), 0.0, 1.0);
     float worley1 = clamp(worleyFBMNoise(position, 3.0, 2.0), 0.0, 1.0);
     float worley2 = clamp(worleyFBMNoise(position, 3.0, 3.0), 0.0, 1.0);
-    gl_FragColor = vec4(worley0, worley1, worley2, 1.0);
+    out_FragColor = vec4(worley0, worley1, worley2, 1.0);
 }

package/Source/Shaders/CloudNoiseFS.js

@@ -2,10 +2,7 @@
 export default "uniform vec3 u_noiseTextureDimensions;\n\
 uniform float u_noiseDetail;\n\
 uniform vec3 u_noiseOffset;\n\
-varying vec2 v_position;\n\
-\n\
-float textureSliceWidth = u_noiseTextureDimensions.x;\n\
-float inverseNoiseTextureRows = u_noiseTextureDimensions.z;\n\
+in vec2 v_position;\n\
 \n\
 float wrap(float value, float rangeLength) {\n\
     if(value < 0.0) {\n\
@@ -31,6 +28,7 @@ vec3 random3(vec3 p) {\n\
 // Frequency corresponds to cell size.\n\
 // The higher the frequency, the smaller the cell size.\n\
 vec3 getWorleyCellPoint(vec3 centerCell, vec3 offset, float freq) {\n\
+    float textureSliceWidth = u_noiseTextureDimensions.x;\n\
     vec3 cell = centerCell + offset;\n\
     cell = wrapVec(cell, textureSliceWidth / u_noiseDetail);\n\
     cell += floor(u_noiseOffset / u_noiseDetail);\n\
@@ -79,6 +77,8 @@ float worleyFBMNoise(vec3 p, float octaves, float scale) {\n\
 }\n\
 \n\
 void main() {\n\
+    float textureSliceWidth = u_noiseTextureDimensions.x;\n\
+    float inverseNoiseTextureRows = u_noiseTextureDimensions.z;\n\
     float x = mod(v_position.x, textureSliceWidth);\n\
     float y = mod(v_position.y, textureSliceWidth);\n\
     float sliceRow = floor(v_position.y / textureSliceWidth);\n\
@@ -89,6 +89,6 @@ void main() {\n\
     float worley0 = clamp(worleyFBMNoise(position, 3.0, 1.0), 0.0, 1.0);\n\
     float worley1 = clamp(worleyFBMNoise(position, 3.0, 2.0), 0.0, 1.0);\n\
     float worley2 = clamp(worleyFBMNoise(position, 3.0, 3.0), 0.0, 1.0);\n\
-    gl_FragColor = vec4(worley0, worley1, worley2, 1.0);\n\
+    out_FragColor = vec4(worley0, worley1, worley2, 1.0);\n\
 }\n\
 ";

package/Source/Shaders/CloudNoiseVS.glsl

@@ -1,7 +1,7 @@
 uniform vec3 u_noiseTextureDimensions;
-attribute vec2 position;
+in vec2 position;
 
-varying vec2 v_position;
+out vec2 v_position;
 
 void main()
 {

package/Source/Shaders/CloudNoiseVS.js

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

package/Source/Shaders/CompareAndPackTranslucentDepth.glsl

@@ -1,12 +1,12 @@
 uniform sampler2D u_opaqueDepthTexture;
 uniform sampler2D u_translucentDepthTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
-    float opaqueDepth = texture2D(u_opaqueDepthTexture, v_textureCoordinates).r;
-    float translucentDepth = texture2D(u_translucentDepthTexture, v_textureCoordinates).r;
+    float opaqueDepth = texture(u_opaqueDepthTexture, v_textureCoordinates).r;
+    float translucentDepth = texture(u_translucentDepthTexture, v_textureCoordinates).r;
     translucentDepth = czm_branchFreeTernary(translucentDepth > opaqueDepth, 1.0, translucentDepth);
-    gl_FragColor = czm_packDepth(translucentDepth);
+    out_FragColor = czm_packDepth(translucentDepth);
 }

package/Source/Shaders/CompareAndPackTranslucentDepth.js

@@ -2,13 +2,13 @@
 export default "uniform sampler2D u_opaqueDepthTexture;\n\
 uniform sampler2D u_translucentDepthTexture;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main()\n\
 {\n\
-    float opaqueDepth = texture2D(u_opaqueDepthTexture, v_textureCoordinates).r;\n\
-    float translucentDepth = texture2D(u_translucentDepthTexture, v_textureCoordinates).r;\n\
+    float opaqueDepth = texture(u_opaqueDepthTexture, v_textureCoordinates).r;\n\
+    float translucentDepth = texture(u_translucentDepthTexture, v_textureCoordinates).r;\n\
     translucentDepth = czm_branchFreeTernary(translucentDepth > opaqueDepth, 1.0, translucentDepth);\n\
-    gl_FragColor = czm_packDepth(translucentDepth);\n\
+    out_FragColor = czm_packDepth(translucentDepth);\n\
 }\n\
 ";

package/Source/Shaders/CompositeOITFS.glsl

@@ -8,13 +8,13 @@ uniform sampler2D u_opaque;
 uniform sampler2D u_accumulation;
 uniform sampler2D u_revealage;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
-    vec4 opaque = texture2D(u_opaque, v_textureCoordinates);
-    vec4 accum = texture2D(u_accumulation, v_textureCoordinates);
-    float r = texture2D(u_revealage, v_textureCoordinates).r;
+    vec4 opaque = texture(u_opaque, v_textureCoordinates);
+    vec4 accum = texture(u_accumulation, v_textureCoordinates);
+    float r = texture(u_revealage, v_textureCoordinates).r;
 
 #ifdef MRT
     vec4 transparent = vec4(accum.rgb / clamp(r, 1e-4, 5e4), accum.a);
@@ -22,10 +22,10 @@ void main()
     vec4 transparent = vec4(accum.rgb / clamp(accum.a, 1e-4, 5e4), r);
 #endif
 
-    gl_FragColor = (1.0 - transparent.a) * transparent + transparent.a * opaque;
+    out_FragColor = (1.0 - transparent.a) * transparent + transparent.a * opaque;
 
     if (opaque != czm_backgroundColor)
     {
-        gl_FragColor.a = 1.0;
+        out_FragColor.a = 1.0;
     }
 }

package/Source/Shaders/CompositeOITFS.js

@@ -9,13 +9,13 @@ uniform sampler2D u_opaque;\n\
 uniform sampler2D u_accumulation;\n\
 uniform sampler2D u_revealage;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main()\n\
 {\n\
-    vec4 opaque = texture2D(u_opaque, v_textureCoordinates);\n\
-    vec4 accum = texture2D(u_accumulation, v_textureCoordinates);\n\
-    float r = texture2D(u_revealage, v_textureCoordinates).r;\n\
+    vec4 opaque = texture(u_opaque, v_textureCoordinates);\n\
+    vec4 accum = texture(u_accumulation, v_textureCoordinates);\n\
+    float r = texture(u_revealage, v_textureCoordinates).r;\n\
 \n\
 #ifdef MRT\n\
     vec4 transparent = vec4(accum.rgb / clamp(r, 1e-4, 5e4), accum.a);\n\
@@ -23,11 +23,11 @@ void main()\n\
     vec4 transparent = vec4(accum.rgb / clamp(accum.a, 1e-4, 5e4), r);\n\
 #endif\n\
 \n\
-    gl_FragColor = (1.0 - transparent.a) * transparent + transparent.a * opaque;\n\
+    out_FragColor = (1.0 - transparent.a) * transparent + transparent.a * opaque;\n\
 \n\
     if (opaque != czm_backgroundColor)\n\
     {\n\
-        gl_FragColor.a = 1.0;\n\
+        out_FragColor.a = 1.0;\n\
     }\n\
 }\n\
 ";

package/Source/Shaders/DepthPlaneFS.glsl

@@ -1,4 +1,4 @@
-varying vec4 positionEC;
+in vec4 positionEC;
 
 void main()
 {
@@ -25,7 +25,7 @@ void main()
     czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid_center, czm_ellipsoidInverseRadii);
     if (!czm_isEmpty(intersection))
     {
-        gl_FragColor = vec4(1.0, 1.0, 0.0, 1.0);
+        out_FragColor = vec4(1.0, 1.0, 0.0, 1.0);
     }
     else
     {

package/Source/Shaders/DepthPlaneFS.js

@@ -1,5 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec4 positionEC;\n\
+export default "in vec4 positionEC;\n\
 \n\
 void main()\n\
 {\n\
@@ -26,7 +26,7 @@ void main()\n\
     czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid_center, czm_ellipsoidInverseRadii);\n\
     if (!czm_isEmpty(intersection))\n\
     {\n\
-        gl_FragColor = vec4(1.0, 1.0, 0.0, 1.0);\n\
+        out_FragColor = vec4(1.0, 1.0, 0.0, 1.0);\n\
     }\n\
     else\n\
     {\n\

package/Source/Shaders/DepthPlaneVS.glsl

@@ -1,6 +1,6 @@
-attribute vec4 position;
+in vec4 position;
 
-varying vec4 positionEC;
+out vec4 positionEC;
 
 void main()
 {

package/Source/Shaders/DepthPlaneVS.js

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

package/Source/Shaders/EllipsoidFS.glsl

@@ -1,13 +1,7 @@
-#ifdef WRITE_DEPTH
-#ifdef GL_EXT_frag_depth
-#extension GL_EXT_frag_depth : enable
-#endif
-#endif
-
 uniform vec3 u_radii;
 uniform vec3 u_oneOverEllipsoidRadiiSquared;
 
-varying vec3 v_positionEC;
+in vec3 v_positionEC;
 
 vec4 computeEllipsoidColor(czm_ray ray, float intersection, float side)
 {
@@ -89,11 +83,10 @@ void main()
     // If the viewer either is inside or can see inside, compute insideFaceColor, with normals facing inward.
     vec4 insideFaceColor = (outsideFaceColor.a < 1.0) ? computeEllipsoidColor(ray, intersection.stop, -1.0) : vec4(0.0);
 
-    gl_FragColor = mix(insideFaceColor, outsideFaceColor, outsideFaceColor.a);
-    gl_FragColor.a = 1.0 - (1.0 - insideFaceColor.a) * (1.0 - outsideFaceColor.a);
+    out_FragColor = mix(insideFaceColor, outsideFaceColor, outsideFaceColor.a);
+    out_FragColor.a = 1.0 - (1.0 - insideFaceColor.a) * (1.0 - outsideFaceColor.a);
 
-#ifdef WRITE_DEPTH
-#ifdef GL_EXT_frag_depth
+#if (defined(WRITE_DEPTH) && (__VERSION__ == 300 || defined(GL_EXT_frag_depth)))
     t = (intersection.start != 0.0) ? intersection.start : intersection.stop;
     vec3 positionEC = czm_pointAlongRay(ray, t);
     vec4 positionCC = czm_projection * vec4(positionEC, 1.0);
@@ -105,8 +98,7 @@ void main()
     float n = czm_depthRange.near;
     float f = czm_depthRange.far;
 
-    gl_FragDepthEXT = (z * (f - n) + f + n) * 0.5;
-#endif
+    gl_FragDepth = (z * (f - n) + f + n) * 0.5;
 #endif
 #endif
 }

package/Source/Shaders/EllipsoidFS.js

@@ -1,14 +1,8 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "#ifdef WRITE_DEPTH\n\
-#ifdef GL_EXT_frag_depth\n\
-#extension GL_EXT_frag_depth : enable\n\
-#endif\n\
-#endif\n\
-\n\
-uniform vec3 u_radii;\n\
+export default "uniform vec3 u_radii;\n\
 uniform vec3 u_oneOverEllipsoidRadiiSquared;\n\
 \n\
-varying vec3 v_positionEC;\n\
+in vec3 v_positionEC;\n\
 \n\
 vec4 computeEllipsoidColor(czm_ray ray, float intersection, float side)\n\
 {\n\
@@ -90,11 +84,10 @@ void main()\n\
     // If the viewer either is inside or can see inside, compute insideFaceColor, with normals facing inward.\n\
     vec4 insideFaceColor = (outsideFaceColor.a < 1.0) ? computeEllipsoidColor(ray, intersection.stop, -1.0) : vec4(0.0);\n\
 \n\
-    gl_FragColor = mix(insideFaceColor, outsideFaceColor, outsideFaceColor.a);\n\
-    gl_FragColor.a = 1.0 - (1.0 - insideFaceColor.a) * (1.0 - outsideFaceColor.a);\n\
+    out_FragColor = mix(insideFaceColor, outsideFaceColor, outsideFaceColor.a);\n\
+    out_FragColor.a = 1.0 - (1.0 - insideFaceColor.a) * (1.0 - outsideFaceColor.a);\n\
 \n\
-#ifdef WRITE_DEPTH\n\
-#ifdef GL_EXT_frag_depth\n\
+#if (defined(WRITE_DEPTH) && (__VERSION__ == 300 || defined(GL_EXT_frag_depth)))\n\
     t = (intersection.start != 0.0) ? intersection.start : intersection.stop;\n\
     vec3 positionEC = czm_pointAlongRay(ray, t);\n\
     vec4 positionCC = czm_projection * vec4(positionEC, 1.0);\n\
@@ -106,8 +99,7 @@ void main()\n\
     float n = czm_depthRange.near;\n\
     float f = czm_depthRange.far;\n\
 \n\
-    gl_FragDepthEXT = (z * (f - n) + f + n) * 0.5;\n\
-#endif\n\
+    gl_FragDepth = (z * (f - n) + f + n) * 0.5;\n\
 #endif\n\
 #endif\n\
 }\n\

package/Source/Shaders/EllipsoidVS.glsl

@@ -1,8 +1,8 @@
-attribute vec3 position;
+in vec3 position;
 
 uniform vec3 u_radii;
 
-varying vec3 v_positionEC;
+out vec3 v_positionEC;
 
 void main()
 {

package/Source/Shaders/EllipsoidVS.js

@@ -1,9 +1,9 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position;\n\
+export default "in vec3 position;\n\
 \n\
 uniform vec3 u_radii;\n\
 \n\
-varying vec3 v_positionEC;\n\
+out vec3 v_positionEC;\n\
 \n\
 void main()\n\
 {\n\

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

@@ -102,28 +102,29 @@ uniform vec4 u_undergroundColorAlphaByDistance;
 
 #ifdef ENABLE_VERTEX_LIGHTING
 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)
@@ -194,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;
 
@@ -375,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)
     {
@@ -405,7 +406,7 @@ void main()
 #endif
 
 #ifdef ENABLE_VERTEX_LIGHTING
-    float diffuseIntensity = clamp(czm_getLambertDiffuse(czm_lightDirectionEC, normalize(v_normalEC)) * u_lambertDiffuseMultiplier + 0.3, 0.0, 1.0);
+    float diffuseIntensity = clamp(czm_getLambertDiffuse(czm_lightDirectionEC, normalize(v_normalEC)) * u_lambertDiffuseMultiplier + u_vertexShadowDarkness, 0.0, 1.0);
     vec4 finalColor = vec4(color.rgb * czm_lightColor * diffuseIntensity, color.a);
 #elif defined(ENABLE_DAYNIGHT_SHADING)
     float diffuseIntensity = clamp(czm_getLambertDiffuse(czm_lightDirectionEC, normalEC) * 5.0 + 0.3, 0.0, 1.0);
@@ -544,7 +545,7 @@ void main()
     }
 #endif
     
-    gl_FragColor =  finalColor;
+    out_FragColor =  finalColor;
 }
 
 

package/Source/Shaders/GlobeFS.js

@@ -103,28 +103,29 @@ uniform vec4 u_undergroundColorAlphaByDistance;\n\
 \n\
 #ifdef ENABLE_VERTEX_LIGHTING\n\
 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\
@@ -195,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\
@@ -376,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\
@@ -406,7 +407,7 @@ void main()\n\
 #endif\n\
 \n\
 #ifdef ENABLE_VERTEX_LIGHTING\n\
-    float diffuseIntensity = clamp(czm_getLambertDiffuse(czm_lightDirectionEC, normalize(v_normalEC)) * u_lambertDiffuseMultiplier + 0.3, 0.0, 1.0);\n\
+    float diffuseIntensity = clamp(czm_getLambertDiffuse(czm_lightDirectionEC, normalize(v_normalEC)) * u_lambertDiffuseMultiplier + u_vertexShadowDarkness, 0.0, 1.0);\n\
     vec4 finalColor = vec4(color.rgb * czm_lightColor * diffuseIntensity, color.a);\n\
 #elif defined(ENABLE_DAYNIGHT_SHADING)\n\
     float diffuseIntensity = clamp(czm_getLambertDiffuse(czm_lightDirectionEC, normalEC) * 5.0 + 0.3, 0.0, 1.0);\n\
@@ -545,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.