From 4ea3c6bdd30b8ff945b06d9f1e51eacae40ffce1 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Mon, 26 Feb 2018 17:42:01 -0500 Subject: [PATCH] fix specs --- Specs/DataSources/EllipsoidGeometryUpdaterSpec.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js b/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js index 75648770501e..e149aeadb9eb 100644 --- a/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js +++ b/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js @@ -3,9 +3,8 @@ defineSuite([ 'Core/Cartesian3', 'Core/Color', 'Core/ColorGeometryInstanceAttribute', - 'Core/DistanceDisplayCondition', - 'Core/DistanceDisplayConditionGeometryInstanceAttribute', 'Core/JulianDate', + 'Core/Math', 'Core/Quaternion', 'Core/TimeIntervalCollection', 'DataSources/ColorMaterialProperty', @@ -25,9 +24,8 @@ defineSuite([ Cartesian3, Color, ColorGeometryInstanceAttribute, - DistanceDisplayCondition, - DistanceDisplayConditionGeometryInstanceAttribute, JulianDate, + CesiumMath, Quaternion, TimeIntervalCollection, ColorMaterialProperty, @@ -284,24 +282,20 @@ defineSuite([ scene.initializeFrame(); scene.render(); - var ddc = new DistanceDisplayCondition(10.0, 100.0); ellipsoid.fill.setValue(false); ellipsoid.outline.setValue(false); ellipsoid.outlineColor = createDynamicProperty(Color.YELLOW); ellipsoid.material = new ColorMaterialProperty(Color.ORANGE); - ellipsoid.distanceDisplayCondition = ddc; updater._onEntityPropertyChanged(entity, 'ellipsoid'); dynamicUpdater.update(time); var attributes = primitives.get(0).getGeometryInstanceAttributes(entity); expect(attributes.show[0]).toEqual(0); - expect(attributes.distanceDisplayCondition).toEqual(DistanceDisplayConditionGeometryInstanceAttribute.toValue(ddc)); expect(primitives.get(0).appearance.material.uniforms.color).toEqual(ellipsoid.material.color.getValue()); attributes = primitives.get(1).getGeometryInstanceAttributes(entity); expect(attributes.show[0]).toEqual(0); expect(attributes.color).toEqual(ColorGeometryInstanceAttribute.toValue(ellipsoid.outlineColor.getValue())); - expect(attributes.distanceDisplayCondition).toEqual(DistanceDisplayConditionGeometryInstanceAttribute.toValue(ddc)); }); it('geometryChanged event is raised when expected', function() {