Merge pull request #4255 from AnalyticalGraphicsInc/dynamic-geometry

Fix dynamic entity geometry on terrain

CHANGES.md

@@ -21,6 +21,7 @@ Change Log
 * Added `GeocoderViewModel.keepExpanded` which when set to true will always keep the Geocoder in its expanded state.
 * Added support for `INT` and `UNSIGNED_INT` in `ComponentDatatype`.
 * Added `ComponentDatatype.fromName` for getting a `ComponentDatatype` from its name.
+* Fixed a crash caused by draping dynamic geometry over terrain. [#4255](https://github.com/AnalyticalGraphicsInc/cesium/pull/4255)
 
 ### 1.24 - 2016-08-01
 

Source/DataSources/GeometryVisualizer.js

@@ -166,7 +166,7 @@ define([
         }
 
         this._groundColorBatch = new StaticGroundGeometryColorBatch(groundPrimitives);
-        this._dynamicBatch = new DynamicGeometryBatch(primitives);
+        this._dynamicBatch = new DynamicGeometryBatch(primitives, groundPrimitives);
 
         this._batches = this._outlineBatches.concat(this._closedColorBatches, this._closedMaterialBatches, this._openColorBatches, this._openMaterialBatches, this._groundColorBatch, this._dynamicBatch);
 

Specs/DataSources/GeometryVisualizerSpec.js

@@ -477,6 +477,32 @@ defineSuite([
         visualizer.destroy();
     });
 
+    it('Creates and removes dynamic geometry on terrain ', function() {
+        var objects = new EntityCollection();
+        var visualizer = new GeometryVisualizer(EllipseGeometryUpdater, scene, objects);
+
+        var ellipse = new EllipseGraphics();
+        ellipse.semiMajorAxis = new SampledProperty(Number);
+        ellipse.semiMajorAxis.addSample(time, 2);
+        ellipse.semiMinorAxis = new ConstantProperty(1);
+        ellipse.material = new ColorMaterialProperty();
+
+        var entity = new Entity();
+        entity.position = new ConstantPositionProperty(new Cartesian3(1234, 5678, 9101112));
+        entity.ellipse = ellipse;
+        objects.add(entity);
+
+        scene.initializeFrame();
+        expect(visualizer.update(time)).toBe(true);
+        scene.render(time);
+        objects.remove(entity);
+        scene.initializeFrame();
+        expect(visualizer.update(time)).toBe(true);
+        scene.render(time);
+        expect(scene.primitives.length).toBe(0);
+        visualizer.destroy();
+    });
+
     it('Constructor throws without type', function() {
         var objects = new EntityCollection();
         expect(function() {