Merge pull request #6034 from AnalyticalGraphicsInc/vector-split

Add Geometry tile support
CesiumGS · Dec 12, 2017 · 618a892 · 618a892
2 parents 772a9c3 + 612c5f5
commit 618a892
Show file tree

Hide file tree

Showing 287 changed files with 2,365 additions and 3,322 deletions.
diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Classification.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Classification.html
@@ -37,7 +37,7 @@
 // For more details, see:
 //    https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/vector-tiles/TileFormats/VectorData
 var classification = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
-    url: 'https://beta.cesium.com/api/assets/3394?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzZjM4MjljZi0xNTAzLTQ0MzctODhlZi0zOTU3Njg5ODA1Y2QiLCJpZCI6OCwiaWF0IjoxNDgxODI5ODMyfQ.dYlV8_PoXcFNlPHGook5kMzuJMS-Bb9DCMzI1mFVvgE',
+    url: 'https://beta.cesium.com/api/assets/3469?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzZjM4MjljZi0xNTAzLTQ0MzctODhlZi0zOTU3Njg5ODA1Y2QiLCJpZCI6OCwiaWF0IjoxNDgxODI5ODMyfQ.dYlV8_PoXcFNlPHGook5kMzuJMS-Bb9DCMzI1mFVvgE',
     skipLevelOfDetail : false,
     classificationType : Cesium.ClassificationType.CESIUM_3D_TILE
 }));

diff --git a/CHANGES.md b/CHANGES.md
@@ -13,7 +13,7 @@ Change Log
 * Added `pack` and `unpack` functions to `OrientedBoundingBox` for packing to and unpacking from a flat buffer.
 * Added experimental support for [3D Tiles Vector Data](https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/vector-tiles/TileFormats/VectorData) ([#4665](https://github.com/AnalyticalGraphicsInc/cesium/pull/4665)). The new and modified Cesium APIs are:
    * `Cesium3DTileStyle` has expanded for styling point features. See the [styling specification](https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/vector-tiles/Styling#vector-data) for details.
-   * `Cesium3DTileFeature` can modify `color` and `show` properties for polygon, polyline, geometry, and mesh features.
+   * `Cesium3DTileFeature` can modify `color` and `show` properties for polygon, polyline, and geometry features.
    * `Cesium3DTilePointFeature` can modify the styling options for a point feature.
 * Added `Cesium3DTileset.classificationType` to specify if a tileset classifies terrain, another 3D Tiles tileset, or both. This only applies to vector, geometry and batched 3D model tilesets. See [#6033](https://github.com/AnalyticalGraphicsInc/cesium/pull/6033) for limitations on the glTF contained in the b3dm tile.
 

diff --git a/Source/Scene/Cesium3DTileContentFactory.js b/Source/Scene/Cesium3DTileContentFactory.js
@@ -1,13 +1,15 @@
 define([
         './Batched3DModel3DTileContent',
         './Composite3DTileContent',
+        './Geometry3DTileContent',
         './Instanced3DModel3DTileContent',
         './PointCloud3DTileContent',
         './Tileset3DTileContent',
         './Vector3DTileContent'
     ], function(
         Batched3DModel3DTileContent,
         Composite3DTileContent,
+        Geometry3DTileContent,
         Instanced3DModel3DTileContent,
         PointCloud3DTileContent,
         Tileset3DTileContent,
@@ -36,6 +38,9 @@ define([
         json : function(tileset, tile, url, arrayBuffer, byteOffset) {
             return new Tileset3DTileContent(tileset, tile, url, arrayBuffer, byteOffset);
         },
+        geom : function(tileset, tile, url, arrayBuffer, byteOffset) {
+            return new Geometry3DTileContent(tileset, tile, url, arrayBuffer, byteOffset);
+        },
         vctr : function(tileset, tile, url, arrayBuffer, byteOffset) {
             return new Vector3DTileContent(tileset, tile, url, arrayBuffer, byteOffset);
         }

diff --git a/Source/Scene/Cesium3DTilePointFeature.js b/Source/Scene/Cesium3DTilePointFeature.js
@@ -72,6 +72,8 @@ define([
         this._pointOutlineColor = undefined;
         this._pointOutlineWidth = undefined;
         this._heightOffset = undefined;
+
+        setBillboardImage(this);
     }
 
     var scratchCartographic = new Cartographic();