From e656a8da514377ea3541db4b4145761d7ceb2764 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Tue, 22 May 2018 12:12:06 -0400 Subject: [PATCH] fix classification type --- .../gallery/Z-Indexing Geometry.html | 18 ++++++------------ .../gallery/Z-Indexing Geometry.jpg | Bin 15127 -> 18128 bytes CHANGES.md | 2 ++ Source/DataSources/CorridorGraphics.js | 2 +- Source/DataSources/EllipseGraphics.js | 2 +- Source/DataSources/GeometryUpdater.js | 2 +- Source/DataSources/PolygonGraphics.js | 2 +- Source/DataSources/RectangleGraphics.js | 2 +- Source/Scene/GroundPrimitive.js | 6 +++--- Specs/Scene/GroundPrimitiveSpec.js | 6 ++++-- 10 files changed, 20 insertions(+), 22 deletions(-) diff --git a/Apps/Sandcastle/gallery/Z-Indexing Geometry.html b/Apps/Sandcastle/gallery/Z-Indexing Geometry.html index 1ec0d4e8e578..a2c43724c3f5 100644 --- a/Apps/Sandcastle/gallery/Z-Indexing Geometry.html +++ b/Apps/Sandcastle/gallery/Z-Indexing Geometry.html @@ -35,8 +35,7 @@ rectangle : { coordinates : Cesium.Rectangle.fromDegrees(-110.0, 20.0, -100.5, 30.0), material : Cesium.Color.RED, - zIndex: 1, - classificationType : Cesium.ClassificationType.TERRAIN + zIndex: 1 } }); @@ -44,8 +43,7 @@ rectangle : { coordinates : Cesium.Rectangle.fromDegrees(-112.0, 25.0, -102.5, 35.0), material : '../images/Cesium_Logo_Color.jpg', - zIndex: 2, - classificationType : Cesium.ClassificationType.TERRAIN + zIndex: 2 } }); @@ -53,8 +51,7 @@ rectangle : { coordinates : Cesium.Rectangle.fromDegrees(-110.0, 31.0, -100.5, 41.0), material : Cesium.Color.BLUE, - zIndex: 3, - classificationType : Cesium.ClassificationType.TERRAIN + zIndex: 3 } }); @@ -62,8 +59,7 @@ rectangle : { coordinates : Cesium.Rectangle.fromDegrees(-99.5, 20.0, -90.0, 30.0), material : '../images/Cesium_Logo_Color.jpg', - zIndex: 3, - classificationType : Cesium.ClassificationType.TERRAIN + zIndex: 3 } }); @@ -71,8 +67,7 @@ rectangle : { coordinates : Cesium.Rectangle.fromDegrees(-97.5, 25.0, -88.0, 35.0), material : Cesium.Color.GREEN, - zIndex: 2, - classificationType : Cesium.ClassificationType.TERRAIN + zIndex: 2 } }); @@ -80,8 +75,7 @@ rectangle : { coordinates : Cesium.Rectangle.fromDegrees(-99.5, 31.0, -90.0, 41.0), material : Cesium.Color.BLUE, - zIndex: 1, - classificationType : Cesium.ClassificationType.TERRAIN + zIndex: 1 } }); diff --git a/Apps/Sandcastle/gallery/Z-Indexing Geometry.jpg b/Apps/Sandcastle/gallery/Z-Indexing Geometry.jpg index 3da960f0ad21237c10e7ad68b3109046a158b912..caae2ada52e648a428a3f0d2e8ce331172300d2b 100644 GIT binary patch delta 17582 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 CZiWE> delta 14558 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 I_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 {ClassificationType} [options.classificationType=ClassificationType.BOTH] Determines whether terrain, 3D Tiles or both will be classified. + * @param {ClassificationType} [options.classificationType=ClassificationType.TERRAIN] 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 for the volumes to be created before the geometry is released or options.releaseGeometryInstance must be false. @@ -208,9 +208,9 @@ define([ * * @type {ClassificationType} * - * @default ClassificationType.BOTH + * @default ClassificationType.TERRAIN */ - this.classificationType = defaultValue(options.classificationType, ClassificationType.BOTH); + this.classificationType = defaultValue(options.classificationType, ClassificationType.TERRAIN); /** * This property is for debugging only; it is not for production use nor is it optimized. *

diff --git a/Specs/Scene/GroundPrimitiveSpec.js b/Specs/Scene/GroundPrimitiveSpec.js index c1d4b9efafdc..e8ab745fe93a 100644 --- a/Specs/Scene/GroundPrimitiveSpec.js +++ b/Specs/Scene/GroundPrimitiveSpec.js @@ -542,7 +542,8 @@ defineSuite([ primitive = new GroundPrimitive({ geometryInstances : rectangleInstance, - asynchronous : false + asynchronous : false, + classificationType: ClassificationType.BOTH }); scene.camera.setView({ destination : rectangle }); @@ -582,7 +583,8 @@ defineSuite([ primitive = new GroundPrimitive({ geometryInstances : rectangleInstance, - asynchronous : false + asynchronous : false, + classificationType: ClassificationType.BOTH }); scene.camera.setView({ destination : rectangle });