cesium 0.16.0 → 0.17.0

data/app/assets/javascripts/DynamicScene/DynamicEllipsoidVisualizer.js

@@ -3,20 +3,18 @@ define([
         '../Core/defaultValue',
         '../Core/DeveloperError',
         '../Core/destroyObject',
-        '../Core/Color',
         '../Core/Matrix3',
         '../Core/Matrix4',
         '../Scene/EllipsoidPrimitive',
         '../Scene/Material'
-       ], function(
-         defaultValue,
-         DeveloperError,
-         destroyObject,
-         Color,
-         Matrix3,
-         Matrix4,
-         EllipsoidPrimitive,
-         Material) {
+    ], function(
+        defaultValue,
+        DeveloperError,
+        destroyObject,
+        Matrix3,
+        Matrix4,
+        EllipsoidPrimitive,
+        Material) {
     "use strict";
 
     var matrix3Scratch = new Matrix3();
@@ -110,7 +108,7 @@ define([
         if (typeof this._dynamicObjectCollection !== 'undefined') {
             var dynamicObjects = this._dynamicObjectCollection.getObjects();
             for ( var i = 0, len = dynamicObjects.length; i < len; i++) {
-                this._updateObject(time, dynamicObjects[i]);
+                updateObject(this, time, dynamicObjects[i]);
             }
         }
     };
@@ -177,8 +175,8 @@ define([
 
     var position;
     var orientation;
-    DynamicEllipsoidVisualizer.prototype._updateObject = function(time, dynamicObject) {
-        var context = this._scene.getContext();
+    function updateObject(dynamicEllipsoidVisualizer, time, dynamicObject) {
+        var context = dynamicEllipsoidVisualizer._scene.getContext();
         var dynamicEllipsoid = dynamicObject.ellipsoid;
         if (typeof dynamicEllipsoid === 'undefined') {
             return;
@@ -207,33 +205,33 @@ define([
         if (!show) {
             //don't bother creating or updating anything else
             if (typeof ellipsoidVisualizerIndex !== 'undefined') {
-                ellipsoid = this._ellipsoidCollection[ellipsoidVisualizerIndex];
+                ellipsoid = dynamicEllipsoidVisualizer._ellipsoidCollection[ellipsoidVisualizerIndex];
                 ellipsoid.show = false;
                 dynamicObject._ellipsoidVisualizerIndex = undefined;
-                this._unusedIndexes.push(ellipsoidVisualizerIndex);
+                dynamicEllipsoidVisualizer._unusedIndexes.push(ellipsoidVisualizerIndex);
             }
             return;
         }
 
         if (typeof ellipsoidVisualizerIndex === 'undefined') {
-            var unusedIndexes = this._unusedIndexes;
+            var unusedIndexes = dynamicEllipsoidVisualizer._unusedIndexes;
             var length = unusedIndexes.length;
             if (length > 0) {
                 ellipsoidVisualizerIndex = unusedIndexes.pop();
-                ellipsoid = this._ellipsoidCollection[ellipsoidVisualizerIndex];
+                ellipsoid = dynamicEllipsoidVisualizer._ellipsoidCollection[ellipsoidVisualizerIndex];
             } else {
-                ellipsoidVisualizerIndex = this._ellipsoidCollection.length;
+                ellipsoidVisualizerIndex = dynamicEllipsoidVisualizer._ellipsoidCollection.length;
                 ellipsoid = new EllipsoidPrimitive();
 
-                this._ellipsoidCollection.push(ellipsoid);
-                this._primitives.add(ellipsoid);
+                dynamicEllipsoidVisualizer._ellipsoidCollection.push(ellipsoid);
+                dynamicEllipsoidVisualizer._primitives.add(ellipsoid);
             }
             dynamicObject._ellipsoidVisualizerIndex = ellipsoidVisualizerIndex;
             ellipsoid.dynamicObject = dynamicObject;
 
             ellipsoid.material = Material.fromType(context, Material.ColorType);
         } else {
-            ellipsoid = this._ellipsoidCollection[ellipsoidVisualizerIndex];
+            ellipsoid = dynamicEllipsoidVisualizer._ellipsoidCollection[ellipsoidVisualizerIndex];
         }
 
         ellipsoid.show = true;
@@ -256,7 +254,7 @@ define([
         if (typeof material !== 'undefined') {
             ellipsoid.material = material.getValue(time, context, ellipsoid.material);
         }
-    };
+    }
 
     DynamicEllipsoidVisualizer.prototype._onObjectsRemoved = function(dynamicObjectCollection, dynamicObjects) {
         var thisEllipsoidCollection = this._ellipsoidCollection;

data/app/assets/javascripts/DynamicScene/DynamicLabelVisualizer.js

@@ -112,7 +112,7 @@ define([
         if (typeof this._dynamicObjectCollection !== 'undefined') {
             var dynamicObjects = this._dynamicObjectCollection.getObjects();
             for ( var i = 0, len = dynamicObjects.length; i < len; i++) {
-                this._updateObject(time, dynamicObjects[i]);
+                updateObject(this, time, dynamicObjects[i]);
             }
         }
     };
@@ -177,7 +177,7 @@ define([
     var outlineColor;
     var eyeOffset;
     var pixelOffset;
-    DynamicLabelVisualizer.prototype._updateObject = function(time, dynamicObject) {
+    function updateObject(dynamicLabelVisualizer, time, dynamicObject) {
         var dynamicLabel = dynamicObject.label;
         if (typeof dynamicLabel === 'undefined') {
             return;
@@ -201,23 +201,23 @@ define([
         if (!show) {
             //don't bother creating or updating anything else
             if (typeof labelVisualizerIndex !== 'undefined') {
-                label = this._labelCollection.get(labelVisualizerIndex);
+                label = dynamicLabelVisualizer._labelCollection.get(labelVisualizerIndex);
                 label.setShow(false);
-                this._unusedIndexes.push(labelVisualizerIndex);
+                dynamicLabelVisualizer._unusedIndexes.push(labelVisualizerIndex);
                 dynamicObject._labelVisualizerIndex = undefined;
             }
             return;
         }
 
         if (typeof labelVisualizerIndex === 'undefined') {
-            var unusedIndexes = this._unusedIndexes;
+            var unusedIndexes = dynamicLabelVisualizer._unusedIndexes;
             var length = unusedIndexes.length;
             if (length > 0) {
                 labelVisualizerIndex = unusedIndexes.pop();
-                label = this._labelCollection.get(labelVisualizerIndex);
+                label = dynamicLabelVisualizer._labelCollection.get(labelVisualizerIndex);
             } else {
-                labelVisualizerIndex = this._labelCollection.getLength();
-                label = this._labelCollection.add();
+                labelVisualizerIndex = dynamicLabelVisualizer._labelCollection.getLength();
+                label = dynamicLabelVisualizer._labelCollection.add();
             }
             dynamicObject._labelVisualizerIndex = labelVisualizerIndex;
             label.dynamicObject = dynamicObject;
@@ -235,7 +235,7 @@ define([
             label.setHorizontalOrigin(HorizontalOrigin.CENTER);
             label.setVerticalOrigin(VerticalOrigin.CENTER);
         } else {
-            label = this._labelCollection.get(labelVisualizerIndex);
+            label = dynamicLabelVisualizer._labelCollection.get(labelVisualizerIndex);
         }
 
         label.setShow(show);
@@ -329,7 +329,7 @@ define([
                 label.setVerticalOrigin(verticalOrigin);
             }
         }
-    };
+    }
 
     DynamicLabelVisualizer.prototype._onObjectsRemoved = function(dynamicObjectCollection, dynamicObjects) {
         var thisLabelCollection = this._labelCollection;

data/app/assets/javascripts/DynamicScene/DynamicMaterialProperty.js

@@ -1,6 +1,5 @@
 /*global define*/
 define([
-        '../Core/JulianDate',
         '../Core/TimeInterval',
         '../Core/TimeIntervalCollection',
         '../Core/Iso8601',
@@ -8,7 +7,6 @@ define([
         './DynamicImageMaterial',
         './DynamicGridMaterial'
     ], function(
-        JulianDate,
         TimeInterval,
         TimeIntervalCollection,
         Iso8601,
@@ -51,10 +49,10 @@ define([
     DynamicMaterialProperty.prototype.processCzmlIntervals = function(czmlIntervals, constrainedInterval, sourceUri) {
         if (Array.isArray(czmlIntervals)) {
             for ( var i = 0, len = czmlIntervals.length; i < len; i++) {
-                this._addCzmlInterval(czmlIntervals[i], constrainedInterval, sourceUri);
+                addCzmlInterval(this, czmlIntervals[i], constrainedInterval, sourceUri);
             }
         } else {
-            this._addCzmlInterval(czmlIntervals, constrainedInterval, sourceUri);
+            addCzmlInterval(this, czmlIntervals, constrainedInterval, sourceUri);
         }
     };
 
@@ -76,7 +74,7 @@ define([
         return existingMaterial;
     };
 
-    DynamicMaterialProperty.prototype._addCzmlInterval = function(czmlInterval, constrainedInterval, sourceUri) {
+    function addCzmlInterval(dynamicMaterialProperty, czmlInterval, constrainedInterval, sourceUri) {
         var iso8601Interval = czmlInterval.interval;
         if (typeof iso8601Interval === 'undefined') {
             iso8601Interval = Iso8601.MAXIMUM_INTERVAL.clone();
@@ -89,7 +87,7 @@ define([
         }
 
         //See if we already have data at that interval.
-        var thisIntervals = this._intervals;
+        var thisIntervals = dynamicMaterialProperty._intervals;
         var existingInterval = thisIntervals.findInterval(iso8601Interval.start, iso8601Interval.stop);
         var foundMaterial = false;
         var existingMaterial;
@@ -121,7 +119,7 @@ define([
         if (foundMaterial) {
             existingMaterial.processCzmlIntervals(czmlInterval, sourceUri);
         }
-    };
+    }
 
     return DynamicMaterialProperty;
 });

data/app/assets/javascripts/DynamicScene/DynamicObject.js

@@ -151,6 +151,12 @@ define([
          */
         this.vertexPositions = undefined;
 
+        /**
+         * Gets or sets the vector.
+         * @type DynamicVector
+         */
+        this.vector = undefined;
+
         /**
          * Gets or sets the suggested initial offset for viewing this object
          * with the camera.  The offset is defined in the east-north-up reference frame.

data/app/assets/javascripts/DynamicScene/DynamicObjectView.js

@@ -9,6 +9,7 @@ define([
         '../Core/Cartographic',
         '../Core/Quaternion',
         '../Core/Matrix3',
+        '../Core/Matrix4',
         '../Core/Ellipsoid',
         '../Core/Transforms',
         '../Scene/CameraColumbusViewMode',
@@ -23,6 +24,7 @@ define([
          Cartographic,
          Quaternion,
          Matrix3,
+         Matrix4,
          Ellipsoid,
          Transforms,
          CameraColumbusViewMode,
@@ -75,13 +77,79 @@ define([
         }
     }
 
-    var update3DTransform;
+    var update3DTransform = new Matrix4();
+    var update3DMatrix3Scratch1 = new Matrix3();
+    var update3DMatrix3Scratch2 = new Matrix3();
+    var update3DMatrix3Scratch3 = new Matrix3();
+    var update3DCartesian3Scratch1 = new Cartesian3();
+    var update3DCartesian3Scratch2 = new Cartesian3();
+    var update3DCartesian3Scratch3 = new Cartesian3();
+
     function update3D(that, camera, objectChanged, offset, positionProperty, time, ellipsoid) {
         update3DController(that, camera, objectChanged, offset);
 
         var cartesian = positionProperty.getValueCartesian(time, that._lastCartesian);
         if (typeof cartesian !== 'undefined') {
-            camera.transform = Transforms.eastNorthUpToFixedFrame(cartesian, ellipsoid, update3DTransform);
+            var successful = false;
+
+            // The time delta was determined based on how fast satellites move compared to vehicles near the surface.
+            // Slower moving vehicles will most likely default to east-north-up, while faster ones will be LVLH.
+            var deltaTime = time.addSeconds(0.01);
+            var deltaCartesian = positionProperty.getValueCartesian(deltaTime, update3DCartesian3Scratch1);
+            if (typeof deltaCartesian !== 'undefined' && !Cartesian3.equalsEpsilon(cartesian, deltaCartesian, CesiumMath.EPSILON6)) {
+                var toInertial = Transforms.computeFixedToIcrfMatrix(time, update3DMatrix3Scratch1);
+                var toInertialDelta = Transforms.computeFixedToIcrfMatrix(deltaTime, update3DMatrix3Scratch2);
+                var toFixed = Matrix3.transpose(toInertial, update3DMatrix3Scratch3);
+
+                // Z along the position
+                var zBasis = update3DCartesian3Scratch2;
+                Cartesian3.normalize(cartesian, zBasis);
+                Cartesian3.normalize(deltaCartesian, deltaCartesian);
+
+                Matrix3.multiplyByVector(toInertial, zBasis, zBasis);
+                Matrix3.multiplyByVector(toInertialDelta, deltaCartesian, deltaCartesian);
+
+                // Y is along the angular momentum vector (e.g. "orbit normal")
+                var yBasis = Cartesian3.cross(zBasis, deltaCartesian, update3DCartesian3Scratch3);
+                if (!Cartesian3.equalsEpsilon(yBasis, Cartesian3.ZERO, CesiumMath.EPSILON6)) {
+                    // X is along the cross of y and z (right handed basis / in the direction of motion)
+                    var xBasis = Cartesian3.cross(yBasis, zBasis, update3DCartesian3Scratch1);
+
+                    Matrix3.multiplyByVector(toFixed, xBasis, xBasis);
+                    Matrix3.multiplyByVector(toFixed, yBasis, yBasis);
+                    Matrix3.multiplyByVector(toFixed, zBasis, zBasis);
+
+                    Cartesian3.normalize(xBasis, xBasis);
+                    Cartesian3.normalize(yBasis, yBasis);
+                    Cartesian3.normalize(zBasis, zBasis);
+
+                    var transform = update3DTransform;
+                    transform[0]  = xBasis.x;
+                    transform[1]  = xBasis.y;
+                    transform[2]  = xBasis.z;
+                    transform[3]  = 0.0;
+                    transform[4]  = yBasis.x;
+                    transform[5]  = yBasis.y;
+                    transform[6]  = yBasis.z;
+                    transform[7]  = 0.0;
+                    transform[8]  = zBasis.x;
+                    transform[9]  = zBasis.y;
+                    transform[10] = zBasis.z;
+                    transform[11] = 0.0;
+                    transform[12]  = cartesian.x;
+                    transform[13]  = cartesian.y;
+                    transform[14] = cartesian.z;
+                    transform[15] = 0.0;
+
+                    camera.transform = transform;
+                    successful = true;
+                }
+            }
+
+            if (!successful) {
+                camera.transform = Transforms.eastNorthUpToFixedFrame(cartesian, ellipsoid, update3DTransform);
+            }
+
             that._screenSpaceCameraController.setEllipsoid(Ellipsoid.UNIT_SPHERE);
 
             var position = camera.position;

data/app/assets/javascripts/DynamicScene/DynamicPathVisualizer.js

@@ -175,7 +175,7 @@ define([
 
         property = dynamicPath.outlineWidth;
         if (typeof property !== 'undefined') {
-            uniforms.outlineWidth = property.getValue(time, uniforms.outlineWidth);
+            uniforms.outlineWidth = property.getValue(time);
         }
 
         property = dynamicPath.width;

data/app/assets/javascripts/DynamicScene/DynamicPointVisualizer.js

@@ -4,17 +4,15 @@ define([
         '../Core/defaultValue',
         '../Core/destroyObject',
         '../Core/DeveloperError',
-        '../Core/Event',
         '../Scene/BillboardCollection',
         '../Renderer/TextureAtlasBuilder'
-       ], function(
-         Color,
-         defaultValue,
-         destroyObject,
-         DeveloperError,
-         Event,
-         BillboardCollection,
-         TextureAtlasBuilder) {
+    ], function(
+        Color,
+        defaultValue,
+        destroyObject,
+        DeveloperError,
+        BillboardCollection,
+        TextureAtlasBuilder) {
     "use strict";
 
     /**
@@ -110,7 +108,7 @@ define([
         if (typeof this._dynamicObjectCollection !== 'undefined') {
             var dynamicObjects = this._dynamicObjectCollection.getObjects();
             for ( var i = 0, len = dynamicObjects.length; i < len; i++) {
-                this._updateObject(time, dynamicObjects[i]);
+                updateObject(this, time, dynamicObjects[i]);
             }
         }
     };
@@ -173,7 +171,7 @@ define([
     var color;
     var position;
     var outlineColor;
-    DynamicPointVisualizer.prototype._updateObject = function(time, dynamicObject) {
+    function updateObject(dynamicPointVisualizer, time, dynamicObject) {
         var dynamicPoint = dynamicObject.point;
         if (typeof dynamicPoint === 'undefined') {
             return;
@@ -192,25 +190,25 @@ define([
         if (!show) {
             //don't bother creating or updating anything else
             if (typeof pointVisualizerIndex !== 'undefined') {
-                billboard = this._billboardCollection.get(pointVisualizerIndex);
+                billboard = dynamicPointVisualizer._billboardCollection.get(pointVisualizerIndex);
                 billboard.setShow(false);
                 billboard.setImageIndex(-1);
                 dynamicObject._pointVisualizerIndex = undefined;
-                this._unusedIndexes.push(pointVisualizerIndex);
+                dynamicPointVisualizer._unusedIndexes.push(pointVisualizerIndex);
             }
             return;
         }
 
         var needRedraw = false;
         if (typeof pointVisualizerIndex === 'undefined') {
-            var unusedIndexes = this._unusedIndexes;
+            var unusedIndexes = dynamicPointVisualizer._unusedIndexes;
             var length = unusedIndexes.length;
             if (length > 0) {
                 pointVisualizerIndex = unusedIndexes.pop();
-                billboard = this._billboardCollection.get(pointVisualizerIndex);
+                billboard = dynamicPointVisualizer._billboardCollection.get(pointVisualizerIndex);
             } else {
-                pointVisualizerIndex = this._billboardCollection.getLength();
-                billboard = this._billboardCollection.add();
+                pointVisualizerIndex = dynamicPointVisualizer._billboardCollection.getLength();
+                billboard = dynamicPointVisualizer._billboardCollection.add();
             }
             dynamicObject._pointVisualizerIndex = pointVisualizerIndex;
             billboard.dynamicObject = dynamicObject;
@@ -222,7 +220,7 @@ define([
             billboard._visualizerPixelSize = 1;
             needRedraw = true;
         } else {
-            billboard = this._billboardCollection.get(pointVisualizerIndex);
+            billboard = dynamicPointVisualizer._billboardCollection.get(pointVisualizerIndex);
         }
 
         billboard.setShow(true);
@@ -275,7 +273,7 @@ define([
             var cssOutlineWidth = defaultValue(billboard._visualizerOutlineWidth, 2);
             var textureId = JSON.stringify([cssColor, cssPixelSize, cssOutlineColor, cssOutlineWidth]);
 
-            this._textureAtlasBuilder.addTextureFromFunction(textureId, function(id, loadedCallback) {
+            dynamicPointVisualizer._textureAtlasBuilder.addTextureFromFunction(textureId, function(id, loadedCallback) {
                 var canvas = document.createElement('canvas');
 
                 var length = cssPixelSize + (2 * cssOutlineWidth);
@@ -303,7 +301,7 @@ define([
                 billboard.setImageIndex(imageIndex);
             });
         }
-    };
+    }
 
     DynamicPointVisualizer.prototype._onObjectsRemoved = function(dynamicObjectCollection, dynamicObjects) {
         var thisBillboardCollection = this._billboardCollection;

data/app/assets/javascripts/DynamicScene/DynamicPolygonVisualizer.js

@@ -102,7 +102,7 @@ define(['../Core/Cartesian3',
         if (typeof this._dynamicObjectCollection !== 'undefined') {
             var dynamicObjects = this._dynamicObjectCollection.getObjects();
             for ( var i = 0, len = dynamicObjects.length; i < len; i++) {
-                this._updateObject(time, dynamicObjects[i]);
+                updateObject(this, time, dynamicObjects[i]);
             }
         }
     };
@@ -168,7 +168,7 @@ define(['../Core/Cartesian3',
     };
 
     var cachedPosition = new Cartesian3();
-    DynamicPolygonVisualizer.prototype._updateObject = function(time, dynamicObject) {
+    function updateObject(dynamicPolygonVisualizer, time, dynamicObject) {
         var dynamicPolygon = dynamicObject.polygon;
         if (typeof dynamicPolygon === 'undefined') {
             return;
@@ -187,26 +187,26 @@ define(['../Core/Cartesian3',
            (typeof ellipseProperty === 'undefined' || typeof positionProperty === 'undefined'))) {
             //Remove the existing primitive if we have one
             if (typeof polygonVisualizerIndex !== 'undefined') {
-                polygon = this._polygonCollection[polygonVisualizerIndex];
+                polygon = dynamicPolygonVisualizer._polygonCollection[polygonVisualizerIndex];
                 polygon.show = false;
                 dynamicObject._polygonVisualizerIndex = undefined;
-                this._unusedIndexes.push(polygonVisualizerIndex);
+                dynamicPolygonVisualizer._unusedIndexes.push(polygonVisualizerIndex);
             }
             return;
         }
 
-        var context = this._scene.getContext();
+        var context = dynamicPolygonVisualizer._scene.getContext();
         if (typeof polygonVisualizerIndex === 'undefined') {
-            var unusedIndexes = this._unusedIndexes;
+            var unusedIndexes = dynamicPolygonVisualizer._unusedIndexes;
             var length = unusedIndexes.length;
             if (length > 0) {
                 polygonVisualizerIndex = unusedIndexes.pop();
-                polygon = this._polygonCollection[polygonVisualizerIndex];
+                polygon = dynamicPolygonVisualizer._polygonCollection[polygonVisualizerIndex];
             } else {
-                polygonVisualizerIndex = this._polygonCollection.length;
+                polygonVisualizerIndex = dynamicPolygonVisualizer._polygonCollection.length;
                 polygon = new Polygon();
-                this._polygonCollection.push(polygon);
-                this._primitives.add(polygon);
+                dynamicPolygonVisualizer._polygonCollection.push(polygon);
+                dynamicPolygonVisualizer._primitives.add(polygon);
             }
             dynamicObject._polygonVisualizerIndex = polygonVisualizerIndex;
             polygon.dynamicObject = dynamicObject;
@@ -214,7 +214,7 @@ define(['../Core/Cartesian3',
             // CZML_TODO Determine official defaults
             polygon.material = Material.fromType(context, Material.ColorType);
         } else {
-            polygon = this._polygonCollection[polygonVisualizerIndex];
+            polygon = dynamicPolygonVisualizer._polygonCollection[polygonVisualizerIndex];
         }
 
         polygon.show = true;
@@ -237,7 +237,7 @@ define(['../Core/Cartesian3',
         if (typeof material !== 'undefined') {
             polygon.material = material.getValue(time, context, polygon.material);
         }
-    };
+    }
 
     DynamicPolygonVisualizer.prototype._onObjectsRemoved = function(dynamicObjectCollection, dynamicObjects) {
         var thisPolygonCollection = this._polygonCollection;