- * * Only to be used with GeometryInstances containing {@link GroundPolylineGeometry}. + *
* * @alias GroundPolylinePrimitive * @constructor @@ -73,6 +81,7 @@ define([ * @param {Boolean} [options.releaseGeometryInstances=true] Whentrue, the primitive does not keep a reference to the input geometryInstances to save memory.
* @param {Boolean} [options.allowPicking=true] When true, each geometry instance will only be pickable with {@link Scene#pick}. When false, GPU memory is saved.
* @param {Boolean} [options.asynchronous=true] Determines if the primitive will be created asynchronously or block until ready. If false initializeTerrainHeights() must be called first.
+ * @param {ClassificationType} [options.classificationType=ClassificationType.BOTH] Determines whether terrain, 3D Tiles or both will be classified.
* @param {Boolean} [options.debugShowBoundingVolume=false] For debugging only. Determines if this primitive's commands' bounding spheres are shown.
* @param {Boolean} [options.debugShowShadowVolume=false] For debugging only. Determines if the shadow volume for each geometry in the primitive is drawn. Must be true on creation to have effect.
*
@@ -168,6 +177,15 @@ define([
*/
this.show = defaultValue(options.show, true);
+ /**
+ * Determines whether terrain, 3D Tiles or both will be classified.
+ *
+ * @type {ClassificationType}
+ *
+ * @default ClassificationType.BOTH
+ */
+ this.classificationType = defaultValue(options.classificationType, ClassificationType.BOTH);
+
/**
* This property is for debugging only; it is not for production use nor is it optimized.
* @@ -209,13 +227,8 @@ define([ this._sp2D = undefined; this._spMorph = undefined; - this._renderState = RenderState.fromCache({ - cull : { - enabled : true // prevent double-draw. Geometry is "inverted" (reversed winding order) so we're drawing backfaces. - }, - blending : BlendingState.ALPHA_BLEND, - depthMask : false - }); + this._renderState = getRenderState(false); + this._renderState3DTiles = getRenderState(true); this._renderStateMorph = RenderState.fromCache({ cull : { @@ -454,6 +467,33 @@ define([ groundPolylinePrimitive._spMorph = colorProgramMorph; } + function getRenderState(mask3DTiles) { + return RenderState.fromCache({ + cull : { + enabled : true // prevent double-draw. Geometry is "inverted" (reversed winding order) so we're drawing backfaces. + }, + blending : BlendingState.ALPHA_BLEND, + depthMask : false, + stencilTest : { + enabled : mask3DTiles, + frontFunction : StencilFunction.EQUAL, + frontOperation : { + fail : StencilOperation.KEEP, + zFail : StencilOperation.KEEP, + zPass : StencilOperation.KEEP + }, + backFunction : StencilFunction.EQUAL, + backOperation : { + fail : StencilOperation.KEEP, + zFail : StencilOperation.KEEP, + zPass : StencilOperation.KEEP + }, + reference : StencilConstants.CESIUM_3D_TILE_MASK, + mask : StencilConstants.CESIUM_3D_TILE_MASK + } + }); + } + function createCommands(groundPolylinePrimitive, appearance, material, translucent, colorCommands, pickCommands) { var primitive = groundPolylinePrimitive._primitive; var length = primitive._va.length; @@ -462,16 +502,13 @@ define([ var isPolylineColorAppearance = appearance instanceof PolylineColorAppearance; - var i; - var command; var materialUniforms = isPolylineColorAppearance ? {} : material._uniforms; var uniformMap = primitive._batchTable.getUniformMapCallback()(materialUniforms); - var pass = Pass.TERRAIN_CLASSIFICATION; - for (i = 0; i < length; i++) { + for (var i = 0; i < length; i++) { var vertexArray = primitive._va[i]; - command = colorCommands[i]; + var command = colorCommands[i]; if (!defined(command)) { command = colorCommands[i] = new DrawCommand({ owner : groundPolylinePrimitive, @@ -483,37 +520,47 @@ define([ command.renderState = groundPolylinePrimitive._renderState; command.shaderProgram = groundPolylinePrimitive._sp; command.uniformMap = uniformMap; - command.pass = pass; + command.pass = Pass.TERRAIN_CLASSIFICATION; command.pickId = 'czm_batchTable_pickColor(v_endPlaneNormalEcAndBatchId.w)'; + var derivedTilesetCommand = DrawCommand.shallowClone(command, command.derivedCommands.tileset); + derivedTilesetCommand.renderState = groundPolylinePrimitive._renderState3DTiles; + derivedTilesetCommand.pass = Pass.CESIUM_3D_TILE_CLASSIFICATION; + command.derivedCommands.tileset = derivedTilesetCommand; + // derive for 2D - var derivedColorCommand = command.derivedCommands.color2D; - if (!defined(derivedColorCommand)) { - derivedColorCommand = DrawCommand.shallowClone(command); - command.derivedCommands.color2D = derivedColorCommand; - } - derivedColorCommand.vertexArray = vertexArray; - derivedColorCommand.renderState = groundPolylinePrimitive._renderState; - derivedColorCommand.shaderProgram = groundPolylinePrimitive._sp2D; - derivedColorCommand.uniformMap = uniformMap; - derivedColorCommand.pass = pass; - derivedColorCommand.pickId = 'czm_batchTable_pickColor(v_endPlaneNormalEcAndBatchId.w)'; + var derived2DCommand = DrawCommand.shallowClone(command, command.derivedCommands.color2D); + derived2DCommand.shaderProgram = groundPolylinePrimitive._sp2D; + command.derivedCommands.color2D = derived2DCommand; + + var derived2DTilesetCommand = DrawCommand.shallowClone(derivedTilesetCommand, derivedTilesetCommand.derivedCommands.color2D); + derived2DTilesetCommand.shaderProgram = groundPolylinePrimitive._sp2D; + derivedTilesetCommand.derivedCommands.color2D = derived2DTilesetCommand; // derive for Morph - derivedColorCommand = command.derivedCommands.colorMorph; - if (!defined(derivedColorCommand)) { - derivedColorCommand = DrawCommand.shallowClone(command); - command.derivedCommands.colorMorph = derivedColorCommand; - } - derivedColorCommand.vertexArray = vertexArray; - derivedColorCommand.renderState = groundPolylinePrimitive._renderStateMorph; - derivedColorCommand.shaderProgram = groundPolylinePrimitive._spMorph; - derivedColorCommand.uniformMap = uniformMap; - derivedColorCommand.pass = pass; - derivedColorCommand.pickId = 'czm_batchTable_pickColor(v_batchId)'; + var derivedMorphCommand = DrawCommand.shallowClone(command, command.derivedCommands.colorMorph); + derivedMorphCommand.renderState = groundPolylinePrimitive._renderStateMorph; + derivedMorphCommand.shaderProgram = groundPolylinePrimitive._spMorph; + derivedMorphCommand.pickId = 'czm_batchTable_pickColor(v_batchId)'; + command.derivedCommands.colorMorph = derivedMorphCommand; } } + function updateAndQueueCommand(groundPolylinePrimitive, command, frameState, modelMatrix, cull, boundingVolume, debugShowBoundingVolume) { + // Use derived appearance command for morph and 2D + if (frameState.mode === SceneMode.MORPHING) { + command = command.derivedCommands.colorMorph; + } else if (frameState.mode !== SceneMode.SCENE3D) { + command = command.derivedCommands.color2D; + } + command.modelMatrix = modelMatrix; + command.boundingVolume = boundingVolume; + command.cull = cull; + command.debugShowBoundingVolume = debugShowBoundingVolume; + + frameState.commandList.push(command); + } + function updateAndQueueCommands(groundPolylinePrimitive, frameState, colorCommands, pickCommands, modelMatrix, cull, debugShowBoundingVolume) { var primitive = groundPolylinePrimitive._primitive; @@ -530,25 +577,25 @@ define([ boundingSpheres = primitive._boundingSphereMorph; } - var commandList = frameState.commandList; + var morphing = frameState.mode === SceneMode.MORPHING; + var classificationType = groundPolylinePrimitive.classificationType; + var queueTerrainCommands = (classificationType !== ClassificationType.CESIUM_3D_TILE); + var queue3DTilesCommands = (classificationType !== ClassificationType.TERRAIN) && !morphing; + + var command; var passes = frameState.passes; if (passes.render || (passes.pick && primitive.allowPicking)) { var colorLength = colorCommands.length; - for (var j = 0; j < colorLength; ++j) { - var colorCommand = colorCommands[j]; - // Use derived appearance command for morph and 2D - if (frameState.mode === SceneMode.MORPHING && colorCommand.shaderProgram !== groundPolylinePrimitive._spMorph) { - colorCommand = colorCommand.derivedCommands.colorMorph; - } else if (frameState.mode !== SceneMode.SCENE3D && colorCommand.shaderProgram !== groundPolylinePrimitive._sp2D) { - colorCommand = colorCommand.derivedCommands.color2D; + var boundingVolume = boundingSpheres[j]; + if (queueTerrainCommands) { + command = colorCommands[j]; + updateAndQueueCommand(groundPolylinePrimitive, command, frameState, modelMatrix, cull, boundingVolume, debugShowBoundingVolume); + } + if (queue3DTilesCommands) { + command = colorCommands[j].derivedCommands.tileset; + updateAndQueueCommand(groundPolylinePrimitive, command, frameState, modelMatrix, cull, boundingVolume, debugShowBoundingVolume); } - colorCommand.modelMatrix = modelMatrix; - colorCommand.boundingVolume = boundingSpheres[j]; - colorCommand.cull = cull; - colorCommand.debugShowBoundingVolume = debugShowBoundingVolume; - - commandList.push(colorCommand); } } } diff --git a/Specs/DataSources/GeometryVisualizerSpec.js b/Specs/DataSources/GeometryVisualizerSpec.js index 489d7694c243..f7f0ba49c965 100644 --- a/Specs/DataSources/GeometryVisualizerSpec.js +++ b/Specs/DataSources/GeometryVisualizerSpec.js @@ -82,6 +82,24 @@ defineSuite([ }); + function visualizerUpdated(visualizer) { + return pollToPromise(function() { + scene.initializeFrame(); + var isUpdated = visualizer.update(time); + scene.render(time); + return isUpdated; + }); + } + + function visualizerEmpty(visualizer) { + return pollToPromise(function() { + scene.initializeFrame(); + expect(visualizer.update(time)).toBe(true); + scene.render(time); + return scene.primitives.length === 0 && scene.groundPrimitives.length === 0; + }); + } + it('Can create and destroy', function() { var objects = new EntityCollection(); var visualizer = new GeometryVisualizer(scene, objects, scene.primitives, scene.groundPrimitives); @@ -107,12 +125,7 @@ defineSuite([ entity.ellipse = ellipse; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -123,12 +136,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -149,12 +157,7 @@ defineSuite([ entity.ellipse = ellipse; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -165,12 +168,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -191,12 +189,7 @@ defineSuite([ entity.ellipse = ellipse; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -207,12 +200,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -233,12 +221,7 @@ defineSuite([ entity.ellipse = ellipse; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -249,12 +232,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -276,12 +254,7 @@ defineSuite([ entity.ellipse = ellipse; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -291,12 +264,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -318,23 +286,13 @@ defineSuite([ entity.ellipse = ellipse; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); expect(primitive.shadows).toBe(shadows); objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -371,23 +329,13 @@ defineSuite([ entity.ellipse = ellipse; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.groundPrimitives.get(0); expect(primitive.classificationType).toBe(type); objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -420,12 +368,7 @@ defineSuite([ entity.ellipse = ellipse; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -435,12 +378,7 @@ defineSuite([ ellipse.material = new GridMaterialProperty(); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { primitive = scene.primitives.get(0); attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -476,12 +414,7 @@ defineSuite([ } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -490,12 +423,7 @@ defineSuite([ color = Color.RED.withAlpha(0.5); entity.ellipse.outlineColor.setValue(color); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); @@ -662,12 +590,7 @@ defineSuite([ }); objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { objects.remove(entity); var entity2 = new Entity({ @@ -682,13 +605,7 @@ defineSuite([ }); objects.add(entity2); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { - + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity2); expect(attributes).toBeDefined(); @@ -698,12 +615,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function() { + return visualizerEmpty(visualizer).then(function() { visualizer.destroy(); }); }); @@ -724,12 +636,7 @@ defineSuite([ } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -737,12 +644,7 @@ defineSuite([ entity.show = false; - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); @@ -769,12 +671,7 @@ defineSuite([ } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -782,12 +679,7 @@ defineSuite([ entity.show = false; - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); @@ -815,12 +707,7 @@ defineSuite([ } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -828,12 +715,7 @@ defineSuite([ entity.show = false; - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); @@ -862,12 +744,7 @@ defineSuite([ } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { expect(scene.groundPrimitives.length).toEqual(1); entities.add({ @@ -879,12 +756,7 @@ defineSuite([ } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { expect(scene.groundPrimitives.length).toEqual(1); @@ -897,12 +769,7 @@ defineSuite([ } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { expect(scene.groundPrimitives.length).toEqual(2); @@ -930,12 +797,7 @@ defineSuite([ } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { expect(scene.groundPrimitives.length).toEqual(1); entities.add({ @@ -948,12 +810,7 @@ defineSuite([ } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { expect(scene.groundPrimitives.length).toEqual(1); @@ -967,12 +824,7 @@ defineSuite([ } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { expect(scene.groundPrimitives.length).toEqual(1); @@ -986,12 +838,7 @@ defineSuite([ } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { expect(scene.groundPrimitives.length).toEqual(2); @@ -1005,12 +852,7 @@ defineSuite([ } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { expect(scene.groundPrimitives.length).toEqual(3); diff --git a/Specs/DataSources/PolylineGraphicsSpec.js b/Specs/DataSources/PolylineGraphicsSpec.js index 97a69c5a8a19..b44bb4244dfe 100644 --- a/Specs/DataSources/PolylineGraphicsSpec.js +++ b/Specs/DataSources/PolylineGraphicsSpec.js @@ -4,6 +4,7 @@ defineSuite([ 'Core/DistanceDisplayCondition', 'DataSources/ColorMaterialProperty', 'DataSources/ConstantProperty', + 'Scene/ClassificationType', 'Scene/ShadowMode', 'Specs/testDefinitionChanged', 'Specs/testMaterialDefinitionChanged' @@ -13,6 +14,7 @@ defineSuite([ DistanceDisplayCondition, ColorMaterialProperty, ConstantProperty, + ClassificationType, ShadowMode, testDefinitionChanged, testMaterialDefinitionChanged) { @@ -30,6 +32,7 @@ defineSuite([ granularity : 2, shadows : ShadowMode.DISABLED, distanceDisplayCondition : new DistanceDisplayCondition(), + classificationType : ClassificationType.TERRAIN, zIndex : 0 }; @@ -44,6 +47,7 @@ defineSuite([ expect(polyline.granularity).toBeInstanceOf(ConstantProperty); expect(polyline.shadows).toBeInstanceOf(ConstantProperty); expect(polyline.distanceDisplayCondition).toBeInstanceOf(ConstantProperty); + expect(polyline.classificationType).toBeInstanceOf(ConstantProperty); expect(polyline.zIndex).toBeInstanceOf(ConstantProperty); expect(polyline.material.color.getValue()).toEqual(options.material); @@ -56,6 +60,7 @@ defineSuite([ expect(polyline.granularity.getValue()).toEqual(options.granularity); expect(polyline.shadows.getValue()).toEqual(options.shadows); expect(polyline.distanceDisplayCondition.getValue()).toEqual(options.distanceDisplayCondition); + expect(polyline.classificationType.getValue()).toEqual(options.classificationType); expect(polyline.zIndex.getValue()).toEqual(options.zIndex); }); @@ -71,6 +76,7 @@ defineSuite([ source.granularity = new ConstantProperty(); source.shadows = new ConstantProperty(ShadowMode.ENABLED); source.distanceDisplayCondition = new ConstantProperty(new DistanceDisplayCondition()); + source.classificationType = new ConstantProperty(ClassificationType.TERRAIN); source.zIndex = new ConstantProperty(); var target = new PolylineGraphics(); @@ -85,6 +91,7 @@ defineSuite([ expect(target.granularity).toBe(source.granularity); expect(target.shadows).toBe(source.shadows); expect(target.distanceDisplayCondition).toBe(source.distanceDisplayCondition); + expect(target.classificationType).toBe(source.classificationType); expect(target.zIndex).toBe(source.zIndex); }); @@ -100,6 +107,7 @@ defineSuite([ source.granularity = new ConstantProperty(); source.shadows = new ConstantProperty(); source.distanceDisplayCondition = new ConstantProperty(); + source.classificationType = new ConstantProperty(); source.zIndex = new ConstantProperty(); var color = new ColorMaterialProperty(); @@ -112,6 +120,7 @@ defineSuite([ var granularity = new ConstantProperty(); var shadows = new ConstantProperty(); var distanceDisplayCondition = new ConstantProperty(); + var classificationType = new ConstantProperty(); var zIndex = new ConstantProperty(); var target = new PolylineGraphics(); @@ -125,6 +134,7 @@ defineSuite([ target.granularity = granularity; target.shadows = shadows; target.distanceDisplayCondition = distanceDisplayCondition; + target.classificationType = classificationType; target.zIndex = zIndex; target.merge(source); @@ -138,6 +148,7 @@ defineSuite([ expect(target.granularity).toBe(granularity); expect(target.shadows).toBe(shadows); expect(target.distanceDisplayCondition).toBe(distanceDisplayCondition); + expect(target.classificationType).toBe(classificationType); expect(target.zIndex).toBe(zIndex); }); @@ -153,6 +164,7 @@ defineSuite([ source.granularity = new ConstantProperty(); source.shadows = new ConstantProperty(); source.distanceDisplayCondition = new ConstantProperty(); + source.classificationType = new ConstantProperty(); source.zIndex = new ConstantProperty(); var result = source.clone(); @@ -166,6 +178,7 @@ defineSuite([ expect(result.granularity).toBe(source.granularity); expect(result.shadows).toBe(source.shadows); expect(result.distanceDisplayCondition).toBe(source.distanceDisplayCondition); + expect(result.classificationType).toBe(source.classificationType); expect(result.zIndex).toBe(source.zIndex); }); @@ -188,6 +201,7 @@ defineSuite([ testDefinitionChanged(property, 'granularity', 2, 1); testDefinitionChanged(property, 'shadows', ShadowMode.ENABLED, ShadowMode.DISABLED); testDefinitionChanged(property, 'distanceDisplayCondition', new DistanceDisplayCondition(), new DistanceDisplayCondition(10.0, 20.0)); + testDefinitionChanged(property, 'classificationType', ClassificationType.TERRAIN); testDefinitionChanged(property, 'zIndex', 20, 5); }); }); diff --git a/Specs/DataSources/PolylineVisualizerSpec.js b/Specs/DataSources/PolylineVisualizerSpec.js index 34722cf0a608..e288753d9002 100644 --- a/Specs/DataSources/PolylineVisualizerSpec.js +++ b/Specs/DataSources/PolylineVisualizerSpec.js @@ -16,6 +16,7 @@ defineSuite([ 'DataSources/EntityCollection', 'DataSources/PolylineArrowMaterialProperty', 'DataSources/PolylineGraphics', + 'Scene/ClassificationType', 'Scene/PolylineColorAppearance', 'Scene/PolylineMaterialAppearance', 'Scene/ShadowMode', @@ -40,6 +41,7 @@ defineSuite([ EntityCollection, PolylineArrowMaterialProperty, PolylineGraphics, + ClassificationType, PolylineColorAppearance, PolylineMaterialAppearance, ShadowMode, @@ -64,6 +66,24 @@ defineSuite([ ApproximateTerrainHeights._terrainHeights = undefined; }); + function visualizerUpdated(visualizer) { + return pollToPromise(function() { + scene.initializeFrame(); + var isUpdated = visualizer.update(time); + scene.render(time); + return isUpdated; + }); + } + + function visualizerEmpty(visualizer) { + return pollToPromise(function() { + scene.initializeFrame(); + expect(visualizer.update(time)).toBe(true); + scene.render(time); + return scene.primitives.length === 0 && scene.groundPrimitives.length === 0; + }); + } + it('Can create and destroy', function() { var objects = new EntityCollection(); var visualizer = new PolylineVisualizer(scene, objects); @@ -79,19 +99,14 @@ defineSuite([ var visualizer = new PolylineVisualizer(scene, objects); var polyline = new PolylineGraphics(); - polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]); + polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]); polyline.material = new ColorMaterialProperty(); var entity = new Entity(); entity.polyline = polyline; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -102,12 +117,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -118,19 +128,14 @@ defineSuite([ var visualizer = new PolylineVisualizer(scene, objects); var polyline = new PolylineGraphics(); - polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]); + polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]); polyline.material = new PolylineArrowMaterialProperty(); var entity = new Entity(); entity.polyline = polyline; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -141,12 +146,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -158,10 +158,10 @@ defineSuite([ } var objects = new EntityCollection(); - var visualizer = new PolylineVisualizer(scene, objects, scene.groundPrimitives); + var visualizer = new PolylineVisualizer(scene, objects); var polyline = new PolylineGraphics(); - polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]); + polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]); polyline.material = new ColorMaterialProperty(); polyline.clampToGround = new ConstantProperty(true); @@ -169,12 +169,7 @@ defineSuite([ entity.polyline = polyline; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.groundPrimitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -185,12 +180,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.groundPrimitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -201,7 +191,7 @@ defineSuite([ var visualizer = new PolylineVisualizer(scene, objects); var polyline = new PolylineGraphics(); - polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]); + polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]); polyline.material = new ColorMaterialProperty(); polyline.shadows = new ConstantProperty(shadows); @@ -209,23 +199,13 @@ defineSuite([ entity.polyline = polyline; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); expect(primitive.shadows).toBe(shadows); objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -252,7 +232,7 @@ defineSuite([ var visualizer = new PolylineVisualizer(scene, objects); var polyline = new PolylineGraphics(); - polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]); + polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]); polyline.material = new ColorMaterialProperty(); polyline.depthFailMaterial = new ColorMaterialProperty(); @@ -261,12 +241,7 @@ defineSuite([ entity.polyline = polyline; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -278,12 +253,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -294,7 +264,7 @@ defineSuite([ var visualizer = new PolylineVisualizer(scene, objects); var polyline = new PolylineGraphics(); - polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]); + polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]); polyline.material = new ColorMaterialProperty(); polyline.depthFailMaterial = new PolylineArrowMaterialProperty(); @@ -303,12 +273,7 @@ defineSuite([ entity.polyline = polyline; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -320,12 +285,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -336,7 +296,7 @@ defineSuite([ var visualizer = new PolylineVisualizer(scene, objects); var polyline = new PolylineGraphics(); - polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]); + polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]); polyline.material = new PolylineArrowMaterialProperty(); polyline.depthFailMaterial = new PolylineArrowMaterialProperty(); @@ -345,12 +305,7 @@ defineSuite([ entity.polyline = polyline; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -362,12 +317,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); @@ -378,7 +328,7 @@ defineSuite([ var visualizer = new PolylineVisualizer(scene, objects); var polyline = new PolylineGraphics(); - polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]); + polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]); polyline.material = new PolylineArrowMaterialProperty(); polyline.depthFailMaterial = new ColorMaterialProperty(); @@ -387,12 +337,7 @@ defineSuite([ entity.polyline = polyline; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -404,15 +349,52 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function(){ + return visualizerEmpty(visualizer).then(function(){ + visualizer.destroy(); + }); + }); + }); + + function createAndRemoveGeometryWithClassificationType(classificationType) { + if (!Entity.supportsPolylinesOnTerrain(scene)) { + return; + } + + var objects = new EntityCollection(); + var visualizer = new PolylineVisualizer(scene, objects); + + var polyline = new PolylineGraphics(); + polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]); + polyline.material = new ColorMaterialProperty(); + polyline.classificationType = new ConstantProperty(classificationType); + polyline.clampToGround = true; + + var entity = new Entity(); + entity.polyline = polyline; + objects.add(entity); + + return visualizerUpdated(visualizer).then(function() { + var primitive = scene.groundPrimitives.get(0); + expect(primitive.classificationType).toBe(classificationType); + + objects.remove(entity); + + return visualizerEmpty(visualizer).then(function(){ visualizer.destroy(); }); }); + } + + it('Creates and removes geometry classifying terrain', function() { + return createAndRemoveGeometryWithClassificationType(ClassificationType.TERRAIN); + }); + + it('Creates and removes geometry classifying 3D Tiles', function() { + return createAndRemoveGeometryWithClassificationType(ClassificationType.CESIUM_3D_TILE); + }); + + it('Creates and removes geometry classifying both terrain and 3D Tiles', function() { + return createAndRemoveGeometryWithClassificationType(ClassificationType.BOTH); }); it('Correctly handles geometry changing batches', function() { @@ -420,19 +402,14 @@ defineSuite([ var visualizer = new PolylineVisualizer(scene, objects); var polyline = new PolylineGraphics(); - polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]); + polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]); polyline.material = new ColorMaterialProperty(); var entity = new Entity(); entity.polyline = polyline; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -442,12 +419,7 @@ defineSuite([ polyline.material = new PolylineArrowMaterialProperty(); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { primitive = scene.primitives.get(0); attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -473,7 +445,7 @@ defineSuite([ var polyline = new PolylineGraphics(); polyline.positions = new CallbackProperty(function() { - return [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]; + return [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]; }, false); polyline.material = new ColorMaterialProperty(); @@ -520,7 +492,7 @@ defineSuite([ var visualizer = new PolylineVisualizer(scene, entityCollection); var polyline = new PolylineGraphics(); - polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]); + polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]); polyline.material = new PolylineArrowMaterialProperty(); var entity = new Entity(); @@ -578,37 +550,26 @@ defineSuite([ var entity = new Entity({ id : 'test', polyline : { - positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)], + positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)], material: Color.ORANGE } }); objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { objects.remove(entity); var entity2 = new Entity({ id : 'test', position : Cartesian3.fromDegrees(0, 0, 0), polyline : { - positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)], + positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)], material : Color.BLUE } }); objects.add(entity2); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { - + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity2); expect(attributes).toBeDefined(); @@ -618,12 +579,7 @@ defineSuite([ objects.remove(entity); - return pollToPromise(function() { - scene.initializeFrame(); - expect(visualizer.update(time)).toBe(true); - scene.render(time); - return scene.primitives.length === 0; - }).then(function() { + return visualizerEmpty(visualizer).then(function() { visualizer.destroy(); }); }); @@ -636,17 +592,12 @@ defineSuite([ var entity = entities.add({ polyline : { - positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)], + positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)], material : new ColorMaterialProperty(createDynamicProperty(Color.BLUE)) } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -654,12 +605,7 @@ defineSuite([ entity.show = false; - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); @@ -678,17 +624,12 @@ defineSuite([ var entity = entities.add({ position : new Cartesian3(1234, 5678, 9101112), polyline : { - positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)], + positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)], material : new PolylineArrowMaterialProperty(createDynamicProperty(Color.BLUE)) } }); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -696,12 +637,7 @@ defineSuite([ entity.show = false; - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { var primitive = scene.primitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); @@ -719,10 +655,10 @@ defineSuite([ } var objects = new EntityCollection(); - var visualizer = new PolylineVisualizer(scene, objects, scene.groundPrimitives); + var visualizer = new PolylineVisualizer(scene, objects); var polyline = new PolylineGraphics(); - polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]); + polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]); polyline.material = new ColorMaterialProperty(); polyline.clampToGround = new ConstantProperty(true); @@ -730,12 +666,7 @@ defineSuite([ entity.polyline = polyline; objects.add(entity); - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }).then(function() { + return visualizerUpdated(visualizer).then(function() { var primitive = scene.groundPrimitives.get(0); var attributes = primitive.getGeometryInstanceAttributes(entity); expect(attributes).toBeDefined(); @@ -746,12 +677,7 @@ defineSuite([ entity.polyline.show = false; - return pollToPromise(function() { - scene.initializeFrame(); - var isUpdated = visualizer.update(time); - scene.render(time); - return isUpdated; - }); + return visualizerUpdated(visualizer); }).then(function() { expect(scene.primitives.length).toEqual(0); @@ -759,4 +685,85 @@ defineSuite([ visualizer.destroy(); }); }); + + it('batches ground poylines by material if ground polylines are supported', function() { + if (!Entity.supportsPolylinesOnTerrain(scene)) { + return; + } + + var entities = new EntityCollection(); + var visualizer = new PolylineVisualizer(scene, entities); + + var blueColor = Color.BLUE.withAlpha(0.5); + var redColor = Color.RED.withAlpha(0.5); + var positions = [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]; + entities.add({ + polyline : { + positions : positions, + material : blueColor, + classificationType : ClassificationType.TERRAIN, + clampToGround : true + } + }); + + return visualizerUpdated(visualizer).then(function() { + expect(scene.groundPrimitives.length).toEqual(1); + + entities.add({ + polyline : { + positions : positions, + material : blueColor, + classificationType : ClassificationType.TERRAIN, + clampToGround : true + } + }); + + return visualizerUpdated(visualizer); + }).then(function() { + expect(scene.groundPrimitives.length).toEqual(1); + + entities.add({ + polyline : { + positions : positions, + material : redColor, + classificationType : ClassificationType.TERRAIN, + clampToGround : true + } + }); + + return visualizerUpdated(visualizer); + }).then(function() { + expect(scene.groundPrimitives.length).toEqual(1); + + entities.add({ + polyline : { + positions : positions, + material : new PolylineArrowMaterialProperty(), + classificationType : ClassificationType.TERRAIN, + clampToGround : true + } + }); + + return visualizerUpdated(visualizer); + }).then(function() { + expect(scene.groundPrimitives.length).toEqual(2); + + entities.add({ + polyline : { + positions : positions, + material : new PolylineArrowMaterialProperty(), + classificationType : ClassificationType.CESIUM_3D_TILE, + clampToGround : true + } + }); + + return visualizerUpdated(visualizer); + }).then(function() { + expect(scene.groundPrimitives.length).toEqual(3); + + entities.removeAll(); + visualizer.destroy(); + }); + }); + }, 'WebGL'); diff --git a/Specs/DataSources/StaticGroundPolylinePerMaterialBatchSpec.js b/Specs/DataSources/StaticGroundPolylinePerMaterialBatchSpec.js index 6fbd74d96407..14bff2aae491 100644 --- a/Specs/DataSources/StaticGroundPolylinePerMaterialBatchSpec.js +++ b/Specs/DataSources/StaticGroundPolylinePerMaterialBatchSpec.js @@ -18,6 +18,7 @@ defineSuite([ 'DataSources/PolylineGeometryUpdater', 'DataSources/PolylineGraphics', 'DataSources/TimeIntervalCollectionProperty', + 'Scene/ClassificationType', 'Scene/GroundPolylinePrimitive', 'Specs/createScene', 'Specs/pollToPromise' @@ -41,6 +42,7 @@ defineSuite([ PolylineGeometryUpdater, PolylineGraphics, TimeIntervalCollectionProperty, + ClassificationType, GroundPolylinePrimitive, createScene, pollToPromise) { @@ -90,7 +92,7 @@ defineSuite([ return; } - batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, false); + batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, ClassificationType.BOTH, false); var polyline1 = createGroundPolyline(); polyline1.material = new PolylineOutlineMaterialProperty(); @@ -151,7 +153,7 @@ defineSuite([ polyline: polyline }); - batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, false); + batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, ClassificationType.BOTH, false); var updater = new PolylineGeometryUpdater(entity, scene); batch.add(validTime, updater); @@ -197,7 +199,7 @@ defineSuite([ polyline: polyline }); - batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, false); + batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, ClassificationType.BOTH, false); var updater = new PolylineGeometryUpdater(entity, scene); batch.add(validTime, updater); @@ -230,7 +232,7 @@ defineSuite([ return; } - batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, false); + batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, ClassificationType.BOTH, false); function buildEntity() { var polyline = createGroundPolyline(); @@ -299,7 +301,7 @@ defineSuite([ return; } - batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, false); + batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, ClassificationType.BOTH, false); var polyline1 = createGroundPolyline(); polyline1.material = Color.RED; var entity = new Entity({ @@ -335,7 +337,7 @@ defineSuite([ return; } - batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, false); + batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, ClassificationType.BOTH, false); var polyline1 = createGroundPolyline(); polyline1.material = new PolylineOutlineMaterialProperty(); @@ -376,7 +378,7 @@ defineSuite([ return; } - batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, false); + batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, ClassificationType.BOTH, false); var polyline1 = createGroundPolyline(); polyline1.material = new PolylineOutlineMaterialProperty(); @@ -417,7 +419,7 @@ defineSuite([ } var resultSphere = new BoundingSphere(); - batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, false); + batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, ClassificationType.BOTH, false); var polyline1 = createGroundPolyline(); polyline1.material = new PolylineOutlineMaterialProperty(); @@ -457,7 +459,7 @@ defineSuite([ // Don't fail if GroundPolylinePrimitive is not supported return; } - batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, false); + batch = new StaticGroundPolylinePerMaterialBatch(scene.groundPrimitives, ClassificationType.BOTH, false); function buildEntity() { var polyline = createGroundPolyline();