cesium 0.16.0 → 0.17.0

data/app/assets/javascripts/Scene/TileReplacementQueue.js

@@ -71,29 +71,29 @@ define([
 
             if (shouldRemoveTile) {
                 tileToTrim.freeResources();
-                this._remove(tileToTrim);
+                remove(this, tileToTrim);
             }
 
             tileToTrim = previous;
         }
     };
 
-    TileReplacementQueue.prototype._remove = function(item) {
+    function remove(tileReplacementQueue, item) {
         var previous = item.replacementPrevious;
         var next = item.replacementNext;
 
-        if (item === this._lastBeforeStartOfFrame) {
-            this._lastBeforeStartOfFrame = next;
+        if (item === tileReplacementQueue._lastBeforeStartOfFrame) {
+            tileReplacementQueue._lastBeforeStartOfFrame = next;
         }
 
-        if (item === this.head) {
-            this.head = next;
+        if (item === tileReplacementQueue.head) {
+            tileReplacementQueue.head = next;
         } else {
             previous.replacementNext = next;
         }
 
-        if (item === this.tail) {
-            this.tail = previous;
+        if (item === tileReplacementQueue.tail) {
+            tileReplacementQueue.tail = previous;
         } else {
             next.replacementPrevious = previous;
         }
@@ -101,8 +101,8 @@ define([
         item.replacementPrevious = undefined;
         item.replacementNext = undefined;
 
-        --this.count;
-    };
+        --tileReplacementQueue.count;
+    }
 
     /**
      * Marks a tile as rendered this frame and moves it before the first tile that was not rendered
@@ -134,7 +134,7 @@ define([
 
         if (typeof item.replacementPrevious !== 'undefined' || typeof item.replacementNext !== 'undefined') {
             // tile already in the list, remove from its current location
-            this._remove(item);
+            remove(this, item);
         }
 
         item.replacementPrevious = undefined;

data/app/assets/javascripts/Scene/VRTheWorldTerrainProvider.js

@@ -11,7 +11,6 @@ define([
         '../Core/Math',
         '../Core/Ellipsoid',
         '../Core/Event',
-        '../Core/RuntimeError',
         './TerrainProvider',
         './TileProviderError',
         './GeographicTilingScheme',
@@ -29,7 +28,6 @@ define([
         CesiumMath,
         Ellipsoid,
         Event,
-        RuntimeError,
         TerrainProvider,
         TileProviderError,
         GeographicTilingScheme,

data/app/assets/javascripts/Scene/WebMapServiceImageryProvider.js

@@ -8,7 +8,6 @@ define([
         '../Core/Event',
         '../Core/Extent',
         './ImageryProvider',
-        './WebMercatorTilingScheme',
         './GeographicTilingScheme'
     ], function(
         clone,
@@ -19,7 +18,6 @@ define([
         Event,
         Extent,
         ImageryProvider,
-        WebMercatorTilingScheme,
         GeographicTilingScheme) {
     "use strict";
 

data/app/assets/javascripts/Scene/WebMercatorTilingScheme.js

@@ -1,22 +1,16 @@
 /*global define*/
 define([
         '../Core/defaultValue',
-        '../Core/DeveloperError',
-        '../Core/Math',
         '../Core/Ellipsoid',
         '../Core/Extent',
         '../Core/Cartesian2',
-        '../Core/Cartographic',
         '../Core/WebMercatorProjection',
         './TilingScheme'
     ], function(
         defaultValue,
-        DeveloperError,
-        CesiumMath,
         Ellipsoid,
         Extent,
         Cartesian2,
-        Cartographic,
         WebMercatorProjection,
         TilingScheme) {
     "use strict";

data/app/assets/javascripts/Scene/sampleTerrain.js

@@ -1,13 +1,9 @@
 /*global define*/
 define([
-        '../Core/defaultValue',
         '../Core/DeveloperError',
-        './TerrainState',
         '../ThirdParty/when'
     ], function(
-        defaultValue,
         DeveloperError,
-        TerrainState,
         when) {
     "use strict";
 

data/app/assets/javascripts/Shaders/BuiltinFunctions.glsl

@@ -613,6 +613,68 @@ vec4 czm_antialias(vec4 color1, vec4 color2, vec4 currentColor, float dist)
     return czm_antialias(color1, color2, currentColor, dist, 0.1);
 }
 
+/**
+ * Converts an RGB color to CIE Yxy.
+ * <p>The conversion is described in
+ * <a href="http://content.gpwiki.org/index.php/D3DBook:High-Dynamic_Range_Rendering#Luminance_Transform">Luminance Transform</a>
+ * </p>
+ * 
+ * @name czm_RGBToXYZ
+ * @glslFunction
+ * 
+ * @param {vec3} rgb The color in RGB.
+ *
+ * @returns {vec3} The color in CIE Yxy.
+ *
+ * @example
+ * vec3 xyz = czm_RGBToXYZ(rgb);
+ * xyz.x = max(xyz.x - luminanceThreshold, 0.0);
+ * rgb = czm_XYZToRGB(xyz);
+ */
+vec3 czm_RGBToXYZ(vec3 rgb)
+{
+	const mat3 RGB2XYZ = mat3(0.4124, 0.2126, 0.0193,
+	                          0.3576, 0.7152, 0.1192,
+	                          0.1805, 0.0722, 0.9505);
+    vec3 xyz = RGB2XYZ * rgb;
+    vec3 Yxy;
+    Yxy.r = xyz.g;
+    float temp = dot(vec3(1.0), xyz);
+    Yxy.gb = xyz.rg / temp;
+    return Yxy;
+}
+
+/**
+ * Converts a CIE Yxy color to RGB.
+ * <p>The conversion is described in
+ * <a href="http://content.gpwiki.org/index.php/D3DBook:High-Dynamic_Range_Rendering#Luminance_Transform">Luminance Transform</a>
+ * </p>
+ * 
+ * @name czm_XYZToRGB
+ * @glslFunction
+ * 
+ * @param {vec3} Yxy The color in CIE Yxy.
+ *
+ * @returns {vec3} The color in RGB.
+ *
+ * @example
+ * vec3 xyz = czm_RGBToXYZ(rgb);
+ * xyz.x = max(xyz.x - luminanceThreshold, 0.0);
+ * rgb = czm_XYZToRGB(xyz);
+ */
+vec3 czm_XYZToRGB(vec3 Yxy)
+{
+	const mat3 XYZ2RGB = mat3( 3.2405, -0.9693,  0.0556,
+	                          -1.5371,  1.8760, -0.2040,
+	                          -0.4985,  0.0416,  1.0572);
+    vec3 xyz;
+    xyz.r = Yxy.r * Yxy.g / Yxy.b;
+    xyz.g = Yxy.r;
+    xyz.b = Yxy.r * (1.0 - Yxy.g - Yxy.b) / Yxy.b;
+    
+    return XYZ2RGB * xyz;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 /**

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

@@ -635,6 +635,68 @@ vec4 czm_antialias(vec4 color1, vec4 color2, vec4 currentColor, float dist)\n\
     return czm_antialias(color1, color2, currentColor, dist, 0.1);\n\
 }\n\
 \n\
+/**\n\
+ * Converts an RGB color to CIE Yxy.\n\
+ * <p>The conversion is described in\n\
+ * <a href=\"http://content.gpwiki.org/index.php/D3DBook:High-Dynamic_Range_Rendering#Luminance_Transform\">Luminance Transform</a>\n\
+ * </p>\n\
+ * \n\
+ * @name czm_RGBToXYZ\n\
+ * @glslFunction\n\
+ * \n\
+ * @param {vec3} rgb The color in RGB.\n\
+ *\n\
+ * @returns {vec3} The color in CIE Yxy.\n\
+ *\n\
+ * @example\n\
+ * vec3 xyz = czm_RGBToXYZ(rgb);\n\
+ * xyz.x = max(xyz.x - luminanceThreshold, 0.0);\n\
+ * rgb = czm_XYZToRGB(xyz);\n\
+ */\n\
+vec3 czm_RGBToXYZ(vec3 rgb)\n\
+{\n\
+	const mat3 RGB2XYZ = mat3(0.4124, 0.2126, 0.0193,\n\
+	                          0.3576, 0.7152, 0.1192,\n\
+	                          0.1805, 0.0722, 0.9505);\n\
+    vec3 xyz = RGB2XYZ * rgb;\n\
+    vec3 Yxy;\n\
+    Yxy.r = xyz.g;\n\
+    float temp = dot(vec3(1.0), xyz);\n\
+    Yxy.gb = xyz.rg / temp;\n\
+    return Yxy;\n\
+}\n\
+\n\
+/**\n\
+ * Converts a CIE Yxy color to RGB.\n\
+ * <p>The conversion is described in\n\
+ * <a href=\"http://content.gpwiki.org/index.php/D3DBook:High-Dynamic_Range_Rendering#Luminance_Transform\">Luminance Transform</a>\n\
+ * </p>\n\
+ * \n\
+ * @name czm_XYZToRGB\n\
+ * @glslFunction\n\
+ * \n\
+ * @param {vec3} Yxy The color in CIE Yxy.\n\
+ *\n\
+ * @returns {vec3} The color in RGB.\n\
+ *\n\
+ * @example\n\
+ * vec3 xyz = czm_RGBToXYZ(rgb);\n\
+ * xyz.x = max(xyz.x - luminanceThreshold, 0.0);\n\
+ * rgb = czm_XYZToRGB(xyz);\n\
+ */\n\
+vec3 czm_XYZToRGB(vec3 Yxy)\n\
+{\n\
+	const mat3 XYZ2RGB = mat3( 3.2405, -0.9693,  0.0556,\n\
+	                          -1.5371,  1.8760, -0.2040,\n\
+	                          -0.4985,  0.0416,  1.0572);\n\
+    vec3 xyz;\n\
+    xyz.r = Yxy.r * Yxy.g / Yxy.b;\n\
+    xyz.g = Yxy.r;\n\
+    xyz.b = Yxy.r * (1.0 - Yxy.g - Yxy.b) / Yxy.b;\n\
+    \n\
+    return XYZ2RGB * xyz;\n\
+}\n\
+\n\
 ///////////////////////////////////////////////////////////////////////////////\n\
 \n\
 /**\n\

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

@@ -85,7 +85,10 @@ void main()
 
     gl_Position = getPosition(position3DWC);
     
+#ifdef SHOW_REFLECTIVE_OCEAN
     v_positionEC = (czm_modelView3D * vec4(position3DWC, 1.0)).xyz;
     v_positionMC = position3DWC;                                 // position in model coordinates
+#endif
+
     v_textureCoordinates = textureCoordinates;
 }

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

@@ -89,8 +89,11 @@ void main() \n\
 \n\
     gl_Position = getPosition(position3DWC);\n\
     \n\
+#ifdef SHOW_REFLECTIVE_OCEAN\n\
     v_positionEC = (czm_modelView3D * vec4(position3DWC, 1.0)).xyz;\n\
     v_positionMC = position3DWC;                                 // position in model coordinates\n\
+#endif\n\
+\n\
     v_textureCoordinates = textureCoordinates;\n\
 }\n\
 ";

data/app/assets/javascripts/Shaders/Materials/PolylineArrowMaterial.glsl

@@ -16,7 +16,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
     
     vec2 st = materialInput.st;
     
-    float base = 1.0 - abs(dFdx(st.s)) * 10.0;
+    float base = 1.0 - abs(fwidth(st.s)) * 10.0;
     vec2 center = vec2(1.0, 0.5);
     float ptOnUpperLine = getPointOnLine(vec2(base, 1.0), center, st.s);
     float ptOnLowerLine = getPointOnLine(vec2(base, 0.0), center, st.s);

data/app/assets/javascripts/Shaders/Materials/PolylineArrowMaterial.js

@@ -20,7 +20,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
     \n\
     vec2 st = materialInput.st;\n\
     \n\
-    float base = 1.0 - abs(dFdx(st.s)) * 10.0;\n\
+    float base = 1.0 - abs(fwidth(st.s)) * 10.0;\n\
     vec2 center = vec2(1.0, 0.5);\n\
     float ptOnUpperLine = getPointOnLine(vec2(base, 1.0), center, st.s);\n\
     float ptOnLowerLine = getPointOnLine(vec2(base, 0.0), center, st.s);\n\

data/app/assets/javascripts/Shaders/PolylineVS.glsl

@@ -23,9 +23,11 @@ void clipLineSegmentToNearPlane(
     vec3 p0,
     vec3 p1,
     out vec4 positionWC,
+    out bool clipped,
     out bool culledByNearPlane)
 {
     culledByNearPlane = false;
+    clipped = false;
     
     vec3 p1ToP0 = p1 - p0;
     float magnitude = length(p1ToP0);
@@ -48,6 +50,7 @@ void clipLineSegmentToNearPlane(
         else
         {
             p0 = p0 + t * direction;
+            clipped = true;
         }
     }
     
@@ -92,15 +95,15 @@ void main()
     }
     
     vec4 endPointWC, p0, p1;
-    bool culledByNearPlane;
+    bool culledByNearPlane, clipped;
     
     vec4 positionEC = czm_modelViewRelativeToEye * p;
     vec4 prevEC = czm_modelViewRelativeToEye * prev;
     vec4 nextEC = czm_modelViewRelativeToEye * next;
     
-    clipLineSegmentToNearPlane(prevEC.xyz, positionEC.xyz, p0, culledByNearPlane);
-    clipLineSegmentToNearPlane(nextEC.xyz, positionEC.xyz, p1, culledByNearPlane);
-    clipLineSegmentToNearPlane(positionEC.xyz, usePrev ? prevEC.xyz : nextEC.xyz, endPointWC, culledByNearPlane);
+    clipLineSegmentToNearPlane(prevEC.xyz, positionEC.xyz, p0, clipped, culledByNearPlane);
+    clipLineSegmentToNearPlane(nextEC.xyz, positionEC.xyz, p1, clipped, culledByNearPlane);
+    clipLineSegmentToNearPlane(positionEC.xyz, usePrev ? prevEC.xyz : nextEC.xyz, endPointWC, clipped, culledByNearPlane);
     
     if (culledByNearPlane)
     {
@@ -118,7 +121,7 @@ void main()
 	{
 	    direction = vec2(-nextWC.y, nextWC.x);
     }
-	else if (czm_equalsEpsilon(normalize(next.xyz - p.xyz), vec3(0.0), czm_epsilon1))
+	else if (czm_equalsEpsilon(normalize(next.xyz - p.xyz), vec3(0.0), czm_epsilon1) || clipped)
 	{
         direction = vec2(prevWC.y, -prevWC.x);
     }

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

@@ -27,9 +27,11 @@ void clipLineSegmentToNearPlane(\n\
     vec3 p0,\n\
     vec3 p1,\n\
     out vec4 positionWC,\n\
+    out bool clipped,\n\
     out bool culledByNearPlane)\n\
 {\n\
     culledByNearPlane = false;\n\
+    clipped = false;\n\
     \n\
     vec3 p1ToP0 = p1 - p0;\n\
     float magnitude = length(p1ToP0);\n\
@@ -52,6 +54,7 @@ void clipLineSegmentToNearPlane(\n\
         else\n\
         {\n\
             p0 = p0 + t * direction;\n\
+            clipped = true;\n\
         }\n\
     }\n\
     \n\
@@ -96,15 +99,15 @@ void main() \n\
     }\n\
     \n\
     vec4 endPointWC, p0, p1;\n\
-    bool culledByNearPlane;\n\
+    bool culledByNearPlane, clipped;\n\
     \n\
     vec4 positionEC = czm_modelViewRelativeToEye * p;\n\
     vec4 prevEC = czm_modelViewRelativeToEye * prev;\n\
     vec4 nextEC = czm_modelViewRelativeToEye * next;\n\
     \n\
-    clipLineSegmentToNearPlane(prevEC.xyz, positionEC.xyz, p0, culledByNearPlane);\n\
-    clipLineSegmentToNearPlane(nextEC.xyz, positionEC.xyz, p1, culledByNearPlane);\n\
-    clipLineSegmentToNearPlane(positionEC.xyz, usePrev ? prevEC.xyz : nextEC.xyz, endPointWC, culledByNearPlane);\n\
+    clipLineSegmentToNearPlane(prevEC.xyz, positionEC.xyz, p0, clipped, culledByNearPlane);\n\
+    clipLineSegmentToNearPlane(nextEC.xyz, positionEC.xyz, p1, clipped, culledByNearPlane);\n\
+    clipLineSegmentToNearPlane(positionEC.xyz, usePrev ? prevEC.xyz : nextEC.xyz, endPointWC, clipped, culledByNearPlane);\n\
     \n\
     if (culledByNearPlane)\n\
     {\n\
@@ -122,7 +125,7 @@ void main() \n\
 	{\n\
 	    direction = vec2(-nextWC.y, nextWC.x);\n\
     }\n\
-	else if (czm_equalsEpsilon(normalize(next.xyz - p.xyz), vec3(0.0), czm_epsilon1))\n\
+	else if (czm_equalsEpsilon(normalize(next.xyz - p.xyz), vec3(0.0), czm_epsilon1) || clipped)\n\
 	{\n\
         direction = vec2(prevWC.y, -prevWC.x);\n\
     }\n\

data/app/assets/javascripts/Shaders/PostProcessFilters/AdditiveBlend.glsl

@@ -0,0 +1,17 @@
+uniform sampler2D u_texture0;
+uniform sampler2D u_texture1;
+
+uniform vec2 u_center;
+uniform float u_radius;
+
+varying vec2 v_textureCoordinates;
+
+void main()
+{
+    vec4 color0 = texture2D(u_texture0, v_textureCoordinates);
+    vec4 color1 = texture2D(u_texture1, v_textureCoordinates);
+    
+    float x = length(gl_FragCoord.xy - u_center) / u_radius;
+    float t = smoothstep(0.5, 0.8, x);
+    gl_FragColor = mix(color0 + color1, color0, t);
+}

data/app/assets/javascripts/Shaders/PostProcessFilters/AdditiveBlend.js

@@ -0,0 +1,23 @@
+//This file is automatically rebuilt by the Cesium build process.
+/*global define*/
+define(function() {
+"use strict";
+return "uniform sampler2D u_texture0;\n\
+uniform sampler2D u_texture1;\n\
+\n\
+uniform vec2 u_center;\n\
+uniform float u_radius;\n\
+\n\
+varying vec2 v_textureCoordinates;\n\
+\n\
+void main()\n\
+{\n\
+    vec4 color0 = texture2D(u_texture0, v_textureCoordinates);\n\
+    vec4 color1 = texture2D(u_texture1, v_textureCoordinates);\n\
+    \n\
+    float x = length(gl_FragCoord.xy - u_center) / u_radius;\n\
+    float t = smoothstep(0.5, 0.8, x);\n\
+    gl_FragColor = mix(color0 + color1, color0, t);\n\
+}\n\
+";
+});