cesium 0.22.0 → 0.23.0

data/app/assets/javascripts/Renderer/TextureWrap.js

@@ -1,5 +1,5 @@
 /*global define*/
-define(['Core/Enumeration'], function(Enumeration) {
+define(function() {
     "use strict";
 
     /**
@@ -9,31 +9,29 @@ define(['Core/Enumeration'], function(Enumeration) {
      */
     var TextureWrap = {
         /**
-         * DOC_TBA
+         * 0x812F.  Clamps texture coordinates to the normalized range [0, 1].
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x812F
          */
-        CLAMP_TO_EDGE : new Enumeration(0x812F, 'CLAMP_TO_EDGE'),
+        CLAMP_TO_EDGE : 0x812F,
 
         /**
-         * DOC_TBA
+         * 0x2901.  Repeats texture coordinates outside the normalized range [0, 1] by ignoring the integer part.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x2901
          */
-        REPEAT : new Enumeration(0x2901, 'REPEAT'),
+        REPEAT : 0x2901,
 
         /**
-         * DOC_TBA
+         * 0x8370.  Mirror repeats texture coordinates outside the normalized range [0, 1], using the
+         * integer part of the texture coordinate if it is even, or 1.0 minus the fractional part if it is odd.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x8370
          */
-        MIRRORED_REPEAT : new Enumeration(0x8370, 'MIRRORED_REPEAT'),
+        MIRRORED_REPEAT : 0x8370,
 
         /**
          * DOC_TBA

data/app/assets/javascripts/Renderer/UniformDatatype.js

@@ -20,7 +20,7 @@ define(['Core/Enumeration'], function(Enumeration) {
             getGLSL : function() {
                 return 'float';
             }
-        }), // FLOAT
+        }),
 
         /**
          * A <code>vec2</code> uniform: a two-component floating-point vector.
@@ -29,11 +29,11 @@ define(['Core/Enumeration'], function(Enumeration) {
          * @constant
          * @default 0x8B50
          */
-        FLOAT_VECTOR2 : new Enumeration(0x8B50, 'FLOAT_VECTOR2', {
+       FLOAT_VEC2 : new Enumeration(0x8B50, 'FLOAT_VEC2', {
             getGLSL : function() {
                 return 'vec2';
             }
-        }), // FLOAT_VEC2
+        }),
 
         /**
          * A <code>vec3</code> uniform: a three-component floating-point vector.
@@ -42,11 +42,11 @@ define(['Core/Enumeration'], function(Enumeration) {
          * @constant
          * @default 0x8B51
          */
-        FLOAT_VECTOR3 : new Enumeration(0x8B51, 'FLOAT_VECTOR3', {
+        FLOAT_VEC3 : new Enumeration(0x8B51, 'FLOAT_VEC3', {
             getGLSL : function() {
                 return 'vec3';
             }
-        }), // FLOAT_VEC3
+        }),
 
         /**
          * A <code>vec4</code> uniform: a four-component floating-point vector.
@@ -55,11 +55,11 @@ define(['Core/Enumeration'], function(Enumeration) {
          * @constant
          * @default 0x8B52
          */
-        FLOAT_VECTOR4 : new Enumeration(0x8B52, 'FLOAT_VECTOR4', {
+        FLOAT_VEC4 : new Enumeration(0x8B52, 'FLOAT_VEC4', {
             getGLSL : function() {
                 return 'vec4';
             }
-        }), // FLOAT_VEC4
+        }),
 
         /**
          * An <code>int</code> uniform.
@@ -72,7 +72,7 @@ define(['Core/Enumeration'], function(Enumeration) {
             getGLSL : function() {
                 return 'int';
             }
-        }), // INT
+        }),
 
         /**
          * An <code>ivec2</code> uniform: a two-component integer vector.
@@ -81,11 +81,11 @@ define(['Core/Enumeration'], function(Enumeration) {
          * @constant
          * @default 0x8B53
          */
-        INT_VECTOR2 : new Enumeration(0x8B53, 'INT_VECTOR2', {
+        INT_VEC2 : new Enumeration(0x8B53, 'INT_VEC2', {
             getGLSL : function() {
                 return 'ivec2';
             }
-        }), // INT_VEC2
+        }),
 
         /**
          * An <code>ivec3</code> uniform: a three-component integer vector.
@@ -94,11 +94,11 @@ define(['Core/Enumeration'], function(Enumeration) {
          * @constant
          * @default 0x8B54
          */
-        INT_VECTOR3 : new Enumeration(0x8B54, 'INT_VECTOR3', {
+        INT_VEC3 : new Enumeration(0x8B54, 'INT_VEC3', {
             getGLSL : function() {
                 return 'ivec3';
             }
-        }), // INT_VEC3
+        }),
 
         /**
          * An <code>ivec4</code> uniform: a four-component integer vector.
@@ -107,11 +107,11 @@ define(['Core/Enumeration'], function(Enumeration) {
          * @constant
          * @default 0x8B55
          */
-        INT_VECTOR4 : new Enumeration(0x8B55, 'INT_VECTOR4', {
+        INT_VEC4 : new Enumeration(0x8B55, 'INT_VEC4', {
             getGLSL : function() {
                 return 'ivec4';
             }
-        }), // INT_VEC4
+        }),
 
         /**
          * A <code>bool</code> uniform.
@@ -124,7 +124,7 @@ define(['Core/Enumeration'], function(Enumeration) {
             getGLSL : function() {
                 return 'bool';
             }
-        }), // BOOL
+        }),
 
         /**
          * A <code>bvec2</code> uniform: a two-component boolean vector.
@@ -133,11 +133,11 @@ define(['Core/Enumeration'], function(Enumeration) {
          * @constant
          * @default 0x8B57
          */
-        BOOL_VECTOR2 : new Enumeration(0x8B57, 'BOOL_VECTOR2', {
+        BOOL_VEC2 : new Enumeration(0x8B57, 'BOOL_VEC2', {
             getGLSL : function() {
                 return 'bvec2';
             }
-        }), // BOOL_VEC2
+        }),
 
         /**
          * A <code>bvec3</code> uniform: a three-component boolean vector.
@@ -146,11 +146,11 @@ define(['Core/Enumeration'], function(Enumeration) {
          * @constant
          * @default 0x8B58
          */
-        BOOL_VECTOR3 : new Enumeration(0x8B58, 'BOOL_VECTOR3', {
+        BOOL_VEC3 : new Enumeration(0x8B58, 'BOOL_VEC3', {
             getGLSL : function() {
                 return 'bvec3';
             }
-        }), // BOOL_VEC3
+        }),
 
         /**
          * A <code>bvec4</code> uniform: a four-component boolean vector.
@@ -159,11 +159,11 @@ define(['Core/Enumeration'], function(Enumeration) {
          * @constant
          * @default 0x8B59
          */
-        BOOL_VECTOR4 : new Enumeration(0x8B59, 'BOOL_VECTOR4', {
+        BOOL_VEC4 : new Enumeration(0x8B59, 'BOOL_VEC4', {
             getGLSL : function() {
                 return 'bvec4';
             }
-        }), // BOOL_VEC4
+        }),
 
         /**
          * An <code>mat2</code> uniform: a 2x2 floating-point matrix.
@@ -172,11 +172,11 @@ define(['Core/Enumeration'], function(Enumeration) {
          * @constant
          * @default 0x8B5A
          */
-        FLOAT_MATRIX2 : new Enumeration(0x8B5A, 'FLOAT_MATRIX2', {
+        FLOAT_MAT2 : new Enumeration(0x8B5A, 'FLOAT_MAT2', {
             getGLSL : function() {
                 return 'mat2';
             }
-        }), // FLOAT_MAT2
+        }),
 
         /**
          * An <code>mat3</code> uniform: a 3x3 floating-point matrix.
@@ -185,11 +185,11 @@ define(['Core/Enumeration'], function(Enumeration) {
          * @constant
          * @default 0x8B5B
          */
-        FLOAT_MATRIX3 : new Enumeration(0x8B5B, 'FLOAT_MATRIX3', {
+        FLOAT_MAT3 : new Enumeration(0x8B5B, 'FLOAT_MAT3', {
             getGLSL : function() {
                 return 'mat3';
             }
-        }), // FLOAT_MAT3
+        }),
 
         /**
          * An <code>mat4</code> uniform: a 4x4 floating-point matrix.
@@ -198,11 +198,11 @@ define(['Core/Enumeration'], function(Enumeration) {
          * @constant
          * @default 0x8B5C
          */
-        FLOAT_MATRIX4 : new Enumeration(0x8B5C, 'FLOAT_MATRIX4', {
+        FLOAT_MAT4 : new Enumeration(0x8B5C, 'FLOAT_MAT4', {
             getGLSL : function() {
                 return 'mat4';
             }
-        }), // FLOAT_MAT4
+        }),
 
         /**
          * A <code>sampler2D</code> uniform: an opaque type to access 2D textures.
@@ -215,7 +215,7 @@ define(['Core/Enumeration'], function(Enumeration) {
             getGLSL : function() {
                 return 'sampler2D';
             }
-        }), // SAMPLER_2D
+        }),
 
         /**
          * A <code>samplerCube</code> uniform: an opaque type to access cube-map textures.
@@ -228,7 +228,7 @@ define(['Core/Enumeration'], function(Enumeration) {
             getGLSL : function() {
                 return 'samplerCube';
             }
-        }) // SAMPLER_CUBE
+        })
     };
 
     return UniformDatatype;

data/app/assets/javascripts/Renderer/VertexArray.js

@@ -8,11 +8,14 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
     "use strict";
 
     function addAttribute(attributes, attribute, index) {
-        if (!attribute.vertexBuffer && !attribute.value) {
+        var hasVertexBuffer = defined(attribute.vertexBuffer);
+        var hasValue = defined(attribute.value);
+
+        if (!hasVertexBuffer && !hasValue) {
             throw new DeveloperError('attribute must have a vertexBuffer or a value.');
         }
 
-        if (attribute.vertexBuffer && attribute.value) {
+        if (hasVertexBuffer && hasValue) {
             throw new DeveloperError('attribute cannot have both a vertexBuffer and a value.  It must have either a vertexBuffer property defining per-vertex data or a value property defining data for all vertices.');
         }
 
@@ -22,21 +25,18 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
             (componentsPerAttribute !== 2) &&
             (componentsPerAttribute !== 3) &&
             (componentsPerAttribute !== 4)) {
-            if (attribute.value) {
+            if (hasValue) {
                 throw new DeveloperError('attribute.value.length must be in the range [1, 4].');
             }
 
             throw new DeveloperError('attribute.componentsPerAttribute must be in the range [1, 4].');
         }
 
-        if (attribute.componentDatatype) {
-            var datatype = attribute.componentDatatype;
-            if (!ComponentDatatype.validate(datatype)) {
-                throw new DeveloperError('attribute must have a valid componentDatatype or not specify it.');
-            }
+        if (defined(attribute.componentDatatype) && !ComponentDatatype.validate(attribute.componentDatatype)) {
+            throw new DeveloperError('attribute must have a valid componentDatatype or not specify it.');
         }
 
-        if (attribute.strideInBytes && (attribute.strideInBytes > 255)) {
+        if (defined(attribute.strideInBytes) && (attribute.strideInBytes > 255)) {
             // WebGL limit.  Not in GL ES.
             throw new DeveloperError('attribute must have a strideInBytes less than or equal to 255 or not specify it.');
         }
@@ -46,15 +46,15 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
             index : defaultValue(attribute.index, index),
             enabled : defaultValue(attribute.enabled, true),
             vertexBuffer : attribute.vertexBuffer,
-            value : attribute.value ? attribute.value.slice(0) : undefined,
+            value : hasValue ? attribute.value.slice(0) : undefined,
             componentsPerAttribute : componentsPerAttribute,
-            componentDatatype : attribute.componentDatatype || ComponentDatatype.FLOAT,
-            normalize : attribute.normalize || false,
-            offsetInBytes : attribute.offsetInBytes || 0,
-            strideInBytes : attribute.strideInBytes || 0
+            componentDatatype : defaultValue(attribute.componentDatatype, ComponentDatatype.FLOAT),
+            normalize : defaultValue(attribute.normalize, false),
+            offsetInBytes : defaultValue(attribute.offsetInBytes, 0),
+            strideInBytes : defaultValue(attribute.strideInBytes, 0)
         };
 
-        if (attr.vertexBuffer) {
+        if (hasVertexBuffer) {
             // Common case: vertex buffer for per-vertex data
             attr.vertexAttrib = function(gl) {
                 gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer._getBuffer());
@@ -117,15 +117,32 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
      *
      * @internalConstructor
      *
+     * @exception {DeveloperError} attributes is required.
+     *
      * @see {@link Context#createVertexArray}
      * @see {@link Context#createVertexArrayFromGeometry}
      */
     var VertexArray = function(gl, vertexArrayObject, attributes, indexBuffer) {
+        if (!defined(attributes)) {
+            throw new DeveloperError('attributes is required.');
+        }
+
+        var i;
         var vaAttributes = [];
+        var numberOfVertices = 1;   // if every attribute is backed by a single value
 
-        if (defined(attributes)) {
-            for ( var i = 0; i < attributes.length; ++i) {
-                addAttribute(vaAttributes, attributes[i], i);
+        for (i = 0; i < attributes.length; ++i) {
+            addAttribute(vaAttributes, attributes[i], i);
+        }
+
+        for (i = 0; i < vaAttributes.length; ++i) {
+            var attribute = vaAttributes[i];
+
+            if (defined(attribute.vertexBuffer)) {
+                // This assumes that each vertex buffer in the vertex array has the same number of vertices.
+                var bytes = attribute.strideInBytes || (attribute.componentsPerAttribute * attribute.componentDatatype.sizeInBytes);
+                numberOfVertices = attribute.vertexBuffer.getSizeInBytes() / bytes;
+                break;
             }
         }
 
@@ -150,6 +167,12 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
             vertexArrayObject.bindVertexArrayOES(null);
         }
 
+        /**
+         * @readonly
+         * @private
+         */
+        this.numberOfVertices = numberOfVertices;
+
         this._gl = gl;
         this._vaoExtension = vertexArrayObject;
         this._vao = vao;
@@ -225,21 +248,6 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
         }
     };
 
-    /**
-     * This assumes that each vertex buffer in the vertex array has the same number of vertices.
-     * @private
-     */
-    VertexArray.prototype._getNumberOfVertices = function() {
-        if (this._attributes.length > 0) {
-            var attribute = this._attributes[0];
-            var bytes = attribute.strideInBytes || (attribute.componentsPerAttribute * attribute.componentDatatype.sizeInBytes);
-
-            return attribute.vertexBuffer.getSizeInBytes() / bytes;
-        }
-
-        return 0;
-    };
-
     /**
      * Returns true if this object was destroyed; otherwise, false.
      * <br /><br />
@@ -297,13 +305,13 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
         var attributes = this._attributes;
         for ( var i = 0; i < attributes.length; ++i) {
             var vertexBuffer = attributes[i].vertexBuffer;
-            if (vertexBuffer && !vertexBuffer.isDestroyed() && vertexBuffer.getVertexArrayDestroyable()) {
+            if (defined(vertexBuffer) && !vertexBuffer.isDestroyed() && vertexBuffer.getVertexArrayDestroyable()) {
                 vertexBuffer.destroy();
             }
         }
 
         var indexBuffer = this._indexBuffer;
-        if (indexBuffer && !indexBuffer.isDestroyed() && indexBuffer.getVertexArrayDestroyable()) {
+        if (defined(indexBuffer) && !indexBuffer.isDestroyed() && indexBuffer.getVertexArrayDestroyable()) {
             indexBuffer.destroy();
         }
 

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

@@ -1,9 +1,8 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/defined', 'Core/jsonp', 'Core/writeTextToCanvas', 'Core/Cartesian2', 'Core/DeveloperError', 'Core/Event', 'Scene/DiscardMissingTileImagePolicy', 'Scene/GeographicTilingScheme', 'Scene/ImageryProvider', 'Scene/TileProviderError', 'Scene/WebMercatorTilingScheme', 'Scene/Credit', 'ThirdParty/when'], function(
+define(['Core/defaultValue', 'Core/defined', 'Core/jsonp', 'Core/Cartesian2', 'Core/DeveloperError', 'Core/Event', 'Scene/DiscardMissingTileImagePolicy', 'Scene/GeographicTilingScheme', 'Scene/ImageryProvider', 'Scene/TileProviderError', 'Scene/WebMercatorTilingScheme', 'Scene/Credit', 'ThirdParty/when'], function(
         defaultValue,
         defined,
         jsonp,
-        writeTextToCanvas,
         Cartesian2,
         DeveloperError,
         Event,

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

@@ -151,8 +151,10 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/defaultValue'
         this._allHorizontalCenter = true;
 
         this._baseVolume = new BoundingSphere();
+        this._baseVolumeWC = new BoundingSphere();
         this._baseVolume2D = new BoundingSphere();
         this._boundingVolume = new BoundingSphere();
+        this._boundingVolumeDirty = false;
 
         this._colorCommands = [];
         this._pickCommands = [];
@@ -707,6 +709,7 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/defaultValue'
 
         if (billboardCollection._mode === SceneMode.SCENE3D) {
             billboardCollection._baseVolume.expand(position, billboardCollection._baseVolume);
+            billboardCollection._boundingVolumeDirty = true;
         }
 
         EncodedCartesian3.fromCartesian(position, writePositionScratch);
@@ -943,6 +946,7 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/defaultValue'
         var boundingVolume;
         if (frameState.mode === SceneMode.SCENE3D) {
             boundingVolume = billboardCollection._baseVolume;
+            billboardCollection._boundingVolumeDirty = true;
         } else {
             boundingVolume = billboardCollection._baseVolume2D;
         }
@@ -1173,11 +1177,16 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/defaultValue'
             return;
         }
 
+        if (this._boundingVolumeDirty) {
+            this._boundingVolumeDirty = false;
+            BoundingSphere.transform(this._baseVolume, this.modelMatrix, this._baseVolumeWC);
+        }
+
         var boundingVolume;
         var modelMatrix = Matrix4.IDENTITY;
         if (frameState.mode === SceneMode.SCENE3D) {
             modelMatrix = this.modelMatrix;
-            boundingVolume = BoundingSphere.clone(this._baseVolume, this._boundingVolume);
+            boundingVolume = BoundingSphere.clone(this._baseVolumeWC, this._boundingVolume);
         } else {
             boundingVolume = BoundingSphere.clone(this._baseVolume2D, this._boundingVolume);
         }