cesium 0.13.2 → 0.14.0

data/app/assets/javascripts/Shaders/CentralBodyFS.js

@@ -2,7 +2,12 @@
 /*global define*/
 define(function() {
     "use strict";
-    return "#if TEXTURE_UNITS > 0\n\
+    return "//#define SHOW_TILE_BOUNDARIES\n\
+//#define SHOW_TEXTURE_BOUNDARIES\n\
+\n\
+uniform float u_morphTime;\n\
+\n\
+#if TEXTURE_UNITS > 0\n\
 uniform sampler2D u_dayTextures[TEXTURE_UNITS];\n\
 uniform vec4 u_dayTextureTranslationAndScale[TEXTURE_UNITS];\n\
 uniform float u_dayTextureAlpha[TEXTURE_UNITS];\n\
@@ -13,70 +18,198 @@ uniform float u_dayTextureSaturation[TEXTURE_UNITS];\n\
 uniform float u_dayTextureOneOverGamma[TEXTURE_UNITS];\n\
 uniform vec4 u_dayTextureTexCoordsExtent[TEXTURE_UNITS];\n\
 #endif\n\
+\n\
+#ifdef SHOW_REFLECTIVE_OCEAN\n\
+uniform sampler2D u_waterMask;\n\
+uniform vec4 u_waterMaskTranslationAndScale;\n\
+uniform float u_zoomedOutOceanSpecularIntensity;\n\
+#endif\n\
+\n\
+#ifdef SHOW_OCEAN_WAVES\n\
+uniform sampler2D u_oceanNormalMap;\n\
+#endif\n\
+\n\
 varying vec3 v_positionMC;\n\
 varying vec3 v_positionEC;\n\
 varying vec2 v_textureCoordinates;\n\
+\n\
 vec3 sampleAndBlend(\n\
-vec3 previousColor,\n\
-sampler2D texture,\n\
-vec2 tileTextureCoordinates,\n\
-vec4 textureCoordinateExtent,\n\
-vec4 textureCoordinateTranslationAndScale,\n\
-float textureAlpha,\n\
-float textureBrightness,\n\
-float textureContrast,\n\
-float textureHue,\n\
-float textureSaturation,\n\
-float textureOneOverGamma)\n\
+    vec3 previousColor,\n\
+    sampler2D texture,\n\
+    vec2 tileTextureCoordinates,\n\
+    vec4 textureCoordinateExtent,\n\
+    vec4 textureCoordinateTranslationAndScale,\n\
+    float textureAlpha,\n\
+    float textureBrightness,\n\
+    float textureContrast,\n\
+    float textureHue,\n\
+    float textureSaturation,\n\
+    float textureOneOverGamma)\n\
 {\n\
-vec2 alphaMultiplier = step(textureCoordinateExtent.st, tileTextureCoordinates);\n\
-textureAlpha = textureAlpha * alphaMultiplier.x * alphaMultiplier.y;\n\
-alphaMultiplier = step(vec2(0.0), textureCoordinateExtent.pq - tileTextureCoordinates);\n\
-textureAlpha = textureAlpha * alphaMultiplier.x * alphaMultiplier.y;\n\
-vec2 translation = textureCoordinateTranslationAndScale.xy;\n\
-vec2 scale = textureCoordinateTranslationAndScale.zw;\n\
-vec2 textureCoordinates = tileTextureCoordinates * scale + translation;\n\
-vec4 sample = texture2D(texture, textureCoordinates);\n\
-vec3 color = sample.rgb;\n\
-float alpha = sample.a;\n\
+    // This crazy step stuff sets the alpha to 0.0 if this following condition is true:\n\
+    //    tileTextureCoordinates.s < textureCoordinateExtent.s ||\n\
+    //    tileTextureCoordinates.s > textureCoordinateExtent.p ||\n\
+    //    tileTextureCoordinates.t < textureCoordinateExtent.t ||\n\
+    //    tileTextureCoordinates.t > textureCoordinateExtent.q\n\
+    // In other words, the alpha is zero if the fragment is outside the extent\n\
+    // covered by this texture.  Would an actual 'if' yield better performance?\n\
+    vec2 alphaMultiplier = step(textureCoordinateExtent.st, tileTextureCoordinates); \n\
+    textureAlpha = textureAlpha * alphaMultiplier.x * alphaMultiplier.y;\n\
+    \n\
+    alphaMultiplier = step(vec2(0.0), textureCoordinateExtent.pq - tileTextureCoordinates);\n\
+    textureAlpha = textureAlpha * alphaMultiplier.x * alphaMultiplier.y;\n\
+    \n\
+    vec2 translation = textureCoordinateTranslationAndScale.xy;\n\
+    vec2 scale = textureCoordinateTranslationAndScale.zw;\n\
+    vec2 textureCoordinates = tileTextureCoordinates * scale + translation;\n\
+    vec4 sample = texture2D(texture, textureCoordinates);\n\
+    vec3 color = sample.rgb;\n\
+    float alpha = sample.a;\n\
+    \n\
 #ifdef APPLY_BRIGHTNESS\n\
-color = mix(vec3(0.0, 0.0, 0.0), color, textureBrightness);\n\
+    color = mix(vec3(0.0), color, textureBrightness);\n\
 #endif\n\
+\n\
 #ifdef APPLY_CONTRAST\n\
-color = mix(vec3(0.5, 0.5, 0.5), color, textureContrast);\n\
+    color = mix(vec3(0.5), color, textureContrast);\n\
 #endif\n\
+\n\
 #ifdef APPLY_HUE\n\
-color = czm_hue(color, textureHue);\n\
+    color = czm_hue(color, textureHue);\n\
 #endif\n\
+\n\
 #ifdef APPLY_SATURATION\n\
-color = czm_saturation(color, textureSaturation);\n\
+    color = czm_saturation(color, textureSaturation);\n\
 #endif\n\
+\n\
 #ifdef APPLY_GAMMA\n\
-color = pow(color, vec3(textureOneOverGamma));\n\
+    color = pow(color, vec3(textureOneOverGamma));\n\
 #endif\n\
+\n\
 #ifdef SHOW_TEXTURE_BOUNDARIES\n\
-if (textureCoordinates.x < (1.0/256.0) || textureCoordinates.x > (255.0/256.0) ||\n\
-textureCoordinates.y < (1.0/256.0) || textureCoordinates.y > (255.0/256.0))\n\
-{\n\
-color = vec3(1.0, 1.0, 0.0);\n\
-alpha = 1.0;\n\
-}\n\
+    if (textureCoordinates.x < (1.0/256.0) || textureCoordinates.x > (255.0/256.0) ||\n\
+        textureCoordinates.y < (1.0/256.0) || textureCoordinates.y > (255.0/256.0))\n\
+    {\n\
+        color = vec3(1.0);\n\
+        alpha = 1.0;\n\
+    }\n\
 #endif\n\
-return mix(previousColor, color, alpha * textureAlpha);\n\
+\n\
+    return mix(previousColor, color, alpha * textureAlpha);\n\
 }\n\
+\n\
 vec3 computeDayColor(vec3 initialColor, vec2 textureCoordinates);\n\
+vec4 computeWaterColor(vec3 positionEyeCoordinates, vec2 textureCoordinates, mat3 enuToEye, vec3 imageryColor, float specularMapValue);\n\
+\n\
 void main()\n\
 {\n\
-vec3 initialColor = vec3(0.0, 0.0, 0.5);\n\
-vec3 startDayColor = computeDayColor(initialColor, clamp(v_textureCoordinates, 0.0, 1.0));\n\
+    // The clamp below works around an apparent bug in Chrome Canary v23.0.1241.0\n\
+    // where the fragment shader sees textures coordinates < 0.0 and > 1.0 for the\n\
+    // fragments on the edges of tiles even though the vertex shader is outputting\n\
+    // coordinates strictly in the 0-1 range.\n\
+    vec3 initialColor = vec3(0.0, 0.0, 0.5);\n\
+    vec3 startDayColor = computeDayColor(initialColor, clamp(v_textureCoordinates, 0.0, 1.0));\n\
+\n\
 #ifdef SHOW_TILE_BOUNDARIES\n\
-if (v_textureCoordinates.x < (1.0/256.0) || v_textureCoordinates.x > (255.0/256.0) ||\n\
-v_textureCoordinates.y < (1.0/256.0) || v_textureCoordinates.y > (255.0/256.0))\n\
+    if (v_textureCoordinates.x < (1.0/256.0) || v_textureCoordinates.x > (255.0/256.0) ||\n\
+        v_textureCoordinates.y < (1.0/256.0) || v_textureCoordinates.y > (255.0/256.0))\n\
+    {\n\
+        startDayColor = vec3(1.0, 0.0, 0.0);\n\
+    }\n\
+#endif\n\
+\n\
+    vec4 color = vec4(startDayColor, 1.0);\n\
+\n\
+#ifdef SHOW_REFLECTIVE_OCEAN\n\
+    vec2 waterMaskTranslation = u_waterMaskTranslationAndScale.xy;\n\
+    vec2 waterMaskScale = u_waterMaskTranslationAndScale.zw;\n\
+    vec2 waterMaskTextureCoordinates = v_textureCoordinates * waterMaskScale + waterMaskTranslation;\n\
+\n\
+    float mask = texture2D(u_waterMask, waterMaskTextureCoordinates).r;\n\
+\n\
+    if (mask > 0.0)\n\
+    {\n\
+        vec3 normalMC = normalize(czm_geodeticSurfaceNormal(v_positionMC, vec3(0.0), vec3(1.0)));   // normalized surface normal in model coordinates\n\
+        vec3 normalEC = normalize(czm_normal3D * normalMC);                                           // normalized surface normal in eye coordiantes\n\
+        mat3 enuToEye = czm_eastNorthUpToEyeCoordinates(v_positionMC, normalEC);\n\
+\n\
+        vec2 ellipsoidTextureCoordinates = czm_ellipsoidWgs84TextureCoordinates(normalMC);\n\
+        vec2 ellipsoidFlippedTextureCoordinates = czm_ellipsoidWgs84TextureCoordinates(normalMC.zyx);\n\
+\n\
+        vec2 textureCoordinates = mix(ellipsoidTextureCoordinates, ellipsoidFlippedTextureCoordinates, u_morphTime * smoothstep(0.9, 0.95, normalMC.z));\n\
+\n\
+        color = computeWaterColor(v_positionEC, textureCoordinates, enuToEye, startDayColor, mask);\n\
+    }\n\
+#endif\n\
+    \n\
+    gl_FragColor = color;\n\
+}\n\
+\n\
+#ifdef SHOW_REFLECTIVE_OCEAN\n\
+\n\
+float waveFade(float edge0, float edge1, float x)\n\
 {\n\
-startDayColor = vec3(1.0, 0.0, 0.0);\n\
+    float y = clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);\n\
+    return pow(1.0 - y, 5.0);\n\
 }\n\
+\n\
+// Based on water rendering by Jonas Wagner:\n\
+// http://29a.ch/2012/7/19/webgl-terrain-rendering-water-fog\n\
+\n\
+const float oceanFrequency = 125000.0;\n\
+const float oceanAnimationSpeed = 0.006;\n\
+const float oceanAmplitude = 2.0;\n\
+const float oceanSpecularIntensity = 0.5;\n\
+\n\
+vec4 computeWaterColor(vec3 positionEyeCoordinates, vec2 textureCoordinates, mat3 enuToEye, vec3 imageryColor, float specularMapValue)\n\
+{\n\
+    float time = czm_frameNumber * oceanAnimationSpeed;\n\
+    \n\
+    vec3 positionToEyeEC = -positionEyeCoordinates;\n\
+    float positionToEyeECLength = length(positionToEyeEC);\n\
+\n\
+    // The double normalize below works around a bug in Firefox on Android devices.\n\
+    vec3 normalizedpositionToEyeEC = normalize(normalize(positionToEyeEC));\n\
+    \n\
+    // Fade out the waves as the camera moves far from the surface.\n\
+    float waveIntensity = waveFade(70000.0, 1000000.0, positionToEyeECLength);\n\
+\n\
+#ifdef SHOW_OCEAN_WAVES\n\
+    vec4 noise = czm_getWaterNoise(u_oceanNormalMap, textureCoordinates * oceanFrequency, time, 0.0);\n\
+    vec3 normalTangentSpace = noise.xyz * vec3(1.0, 1.0, (1.0 / oceanAmplitude));\n\
+    \n\
+    // fade out the normal perturbation as we move farther from the water surface\n\
+    normalTangentSpace.xy *= waveIntensity;\n\
+    normalTangentSpace = normalize(normalTangentSpace);\n\
+#else\n\
+    vec3 normalTangentSpace = vec3(0.0, 0.0, 1.0);\n\
+#endif\n\
+\n\
+    vec3 normalEC = enuToEye * normalTangentSpace;\n\
+    \n\
+    const vec3 waveHighlightColor = vec3(0.3, 0.45, 0.6);\n\
+    \n\
+    // Use diffuse light to highlight the waves\n\
+    float diffuseIntensity = getLambertDiffuse(czm_sunDirectionEC, normalEC);\n\
+    vec3 diffuseHighlight = waveHighlightColor * diffuseIntensity;\n\
+    \n\
+#ifdef SHOW_OCEAN_WAVES\n\
+    // Where diffuse light is low or non-existent, use wave highlights based solely on\n\
+    // the wave bumpiness and no particular light direction.\n\
+    float tsPerturbationRatio = normalTangentSpace.z;\n\
+    vec3 nonDiffuseHighlight = mix(waveHighlightColor * 5.0 * (1.0 - tsPerturbationRatio), vec3(0.0), diffuseIntensity);\n\
+#else\n\
+    vec3 nonDiffuseHighlight = vec3(0.0);\n\
 #endif\n\
-gl_FragColor = vec4(startDayColor, 1.0);\n\
+\n\
+    // Add specular highlights in 3D, and in all modes when zoomed in.\n\
+    float specularIntensity = getSpecular(czm_sunDirectionEC, normalizedpositionToEyeEC, normalEC, 10.0) + 0.25 * getSpecular(czm_moonDirectionEC, normalizedpositionToEyeEC, normalEC, 10.0);\n\
+    float surfaceReflectance = mix(0.0, mix(u_zoomedOutOceanSpecularIntensity, oceanSpecularIntensity, waveIntensity), specularMapValue);\n\
+    float specular = specularIntensity * surfaceReflectance;\n\
+    \n\
+    return vec4(imageryColor + diffuseHighlight + nonDiffuseHighlight + specular, 1.0); \n\
 }\n\
+\n\
+#endif // #ifdef SHOW_REFLECTIVE_OCEAN\n\
 ";
 });

data/app/assets/javascripts/Shaders/CentralBodyFSDepth.js

@@ -3,20 +3,23 @@
 define(function() {
     "use strict";
     return "varying vec4 positionEC;\n\
+\n\
 void main()\n\
 {\n\
-czm_ellipsoid ellipsoid = czm_getWgs84EllipsoidEC();\n\
-vec3 direction = normalize(positionEC.xyz);\n\
-czm_ray ray = czm_ray(vec3(0.0), direction);\n\
-czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid);\n\
-if (!czm_isEmpty(intersection))\n\
-{\n\
-gl_FragColor = vec4(1.0, 1.0, 0.0, 1.0);\n\
-}\n\
-else\n\
-{\n\
-discard;\n\
-}\n\
-}\n\
-";
+    // TODO: make arbitrary ellipsoid\n\
+    czm_ellipsoid ellipsoid = czm_getWgs84EllipsoidEC();\n\
+    \n\
+    vec3 direction = normalize(positionEC.xyz);\n\
+    czm_ray ray = czm_ray(vec3(0.0), direction);\n\
+    \n\
+    czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid);\n\
+    if (!czm_isEmpty(intersection))\n\
+    {\n\
+        gl_FragColor = vec4(1.0, 1.0, 0.0, 1.0);\n\
+    }\n\
+    else\n\
+    {\n\
+        discard;\n\
+    }\n\
+}";
 });

data/app/assets/javascripts/Shaders/CentralBodyFSPole.js

@@ -3,26 +3,32 @@
 define(function() {
     "use strict";
     return "uniform vec3 u_color;\n\
+\n\
 varying vec2 v_textureCoordinates;\n\
+\n\
 void main()\n\
 {\n\
-czm_ellipsoid ellipsoid = czm_getWgs84EllipsoidEC();\n\
-vec3 direction = normalize(czm_windowToEyeCoordinates(gl_FragCoord).xyz);\n\
-czm_ray ray = czm_ray(vec3(0.0), direction);\n\
-czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid);\n\
-if (!czm_isEmpty(intersection))\n\
-{\n\
-vec3 positionEC = czm_pointAlongRay(ray, intersection.start);\n\
-vec3 positionMC = (czm_inverseModelView * vec4(positionEC, 1.0)).xyz;\n\
-vec3 normalMC = normalize(czm_geodeticSurfaceNormal(positionMC, vec3(0.0), vec3(1.0)));\n\
-vec3 normalEC = normalize(czm_normal * normalMC);\n\
-vec3 startDayColor = u_color;\n\
-gl_FragColor = vec4(startDayColor, 1.0);\n\
-}\n\
-else\n\
-{\n\
-discard;\n\
-}\n\
-}\n\
-";
+    // TODO: make arbitrary ellipsoid\n\
+    czm_ellipsoid ellipsoid = czm_getWgs84EllipsoidEC();\n\
+    vec3 direction = normalize(czm_windowToEyeCoordinates(gl_FragCoord).xyz);\n\
+    czm_ray ray = czm_ray(vec3(0.0), direction);\n\
+    czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid);\n\
+    \n\
+    if (!czm_isEmpty(intersection))\n\
+    {\n\
+        vec3 positionEC = czm_pointAlongRay(ray, intersection.start);\n\
+        vec3 positionMC = (czm_inverseModelView * vec4(positionEC, 1.0)).xyz;\n\
+	    \n\
+	    vec3 normalMC = normalize(czm_geodeticSurfaceNormal(positionMC, vec3(0.0), vec3(1.0)));\n\
+	    vec3 normalEC = normalize(czm_normal * normalMC);\n\
+	    \n\
+        vec3 startDayColor = u_color;\n\
+		\n\
+        gl_FragColor = vec4(startDayColor, 1.0);\n\
+    }\n\
+    else\n\
+    {\n\
+        discard;\n\
+    }\n\
+}";
 });

data/app/assets/javascripts/Shaders/CentralBodyVS.js

@@ -2,68 +2,98 @@
 /*global define*/
 define(function() {
     "use strict";
-    return "attribute vec3 position3D;\n\
+    return "attribute vec4 position3DAndHeight;\n\
 attribute vec2 textureCoordinates;\n\
+\n\
 uniform float u_morphTime;\n\
+\n\
 uniform vec3 u_center3D;\n\
 uniform mat4 u_modifiedModelView;\n\
 uniform vec4 u_tileExtent;\n\
+\n\
+// Uniforms for 2D Mercator projection\n\
 uniform vec2 u_southAndNorthLatitude;\n\
 uniform vec3 u_southMercatorYLowAndHighAndOneOverHeight;\n\
+\n\
 varying vec3 v_positionMC;\n\
 varying vec3 v_positionEC;\n\
+\n\
 varying vec2 v_textureCoordinates;\n\
+\n\
+// These functions are generated at runtime.\n\
 vec4 getPosition(vec3 position3DWC);\n\
 float get2DYPositionFraction();\n\
+\n\
 vec4 getPosition3DMode(vec3 position3DWC)\n\
 {\n\
-return czm_projection * (u_modifiedModelView * vec4(position3D, 1.0));\n\
+    return czm_projection * (u_modifiedModelView * vec4(position3DAndHeight.xyz, 1.0));\n\
 }\n\
+\n\
 float get2DMercatorYPositionFraction()\n\
 {\n\
-const float maxTileWidth = 0.003068;\n\
-float positionFraction = textureCoordinates.y;\n\
-float southLatitude = u_southAndNorthLatitude.x;\n\
-float northLatitude = u_southAndNorthLatitude.y;\n\
-if (northLatitude - southLatitude > maxTileWidth)\n\
-{\n\
-float southMercatorYLow = u_southMercatorYLowAndHighAndOneOverHeight.x;\n\
-float southMercatorYHigh = u_southMercatorYLowAndHighAndOneOverHeight.y;\n\
-float oneOverMercatorHeight = u_southMercatorYLowAndHighAndOneOverHeight.z;\n\
-float currentLatitude = mix(southLatitude, northLatitude, textureCoordinates.y);\n\
-currentLatitude = clamp(currentLatitude, -czm_webMercatorMaxLatitude, czm_webMercatorMaxLatitude);\n\
-positionFraction = czm_latitudeToWebMercatorFraction(currentLatitude, southMercatorYLow, southMercatorYHigh, oneOverMercatorHeight);\n\
-}\n\
-return positionFraction;\n\
+    // The width of a tile at level 11, in radians and assuming a single root tile, is\n\
+    //   2.0 * czm_pi / pow(2.0, 11.0)\n\
+    // We want to just linearly interpolate the 2D position from the texture coordinates\n\
+    // when we're at this level or higher.  The constant below is the expression\n\
+    // above evaluated and then rounded up at the 4th significant digit.\n\
+    const float maxTileWidth = 0.003068;\n\
+    float positionFraction = textureCoordinates.y;\n\
+    float southLatitude = u_southAndNorthLatitude.x;\n\
+    float northLatitude = u_southAndNorthLatitude.y;\n\
+    if (northLatitude - southLatitude > maxTileWidth)\n\
+    {\n\
+        float southMercatorYLow = u_southMercatorYLowAndHighAndOneOverHeight.x;\n\
+        float southMercatorYHigh = u_southMercatorYLowAndHighAndOneOverHeight.y;\n\
+        float oneOverMercatorHeight = u_southMercatorYLowAndHighAndOneOverHeight.z;\n\
+\n\
+        float currentLatitude = mix(southLatitude, northLatitude, textureCoordinates.y);\n\
+        currentLatitude = clamp(currentLatitude, -czm_webMercatorMaxLatitude, czm_webMercatorMaxLatitude);\n\
+        positionFraction = czm_latitudeToWebMercatorFraction(currentLatitude, southMercatorYLow, southMercatorYHigh, oneOverMercatorHeight);\n\
+    }    \n\
+    return positionFraction;\n\
 }\n\
+\n\
 float get2DGeographicYPositionFraction()\n\
 {\n\
-return textureCoordinates.y;\n\
+    return textureCoordinates.y;\n\
+}\n\
+\n\
+vec4 getPositionPlanarEarth(vec3 position3DWC, float height2D)\n\
+{\n\
+    float yPositionFraction = get2DYPositionFraction();\n\
+    vec4 rtcPosition2D = vec4(height2D, mix(u_tileExtent.st, u_tileExtent.pq, vec2(textureCoordinates.x, yPositionFraction)), 1.0);  \n\
+    return czm_projection * (u_modifiedModelView * rtcPosition2D);\n\
 }\n\
+\n\
 vec4 getPosition2DMode(vec3 position3DWC)\n\
 {\n\
-float yPositionFraction = get2DYPositionFraction();\n\
-vec4 rtcPosition2D = vec4(0.0, mix(u_tileExtent.st, u_tileExtent.pq, vec2(textureCoordinates.x, yPositionFraction)), 1.0);\n\
-return czm_projection * (u_modifiedModelView * rtcPosition2D);\n\
+    return getPositionPlanarEarth(position3DWC, 0.0);\n\
 }\n\
+\n\
 vec4 getPositionColumbusViewMode(vec3 position3DWC)\n\
 {\n\
-return getPosition2DMode(position3DWC);\n\
+    return getPositionPlanarEarth(position3DWC, position3DAndHeight.w);\n\
 }\n\
+\n\
 vec4 getPositionMorphingMode(vec3 position3DWC)\n\
 {\n\
-float yPositionFraction = get2DYPositionFraction();\n\
-vec3 position2DWC = vec3(0.0, mix(u_tileExtent.st, u_tileExtent.pq, vec2(textureCoordinates.x, yPositionFraction)));\n\
-vec4 morphPosition = czm_columbusViewMorph(position2DWC, position3DWC, u_morphTime);\n\
-return czm_modelViewProjection * morphPosition;\n\
+    // We do not do RTC while morphing, so there is potential for jitter.\n\
+    // This is unlikely to be noticable, though.\n\
+    float yPositionFraction = get2DYPositionFraction();\n\
+    vec3 position2DWC = vec3(0.0, mix(u_tileExtent.st, u_tileExtent.pq, vec2(textureCoordinates.x, yPositionFraction)));\n\
+    vec4 morphPosition = czm_columbusViewMorph(position2DWC, position3DWC, u_morphTime);\n\
+    return czm_modelViewProjection * morphPosition;\n\
 }\n\
-void main()\n\
+\n\
+void main() \n\
 {\n\
-vec3 position3DWC = position3D + u_center3D;\n\
-gl_Position = getPosition(position3DWC);\n\
-v_positionEC = (czm_modelView * vec4(position3DWC, 1.0)).xyz;\n\
-v_positionMC = position3DWC;\n\
-v_textureCoordinates = textureCoordinates;\n\
+    vec3 position3DWC = position3DAndHeight.xyz + u_center3D;\n\
+\n\
+    gl_Position = getPosition(position3DWC);\n\
+    \n\
+    v_positionEC = (czm_modelView3D * vec4(position3DWC, 1.0)).xyz;\n\
+    v_positionMC = position3DWC;                                 // position in model coordinates\n\
+    v_textureCoordinates = textureCoordinates;\n\
 }\n\
 ";
 });