cesium 0.22.0 → 0.23.0

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

@@ -91,9 +91,9 @@ define(['Core/defaultValue', 'Core/DeveloperError', 'Renderer/PixelDatatype'], f
 
         //Firefox bug: texSubImage2D has overloads and can't resolve our enums, so we use + to explicitly convert to a number.
         if (source.arrayBufferView) {
-            gl.texSubImage2D(this._targetFace, 0, xOffset, yOffset, width, height, +this._pixelFormat, +this._pixelDatatype, source.arrayBufferView);
+            gl.texSubImage2D(this._targetFace, 0, xOffset, yOffset, width, height, this._pixelFormat, +this._pixelDatatype, source.arrayBufferView);
         } else {
-            gl.texSubImage2D(this._targetFace, 0, xOffset, yOffset, +this._pixelFormat, +this._pixelDatatype, source);
+            gl.texSubImage2D(this._targetFace, 0, xOffset, yOffset, this._pixelFormat, +this._pixelDatatype, source);
         }
 
         gl.bindTexture(target, null);

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

@@ -13,7 +13,7 @@ define(function() {
      */
     var DrawCommand = function() {
         /**
-         * The bounding volume of the geometry.  This is used for culling and frustum selection.
+         * The bounding volume of the geometry in world space.  This is used for culling and frustum selection.
          * <p>
          * For best rendering performance, use the tightest possible bounding volume.  Although
          * <code>undefined</code> is allowed, always try to provide a bounding volume to
@@ -85,7 +85,7 @@ define(function() {
          *
          * @default undefined
          */
-        this.offset = undefined;
+        this.offset = 0;
 
         /**
          * The shader program to apply.

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

@@ -1,5 +1,5 @@
 /*global define*/
-define(['Core/Enumeration'], function(Enumeration) {
+define(function() {
     "use strict";
 
     /**
@@ -9,67 +9,61 @@ define(['Core/Enumeration'], function(Enumeration) {
      */
     var PixelFormat = {
         /**
-         * A pixel format containing a depth value.
+         * 0x1902.  A pixel format containing a depth value.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x1902
          */
-        DEPTH_COMPONENT : new Enumeration(0x1902, 'DEPTH_COMPONENT'),
+        DEPTH_COMPONENT : 0x1902,
 
         /**
-         * A pixel format containing a depth and stencil value, most often used with {@link PixelDatatype.UNSIGNED_INT_24_8_WEBGL}.
+         * 0x84F9.  A pixel format containing a depth and stencil value, most often used with {@link PixelDatatype.UNSIGNED_INT_24_8_WEBGL}.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x84F9
          */
-        DEPTH_STENCIL : new Enumeration(0x84F9, 'DEPTH_STENCIL'),
+        DEPTH_STENCIL : 0x84F9,
 
         /**
-         * DOC_TBA
+         * 0x1906.  A pixel format containing an alpha channel.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x1906
          */
-        ALPHA : new Enumeration(0x1906, 'ALPHA'),
+        ALPHA : 0x1906,
 
         /**
-         * DOC_TBA
+         * 0x1907.  A pixel format containing red, green, and blue channels.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x1907
          */
-        RGB : new Enumeration(0x1907, 'RGB'),
+        RGB : 0x1907,
 
         /**
-         * DOC_TBA
+         * 0x1908.  A pixel format containing red, green, blue, and alpha channels.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x1908
          */
-        RGBA : new Enumeration(0x1908, 'RGBA'),
+        RGBA : 0x1908,
 
         /**
-         * DOC_TBA
+         * 0x1909.  A pixel format containing a luminance (intensity) channel.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x1909
          */
-        LUMINANCE : new Enumeration(0x1909, 'LUMINANCE'),
+        LUMINANCE : 0x1909,
 
         /**
-         * DOC_TBA
+         * 0x190A.  A pixel format containing luminance (intensity) and alpha channels.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
          * @default 0x190A
          */
-        LUMINANCE_ALPHA : new Enumeration(0x190A, 'LUMINANCE_ALPHA'),
+        LUMINANCE_ALPHA : 0x190A,
 
         /**
          * Returns true if the pixel format is a valid enumeration value.

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

@@ -22,15 +22,15 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/FeatureDetection', 'Core/Ru
             };
         case gl.FLOAT_VEC2:
             return function() {
-                return UniformDatatype.FLOAT_VECTOR2;
+                return UniformDatatype.FLOAT_VEC2;
             };
         case gl.FLOAT_VEC3:
             return function() {
-                return UniformDatatype.FLOAT_VECTOR3;
+                return UniformDatatype.FLOAT_VEC3;
             };
         case gl.FLOAT_VEC4:
             return function() {
-                return UniformDatatype.FLOAT_VECTOR4;
+                return UniformDatatype.FLOAT_VEC4;
             };
         case gl.INT:
             return function() {
@@ -38,15 +38,15 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/FeatureDetection', 'Core/Ru
             };
         case gl.INT_VEC2:
             return function() {
-                return UniformDatatype.INT_VECTOR2;
+                return UniformDatatype.INT_VEC2;
             };
         case gl.INT_VEC3:
             return function() {
-                return UniformDatatype.INT_VECTOR3;
+                return UniformDatatype.INT_VEC3;
             };
         case gl.INT_VEC4:
             return function() {
-                return UniformDatatype.INT_VECTOR4;
+                return UniformDatatype.INT_VEC4;
             };
         case gl.BOOL:
             return function() {
@@ -54,27 +54,27 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/FeatureDetection', 'Core/Ru
             };
         case gl.BOOL_VEC2:
             return function() {
-                return UniformDatatype.BOOL_VECTOR2;
+                return UniformDatatype.BOOL_VEC2;
             };
         case gl.BOOL_VEC3:
             return function() {
-                return UniformDatatype.BOOL_VECTOR3;
+                return UniformDatatype.BOOL_VEC3;
             };
         case gl.BOOL_VEC4:
             return function() {
-                return UniformDatatype.BOOL_VECTOR4;
+                return UniformDatatype.BOOL_VEC4;
             };
         case gl.FLOAT_MAT2:
             return function() {
-                return UniformDatatype.FLOAT_MATRIX2;
+                return UniformDatatype.FLOAT_MAT2;
             };
         case gl.FLOAT_MAT3:
             return function() {
-                return UniformDatatype.FLOAT_MATRIX3;
+                return UniformDatatype.FLOAT_MAT3;
             };
         case gl.FLOAT_MAT4:
             return function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             };
         case gl.SAMPLER_2D:
             return function() {
@@ -231,7 +231,7 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/FeatureDetection', 'Core/Ru
      *
      * var mvp = sp.getAllUniforms().u_mvp;
      * console.log(mvp.getName());           // 'u_mvp'
-     * console.log(mvp.getDatatype().name);  // 'FLOAT_MATRIX4'
+     * console.log(mvp.getDatatype().name);  // 'FLOAT_MAT4'
      * mvp.value = Matrix4.IDENTITY;
      *
      * //////////////////////////////////////////////////////////////////////
@@ -319,7 +319,7 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/FeatureDetection', 'Core/Ru
          *
          * @example
          * // GLSL: uniform mat4 u_mvp;
-         * console.log(sp.getAllUniforms().u_mvp.getDatatype().name);  // 'FLOAT_MATRIX4'
+         * console.log(sp.getAllUniforms().u_mvp.getDatatype().name);  // 'FLOAT_MAT4'
          */
         this.getDatatype = getUniformDatatype(_gl, activeUniform.type);
 
@@ -828,39 +828,26 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/FeatureDetection', 'Core/Ru
         var vsSourceVersioned = extractShaderVersion(vertexShaderSource);
         var fsSourceVersioned = extractShaderVersion(fragmentShaderSource);
 
-        var vsSource = vsSourceVersioned.version + getBuiltinsAndAutomaticUniforms(vsSourceVersioned.source) + '\n#line 0\n' + vsSourceVersioned.source;
-        var fsSource = fsSourceVersioned.version + getFragmentShaderPrecision() + getBuiltinsAndAutomaticUniforms(fsSourceVersioned.source) + '\n#line 0\n' + fsSourceVersioned.source;
+        var vsSource =
+                vsSourceVersioned.version +
+                getBuiltinsAndAutomaticUniforms(vsSourceVersioned.source) +
+                '\n#line 0\n' +
+                vsSourceVersioned.source;
+        var fsSource =
+                fsSourceVersioned.version +
+                getFragmentShaderPrecision() +
+                getBuiltinsAndAutomaticUniforms(fsSourceVersioned.source) +
+                '\n#line 0\n' +
+                fsSourceVersioned.source;
+        var log;
 
         var vertexShader = gl.createShader(gl.VERTEX_SHADER);
         gl.shaderSource(vertexShader, vsSource);
         gl.compileShader(vertexShader);
-        var vsLog = gl.getShaderInfoLog(vertexShader);
-
-        if (logShaderCompilation && vsLog && vsLog.length) {
-            console.log('[GL] Vertex shader compile log: ' + vsLog);
-        }
-
-        if (!gl.getShaderParameter(vertexShader, gl.COMPILE_STATUS)) {
-            gl.deleteShader(vertexShader);
-            console.error('[GL] Vertex shader compile log: ' + vsLog);
-            throw new RuntimeError('Vertex shader failed to compile.  Compile log: ' + vsLog);
-        }
 
         var fragmentShader = gl.createShader(gl.FRAGMENT_SHADER);
         gl.shaderSource(fragmentShader, fsSource);
         gl.compileShader(fragmentShader);
-        var fsLog = gl.getShaderInfoLog(fragmentShader);
-
-        if (logShaderCompilation && fsLog && fsLog.length) {
-            console.log('[GL] Fragment shader compile log: ' + fsLog);
-        }
-
-        if (!gl.getShaderParameter(fragmentShader, gl.COMPILE_STATUS)) {
-            gl.deleteShader(vertexShader);
-            gl.deleteShader(fragmentShader);
-            console.error('[GL] Fragment shader compile log: ' + fsLog);
-            throw new RuntimeError('Fragment shader failed to compile.  Compile log: ' + fsLog);
-        }
 
         var program = gl.createProgram();
         gl.attachShader(program, vertexShader);
@@ -878,16 +865,48 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/FeatureDetection', 'Core/Ru
         }
 
         gl.linkProgram(program);
-        var linkLog = gl.getProgramInfoLog(program);
-
-        if (logShaderCompilation && linkLog && linkLog.length) {
-            console.log('[GL] Shader program link log: ' + linkLog);
-        }
 
         if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
+            // For performance, only check compile errors if there is a linker error.
+            if (!gl.getShaderParameter(fragmentShader, gl.COMPILE_STATUS)) {
+                log = gl.getShaderInfoLog(fragmentShader);
+                gl.deleteProgram(program);
+                console.error('[GL] Fragment shader compile log: ' + log);
+                throw new RuntimeError('Fragment shader failed to compile.  Compile log: ' + log);
+            }
+
+            if (!gl.getShaderParameter(vertexShader, gl.COMPILE_STATUS)) {
+                log = gl.getShaderInfoLog(vertexShader);
+                gl.deleteProgram(program);
+                console.error('[GL] Vertex shader compile log: ' + log);
+                throw new RuntimeError('Vertex shader failed to compile.  Compile log: ' + log);
+            }
+
+            log = gl.getProgramInfoLog(program);
             gl.deleteProgram(program);
-            console.error('[GL] Shader program link log: ' + linkLog);
-            throw new RuntimeError('Program failed to link.  Link log: ' + linkLog);
+            console.error('[GL] Shader program link log: ' + log);
+            throw new RuntimeError('Program failed to link.  Link log: ' + log);
+        }
+
+        if (logShaderCompilation) {
+            log = gl.getShaderInfoLog(vertexShader);
+            if (defined(log) && (log.length > 0)) {
+                console.log('[GL] Vertex shader compile log: ' + log);
+            }
+        }
+
+        if (logShaderCompilation) {
+            log = gl.getShaderInfoLog(fragmentShader);
+            if (defined(log) && (log.length > 0)) {
+                console.log('[GL] Fragment shader compile log: ' + log);
+            }
+        }
+
+        if (logShaderCompilation) {
+            log = gl.getProgramInfoLog(program);
+            if (defined(log) && (log.length > 0)) {
+                console.log('[GL] Shader program link log: ' + log);
+            }
         }
 
         return program;

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

@@ -108,7 +108,7 @@ define(['Core/Cartesian2', 'Core/defaultValue', 'Core/defined', 'Core/destroyObj
 
         //Firefox bug: texSubImage2D has overloads and can't resolve our enums, so we use + to explicitly convert to a number.
         if (source.arrayBufferView) {
-            gl.texSubImage2D(target, 0, xOffset, yOffset, width, height, +this._pixelFormat, +this._pixelDatatype, source.arrayBufferView);
+            gl.texSubImage2D(target, 0, xOffset, yOffset, width, height, this._pixelFormat, +this._pixelDatatype, source.arrayBufferView);
         } else {
             gl.texSubImage2D(target, 0, xOffset, yOffset, this._pixelFormat, this._pixelDatatype, source);
         }

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

@@ -1,5 +1,5 @@
 /*global define*/
-define(['Core/Enumeration'], function(Enumeration) {
+define(function() {
     "use strict";
 
     /**
@@ -9,22 +9,20 @@ define(['Core/Enumeration'], function(Enumeration) {
      */
     var TextureMagnificationFilter = {
         /**
-         * DOC_TBA
+         * 0x2600.  Nearest magnification texture filtering.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x2600
          */
-        NEAREST : new Enumeration(0x2600, 'NEAREST'),
+        NEAREST : 0x2600,
 
         /**
-         * DOC_TBA
+         * 0x2601.  Linear (bilinear for 2D textures) magnification texture filtering.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x2601
          */
-        LINEAR : new Enumeration(0x2601, 'LINEAR'),
+        LINEAR : 0x2601,
 
         /**
          * DOC_TBA

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

@@ -1,5 +1,5 @@
 /*global define*/
-define(['Core/Enumeration'], function(Enumeration) {
+define(function() {
     "use strict";
 
     /**
@@ -9,58 +9,52 @@ define(['Core/Enumeration'], function(Enumeration) {
      */
     var TextureMinificationFilter = {
         /**
-         * DOC_TBA
+         * 0x2600.  Nearest minification texture filtering.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x2600
          */
-        NEAREST : new Enumeration(0x2600, 'NEAREST'),
+        NEAREST : 0x2600,
 
         /**
-         * DOC_TBA
+         * 0x2601.  Linear (bilinear for 2D textures) minification texture filtering.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x2601
          */
-        LINEAR : new Enumeration(0x2601, 'LINEAR'),
+        LINEAR : 0x2601,
 
         /**
-         * DOC_TBA
+         * 0x2700.  Nearest-mipmap-nearest minification texture filtering.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x2700
          */
-        NEAREST_MIPMAP_NEAREST : new Enumeration(0x2700, 'NEAREST_MIPMAP_NEAREST'),
+        NEAREST_MIPMAP_NEAREST : 0x2700,
 
         /**
-         * DOC_TBA
+         * 0x2701.  Linear-mipmap-nearest minification texture filtering.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x2701
          */
-        LINEAR_MIPMAP_NEAREST : new Enumeration(0x2701, 'LINEAR_MIPMAP_NEAREST'),
+        LINEAR_MIPMAP_NEAREST : 0x2701,
 
         /**
-         * DOC_TBA
+         * 0x2702.  Nearest-mipmap-linear minification texture filtering.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x2702
          */
-        NEAREST_MIPMAP_LINEAR : new Enumeration(0x2702, 'NEAREST_MIPMAP_LINEAR'),
+        NEAREST_MIPMAP_LINEAR : 0x2702,
 
         /**
-         * DOC_TBA
+         * 0x2703.  Linear-mipmap-linear minification texture filtering.
          *
-         * @type {Enumeration}
+         * @type {Number}
          * @constant
-         * @default 0x2703
          */
-        LINEAR_MIPMAP_LINEAR : new Enumeration(0x2703, 'LINEAR_MIPMAP_LINEAR'),
+        LINEAR_MIPMAP_LINEAR : 0x2703,
 
         /**
          * DOC_TBA