cesium 0.21 → 0.21.1

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

@@ -704,7 +704,7 @@ define(['Core/defined', 'Core/destroyObject', 'Core/Cartesian2', 'Core/Cartesian
 
         if (defined(restrictedAngle)) {
             var direction = Cartesian3.clone(cameraController._camera.directionWC, rotate3DRestrictedDirection);
-            var invTransform = transform.inverseTransformation();
+            var invTransform = Matrix4.inverseTransformation(transform);
             Matrix4.multiplyByVector(invTransform, direction, direction);
 
             var dot = -Cartesian3.dot(direction, constrainedAxis);

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

@@ -1,5 +1,6 @@
 /*global define*/
-define(['Core/BoxGeometry', 'Core/Cartesian3', 'Core/defined', 'Core/destroyObject', 'Core/DeveloperError', 'Core/Matrix4', 'Core/GeometryPipeline', 'Core/VertexFormat', 'Core/PrimitiveType', 'Renderer/loadCubeMap', 'Renderer/BufferUsage', 'Renderer/DrawCommand', 'Renderer/BlendingState', 'Scene/SceneMode', 'Shaders/SkyBoxVS', 'Shaders/SkyBoxFS'], function(
+define(['Core/defaultValue', 'Core/BoxGeometry', 'Core/Cartesian3', 'Core/defined', 'Core/destroyObject', 'Core/DeveloperError', 'Core/Matrix4', 'Core/GeometryPipeline', 'Core/VertexFormat', 'Core/PrimitiveType', 'Renderer/loadCubeMap', 'Renderer/BufferUsage', 'Renderer/DrawCommand', 'Renderer/BlendingState', 'Scene/SceneMode', 'Shaders/SkyBoxVS', 'Shaders/SkyBoxFS'], function(
+        defaultValue,
         BoxGeometry,
         Cartesian3,
         defined,
@@ -27,47 +28,36 @@ define(['Core/BoxGeometry', 'Core/Cartesian3', 'Core/defined', 'Core/destroyObje
      * @alias SkyBox
      * @constructor
      *
-     * @param {Object} sources The source URL or <code>Image</code> object for each of the six cube map faces.  See the example below.
-     *
-     * @exception {DeveloperError} sources is required and must have positiveX, negativeX, positiveY, negativeY, positiveZ, and negativeZ properties.
-     * @exception {DeveloperError} sources properties must all be the same type.
+     * @param {Object} [options.sources] The source URL or <code>Image</code> object for each of the six cube map faces.  See the example below.
+     * @param {Boolean} [options.show=true] Determines if this primitive will be shown.
      *
      * @example
      * scene.skyBox = new SkyBox({
+     *   sources : {
      *     positiveX : 'skybox_px.png',
      *     negativeX : 'skybox_nx.png',
      *     positiveY : 'skybox_py.png',
      *     negativeY : 'skybox_ny.png',
      *     positiveZ : 'skybox_pz.png',
      *     negativeZ : 'skybox_nz.png'
+     *   }
      * });
      *
      * @see Scene#skyBox
      * @see Transforms.computeTemeToPseudoFixedMatrix
      */
-    var SkyBox = function(sources) {
-        if ((!defined(sources)) ||
-            (!defined(sources.positiveX)) ||
-            (!defined(sources.negativeX)) ||
-            (!defined(sources.positiveY)) ||
-            (!defined(sources.negativeY)) ||
-            (!defined(sources.positiveZ)) ||
-            (!defined(sources.negativeZ))) {
-            throw new DeveloperError('sources is required and must have positiveX, negativeX, positiveY, negativeY, positiveZ, and negativeZ properties.');
-        }
-
-        if ((typeof sources.positiveX !== typeof sources.negativeX) ||
-            (typeof sources.positiveX !== typeof sources.positiveY) ||
-            (typeof sources.positiveX !== typeof sources.negativeY) ||
-            (typeof sources.positiveX !== typeof sources.positiveZ) ||
-            (typeof sources.positiveX !== typeof sources.negativeZ)) {
-            throw new DeveloperError('sources properties must all be the same type.');
-        }
-
-        this._command = new DrawCommand();
-        this._command.owner = this;
-        this._cubeMap = undefined;
-        this._sources = sources;
+    var SkyBox = function(options) {
+        /**
+         * The sources used to create the cube map faces: an object
+         * with <code>positiveX</code>, <code>negativeX</code>, <code>positiveY</code>,
+         * <code>negativeY</code>, <code>positiveZ</code>, and <code>negativeZ</code> properties.
+         * These can be either URLs or <code>Image</code> objects.
+         *
+         * @type Object
+         * @default undefined
+         */
+        this.sources = options.sources;
+        this._sources = undefined;
 
         /**
          * Determines if the sky box will be shown.
@@ -75,25 +65,17 @@ define(['Core/BoxGeometry', 'Core/Cartesian3', 'Core/defined', 'Core/destroyObje
          * @type {Boolean}
          * @default true
          */
-        this.show = true;
-    };
+        this.show = defaultValue(options.show, true);
 
-    /**
-     * Returns the sources used to create the cube map faces: an object
-     * with <code>positiveX</code>, <code>negativeX</code>, <code>positiveY</code>,
-     * <code>negativeY</code>, <code>positiveZ</code>, and <code>negativeZ</code> properties.
-     * These are either URLs or <code>Image</code> objects, depending on how the sky box
-     * was constructed.
-     *
-     * @memberof SkyBox
-     *
-     * @returns {Object} The sources used to create the cube map faces.
-     */
-    SkyBox.prototype.getSources = function() {
-        return this._sources;
+        this._command = new DrawCommand();
+        this._command.owner = this;
+        this._cubeMap = undefined;
     };
 
     /**
+     * @exception {DeveloperError} sources is required and must have positiveX, negativeX, positiveY, negativeY, positiveZ, and negativeZ properties.
+     * @exception {DeveloperError} sources properties must all be the same type.
+     *
      * @private
      */
     SkyBox.prototype.update = function(context, frameState) {
@@ -111,22 +93,45 @@ define(['Core/BoxGeometry', 'Core/Cartesian3', 'Core/defined', 'Core/destroyObje
             return undefined;
         }
 
-        var command = this._command;
+        if (this._sources !== this.sources) {
+            this._sources = this.sources;
+            var sources = this.sources;
+
+            if ((!defined(sources.positiveX)) ||
+                (!defined(sources.negativeX)) ||
+                (!defined(sources.positiveY)) ||
+                (!defined(sources.negativeY)) ||
+                (!defined(sources.positiveZ)) ||
+                (!defined(sources.negativeZ))) {
+                throw new DeveloperError('sources is required and must have positiveX, negativeX, positiveY, negativeY, positiveZ, and negativeZ properties.');
+            }
 
-        if (!defined(command.vertexArray)) {
-            var sources = this._sources;
-            var that = this;
+            if ((typeof sources.positiveX !== typeof sources.negativeX) ||
+                (typeof sources.positiveX !== typeof sources.positiveY) ||
+                (typeof sources.positiveX !== typeof sources.negativeY) ||
+                (typeof sources.positiveX !== typeof sources.positiveZ) ||
+                (typeof sources.positiveX !== typeof sources.negativeZ)) {
+                throw new DeveloperError('sources properties must all be the same type.');
+            }
 
             if (typeof sources.positiveX === 'string') {
                 // Given urls for cube-map images.  Load them.
                 loadCubeMap(context, this._sources).then(function(cubeMap) {
+                    that._cubeMap = that._cubeMap && that._cubeMap.destroy();
                     that._cubeMap = cubeMap;
                 });
             } else {
+                this._cubeMap = this._cubeMap && this._cubeMap.destroy();
                 this._cubeMap = context.createCubeMap({
                     source : sources
                 });
             }
+        }
+
+        var command = this._command;
+
+        if (!defined(command.vertexArray)) {
+            var that = this;
 
             command.uniformMap = {
                 u_cubeMap: function() {
@@ -141,7 +146,7 @@ define(['Core/BoxGeometry', 'Core/Cartesian3', 'Core/defined', 'Core/destroyObje
             var attributeIndices = GeometryPipeline.createAttributeIndices(geometry);
 
             command.primitiveType = PrimitiveType.TRIANGLES;
-            command.modelMatrix = Matrix4.IDENTITY.clone();
+            command.modelMatrix = Matrix4.clone(Matrix4.IDENTITY);
             command.vertexArray = context.createVertexArrayFromGeometry({
                 geometry: geometry,
                 attributeIndices: attributeIndices,

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

@@ -108,7 +108,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/Cartographic', 'Core/Develope
                 var ne = Cartographic.fromDegrees(parseFloat(bbox.getAttribute('maxy')), parseFloat(bbox.getAttribute('maxx')));
                 that._extent = new Extent(sw.longitude, sw.latitude, ne.longitude, ne.latitude);
             } else {
-                that._extent = that._extent.clone();
+                that._extent = Extent.clone(that._extent);
             }
 
             // tiling scheme handling
@@ -366,4 +366,4 @@ define(['Core/defaultValue', 'Core/defined', 'Core/Cartographic', 'Core/Develope
     };
 
     return TileMapServiceImageryProvider;
-});
+});

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

@@ -7,6 +7,7 @@ attribute vec2 pixelOffset;
 attribute vec4 eyeOffsetAndScale;               // eye offset in meters
 attribute vec4 rotationAndAlignedAxis;
 attribute vec4 scaleByDistance;                 // near, nearScale, far, farScale
+attribute vec4 translucencyByDistance;          // near, nearTrans, far, farTrans
 
 #ifdef RENDER_FOR_PICK
 attribute vec4 pickColor;
@@ -24,6 +25,23 @@ varying vec4 v_pickColor;
 varying vec4 v_color;
 #endif
 
+float getNearFarScalar(vec4 nearFarScalar, float cameraDistSq)
+{
+    float valueAtMin = nearFarScalar.y;
+    float valueAtMax = nearFarScalar.w;
+    float nearDistanceSq = nearFarScalar.x * nearFarScalar.x;
+    float farDistanceSq = nearFarScalar.z * nearFarScalar.z;
+
+    // ensure that t will fall within the range of [0.0, 1.0]
+    cameraDistSq = clamp(cameraDistSq, nearDistanceSq, farDistanceSq);
+
+    float t = (cameraDistSq - nearDistanceSq) / (farDistanceSq - nearDistanceSq);
+
+    t = pow(t, 0.15);
+
+    return mix(valueAtMin, valueAtMax, t);
+}
+
 void main() 
 {
     // Modifying this shader may also require modifications to Billboard.computeScreenSpacePosition
@@ -44,8 +62,7 @@ void main()
     positionEC.xyz *= show;
     
     ///////////////////////////////////////////////////////////////////////////     
-    
-#ifdef EYE_DISTANCE_SCALING  // scale based on eye distance
+
     float lengthSq;
     if (czm_sceneMode == czm_sceneMode2D)
     {
@@ -58,19 +75,23 @@ void main()
         lengthSq = dot(positionEC.xyz, positionEC.xyz);
     }
 
-    float scaleAtMin = scaleByDistance.y;
-    float scaleAtMax = scaleByDistance.w;
-    float nearDistanceSq = scaleByDistance.x * scaleByDistance.x;
-    float farDistanceSq = scaleByDistance.z * scaleByDistance.z;
-
-    // ensure that t will fall within the range of [0.0, 1.0]
-    lengthSq = clamp(lengthSq, nearDistanceSq, farDistanceSq);
-
-    float t = (lengthSq - nearDistanceSq) / (farDistanceSq - nearDistanceSq);
-
-    t = pow(t, 0.15);
+#ifdef EYE_DISTANCE_SCALING
+    scale *= getNearFarScalar(scaleByDistance, lengthSq);
+    // push vertex behind near plane for clipping
+    if (scale == 0.0)
+    {
+        positionEC.xyz = vec3(0.0);
+    }
+#endif
 
-    scale *= mix(scaleAtMin, scaleAtMax, t);
+    float translucency = 1.0;
+#ifdef EYE_DISTANCE_TRANSLUCENCY
+    translucency = getNearFarScalar(translucencyByDistance, lengthSq);
+    // push vertex behind near plane for clipping
+    if (translucency == 0.0)
+    {
+        positionEC.xyz = vec3(0.0);
+    }
 #endif
 
     vec4 positionWC = czm_eyeToWindowCoordinates(positionEC);
@@ -113,5 +134,6 @@ void main()
     v_pickColor = pickColor;
 #else
     v_color = color;
+    v_color.a *= translucency;
 #endif
 }

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

@@ -11,6 +11,7 @@ attribute vec2 pixelOffset;\n\
 attribute vec4 eyeOffsetAndScale;\n\
 attribute vec4 rotationAndAlignedAxis;\n\
 attribute vec4 scaleByDistance;\n\
+attribute vec4 translucencyByDistance;\n\
 #ifdef RENDER_FOR_PICK\n\
 attribute vec4 pickColor;\n\
 #else\n\
@@ -23,6 +24,17 @@ varying vec4 v_pickColor;\n\
 #else\n\
 varying vec4 v_color;\n\
 #endif\n\
+float getNearFarScalar(vec4 nearFarScalar, float cameraDistSq)\n\
+{\n\
+float valueAtMin = nearFarScalar.y;\n\
+float valueAtMax = nearFarScalar.w;\n\
+float nearDistanceSq = nearFarScalar.x * nearFarScalar.x;\n\
+float farDistanceSq = nearFarScalar.z * nearFarScalar.z;\n\
+cameraDistSq = clamp(cameraDistSq, nearDistanceSq, farDistanceSq);\n\
+float t = (cameraDistSq - nearDistanceSq) / (farDistanceSq - nearDistanceSq);\n\
+t = pow(t, 0.15);\n\
+return mix(valueAtMin, valueAtMax, t);\n\
+}\n\
 void main()\n\
 {\n\
 vec3 eyeOffset = eyeOffsetAndScale.xyz;\n\
@@ -35,7 +47,6 @@ vec4 p = czm_translateRelativeToEye(positionHigh, positionLow);\n\
 vec4 positionEC = czm_modelViewRelativeToEye * p;\n\
 positionEC = czm_eyeOffset(positionEC, eyeOffset);\n\
 positionEC.xyz *= show;\n\
-#ifdef EYE_DISTANCE_SCALING\n\
 float lengthSq;\n\
 if (czm_sceneMode == czm_sceneMode2D)\n\
 {\n\
@@ -45,14 +56,20 @@ else\n\
 {\n\
 lengthSq = dot(positionEC.xyz, positionEC.xyz);\n\
 }\n\
-float scaleAtMin = scaleByDistance.y;\n\
-float scaleAtMax = scaleByDistance.w;\n\
-float nearDistanceSq = scaleByDistance.x * scaleByDistance.x;\n\
-float farDistanceSq = scaleByDistance.z * scaleByDistance.z;\n\
-lengthSq = clamp(lengthSq, nearDistanceSq, farDistanceSq);\n\
-float t = (lengthSq - nearDistanceSq) / (farDistanceSq - nearDistanceSq);\n\
-t = pow(t, 0.15);\n\
-scale *= mix(scaleAtMin, scaleAtMax, t);\n\
+#ifdef EYE_DISTANCE_SCALING\n\
+scale *= getNearFarScalar(scaleByDistance, lengthSq);\n\
+if (scale == 0.0)\n\
+{\n\
+positionEC.xyz = vec3(0.0);\n\
+}\n\
+#endif\n\
+float translucency = 1.0;\n\
+#ifdef EYE_DISTANCE_TRANSLUCENCY\n\
+translucency = getNearFarScalar(translucencyByDistance, lengthSq);\n\
+if (translucency == 0.0)\n\
+{\n\
+positionEC.xyz = vec3(0.0);\n\
+}\n\
 #endif\n\
 vec4 positionWC = czm_eyeToWindowCoordinates(positionEC);\n\
 vec2 halfSize = imageSize * scale * czm_highResolutionSnapScale;\n\
@@ -86,6 +103,7 @@ v_textureCoordinates = textureCoordinates;\n\
 v_pickColor = pickColor;\n\
 #else\n\
 v_color = color;\n\
+v_color.a *= translucency;\n\
 #endif\n\
 }\n\
 ";

data/app/assets/javascripts/Shaders/Builtin/Functions/phong.glsl

@@ -41,3 +41,16 @@ vec4 czm_phong(vec3 toEye, czm_material material)
 
     return vec4(color, material.alpha);
 }
+
+vec4 czm_private_phong(vec3 toEye, czm_material material)
+{
+    float diffuse = czm_private_getLambertDiffuseOfMaterial(czm_sunDirectionEC, material);
+    float specular = czm_private_getSpecularOfMaterial(czm_sunDirectionEC, toEye, material);
+
+    vec3 ambient = vec3(0.0);
+    vec3 color = ambient + material.emission;
+    color += material.diffuse * diffuse;
+    color += material.specular * specular;
+
+    return vec4(color, material.alpha);
+}

data/app/assets/javascripts/Shaders/Builtin/Functions/phong.js

@@ -20,5 +20,15 @@ color += material.diffuse * diffuse;\n\
 color += material.specular * specular;\n\
 return vec4(color, material.alpha);\n\
 }\n\
+vec4 czm_private_phong(vec3 toEye, czm_material material)\n\
+{\n\
+float diffuse = czm_private_getLambertDiffuseOfMaterial(czm_sunDirectionEC, material);\n\
+float specular = czm_private_getSpecularOfMaterial(czm_sunDirectionEC, toEye, material);\n\
+vec3 ambient = vec3(0.0);\n\
+vec3 color = ambient + material.emission;\n\
+color += material.diffuse * diffuse;\n\
+color += material.specular * specular;\n\
+return vec4(color, material.alpha);\n\
+}\n\
 ";
 });

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

@@ -1,3 +1,9 @@
+#ifdef WRITE_DEPTH
+#ifdef GL_EXT_frag_depth
+#extension GL_EXT_frag_depth : enable
+#endif
+#endif
+
 uniform vec3 u_radii;
 uniform vec3 u_oneOverEllipsoidRadiiSquared;
 
@@ -24,7 +30,11 @@ vec4 computeEllipsoidColor(czm_ray ray, float intersection, float side)
     materialInput.positionToEyeEC = positionToEyeEC;
     czm_material material = czm_getMaterial(materialInput);
 
+#ifdef ONLY_SUN_LIGHTING
+    return czm_private_phong(normalize(positionToEyeEC), material);
+#else
     return czm_phong(normalize(positionToEyeEC), material);
+#endif
 }
 
 void main()
@@ -80,4 +90,18 @@ void main()
 
     gl_FragColor = mix(insideFaceColor, outsideFaceColor, outsideFaceColor.a);
     gl_FragColor.a = 1.0 - (1.0 - insideFaceColor.a) * (1.0 - outsideFaceColor.a);
+    
+#ifdef WRITE_DEPTH
+#ifdef 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);
+    float z = positionCC.z / positionCC.w;
+    
+    float n = gl_DepthRange.near;
+    float f = gl_DepthRange.far;
+    
+    gl_FragDepthEXT = (z * (f - n) + f + n) * 0.5;
+#endif
+#endif
 }

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

@@ -2,7 +2,12 @@
     /*global define*/
     define(function() {
     "use strict";
-    return "uniform vec3 u_radii;\n\
+    return "#ifdef WRITE_DEPTH\n\
+#ifdef GL_EXT_frag_depth\n\
+#extension GL_EXT_frag_depth : enable\n\
+#endif\n\
+#endif\n\
+uniform vec3 u_radii;\n\
 uniform vec3 u_oneOverEllipsoidRadiiSquared;\n\
 varying vec3 v_positionEC;\n\
 vec4 computeEllipsoidColor(czm_ray ray, float intersection, float side)\n\
@@ -23,7 +28,11 @@ materialInput.normalEC = normalEC;\n\
 materialInput.tangentToEyeMatrix = czm_eastNorthUpToEyeCoordinates(positionMC, normalEC);\n\
 materialInput.positionToEyeEC = positionToEyeEC;\n\
 czm_material material = czm_getMaterial(materialInput);\n\
+#ifdef ONLY_SUN_LIGHTING\n\
+return czm_private_phong(normalize(positionToEyeEC), material);\n\
+#else\n\
 return czm_phong(normalize(positionToEyeEC), material);\n\
+#endif\n\
 }\n\
 void main()\n\
 {\n\
@@ -57,6 +66,17 @@ vec4 outsideFaceColor = (intersection.start != 0.0) ? computeEllipsoidColor(ray,
 vec4 insideFaceColor = (outsideFaceColor.a < 1.0) ? computeEllipsoidColor(ray, intersection.stop, -1.0) : vec4(0.0);\n\
 gl_FragColor = mix(insideFaceColor, outsideFaceColor, outsideFaceColor.a);\n\
 gl_FragColor.a = 1.0 - (1.0 - insideFaceColor.a) * (1.0 - outsideFaceColor.a);\n\
+#ifdef WRITE_DEPTH\n\
+#ifdef 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\
+float z = positionCC.z / positionCC.w;\n\
+float n = gl_DepthRange.near;\n\
+float f = gl_DepthRange.far;\n\
+gl_FragDepthEXT = (z * (f - n) + f + n) * 0.5;\n\
+#endif\n\
+#endif\n\
 }\n\
 ";
 });