@cesium/engine 1.1.0 → 2.1.0

package/Source/Shaders/Appearances/AllMaterialAppearanceVS.js

@@ -1,17 +1,17 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec3 normal;\n\
-attribute vec3 tangent;\n\
-attribute vec3 bitangent;\n\
-attribute vec2 st;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 normal;\n\
+in vec3 tangent;\n\
+in vec3 bitangent;\n\
+in vec2 st;\n\
+in float batchId;\n\
 \n\
-varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
-varying vec3 v_tangentEC;\n\
-varying vec3 v_bitangentEC;\n\
-varying vec2 v_st;\n\
+out vec3 v_positionEC;\n\
+out vec3 v_normalEC;\n\
+out vec3 v_tangentEC;\n\
+out vec3 v_bitangentEC;\n\
+out vec2 v_st;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/BasicMaterialAppearanceFS.glsl

@@ -1,5 +1,5 @@
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
+in vec3 v_positionEC;
+in vec3 v_normalEC;
 
 void main()
 {
@@ -16,8 +16,8 @@ void main()
     czm_material material = czm_getMaterial(materialInput);
 
 #ifdef FLAT
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);
 #else
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
 #endif
 }

package/Source/Shaders/Appearances/BasicMaterialAppearanceFS.js

@@ -1,6 +1,6 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
+export default "in vec3 v_positionEC;\n\
+in vec3 v_normalEC;\n\
 \n\
 void main()\n\
 {\n\
@@ -17,9 +17,9 @@ void main()\n\
     czm_material material = czm_getMaterial(materialInput);\n\
 \n\
 #ifdef FLAT\n\
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
 #else\n\
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
 #endif\n\
 }\n\
 ";

package/Source/Shaders/Appearances/BasicMaterialAppearanceVS.glsl

@@ -1,10 +1,10 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec3 normal;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec3 normal;
+in float batchId;
 
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
+out vec3 v_positionEC;
+out vec3 v_normalEC;
 
 void main()
 {

package/Source/Shaders/Appearances/BasicMaterialAppearanceVS.js

@@ -1,11 +1,11 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec3 normal;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 normal;\n\
+in float batchId;\n\
 \n\
-varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
+out vec3 v_positionEC;\n\
+out vec3 v_normalEC;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/EllipsoidSurfaceAppearanceFS.glsl

@@ -1,6 +1,6 @@
-varying vec3 v_positionMC;
-varying vec3 v_positionEC;
-varying vec2 v_st;
+in vec3 v_positionMC;
+in vec3 v_positionEC;
+in vec2 v_st;
 
 void main()
 {
@@ -26,8 +26,8 @@ void main()
     czm_material material = czm_getMaterial(materialInput);
 
 #ifdef FLAT
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);
 #else
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
 #endif
 }

package/Source/Shaders/Appearances/EllipsoidSurfaceAppearanceFS.js

@@ -1,7 +1,7 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec3 v_positionMC;\n\
-varying vec3 v_positionEC;\n\
-varying vec2 v_st;\n\
+export default "in vec3 v_positionMC;\n\
+in vec3 v_positionEC;\n\
+in vec2 v_st;\n\
 \n\
 void main()\n\
 {\n\
@@ -27,9 +27,9 @@ void main()\n\
     czm_material material = czm_getMaterial(materialInput);\n\
 \n\
 #ifdef FLAT\n\
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
 #else\n\
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
 #endif\n\
 }\n\
 ";

package/Source/Shaders/Appearances/EllipsoidSurfaceAppearanceVS.glsl

@@ -1,11 +1,11 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec2 st;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec2 st;
+in float batchId;
 
-varying vec3 v_positionMC;
-varying vec3 v_positionEC;
-varying vec2 v_st;
+out vec3 v_positionMC;
+out vec3 v_positionEC;
+out vec2 v_st;
 
 void main()
 {

package/Source/Shaders/Appearances/EllipsoidSurfaceAppearanceVS.js

@@ -1,12 +1,12 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec2 st;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec2 st;\n\
+in float batchId;\n\
 \n\
-varying vec3 v_positionMC;\n\
-varying vec3 v_positionEC;\n\
-varying vec2 v_st;\n\
+out vec3 v_positionMC;\n\
+out vec3 v_positionEC;\n\
+out vec2 v_st;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/PerInstanceColorAppearanceFS.glsl

@@ -1,6 +1,6 @@
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
-varying vec4 v_color;
+in vec3 v_positionEC;
+in vec3 v_normalEC;
+in vec4 v_color;
 
 void main()
 {
@@ -20,5 +20,5 @@ void main()
     material.diffuse = color.rgb;
     material.alpha = color.a;
 
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
 }

package/Source/Shaders/Appearances/PerInstanceColorAppearanceFS.js

@@ -1,7 +1,7 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
-varying vec4 v_color;\n\
+export default "in vec3 v_positionEC;\n\
+in vec3 v_normalEC;\n\
+in vec4 v_color;\n\
 \n\
 void main()\n\
 {\n\
@@ -21,6 +21,6 @@ void main()\n\
     material.diffuse = color.rgb;\n\
     material.alpha = color.a;\n\
 \n\
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
 }\n\
 ";

package/Source/Shaders/Appearances/PerInstanceColorAppearanceVS.glsl

@@ -1,12 +1,12 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec3 normal;
-attribute vec4 color;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec3 normal;
+in vec4 color;
+in float batchId;
 
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
-varying vec4 v_color;
+out vec3 v_positionEC;
+out vec3 v_normalEC;
+out vec4 v_color;
 
 void main()
 {

package/Source/Shaders/Appearances/PerInstanceColorAppearanceVS.js

@@ -1,13 +1,13 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec3 normal;\n\
-attribute vec4 color;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 normal;\n\
+in vec4 color;\n\
+in float batchId;\n\
 \n\
-varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
-varying vec4 v_color;\n\
+out vec3 v_positionEC;\n\
+out vec3 v_normalEC;\n\
+out vec4 v_color;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/PerInstanceFlatColorAppearanceFS.glsl

@@ -1,6 +1,6 @@
-varying vec4 v_color;
+in vec4 v_color;
 
 void main()
 {
-    gl_FragColor = czm_gammaCorrect(v_color);
+    out_FragColor = czm_gammaCorrect(v_color);
 }

package/Source/Shaders/Appearances/PerInstanceFlatColorAppearanceFS.js

@@ -1,8 +1,8 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec4 v_color;\n\
+export default "in vec4 v_color;\n\
 \n\
 void main()\n\
 {\n\
-    gl_FragColor = czm_gammaCorrect(v_color);\n\
+    out_FragColor = czm_gammaCorrect(v_color);\n\
 }\n\
 ";

package/Source/Shaders/Appearances/PerInstanceFlatColorAppearanceVS.glsl

@@ -1,9 +1,9 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec4 color;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec4 color;
+in float batchId;
 
-varying vec4 v_color;
+out vec4 v_color;
 
 void main()
 {

package/Source/Shaders/Appearances/PerInstanceFlatColorAppearanceVS.js

@@ -1,10 +1,10 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec4 color;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec4 color;\n\
+in float batchId;\n\
 \n\
-varying vec4 v_color;\n\
+out vec4 v_color;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/PolylineColorAppearanceVS.glsl

@@ -1,14 +1,14 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec3 prevPosition3DHigh;
-attribute vec3 prevPosition3DLow;
-attribute vec3 nextPosition3DHigh;
-attribute vec3 nextPosition3DLow;
-attribute vec2 expandAndWidth;
-attribute vec4 color;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec3 prevPosition3DHigh;
+in vec3 prevPosition3DLow;
+in vec3 nextPosition3DHigh;
+in vec3 nextPosition3DLow;
+in vec2 expandAndWidth;
+in vec4 color;
+in float batchId;
 
-varying vec4 v_color;
+out vec4 v_color;
 
 void main()
 {

package/Source/Shaders/Appearances/PolylineColorAppearanceVS.js

@@ -1,15 +1,15 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec3 prevPosition3DHigh;\n\
-attribute vec3 prevPosition3DLow;\n\
-attribute vec3 nextPosition3DHigh;\n\
-attribute vec3 nextPosition3DLow;\n\
-attribute vec2 expandAndWidth;\n\
-attribute vec4 color;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 prevPosition3DHigh;\n\
+in vec3 prevPosition3DLow;\n\
+in vec3 nextPosition3DHigh;\n\
+in vec3 nextPosition3DLow;\n\
+in vec2 expandAndWidth;\n\
+in vec4 color;\n\
+in float batchId;\n\
 \n\
-varying vec4 v_color;\n\
+out vec4 v_color;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/PolylineMaterialAppearanceVS.glsl

@@ -1,16 +1,16 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec3 prevPosition3DHigh;
-attribute vec3 prevPosition3DLow;
-attribute vec3 nextPosition3DHigh;
-attribute vec3 nextPosition3DLow;
-attribute vec2 expandAndWidth;
-attribute vec2 st;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec3 prevPosition3DHigh;
+in vec3 prevPosition3DLow;
+in vec3 nextPosition3DHigh;
+in vec3 nextPosition3DLow;
+in vec2 expandAndWidth;
+in vec2 st;
+in float batchId;
 
-varying float v_width;
-varying vec2 v_st;
-varying float v_polylineAngle;
+out float v_width;
+out vec2 v_st;
+out float v_polylineAngle;
 
 void main()
 {

package/Source/Shaders/Appearances/PolylineMaterialAppearanceVS.js

@@ -1,17 +1,17 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec3 prevPosition3DHigh;\n\
-attribute vec3 prevPosition3DLow;\n\
-attribute vec3 nextPosition3DHigh;\n\
-attribute vec3 nextPosition3DLow;\n\
-attribute vec2 expandAndWidth;\n\
-attribute vec2 st;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 prevPosition3DHigh;\n\
+in vec3 prevPosition3DLow;\n\
+in vec3 nextPosition3DHigh;\n\
+in vec3 nextPosition3DLow;\n\
+in vec2 expandAndWidth;\n\
+in vec2 st;\n\
+in float batchId;\n\
 \n\
-varying float v_width;\n\
-varying vec2 v_st;\n\
-varying float v_polylineAngle;\n\
+out float v_width;\n\
+out vec2 v_st;\n\
+out float v_polylineAngle;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/TexturedMaterialAppearanceFS.glsl

@@ -1,6 +1,6 @@
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
-varying vec2 v_st;
+in vec3 v_positionEC;
+in vec3 v_normalEC;
+in vec2 v_st;
 
 void main()
 {
@@ -18,8 +18,8 @@ void main()
     czm_material material = czm_getMaterial(materialInput);
 
 #ifdef FLAT
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);
 #else
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
 #endif
 }

package/Source/Shaders/Appearances/TexturedMaterialAppearanceFS.js

@@ -1,7 +1,7 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
-varying vec2 v_st;\n\
+export default "in vec3 v_positionEC;\n\
+in vec3 v_normalEC;\n\
+in vec2 v_st;\n\
 \n\
 void main()\n\
 {\n\
@@ -19,9 +19,9 @@ void main()\n\
     czm_material material = czm_getMaterial(materialInput);\n\
 \n\
 #ifdef FLAT\n\
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
 #else\n\
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
 #endif\n\
 }\n\
 ";

package/Source/Shaders/Appearances/TexturedMaterialAppearanceVS.glsl

@@ -1,12 +1,12 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec3 normal;
-attribute vec2 st;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec3 normal;
+in vec2 st;
+in float batchId;
 
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
-varying vec2 v_st;
+out vec3 v_positionEC;
+out vec3 v_normalEC;
+out vec2 v_st;
 
 void main()
 {

package/Source/Shaders/Appearances/TexturedMaterialAppearanceVS.js

@@ -1,13 +1,13 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec3 normal;\n\
-attribute vec2 st;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 normal;\n\
+in vec2 st;\n\
+in float batchId;\n\
 \n\
-varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
-varying vec2 v_st;\n\
+out vec3 v_positionEC;\n\
+out vec3 v_normalEC;\n\
+out vec2 v_st;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/BillboardCollectionFS.glsl

@@ -8,20 +8,20 @@ uniform sampler2D u_atlas;
 uniform vec4 u_highlightColor;
 #endif
 
-varying vec2 v_textureCoordinates;
-varying vec4 v_pickColor;
-varying vec4 v_color;
+in vec2 v_textureCoordinates;
+in vec4 v_pickColor;
+in vec4 v_color;
 
 #ifdef SDF
-varying vec4 v_outlineColor;
-varying float v_outlineWidth;
+in vec4 v_outlineColor;
+in float v_outlineWidth;
 #endif
 
 #ifdef FRAGMENT_DEPTH_CHECK
-varying vec4 v_textureCoordinateBounds;                  // the min and max x and y values for the texture coordinates
-varying vec4 v_originTextureCoordinateAndTranslate;      // texture coordinate at the origin, billboard translate (used for label glyphs)
-varying vec4 v_compressed;                               // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize
-varying mat2 v_rotationMatrix;
+in vec4 v_textureCoordinateBounds;                  // the min and max x and y values for the texture coordinates
+in vec4 v_originTextureCoordinateAndTranslate;      // texture coordinate at the origin, billboard translate (used for label glyphs)
+in vec4 v_compressed;                               // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize
+in mat2 v_rotationMatrix;
 
 const float SHIFT_LEFT12 = 4096.0;
 const float SHIFT_LEFT1 = 2.0;
@@ -45,7 +45,7 @@ float getGlobeDepth(vec2 adjustedST, vec2 depthLookupST, bool applyTranslate, ve
     }
 
     vec2 st = ((lookupVector - translation + labelOffset) + gl_FragCoord.xy) / czm_viewport.zw;
-    float logDepthOrDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, st));
+    float logDepthOrDepth = czm_unpackDepth(texture(czm_globeDepthTexture, st));
 
     if (logDepthOrDepth == 0.0)
     {
@@ -63,7 +63,7 @@ float getGlobeDepth(vec2 adjustedST, vec2 depthLookupST, bool applyTranslate, ve
 // Get the distance from the edge of a glyph at a given position sampling an SDF texture.
 float getDistance(vec2 position)
 {
-    return texture2D(u_atlas, position).r;
+    return texture(u_atlas, position).r;
 }
 
 // Samples the sdf texture at the given position and produces a color based on the fill color and the outline.
@@ -90,7 +90,7 @@ vec4 getSDFColor(vec2 position, float outlineWidth, vec4 outlineColor, float smo
 
 void main()
 {
-    vec4 color = texture2D(u_atlas, v_textureCoordinates);
+    vec4 color = texture(u_atlas, v_textureCoordinates);
 
 #ifdef SDF
     float outlineWidth = v_outlineWidth;
@@ -99,7 +99,7 @@ void main()
     // Get the current distance
     float distance = getDistance(v_textureCoordinates);
 
-#ifdef GL_OES_standard_derivatives
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))
     float smoothing = fwidth(distance);
     // Get an offset that is approximately half the distance to the neighbor pixels
     // 0.354 is approximately half of 1/sqrt(2)
@@ -117,7 +117,7 @@ void main()
     // Equally weight the center sample and the 4 neighboring samples
     color = (center + color1 + color2 + color3 + color4)/5.0;
 #else
-    // Just do a single sample
+    // If no derivatives available (IE 10?), just do a single sample
     float smoothing = 1.0/32.0;
     color = getSDFColor(v_textureCoordinates, outlineWidth, outlineColor, smoothing);
 #endif
@@ -153,7 +153,7 @@ void main()
 #ifdef VECTOR_TILE
     color *= u_highlightColor;
 #endif
-    gl_FragColor = color;
+    out_FragColor = color;
 
 #ifdef LOG_DEPTH
     czm_writeLogDepth();