cesium 0.16.0 → 0.17.0

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

@@ -0,0 +1,30 @@
+uniform sampler2D u_texture;
+
+uniform float u_avgLuminance;
+uniform float u_threshold;
+uniform float u_offset;
+
+varying vec2 v_textureCoordinates;
+
+float key(float avg)
+{
+    float guess = 1.5 - (1.5 / (avg * 0.1 + 1.0));
+    return max(0.0, guess) + 0.1;
+}
+
+// See section 9. "The bright-pass filter" of Realtime HDR Rendering
+// http://www.cg.tuwien.ac.at/research/publications/2007/Luksch_2007_RHR/Luksch_2007_RHR-RealtimeHDR%20.pdf
+
+void main()
+{
+    vec4 color = texture2D(u_texture, v_textureCoordinates);
+    vec3 xyz = czm_RGBToXYZ(color.rgb);
+    float luminance = xyz.r;
+    
+    float scaledLum = key(u_avgLuminance) * luminance / u_avgLuminance;
+    float brightLum = max(scaledLum - u_threshold, 0.0);
+    float brightness = brightLum / (u_offset + brightLum);
+    
+    xyz.r = brightness;
+    gl_FragColor = vec4(czm_XYZToRGB(xyz), 1.0);
+}

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

@@ -0,0 +1,36 @@
+//This file is automatically rebuilt by the Cesium build process.
+/*global define*/
+define(function() {
+"use strict";
+return "uniform sampler2D u_texture;\n\
+\n\
+uniform float u_avgLuminance;\n\
+uniform float u_threshold;\n\
+uniform float u_offset;\n\
+\n\
+varying vec2 v_textureCoordinates;\n\
+\n\
+float key(float avg)\n\
+{\n\
+    float guess = 1.5 - (1.5 / (avg * 0.1 + 1.0));\n\
+    return max(0.0, guess) + 0.1;\n\
+}\n\
+\n\
+// See section 9. \"The bright-pass filter\" of Realtime HDR Rendering\n\
+// http://www.cg.tuwien.ac.at/research/publications/2007/Luksch_2007_RHR/Luksch_2007_RHR-RealtimeHDR%20.pdf\n\
+\n\
+void main()\n\
+{\n\
+    vec4 color = texture2D(u_texture, v_textureCoordinates);\n\
+    vec3 xyz = czm_RGBToXYZ(color.rgb);\n\
+    float luminance = xyz.r;\n\
+    \n\
+    float scaledLum = key(u_avgLuminance) * luminance / u_avgLuminance;\n\
+    float brightLum = max(scaledLum - u_threshold, 0.0);\n\
+    float brightness = brightLum / (u_offset + brightLum);\n\
+    \n\
+    xyz.r = brightness;\n\
+    gl_FragColor = vec4(czm_XYZToRGB(xyz), 1.0);\n\
+}\n\
+";
+});

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

@@ -0,0 +1,37 @@
+#define SAMPLES 8
+
+uniform float delta;
+uniform float sigma;
+uniform float direction; // 0.0 for x direction, 1.0 for y direction
+
+uniform sampler2D u_texture;
+uniform vec2 u_step;
+
+varying vec2 v_textureCoordinates;
+
+//  Incremental Computation of the Gaussian:
+//  http://http.developer.nvidia.com/GPUGems3/gpugems3_ch40.html
+
+void main()
+{
+    vec2 st = v_textureCoordinates;
+    
+    vec2 dir = vec2(1.0 - direction, direction);
+    
+    vec3 g;
+    g.x = 1.0 / (sqrt(czm_twoPi) * sigma);
+    g.y = exp((-0.5 * delta * delta) / (sigma * sigma));
+    g.z = g.y * g.y;
+    
+    vec4 result = texture2D(u_texture, st) * g.x;
+    for (int i = 1; i < SAMPLES; ++i)
+    {
+        g.xy *= g.yz;
+        
+        vec2 offset = float(i) * dir * u_step;
+        result += texture2D(u_texture, st - offset) * g.x;
+        result += texture2D(u_texture, st + offset) * g.x;
+    }
+    
+    gl_FragColor = result;
+}

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

@@ -0,0 +1,43 @@
+//This file is automatically rebuilt by the Cesium build process.
+/*global define*/
+define(function() {
+"use strict";
+return "#define SAMPLES 8\n\
+\n\
+uniform float delta;\n\
+uniform float sigma;\n\
+uniform float direction; // 0.0 for x direction, 1.0 for y direction\n\
+\n\
+uniform sampler2D u_texture;\n\
+uniform vec2 u_step;\n\
+\n\
+varying vec2 v_textureCoordinates;\n\
+\n\
+//  Incremental Computation of the Gaussian:\n\
+//  http://http.developer.nvidia.com/GPUGems3/gpugems3_ch40.html\n\
+\n\
+void main()\n\
+{\n\
+    vec2 st = v_textureCoordinates;\n\
+    \n\
+    vec2 dir = vec2(1.0 - direction, direction);\n\
+    \n\
+    vec3 g;\n\
+    g.x = 1.0 / (sqrt(czm_twoPi) * sigma);\n\
+    g.y = exp((-0.5 * delta * delta) / (sigma * sigma));\n\
+    g.z = g.y * g.y;\n\
+    \n\
+    vec4 result = texture2D(u_texture, st) * g.x;\n\
+    for (int i = 1; i < SAMPLES; ++i)\n\
+    {\n\
+        g.xy *= g.yz;\n\
+        \n\
+        vec2 offset = float(i) * dir * u_step;\n\
+        result += texture2D(u_texture, st - offset) * g.x;\n\
+        result += texture2D(u_texture, st + offset) * g.x;\n\
+    }\n\
+    \n\
+    gl_FragColor = result;\n\
+}\n\
+";
+});

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

@@ -0,0 +1,8 @@
+uniform sampler2D u_texture;
+
+varying vec2 v_textureCoordinates;
+
+void main() 
+{
+    gl_FragColor = texture2D(u_texture, v_textureCoordinates);
+}

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

@@ -0,0 +1,14 @@
+//This file is automatically rebuilt by the Cesium build process.
+/*global define*/
+define(function() {
+"use strict";
+return "uniform sampler2D u_texture;\n\
+\n\
+varying vec2 v_textureCoordinates;\n\
+\n\
+void main() \n\
+{\n\
+    gl_FragColor = texture2D(u_texture, v_textureCoordinates);\n\
+}\n\
+";
+});

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

@@ -0,0 +1,11 @@
+varying vec2 v_textureCoordinates;
+
+void main()
+{
+    vec4 color = vec4(1.0, 1.0, 0.0, 1.0);
+    
+    float b = smoothstep(0.03, 0.3, length(v_textureCoordinates - vec2(0.5)));
+    color.ba = mix(vec2(1.0), vec2(0.0), b);
+    
+    gl_FragColor = color;
+}

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

@@ -0,0 +1,17 @@
+//This file is automatically rebuilt by the Cesium build process.
+/*global define*/
+define(function() {
+"use strict";
+return "varying vec2 v_textureCoordinates;\n\
+\n\
+void main()\n\
+{\n\
+    vec4 color = vec4(1.0, 1.0, 0.0, 1.0);\n\
+    \n\
+    float b = smoothstep(0.03, 0.3, length(v_textureCoordinates - vec2(0.5)));\n\
+    color.ba = mix(vec2(1.0), vec2(0.0), b);\n\
+    \n\
+    gl_FragColor = color;\n\
+}\n\
+";
+});

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

@@ -0,0 +1,28 @@
+attribute vec2 direction;
+
+varying vec2 v_textureCoordinates;
+
+void main() 
+{
+    vec4 position;
+    if (czm_morphTime == 1.0)
+    {
+        position = vec4(czm_sunPositionWC, 1.0);
+    }
+    else
+    {
+        position = vec4(czm_sunPositionColumbusView.zxy, 1.0);
+    }
+    
+    vec4 positionEC = czm_view * position;
+    vec4 positionWC = czm_eyeToWindowCoordinates(positionEC);
+    
+    vec4 limb = czm_eyeToWindowCoordinates(positionEC + vec4(czm_solarRadius, 0.0, 0.0, 0.0));
+    vec2 halfSize = vec2(length(limb.xy - positionWC.xy));
+    halfSize *= 30.0;
+    halfSize *= ((direction * 2.0) - 1.0);
+    
+    gl_Position = czm_viewportOrthographic * vec4(positionWC.xy + halfSize, -positionWC.z, 1.0);
+    
+    v_textureCoordinates = direction;
+}

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

@@ -0,0 +1,34 @@
+//This file is automatically rebuilt by the Cesium build process.
+/*global define*/
+define(function() {
+"use strict";
+return "attribute vec2 direction;\n\
+\n\
+varying vec2 v_textureCoordinates;\n\
+\n\
+void main() \n\
+{\n\
+    vec4 position;\n\
+    if (czm_morphTime == 1.0)\n\
+    {\n\
+        position = vec4(czm_sunPositionWC, 1.0);\n\
+    }\n\
+    else\n\
+    {\n\
+        position = vec4(czm_sunPositionColumbusView.zxy, 1.0);\n\
+    }\n\
+    \n\
+    vec4 positionEC = czm_view * position;\n\
+    vec4 positionWC = czm_eyeToWindowCoordinates(positionEC);\n\
+    \n\
+    vec4 limb = czm_eyeToWindowCoordinates(positionEC + vec4(czm_solarRadius, 0.0, 0.0, 0.0));\n\
+    vec2 halfSize = vec2(length(limb.xy - positionWC.xy));\n\
+    halfSize *= 30.0;\n\
+    halfSize *= ((direction * 2.0) - 1.0);\n\
+    \n\
+    gl_Position = czm_viewportOrthographic * vec4(positionWC.xy + halfSize, -positionWC.z, 1.0);\n\
+    \n\
+    v_textureCoordinates = direction;\n\
+}\n\
+";
+});

data/app/assets/javascripts/Widgets/Animation/Animation.js

@@ -1,17 +1,13 @@
 /*global define*/
 define(['../../Core/destroyObject',
         '../../Core/DeveloperError',
-        '../../Core/ClockStep',
         '../../Core/Color',
-        '../../Core/defaultValue',
-        '../../ThirdParty/sprintf'
-        ], function(
-         destroyObject,
-         DeveloperError,
-         ClockStep,
-         Color,
-         defaultValue,
-         sprintf) {
+        '../../Core/defaultValue'
+    ], function(
+        destroyObject,
+        DeveloperError,
+        Color,
+        defaultValue) {
     "use strict";
 
     var svgNS = "http://www.w3.org/2000/svg";

data/app/assets/javascripts/Widgets/Animation/AnimationViewModel.js

@@ -5,10 +5,7 @@ define([
         '../../Core/binarySearch',
         '../../Core/ClockStep',
         '../../Core/ClockRange',
-        '../../Core/Color',
         '../../Core/DeveloperError',
-        '../../Core/JulianDate',
-        '../../Core/defaultValue',
         '../../ThirdParty/sprintf',
         '../../ThirdParty/knockout'
     ], function(
@@ -17,10 +14,7 @@ define([
         binarySearch,
         ClockStep,
         ClockRange,
-        Color,
         DeveloperError,
-        JulianDate,
-        defaultValue,
         sprintf,
         knockout) {
     "use strict";
@@ -282,7 +276,7 @@ define([
          */
         this.playRealtimeViewModel = new ToggleButtonViewModel({
             toggled : knockout.computed(function() {
-                return clockViewModel.clockStep() === ClockStep.SYSTEM_CLOCK;
+                return clockViewModel.shouldAnimate() && clockViewModel.clockStep() === ClockStep.SYSTEM_CLOCK;
             }),
             tooltip : knockout.computed(function() {
                 if (that._isSystemTimeAvailable()) {
@@ -292,13 +286,9 @@ define([
             }),
             command : createCommand(function() {
                 var clockViewModel = that.clockViewModel;
-                if (clockViewModel.clockStep() !== ClockStep.SYSTEM_CLOCK) {
-                    if (that._isSystemTimeAvailable()) {
-                        clockViewModel.clockStep(ClockStep.SYSTEM_CLOCK);
-                        clockViewModel.multiplier(1.0);
-                        that.clockViewModel.shouldAnimate(true);
-                    }
-                }
+                clockViewModel.clockStep(ClockStep.SYSTEM_CLOCK);
+                clockViewModel.multiplier(1.0);
+                clockViewModel.shouldAnimate(true);
             }, knockout.computed(function() {
                 return that._isSystemTimeAvailable();
             }))

data/app/assets/javascripts/Widgets/BaseLayerPicker/BaseLayerPicker.js

@@ -121,14 +121,9 @@ define(['./BaseLayerPickerViewModel',
          */
         this.container = container;
 
-        /**
-         * Gets the element created by this widget.
-         * @memberof FullscreenWidget
-         * @type {Element}
-         */
-        this.element = document.createElement('img');
+        this._element = document.createElement('img');
 
-        var element = this.element;
+        var element = this._element;
         element.setAttribute('draggable', 'false');
         element.className = 'cesium-baseLayerPicker-selected';
         element.setAttribute('data-bind', '\
@@ -186,7 +181,7 @@ define(['./BaseLayerPickerViewModel',
         document.removeEventListener('touchstart', this._closeDropDown);
         var container = this.container;
         knockout.cleanNode(container);
-        container.removeChild(this.element);
+        container.removeChild(this._element);
         return destroyObject(this);
     };
 

data/app/assets/javascripts/Widgets/BaseLayerPicker/BaseLayerPickerViewModel.js

@@ -1,13 +1,12 @@
 /*global define*/
-define(['../../Core/DeveloperError',
-        '../../Scene/SceneMode',
+define([
+        '../../Core/DeveloperError',
         '../createCommand',
         '../../ThirdParty/knockout'
-        ], function(
-            DeveloperError,
-            SceneMode,
-            createCommand,
-            knockout) {
+    ], function(
+        DeveloperError,
+        createCommand,
+        knockout) {
     "use strict";
 
     /**

data/app/assets/javascripts/Widgets/CesiumWidget/CesiumWidget.js

@@ -15,7 +15,8 @@ define(['../../Core/buildModuleUrl',
         '../../Scene/Scene',
         '../../Scene/SceneTransitioner',
         '../../Scene/SkyBox',
-        '../../Scene/SkyAtmosphere'
+        '../../Scene/SkyAtmosphere',
+        '../../Scene/Sun'
     ], function(
         buildModuleUrl,
         Cartesian2,
@@ -33,7 +34,8 @@ define(['../../Core/buildModuleUrl',
         Scene,
         SceneTransitioner,
         SkyBox,
-        SkyAtmosphere) {
+        SkyAtmosphere,
+        Sun) {
     "use strict";
 
     function getDefaultSkyBoxUrl(suffix) {
@@ -123,8 +125,8 @@ define(['../../Core/buildModuleUrl',
             positiveZ : getDefaultSkyBoxUrl('pz'),
             negativeZ : getDefaultSkyBoxUrl('mz')
         });
-
         scene.skyAtmosphere = new SkyAtmosphere(_ellipsoid);
+        scene.sun = new Sun();
 
         //Set the base imagery layer
         var imageryProvider = options.imageryProvider;

data/app/assets/javascripts/Widgets/ClockViewModel.js

@@ -1,15 +1,14 @@
 /*global define*/
-define(['../Core/DeveloperError',
+define([
         '../Core/defaultValue',
         '../Core/Clock',
         '../Core/JulianDate',
         '../ThirdParty/knockout'
-        ], function(
-         DeveloperError,
-         defaultValue,
-         Clock,
-         JulianDate,
-         knockout) {
+    ], function(
+        defaultValue,
+        Clock,
+        JulianDate,
+        knockout) {
     "use strict";
 
     /**