cesium 0.22.0 → 0.23.0

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

@@ -1,9 +1,7 @@
 /*global define*/
-define(['Core/Color', 'Core/combine', 'Core/destroyObject', 'Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/BoundingRectangle', 'Core/ComponentDatatype', 'Core/PrimitiveType', 'Core/Geometry', 'Core/GeometryAttribute', 'Scene/Material', 'Renderer/BufferUsage', 'Renderer/BlendingState', 'Renderer/CommandLists', 'Renderer/DrawCommand', 'Renderer/createShaderSource', 'Shaders/ViewportQuadVS', 'Shaders/ViewportQuadFS'], function(
+define(['Core/Color', 'Core/destroyObject', 'Core/defined', 'Core/DeveloperError', 'Core/BoundingRectangle', 'Core/ComponentDatatype', 'Core/PrimitiveType', 'Core/Geometry', 'Core/GeometryAttribute', 'Scene/Material', 'Renderer/BufferUsage', 'Renderer/BlendingState', 'Renderer/CommandLists', 'Renderer/DrawCommand', 'Renderer/createShaderSource', 'Shaders/ViewportQuadVS', 'Shaders/ViewportQuadFS'], function(
         Color,
-        combine,
         destroyObject,
-        defaultValue,
         defined,
         DeveloperError,
         BoundingRectangle,

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

@@ -1,10 +1,9 @@
 /*global define*/
-define(['Core/clone', 'Core/defaultValue', 'Core/defined', 'Core/freezeObject', 'Core/writeTextToCanvas', 'Core/DeveloperError', 'Core/Event', 'Core/Extent', 'Scene/Credit', 'Scene/ImageryProvider', 'Scene/GeographicTilingScheme'], function(
+define(['Core/clone', 'Core/defaultValue', 'Core/defined', 'Core/freezeObject', 'Core/DeveloperError', 'Core/Event', 'Core/Extent', 'Scene/Credit', 'Scene/ImageryProvider', 'Scene/GeographicTilingScheme'], function(
         clone,
         defaultValue,
         defined,
         freezeObject,
-        writeTextToCanvas,
         DeveloperError,
         Event,
         Extent,

data/app/assets/javascripts/ThirdParty/knockout-3.0.0.js

@@ -1,6 +1,9 @@
-// Knockout JavaScript library v3.0.0
-// (c) Steven Sanderson - http://knockoutjs.com/
-// License: MIT (http://www.opensource.org/licenses/mit-license.php)
+/**
+@license
+Knockout JavaScript library v3.0.0
+(c) Steven Sanderson - http://knockoutjs.com/
+License: MIT (http://www.opensource.org/licenses/mit-license.php)
+*/
 
 (function() {(function(q){var y=this||(0,eval)("this"),w=y.document,K=y.navigator,u=y.jQuery,B=y.JSON;(function(q){"function"===typeof require&&"object"===typeof exports&&"object"===typeof module?q(module.exports||exports):"function"===typeof define&&define.amd?define(["exports"],q):q(y.ko={})})(function(F){function G(a,c){return null===a||typeof a in N?a===c:!1}function H(b,c,d,e){a.d[b]={init:function(b){a.a.f.set(b,L,{});return{controlsDescendantBindings:!0}},update:function(b,h,k,m,f){k=a.a.f.get(b,L);h=a.a.c(h());
 m=!d!==!h;var p=!k.ob;if(p||c||m!==k.Db)p&&(k.ob=a.a.Ya(a.e.childNodes(b),!0)),m?(p||a.e.S(b,a.a.Ya(k.ob)),a.Ta(e?e(f,h):f,b)):a.e.Z(b),k.Db=m}};a.g.Y[b]=!1;a.e.P[b]=!0}var a="undefined"!==typeof F?F:{};a.b=function(b,c){for(var d=b.split("."),e=a,g=0;g<d.length-1;g++)e=e[d[g]];e[d[d.length-1]]=c};a.s=function(a,c,d){a[c]=d};a.version="3.0.0";a.b("version",a.version);a.a=function(){function b(a,b){for(var f in a)a.hasOwnProperty(f)&&b(f,a[f])}function c(k,b){if("input"!==a.a.v(k)||!k.type||"click"!=

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

@@ -51,7 +51,7 @@ define(['Core/buildModuleUrl', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Clock
             } catch (e) {
                 widget._useDefaultRenderLoop = false;
                 widget._renderLoopRunning = false;
-                widget._onRenderLoopError.raiseEvent(widget, e);
+                widget._renderLoopError.raiseEvent(widget, e);
                 if (widget._showRenderLoopErrors) {
                     widget.showErrorPanel('An error occurred while rendering.  Rendering has stopped.', e);
                     console.error(e);
@@ -212,7 +212,7 @@ define(['Core/buildModuleUrl', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Clock
             this._creditContainer = creditContainer;
             this._canRender = false;
             this._showRenderLoopErrors = defaultValue(options.showRenderLoopErrors, true);
-            this._onRenderLoopError = new Event();
+            this._renderLoopError = new Event();
 
             if (options.sceneMode) {
                 if (options.sceneMode === SceneMode.SCENE2D) {
@@ -339,7 +339,7 @@ define(['Core/buildModuleUrl', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Clock
          */
         onRenderLoopError : {
             get : function() {
-                return this._onRenderLoopError;
+                return this._renderLoopError;
             }
         },
 
@@ -432,6 +432,7 @@ define(['Core/buildModuleUrl', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Clock
      * @memberof CesiumWidget
      */
     CesiumWidget.prototype.destroy = function() {
+        this._scene = this._scene && this._scene.destroy();
         this._container.removeChild(this._element);
         destroyObject(this);
     };

data/app/assets/javascripts/Widgets/SceneModePicker/SceneModePickerViewModel.js

@@ -34,7 +34,7 @@ define(['Core/defineProperties', 'Core/defined', 'Core/destroyObject', 'Core/Dev
         };
 
         this._eventHelper = new EventHelper();
-        this._eventHelper.add(transitioner.onTransitionStart, transitionStart);
+        this._eventHelper.add(transitioner.transitionStart, transitionStart);
 
         /**
          * Gets or sets the current SceneMode.  This property is observable.

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

@@ -53,7 +53,7 @@ define(['Core/Cartesian2', 'Core/defaultValue', 'Core/defined', 'Core/DeveloperE
             } catch (e) {
                 viewer._useDefaultRenderLoop = false;
                 viewer._renderLoopRunning = false;
-                viewer._onRenderLoopError.raiseEvent(viewer, e);
+                viewer._renderLoopError.raiseEvent(viewer, e);
                 if (viewer._showRenderLoopErrors) {
                     /*global console*/
                     viewer.cesiumWidget.showErrorPanel('An error occurred while rendering.  Rendering has stopped.', e);
@@ -143,7 +143,7 @@ define(['Core/Cartesian2', 'Core/defaultValue', 'Core/defined', 'Core/DeveloperE
      * viewer.extend(Cesium.viewerDynamicObjectMixin);
      *
      * //Show a pop-up alert if we encounter an error when processing a dropped file
-     * viewer.onDropError.addEventListener(function(dropHandler, name, error) {
+     * viewer.dropError.addEventListener(function(dropHandler, name, error) {
      *     console.log(error);
      *     window.alert(error);
      * });
@@ -318,7 +318,7 @@ Either specify options.imageryProvider instead or set options.baseLayerPicker to
         this._useDefaultRenderLoop = undefined;
         this._renderLoopRunning = false;
         this._showRenderLoopErrors = defaultValue(options.showRenderLoopErrors, true);
-        this._onRenderLoopError = new Event();
+        this._renderLoopError = new Event();
 
         //Start the render loop if not explicitly disabled in options.
         this.useDefaultRenderLoop = defaultValue(options.useDefaultRenderLoop, true);
@@ -531,9 +531,9 @@ Either specify options.imageryProvider instead or set options.baseLayerPicker to
          * @memberof Viewer.prototype
          * @type {Event}
          */
-        onRenderLoopError : {
+        renderLoopError : {
             get : function() {
-                return this._onRenderLoopError;
+                return this._renderLoopError;
             }
         },
 

data/app/assets/javascripts/Widgets/Viewer/viewerDragDropMixin.js

@@ -28,14 +28,14 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
      * @exception {DeveloperError} Element with id <options.dropTarget> does not exist in the document.
      * @exception {DeveloperError} dropTarget is already defined by another mixin.
      * @exception {DeveloperError} dropEnabled is already defined by another mixin.
-     * @exception {DeveloperError} onDropError is already defined by another mixin.
+     * @exception {DeveloperError} dropError is already defined by another mixin.
      * @exception {DeveloperError} clearOnDrop is already defined by another mixin.
      *
      * @example
      * // Add basic drag and drop support and pop up an alert window on error.
      * var viewer = new Cesium.Viewer('cesiumContainer');
      * viewer.extend(Cesium.viewerDragDropMixin);
-     * viewer.onDropError.addEventListener(function(viewerArg, source, error) {
+     * viewer.dropError.addEventListener(function(viewerArg, source, error) {
      *     window.alert('Error processing ' + source + ':' + error);
      * });
      */
@@ -49,8 +49,8 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
         if (viewer.hasOwnProperty('dropEnabled')) {
             throw new DeveloperError('dropEnabled is already defined by another mixin.');
         }
-        if (viewer.hasOwnProperty('onDropError')) {
-            throw new DeveloperError('onDropError is already defined by another mixin.');
+        if (viewer.hasOwnProperty('dropError')) {
+            throw new DeveloperError('dropError is already defined by another mixin.');
         }
         if (viewer.hasOwnProperty('clearOnDrop')) {
             throw new DeveloperError('clearOnDrop is already defined by another mixin.');
@@ -60,7 +60,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
 
         //Local variables to be closed over by defineProperties.
         var dropEnabled = true;
-        var onDropError = new Event();
+        var dropError = new Event();
         var clearOnDrop = defaultValue(options.clearOnDrop, true);
         var dropTarget = defaultValue(options.dropTarget, viewer.container);
 
@@ -114,9 +114,9 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
              * @memberof viewerDragDropMixin.prototype
              * @type {Event}
              */
-            onDropError : {
+            dropError : {
                 get : function() {
-                    return onDropError;
+                    return dropError;
                 }
             },
 
@@ -148,7 +148,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
                 var f = files[i];
                 var reader = new FileReader();
                 reader.onload = createOnLoadCallback(viewer, f.name);
-                reader.onerror = createOnDropErrorCallback(viewer, f.name);
+                reader.onerror = createDropErrorCallback(viewer, f.name);
                 reader.readAsText(f);
             }
         }
@@ -203,7 +203,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
         endsWith(sourceUpperCase, ".TOPOJSON")) {
             DataSource = GeoJsonDataSource;
         } else {
-            viewer.onDropError.raiseEvent(viewer, source, 'Unrecognized file extension: ' + source);
+            viewer.dropError.raiseEvent(viewer, source, 'Unrecognized file extension: ' + source);
             return undefined;
         }
 
@@ -213,17 +213,17 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
                 when(dataSource.load(JSON.parse(evt.target.result), source), function() {
                     viewer.dataSources.add(dataSource);
                 }, function(error) {
-                    viewer.onDropError.raiseEvent(viewer, source, error);
+                    viewer.dropError.raiseEvent(viewer, source, error);
                 });
             } catch (error) {
-                viewer.onDropError.raiseEvent(viewer, source, error);
+                viewer.dropError.raiseEvent(viewer, source, error);
             }
         };
     }
 
-    function createOnDropErrorCallback(viewer, name) {
+    function createDropErrorCallback(viewer, name) {
         return function(evt) {
-            viewer.onDropError.raiseEvent(viewer, name, evt.target.error);
+            viewer.dropError.raiseEvent(viewer, name, evt.target.error);
         };
     }
 

data/app/assets/javascripts/Widgets/Viewer/viewerDynamicObjectMixin.js

@@ -39,12 +39,12 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
         if (viewer.hasOwnProperty('trackedObject')) {
             throw new DeveloperError('trackedObject is already defined by another mixin.');
         }
-        if (viewer.hasOwnProperty('onObjectTracked')) {
-            throw new DeveloperError('onObjectTracked is already defined by another mixin.');
+        if (viewer.hasOwnProperty('objectTracked')) {
+            throw new DeveloperError('objectTracked is already defined by another mixin.');
         }
 
         var eventHelper = new EventHelper();
-        var onObjectTracked = new Event();
+        var objectTracked = new Event();
         var trackedObject;
         var dynamicObjectView;
 
@@ -138,7 +138,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
                     if (trackedObject !== value) {
                         trackedObject = value;
                         dynamicObjectView = defined(value) ? new DynamicObjectView(value, viewer.scene, viewer.centralBody.getEllipsoid()) : undefined;
-                        onObjectTracked.raiseEvent(viewer, value);
+                        objectTracked.raiseEvent(viewer, value);
                     }
                 }
             },
@@ -150,9 +150,9 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
              * @memberof viewerDynamicObjectMixin.prototype
              * @type {Event}
              */
-            onObjectTracked : {
+            objectTracked : {
                 get : function() {
-                    return onObjectTracked;
+                    return objectTracked;
                 }
             }
         });

data/app/assets/javascripts/Widgets/widgets.css

@@ -8,4 +8,4 @@
 @import url(./Viewer/Viewer.css);
 
 /* Shared CSS classes are imported last, to ensure that the above CSS must override in an order-independent fashion. */
-@import url(../CesiumWidget/CesiumWidget.css);
+@import url(./CesiumWidget/CesiumWidget.css);

data/lib/cesium/version.rb

@@ -1,3 +1,3 @@
 module Cesium
-  VERSION = '0.22.0'
+  VERSION = '0.23.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cesium
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Bogumil Wrona
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -264,6 +264,7 @@ files:
 - app/assets/javascripts/Core/LagrangePolynomialApproximation.js
 - app/assets/javascripts/Core/LeapSecond.js
 - app/assets/javascripts/Core/LinearApproximation.js
+- app/assets/javascripts/Core/LinearSpline.js
 - app/assets/javascripts/Core/loadArrayBuffer.js
 - app/assets/javascripts/Core/loadBlob.js
 - app/assets/javascripts/Core/loadImage.js
@@ -277,8 +278,8 @@ files:
 - app/assets/javascripts/Core/Matrix3.js
 - app/assets/javascripts/Core/Matrix4.js
 - app/assets/javascripts/Core/NearFarScalar.js
+- app/assets/javascripts/Core/ObjectOrientedBoundingBox.js
 - app/assets/javascripts/Core/Occluder.js
-- app/assets/javascripts/Core/OrientationInterpolator.js
 - app/assets/javascripts/Core/Packable.js
 - app/assets/javascripts/Core/PackableForInterpolation.js
 - app/assets/javascripts/Core/package.json
@@ -297,6 +298,7 @@ files:
 - app/assets/javascripts/Core/QuadraticRealPolynomial.js
 - app/assets/javascripts/Core/QuarticRealPolynomial.js
 - app/assets/javascripts/Core/Quaternion.js
+- app/assets/javascripts/Core/QuaternionSpline.js
 - app/assets/javascripts/Core/Queue.js
 - app/assets/javascripts/Core/Ray.js
 - app/assets/javascripts/Core/ReferenceFrame.js
@@ -312,6 +314,7 @@ files:
 - app/assets/javascripts/Core/SphereGeometry.js
 - app/assets/javascripts/Core/SphereOutlineGeometry.js
 - app/assets/javascripts/Core/Spherical.js
+- app/assets/javascripts/Core/Spline.js
 - app/assets/javascripts/Core/TaskProcessor.js
 - app/assets/javascripts/Core/throttleRequestByServer.js
 - app/assets/javascripts/Core/TimeConstants.js

data/app/assets/javascripts/Core/OrientationInterpolator.js

@@ -1,106 +0,0 @@
-/*global define*/
-define(['Core/defined', 'Core/DeveloperError', 'Core/Quaternion'], function(
-        defined,
-        DeveloperError,
-        Quaternion) {
-    "use strict";
-
-    /**
-     * Smoothly interpolates orientation, represented by <code>Quaternion</code>s, over time.
-     * For example, this can be used to set a camera's axes along a path.
-     *
-     * @alias OrientationInterpolator
-     * @constructor
-     *
-     * @param {Array} controlPoints An array, of at least length 2, of objects with <code>orientation</code> and
-     * <code>time</code> properties.
-     *
-     * @exception {DeveloperError} controlPoints is required. It must be an array with at least a length of 3.
-     *
-     * @see Quaternion
-     * @see CatmullRomSpline
-     * @see HermiteSpline
-     */
-    var OrientationInterpolator = function(controlPoints) {
-        if (!defined(controlPoints) || !(controlPoints instanceof Array) || controlPoints.length < 2) {
-            throw new DeveloperError('controlPoints is required. It must be an array with at least a length of 3.');
-        }
-
-        this._points = controlPoints;
-        this._lastTimeIndex = 0;
-    };
-
-    /**
-     * Returns the array of control points.
-     *
-     * @memberof OrientationInterpolator
-     * @returns {Array} The array of control points.
-     */
-    OrientationInterpolator.prototype.getControlPoints = function() {
-        return this._points;
-    };
-
-    function findIndex(orientationInterpolator, time) {
-        // Take advantage of temporal coherence by checking current, next and previous intervals
-        // for containment of time.
-        var i = orientationInterpolator._lastTimeIndex || 0;
-        if (time >= orientationInterpolator._points[i].time) {
-            if (i + 1 < orientationInterpolator._points.length && time < orientationInterpolator._points[i + 1].time) {
-                return i;
-            } else if (i + 2 < orientationInterpolator._points.length && time < orientationInterpolator._points[i + 2].time) {
-                orientationInterpolator._lastTimeIndex = i + 1;
-                return orientationInterpolator._lastTimeIndex;
-            }
-        } else if (i - 1 >= 0 && time >= orientationInterpolator._points[i - 1].time) {
-            orientationInterpolator._lastTimeIndex = i - 1;
-            return orientationInterpolator._lastTimeIndex;
-        }
-
-        // The above failed so do a linear search. For the use cases so far, the
-        // length of the list is less than 10. In the future, if there is a bottle neck,
-        // it might be here.
-        for (i = 0; i < orientationInterpolator._points.length - 1; ++i) {
-            if (time >= orientationInterpolator._points[i].time && time < orientationInterpolator._points[i + 1].time) {
-                break;
-            }
-        }
-
-        if (i === orientationInterpolator._points.length - 1) {
-            i = orientationInterpolator._points.length - 2;
-        }
-
-        orientationInterpolator._lastTimeIndex = i;
-        return orientationInterpolator._lastTimeIndex;
-    }
-
-    /**
-     * Evaluates the orientation at a given time.
-     *
-     * @memberof OrientationInterpolator
-     *
-     * @param {Number} time The time at which to evaluate the orientation.
-     *
-     * @exception {DeveloperError} time is required.
-     * @exception {DeveloperError} time must be in the range <code>[a<sub>0</sub>, a<sub>n</sub>]</code>,
-     * where <code>a<sub>0</sub></code> and <code>a<sub>n</sub></code> are the time properties of first and
-     * last elements in the array given during construction, respectively.
-     *
-     * @returns {Quaternion} The orientation at the given <code>time</code>.
-     */
-    OrientationInterpolator.prototype.evaluate = function(time) {
-        if (!defined(time)) {
-            throw new DeveloperError('time is required.');
-        }
-
-        if (time < this._points[0].time || time > this._points[this._points.length - 1].time) {
-            throw new DeveloperError('time is out of range.');
-        }
-
-        var i = findIndex(this, time);
-        var u = (time - this._points[i].time) / (this._points[i + 1].time - this._points[i].time);
-
-        return Quaternion.slerp(this._points[i].orientation, this._points[i + 1].orientation, u);
-    };
-
-    return OrientationInterpolator;
-});