From 335d58aefb107084d39059f45390659c00373ac0 Mon Sep 17 00:00:00 2001 From: Kangning Li Date: Tue, 12 Jun 2018 10:26:44 -0400 Subject: [PATCH] remove unneeded options from GroundPolylinePrimitive, add simple Sandcastle example for Ground Polyline materials --- .../development/Ground Polyline Material.html | 96 ++++++++++++++++++ .../development/Ground Polyline Material.jpg | Bin 0 -> 24837 bytes Source/Scene/GroundPolylinePrimitive.js | 68 ++++--------- Specs/Scene/GroundPolylinePrimitiveSpec.js | 8 -- 4 files changed, 118 insertions(+), 54 deletions(-) create mode 100644 Apps/Sandcastle/gallery/development/Ground Polyline Material.html create mode 100644 Apps/Sandcastle/gallery/development/Ground Polyline Material.jpg diff --git a/Apps/Sandcastle/gallery/development/Ground Polyline Material.html b/Apps/Sandcastle/gallery/development/Ground Polyline Material.html new file mode 100644 index 000000000000..5d6348eb4ce4 --- /dev/null +++ b/Apps/Sandcastle/gallery/development/Ground Polyline Material.html @@ -0,0 +1,96 @@ + + + + + + + + + Cesium Demo + + + + + + +
+

Loading...

+
+ + + diff --git a/Apps/Sandcastle/gallery/development/Ground Polyline Material.jpg b/Apps/Sandcastle/gallery/development/Ground Polyline Material.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f83e97e704f59a137a0d8246f637a37857c155bf GIT binary patch literal 24837 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 literal 0 HcmV?d00001 diff --git a/Source/Scene/GroundPolylinePrimitive.js b/Source/Scene/GroundPolylinePrimitive.js index a595d4a65529..75399c403590 100644 --- a/Source/Scene/GroundPolylinePrimitive.js +++ b/Source/Scene/GroundPolylinePrimitive.js @@ -1,6 +1,5 @@ define([ '../Core/ApproximateTerrainHeights', - '../Core/Check', '../Core/ComponentDatatype', '../Core/defaultValue', '../Core/defined', @@ -9,9 +8,7 @@ define([ '../Core/DeveloperError', '../Core/GeometryInstance', '../Core/GeometryInstanceAttribute', - '../Core/GroundPolylineGeometry', '../Core/isArray', - '../Core/Matrix4', '../Shaders/PolylineShadowVolumeVS', '../Shaders/PolylineShadowVolumeFS', '../Shaders/PolylineShadowVolumeMorphVS', @@ -24,14 +21,12 @@ define([ '../ThirdParty/when', './BlendingState', './CullFace', - './Material', './PolylineColorAppearance', './PolylineMaterialAppearance', './Primitive', './SceneMode' ], function( ApproximateTerrainHeights, - Check, ComponentDatatype, defaultValue, defined, @@ -40,9 +35,7 @@ define([ DeveloperError, GeometryInstance, GeometryInstanceAttribute, - GroundPolylineGeometry, isArray, - Matrix4, PolylineShadowVolumeVS, PolylineShadowVolumeFS, PolylineShadowVolumeMorphVS, @@ -55,7 +48,6 @@ define([ when, BlendingState, CullFace, - Material, PolylineColorAppearance, PolylineMaterialAppearance, Primitive, @@ -72,16 +64,32 @@ define([ * @param {Array|GeometryInstance} [options.geometryInstances] GeometryInstances containing GroundPolylineGeometry * @param {Appearance} [options.appearance] The Appearance used to render the polyline. Defaults to a white color {@link Material} on a {@link PolylineMaterialAppearance}. * @param {Boolean} [options.show=true] Determines if this primitive will be shown. - * @param {Boolean} [options.vertexCacheOptimize=false] When true, geometry vertices are optimized for the pre and post-vertex-shader caches. * @param {Boolean} [options.interleave=false] When true, geometry vertex attributes are interleaved, which can slightly improve rendering performance but increases load time. - * @param {Boolean} [options.compressVertices=true] When true, the geometry vertices are compressed, which will save memory. * @param {Boolean} [options.releaseGeometryInstances=true] When true, 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 {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 for the volumes to be created before the geometry is released or options.releaseGeometryInstance must be false. + * @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. * + * @example + * var instance = new Cesium.GeometryInstance({ + * geometry : new Cesium.GroundPolylineGeometry({ + * positions : Cesium.Cartesian3.fromDegreesArray([ + * -112.1340164450331, 36.05494287836128, + * -112.08821010582645, 36.097804071380715 + * ]), + * loop : false, + * width : 4.0 + * }), + * id : 'object returned when this instance is picked and to get/set per-instance attributes' + * }); + * + * scene.groundPrimitives.add(new Cesium.GroundPolylinePrimitive({ + * geometryInstances : instance, + * appearance : new Cesium.PolylineMaterialAppearance({ + * material : Cesium.Material.fromType('Color') + * }) + * })); */ function GroundPolylinePrimitive(options) { options = defaultValue(options, defaultValue.EMPTY_OBJECT); @@ -146,12 +154,12 @@ define([ this._primitiveOptions = { geometryInstances : undefined, appearance : undefined, - vertexCacheOptimize : defaultValue(options.vertexCacheOptimize, false), + vertexCacheOptimize : false, interleave : defaultValue(options.interleave, false), releaseGeometryInstances : defaultValue(options.releaseGeometryInstances, true), allowPicking : defaultValue(options.allowPicking, true), asynchronous : defaultValue(options.asynchronous, true), - compressVertices : defaultValue(options.compressVertices, true), + compressVertices : false, _createShaderProgramFunction : undefined, _createCommandsFunction : undefined, _updateAndQueueCommandsFunction : undefined @@ -191,22 +199,6 @@ define([ } defineProperties(GroundPolylinePrimitive.prototype, { - /** - * When true, geometry vertices are optimized for the pre and post-vertex-shader caches. - * - * @memberof GroundPolylinePrimitive.prototype - * - * @type {Boolean} - * @readonly - * - * @default true - */ - vertexCacheOptimize : { - get : function() { - return this._primitiveOptions.vertexCacheOptimize; - } - }, - /** * Determines if geometry vertex attributes are interleaved, which can slightly improve rendering performance. * @@ -271,22 +263,6 @@ define([ } }, - /** - * When true, geometry vertices are compressed, which will save memory. - * - * @memberof GroundPolylinePrimitive.prototype - * - * @type {Boolean} - * @readonly - * - * @default true - */ - compressVertices : { - get : function() { - return this._primitiveOptions.compressVertices; - } - }, - /** * Determines if the primitive is complete and ready to render. If this property is * true, the primitive will be rendered the next time that {@link GroundPolylinePrimitive#update} diff --git a/Specs/Scene/GroundPolylinePrimitiveSpec.js b/Specs/Scene/GroundPolylinePrimitiveSpec.js index d6806506ea59..4386e892259d 100644 --- a/Specs/Scene/GroundPolylinePrimitiveSpec.js +++ b/Specs/Scene/GroundPolylinePrimitiveSpec.js @@ -1,6 +1,5 @@ defineSuite([ 'Scene/GroundPolylinePrimitive', - 'Core/ApproximateTerrainHeights', 'Core/Color', 'Core/ColorGeometryInstanceAttribute', 'Core/Cartesian3', @@ -21,7 +20,6 @@ defineSuite([ 'Specs/pollToPromise' ], function( GroundPolylinePrimitive, - ApproximateTerrainHeights, Color, ColorGeometryInstanceAttribute, Cartesian3, @@ -160,9 +158,7 @@ defineSuite([ expect(groundPolylinePrimitive.geometryInstances).not.toBeDefined(); expect(groundPolylinePrimitive.appearance instanceof PolylineMaterialAppearance).toBe(true); expect(groundPolylinePrimitive.show).toEqual(true); - expect(groundPolylinePrimitive.vertexCacheOptimize).toEqual(false); expect(groundPolylinePrimitive.interleave).toEqual(false); - expect(groundPolylinePrimitive.compressVertices).toEqual(true); expect(groundPolylinePrimitive.releaseGeometryInstances).toEqual(true); expect(groundPolylinePrimitive.allowPicking).toEqual(true); expect(groundPolylinePrimitive.asynchronous).toEqual(true); @@ -176,9 +172,7 @@ defineSuite([ groundPolylinePrimitive = new GroundPolylinePrimitive({ geometryInstances : geometryInstances, show : false, - vertexCacheOptimize : true, interleave : true, - compressVertices : false, releaseGeometryInstances : false, allowPicking : false, asynchronous : false, @@ -188,9 +182,7 @@ defineSuite([ expect(groundPolylinePrimitive.geometryInstances).toEqual(geometryInstances); expect(groundPolylinePrimitive.show).toEqual(false); - expect(groundPolylinePrimitive.vertexCacheOptimize).toEqual(true); expect(groundPolylinePrimitive.interleave).toEqual(true); - expect(groundPolylinePrimitive.compressVertices).toEqual(false); expect(groundPolylinePrimitive.releaseGeometryInstances).toEqual(false); expect(groundPolylinePrimitive.allowPicking).toEqual(false); expect(groundPolylinePrimitive.asynchronous).toEqual(false);