Merge branch 'dead-ant' into update-requirejs

# Conflicts:
#	CHANGES.md
#	ThirdParty/requirejs-2.1.20/r.js
#	build.xml

.externalToolBuilders/automaticBuild.launch

@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="build,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="build,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Cesium"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Cesium/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${system_path:node}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="./node_modules/gulp/bin/gulp.js build"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Cesium}"/>
 </launchConfiguration>

.gitignore

@@ -8,14 +8,14 @@ Thumbs.db
 /Apps/CesiumViewer/Gallery/gallery-index.js
 
 /Apps/Sandcastle/jsHintOptions.js
+/Apps/Sandcastle/.jshintrc
 /Apps/Sandcastle/gallery/gallery-index.js
 
 /Source/Cesium.js
 
 /Source/Shaders/*.js
 /Source/Shaders/*/*.js
 /Source/Shaders/*/*/*.js
-!/Source/Shaders/Shaders.profile.js
 
 /Specs/SpecList.js
 

.jshintrc

@@ -41,5 +41,6 @@
   "shadow": false,
   "sub": false,
   "supernew": false,
-  "browser": true
+  "browser": true,
+  "predef": [ "JSON" ]
 }

.travis.yml

@@ -3,4 +3,4 @@ node_js:
   - "0.10"
 sudo: false
 script:
-  - ant jsHint release -DnodePath=node
+  - npm run jsHint && npm run release

Apps/CesiumViewer/CesiumViewer.js

@@ -156,10 +156,12 @@ define([
             var roll = ((splitQuery.length > 5) && (!isNaN(+splitQuery[5]))) ? CesiumMath.toRadians(+splitQuery[5]) : undefined;
 
             viewer.camera.setView({
-                position: Cartesian3.fromDegrees(longitude, latitude, height),
-                heading: heading,
-                pitch: pitch,
-                roll: roll
+                destination: Cartesian3.fromDegrees(longitude, latitude, height),
+                orientation: {
+                    heading: heading,
+                    pitch: pitch,
+                    roll: roll
+                }
             });
         }
     }

Apps/Sandcastle/gallery/Camera.html

@@ -139,9 +139,11 @@
     var camera = viewer.camera;
     camera.setView({
         position : Cesium.Cartesian3.fromDegrees(-75.5847, 40.0397, 1000.0),
-        heading : -Cesium.Math.PI_OVER_TWO,
-        pitch : -Cesium.Math.PI_OVER_FOUR,
-        roll : 0.0
+        orientation: {
+            heading : -Cesium.Math.PI_OVER_TWO,
+            pitch : -Cesium.Math.PI_OVER_FOUR,
+            roll : 0.0
+        }
     });
 }
 

CHANGES.md

@@ -16,12 +16,20 @@ Change Log
   * Deprecated `PerspectiveOffCenterFrustum.getPixelSize`, use `PerspectiveOffCenterFrustum.getPixelDimensions` instead. It will be removed in 1.17.
   * Deprecated `Scene\HeadingPitchRange`, use `Core\HeadingPitchRange` instead. It will be removed in 1.17.
   * Deprecated `jsonp` use `loadJsonp` instead. It will be removed in 1.17.
+  * Deprecated `Camera.viewRectangle`, use `Camera.setView({destination: rectangle})` instead. It will be removed in 1.17.
+  * The following options to `Camera.setView` have been deprecated and will be removed in 1.17:
+    * `position`: use `destination` instead.
+    * `positionCartographic`: convert to a `Cartesian3` and use `destination` instead.
+    * `heading`, `pitch` and `roll`: use `orientation.heading/pitch/roll` instead.  
 * Decreased GPU memory usage in `BillboardCollection` and `LabelCollection` by using the WebGL ANGLE_instanced_arrays extension.
 * Added CZML examples to Sandcastle.  See the new CZML tab.
 * Fixed token issue in `ArcGisMapServerImageryProvider`.
 * `ImageryLayerFeatureInfo` now has an `imageryLayer` property, indicating the layer that contains the feature.
 * Added `BoxOutlineGeometry.fromAxisAlignedBoundingBox` and `BoxGeometry.fromAxisAlignedBoundingBox` functions.
+* Switched to [gulp](http://gulpjs.com/) for all build tasks. `Java` and `ant` are no longer required to develop Cesium. [#3106](https://github.com/AnalyticalGraphicsInc/cesium/pull/3106)
 * The WebGL setting of `failIfMajorPerformanceCaveat` now defaults to `false`, which is the official WebGL default. This improves compatibility with out-of-date drivers and remote desktop sessions. Cesium will run slower in these cases instead of simply failing to load. 
+* Changed `Camera.setView` to take the same parameter options as `Camera.flyTo`.  `options.destination` takes a rectangle, `options.orientation` works with heading/pitch/roll or direction/up, and `options.endTransform` was added.
+* Fixed the issue where the camera inertia takes too long to finish causing the camera move events to fire after it appears to. [2839](https://github.com/AnalyticalGraphicsInc/cesium/issues/2839)
 * Updated `requirejs` from 2.1.9 to 2.1.20.
 * Updated `almond` from 0.2.6 to 0.3.1.
 

Source/Renderer/VertexArray.js

@@ -93,16 +93,10 @@ define([
                 gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer._getBuffer());
                 gl.vertexAttribPointer(index, this.componentsPerAttribute, this.componentDatatype, this.normalize, this.strideInBytes, this.offsetInBytes);
                 gl.enableVertexAttribArray(index);
-                if (this.instanceDivisor > 0) {
-                    context.glVertexAttribDivisor(index, this.instanceDivisor);
-                }
             };
 
             attr.disableVertexAttribArray = function(gl) {
                 gl.disableVertexAttribArray(this.index);
-                if (this.instanceDivisor > 0) {
-                    context.glVertexAttribDivisor(index, 0);
-                }
             };
         } else {
             // Less common case: value array for the same data for each vertex
@@ -672,7 +666,8 @@ define([
 
     // Workaround for ANGLE, where the attribute divisor seems to be part of the global state instead
     // of the VAO state. This function is called when the vao is bound, and should be removed
-    // once the ANGLE issue is resolved.
+    // once the ANGLE issue is resolved. Setting the divisor should normally happen in vertexAttrib and
+    // disableVertexAttribArray.
     function setVertexAttribDivisor(vertexArray) {
         var context = vertexArray._context;
         var hasInstancedAttributes = vertexArray._hasInstancedAttributes;
@@ -712,12 +707,13 @@ define([
     VertexArray.prototype._bind = function() {
         if (defined(this._vao)) {
             this._context.glBindVertexArray(this._vao);
-            if (this._context.instancedArrays) {
-                setVertexAttribDivisor(this);
-            }
         } else {
             bind(this._gl, this._attributes, this._indexBuffer);
         }
+
+        if (this._context.instancedArrays) {
+            setVertexAttribDivisor(this);
+        }
     };
 
     VertexArray.prototype._unBind = function() {