diff --git a/Apps/SampleData/Cesium3DTiles/Batched/BatchedColors/batchedColors.b3dm b/Apps/SampleData/Cesium3DTiles/Batched/BatchedColors/batchedColors.b3dm new file mode 100644 index 000000000000..28cf4bd01d3a Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Batched/BatchedColors/batchedColors.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Batched/BatchedColors/tileset.json b/Apps/SampleData/Cesium3DTiles/Batched/BatchedColors/tileset.json new file mode 100644 index 000000000000..cbcfce0a85d9 --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/Batched/BatchedColors/tileset.json @@ -0,0 +1,41 @@ +{ + "asset": { + "version": "1.0" + }, + "properties": { + "id": { + "minimum": 0, + "maximum": 9 + }, + "Longitude": { + "minimum": -1.3196959060375169, + "maximum": -1.3196607462778132 + }, + "Latitude": { + "minimum": 0.6988590050687061, + "maximum": 0.6988864387845588 + }, + "Height": { + "minimum": 6.1022464875131845, + "maximum": 13.410263679921627 + } + }, + "geometricError": 70, + "root": { + "refine": "ADD", + "boundingVolume": { + "region": [ + -1.3197004795898053, + 0.6988582109, + -1.3196595204101946, + 0.6988897891, + 0, + 20 + ] + }, + "geometricError": 0, + "content": { + "uri": "batchedColors.b3dm" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucent/batchedTranslucent.b3dm b/Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucent/batchedTranslucent.b3dm new file mode 100644 index 000000000000..fddc903f85f4 Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucent/batchedTranslucent.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucent/tileset.json b/Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucent/tileset.json new file mode 100644 index 000000000000..036bb25c81f5 --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucent/tileset.json @@ -0,0 +1,41 @@ +{ + "asset": { + "version": "1.0" + }, + "properties": { + "id": { + "minimum": 0, + "maximum": 9 + }, + "Longitude": { + "minimum": -1.3196959060375169, + "maximum": -1.3196607462778132 + }, + "Latitude": { + "minimum": 0.6988590050687061, + "maximum": 0.6988864387845588 + }, + "Height": { + "minimum": 6.1022464875131845, + "maximum": 13.410263679921627 + } + }, + "geometricError": 70, + "root": { + "refine": "ADD", + "boundingVolume": { + "region": [ + -1.3197004795898053, + 0.6988582109, + -1.3196595204101946, + 0.6988897891, + 0, + 20 + ] + }, + "geometricError": 0, + "content": { + "uri": "batchedTranslucent.b3dm" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/batchedTranslucentOpaqueMix.b3dm b/Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/batchedTranslucentOpaqueMix.b3dm new file mode 100644 index 000000000000..db421f7a7f58 Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/batchedTranslucentOpaqueMix.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/tileset.json b/Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/tileset.json new file mode 100644 index 000000000000..37b5733fbf78 --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/tileset.json @@ -0,0 +1,41 @@ +{ + "asset": { + "version": "1.0" + }, + "properties": { + "id": { + "minimum": 0, + "maximum": 9 + }, + "Longitude": { + "minimum": -1.3196959060375169, + "maximum": -1.3196607462778132 + }, + "Latitude": { + "minimum": 0.6988590050687061, + "maximum": 0.6988864387845588 + }, + "Height": { + "minimum": 6.1022464875131845, + "maximum": 13.410263679921627 + } + }, + "geometricError": 70, + "root": { + "refine": "ADD", + "boundingVolume": { + "region": [ + -1.3197004795898053, + 0.6988582109, + -1.3196595204101946, + 0.6988897891, + 0, + 20 + ] + }, + "geometricError": 0, + "content": { + "uri": "batchedTranslucentOpaqueMix.b3dm" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/Batched/BatchedWithBatchTable/batchedWithBatchTable.b3dm b/Apps/SampleData/Cesium3DTiles/Batched/BatchedWithBatchTable/batchedWithBatchTable.b3dm new file mode 100644 index 000000000000..b867b67f266f Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Batched/BatchedWithBatchTable/batchedWithBatchTable.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Batched/BatchedWithBatchTable/tileset.json b/Apps/SampleData/Cesium3DTiles/Batched/BatchedWithBatchTable/tileset.json new file mode 100644 index 000000000000..698746a02d7c --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/Batched/BatchedWithBatchTable/tileset.json @@ -0,0 +1,41 @@ +{ + "asset": { + "version": "1.0" + }, + "properties": { + "id": { + "minimum": 0, + "maximum": 9 + }, + "Longitude": { + "minimum": -1.3196959060375169, + "maximum": -1.3196607462778132 + }, + "Latitude": { + "minimum": 0.6988590050687061, + "maximum": 0.6988864387845588 + }, + "Height": { + "minimum": 6.1022464875131845, + "maximum": 13.410263679921627 + } + }, + "geometricError": 70, + "root": { + "refine": "ADD", + "boundingVolume": { + "region": [ + -1.3197004795898053, + 0.6988582109, + -1.3196595204101946, + 0.6988897891, + 0, + 20 + ] + }, + "geometricError": 0, + "content": { + "uri": "batchedWithBatchTable.b3dm" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/Composite/Composite/composite.cmpt b/Apps/SampleData/Cesium3DTiles/Composite/Composite/composite.cmpt new file mode 100644 index 000000000000..4564fa268abf Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Composite/Composite/composite.cmpt differ diff --git a/Apps/SampleData/Cesium3DTiles/Composite/Composite/tileset.json b/Apps/SampleData/Cesium3DTiles/Composite/Composite/tileset.json new file mode 100644 index 000000000000..31e0deae28d1 --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/Composite/Composite/tileset.json @@ -0,0 +1,41 @@ +{ + "asset": { + "version": "1.0" + }, + "properties": { + "id": { + "minimum": 0, + "maximum": 9 + }, + "Longitude": { + "minimum": -1.3196959060375169, + "maximum": -1.3196607462778132 + }, + "Latitude": { + "minimum": 0.6988590050687061, + "maximum": 0.6988864387845588 + }, + "Height": { + "minimum": 6.1022464875131845, + "maximum": 20 + } + }, + "geometricError": 70, + "root": { + "refine": "ADD", + "boundingVolume": { + "region": [ + -1.3197004795898053, + 0.6988582109, + -1.3196595204101946, + 0.6988897891, + 0, + 30 + ] + }, + "geometricError": 0, + "content": { + "uri": "composite.cmpt" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tile.b3dm b/Apps/SampleData/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tile.b3dm new file mode 100644 index 000000000000..c9eda60d78cf Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tile.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tileset.json b/Apps/SampleData/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tileset.json new file mode 100644 index 000000000000..b58514642f34 --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tileset.json @@ -0,0 +1,53 @@ +{ + "asset": { + "version": "1.0" + }, + "geometricError": 70, + "root": { + "transform": [ + 0.9686356343768792, + 0.24848542777253735, + 0, + 0, + -0.15986460744966327, + 0.623177611820219, + 0.765567091384559, + 0, + 0.19023226619126932, + -0.7415555652213445, + 0.6433560667227647, + 0, + 1215011.9317263428, + -4736309.3434217675, + 4081602.0044800863, + 1 + ], + "refine": "ADD", + "boundingVolume": { + "box": [ + 0, + 0, + 10, + 50, + 0, + 0, + 0, + 50, + 0, + 0, + 0, + 10 + ] + }, + "geometricError": 0, + "content": { + "uri": "tile.b3dm" + } + }, + "extensionsUsed": [ + "3DTILES_batch_table_hierarchy" + ], + "extensionsRequired": [ + "3DTILES_batch_table_hierarchy" + ] +} diff --git a/Apps/SampleData/Cesium3DTiles/Instanced/InstancedOrientation/instancedOrientation.i3dm b/Apps/SampleData/Cesium3DTiles/Instanced/InstancedOrientation/instancedOrientation.i3dm new file mode 100644 index 000000000000..90f8694f975e Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Instanced/InstancedOrientation/instancedOrientation.i3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json b/Apps/SampleData/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json new file mode 100644 index 000000000000..00c6d0c89b9f --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json @@ -0,0 +1,29 @@ +{ + "asset": { + "version": "1.0" + }, + "properties": { + "Height": { + "minimum": 20, + "maximum": 20 + } + }, + "geometricError": 70, + "root": { + "refine": "ADD", + "boundingVolume": { + "region": [ + -1.3197004795898053, + 0.6988582109, + -1.3196595204101946, + 0.6988897891, + 0, + 30 + ] + }, + "geometricError": 0, + "content": { + "uri": "instancedOrientation.i3dm" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/Instanced/InstancedWithBatchTable/instancedWithBatchTable.i3dm b/Apps/SampleData/Cesium3DTiles/Instanced/InstancedWithBatchTable/instancedWithBatchTable.i3dm new file mode 100644 index 000000000000..b0f0bef88d10 Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Instanced/InstancedWithBatchTable/instancedWithBatchTable.i3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Instanced/InstancedWithBatchTable/tileset.json b/Apps/SampleData/Cesium3DTiles/Instanced/InstancedWithBatchTable/tileset.json new file mode 100644 index 000000000000..93ce14f601fa --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/Instanced/InstancedWithBatchTable/tileset.json @@ -0,0 +1,29 @@ +{ + "asset": { + "version": "1.0" + }, + "properties": { + "Height": { + "minimum": 20, + "maximum": 20 + } + }, + "geometricError": 70, + "root": { + "refine": "ADD", + "boundingVolume": { + "region": [ + -1.3197004795898053, + 0.6988582109, + -1.3196595204101946, + 0.6988897891, + 0, + 30 + ] + }, + "geometricError": 0, + "content": { + "uri": "instancedWithBatchTable.i3dm" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudBatched/pointCloudBatched.pnts b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudBatched/pointCloudBatched.pnts new file mode 100644 index 000000000000..9f37709b1616 Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudBatched/pointCloudBatched.pnts differ diff --git a/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudBatched/tileset.json b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudBatched/tileset.json new file mode 100644 index 000000000000..2b2b44d568f3 --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudBatched/tileset.json @@ -0,0 +1,21 @@ +{ + "asset": { + "version": "1.0" + }, + "geometricError": 17.32, + "root": { + "refine": "ADD", + "boundingVolume": { + "sphere": [ + 1215012.8828876738, + -4736313.051199594, + 4081605.22126042, + 5 + ] + }, + "geometricError": 0, + "content": { + "uri": "pointCloudBatched.pnts" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudConstantColor/pointCloudConstantColor.pnts b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudConstantColor/pointCloudConstantColor.pnts new file mode 100644 index 000000000000..4f095df7e9da Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudConstantColor/pointCloudConstantColor.pnts differ diff --git a/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudConstantColor/tileset.json b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudConstantColor/tileset.json new file mode 100644 index 000000000000..0b76d7c655a0 --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudConstantColor/tileset.json @@ -0,0 +1,21 @@ +{ + "asset": { + "version": "1.0" + }, + "geometricError": 17.32, + "root": { + "refine": "ADD", + "boundingVolume": { + "sphere": [ + 1215012.8828876738, + -4736313.051199594, + 4081605.22126042, + 5 + ] + }, + "geometricError": 0, + "content": { + "uri": "pointCloudConstantColor.pnts" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudDraco/pointCloudDraco.pnts b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudDraco/pointCloudDraco.pnts new file mode 100644 index 000000000000..8de2b0de2f61 Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudDraco/pointCloudDraco.pnts differ diff --git a/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudDraco/tileset.json b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudDraco/tileset.json new file mode 100644 index 000000000000..11de73fc9939 --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudDraco/tileset.json @@ -0,0 +1,27 @@ +{ + "asset": { + "version": "1.0" + }, + "extensionsUsed": [ + "3DTILES_draco_point_compression" + ], + "extensionsRequired": [ + "3DTILES_draco_point_compression" + ], + "geometricError": 17.32, + "root": { + "refine": "ADD", + "boundingVolume": { + "sphere": [ + 1215012.8828876738, + -4736313.051199594, + 4081605.22126042, + 5 + ] + }, + "geometricError": 0, + "content": { + "uri": "pointCloudDraco.pnts" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudNormals/pointCloudNormals.pnts b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudNormals/pointCloudNormals.pnts new file mode 100644 index 000000000000..af2e25ae9c71 Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudNormals/pointCloudNormals.pnts differ diff --git a/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudNormals/tileset.json b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudNormals/tileset.json new file mode 100644 index 000000000000..3ed29dc75c8e --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudNormals/tileset.json @@ -0,0 +1,21 @@ +{ + "asset": { + "version": "1.0" + }, + "geometricError": 17.32, + "root": { + "refine": "ADD", + "boundingVolume": { + "sphere": [ + 1215012.8828876738, + -4736313.051199594, + 4081605.22126042, + 5 + ] + }, + "geometricError": 0, + "content": { + "uri": "pointCloudNormals.pnts" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudRGB/pointCloudRGB.pnts b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudRGB/pointCloudRGB.pnts new file mode 100644 index 000000000000..455d3b84065b Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudRGB/pointCloudRGB.pnts differ diff --git a/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudRGB/tileset.json b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudRGB/tileset.json new file mode 100644 index 000000000000..fc39bf5c86ab --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudRGB/tileset.json @@ -0,0 +1,21 @@ +{ + "asset": { + "version": "1.0" + }, + "geometricError": 17.32, + "root": { + "refine": "ADD", + "boundingVolume": { + "sphere": [ + 1215012.8828876738, + -4736313.051199594, + 4081605.22126042, + 5 + ] + }, + "geometricError": 0, + "content": { + "uri": "pointCloudRGB.pnts" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/pointCloudWithPerPointProperties.pnts b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/pointCloudWithPerPointProperties.pnts new file mode 100644 index 000000000000..3b30ca452503 Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/pointCloudWithPerPointProperties.pnts differ diff --git a/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/tileset.json b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/tileset.json new file mode 100644 index 000000000000..4b2412af5253 --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/tileset.json @@ -0,0 +1,39 @@ +{ + "asset": { + "version": "1.0" + }, + "geometricError": 17.32, + "root": { + "transform": [ + 0.968635634376879, + 0.24848542777253735, + 0, + 0, + -0.15986460794399626, + 0.6231776137472074, + 0.7655670897127491, + 0, + 0.190232265775849, + -0.7415555636019701, + 0.6433560687121489, + 0, + 1215012.8828876738, + -4736313.051199594, + 4081605.22126042, + 1 + ], + "refine": "ADD", + "boundingVolume": { + "sphere": [ + 0, + 0, + 0, + 5 + ] + }, + "geometricError": 0, + "content": { + "uri": "pointCloudWithPerPointProperties.pnts" + } + } +} diff --git a/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/ll.b3dm b/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/ll.b3dm new file mode 100644 index 000000000000..98b2b469bda1 Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/ll.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/lr.b3dm b/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/lr.b3dm new file mode 100644 index 000000000000..ebb24758d31f Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/lr.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/parent.b3dm b/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/parent.b3dm new file mode 100644 index 000000000000..8f6c2012861e Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/parent.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/tileset.json b/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/tileset.json new file mode 100644 index 000000000000..d7baf1670f0e --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/tileset.json @@ -0,0 +1,118 @@ +{ + "asset": { + "version": "1.0", + "tilesetVersion": "1.2.3" + }, + "properties": { + "id": { + "minimum": 0, + "maximum": 9 + }, + "Longitude": { + "minimum": -1.3197192952275933, + "maximum": -1.319644104024109 + }, + "Latitude": { + "minimum": 0.698848878034009, + "maximum": 0.6989046192460953 + }, + "Height": { + "minimum": 6.161747192963958, + "maximum": 85.41026367992163 + } + }, + "geometricError": 240, + "root": { + "boundingVolume": { + "region": [ + -1.3197209591796106, + 0.6988424218, + -1.3196390408203893, + 0.6989055782, + 0, + 88 + ] + }, + "geometricError": 70, + "refine": "ADD", + "content": { + "uri": "parent.b3dm", + "boundingVolume": { + "region": [ + -1.3197004795898053, + 0.6988582109, + -1.3196595204101946, + 0.6988897891, + 0, + 88 + ] + } + }, + "children": [ + { + "boundingVolume": { + "region": [ + -1.3197209591796106, + 0.6988424218, + -1.31968, + 0.698874, + 0, + 20 + ] + }, + "geometricError": 0, + "content": { + "uri": "ll.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + -1.31968, + 0.6988424218, + -1.3196390408203893, + 0.698874, + 0, + 20 + ] + }, + "geometricError": 0, + "content": { + "uri": "lr.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + -1.31968, + 0.698874, + -1.3196390408203893, + 0.6989055782, + 0, + 20 + ] + }, + "geometricError": 0, + "content": { + "uri": "ur.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + -1.3197209591796106, + 0.698874, + -1.31968, + 0.6989055782, + 0, + 20 + ] + }, + "geometricError": 0, + "content": { + "uri": "ul.b3dm" + } + } + ] + } +} diff --git a/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/ul.b3dm b/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/ul.b3dm new file mode 100644 index 000000000000..ecd600aba825 Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/ul.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/ur.b3dm b/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/ur.b3dm new file mode 100644 index 000000000000..7dd42a0fdf4b Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/ur.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/ll.b3dm b/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/ll.b3dm new file mode 100644 index 000000000000..98b2b469bda1 Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/ll.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/lr.b3dm b/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/lr.b3dm new file mode 100644 index 000000000000..ebb24758d31f Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/lr.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/points.pnts b/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/points.pnts new file mode 100644 index 000000000000..ddb3915a0146 Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/points.pnts differ diff --git a/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/tileset.json b/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/tileset.json new file mode 100644 index 000000000000..7117c51d0c5d --- /dev/null +++ b/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/tileset.json @@ -0,0 +1,126 @@ +{ + "asset": { + "version": "1.0" + }, + "geometricError": 240, + "root": { + "boundingVolume": { + "region": [ + -1.3197209591796106, + 0.6988424218, + -1.3196390408203893, + 0.6989055782, + 0, + 20 + ] + }, + "geometricError": 70, + "refine": "ADD", + "children": [ + { + "boundingVolume": { + "region": [ + -1.3197209591796106, + 0.6988424218, + -1.31968, + 0.698874, + 0, + 20 + ] + }, + "geometricError": 0, + "content": { + "uri": "ll.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + -1.31968, + 0.6988424218, + -1.3196390408203893, + 0.698874, + 0, + 20 + ] + }, + "geometricError": 0, + "content": { + "uri": "lr.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + -1.31968, + 0.698874, + -1.3196390408203893, + 0.6989055782, + 0, + 20 + ] + }, + "geometricError": 0, + "content": { + "uri": "ur.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + -1.3197209591796106, + 0.698874, + -1.31968, + 0.6989055782, + 0, + 20 + ] + }, + "geometricError": 0, + "content": { + "uri": "ul.b3dm" + } + }, + { + "transform": [ + 0.9686356343768793, + 0.24848542777253738, + 0, + 0, + -0.1598646089326599, + 0.6231776176011753, + 0.7655670863691378, + 0, + 0.19023226494501025, + -0.7415555603632288, + 0.643356072690908, + 0, + 1215014.7852103356, + -4736320.466755246, + 4081611.654821087, + 1 + ], + "viewerRequestVolume": { + "sphere": [ + 0, + 0, + 0, + 1000 + ] + }, + "boundingVolume": { + "sphere": [ + 0, + 0, + 0, + 10 + ] + }, + "geometricError": 0, + "content": { + "uri": "points.pnts" + } + } + ] + } +} diff --git a/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/ul.b3dm b/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/ul.b3dm new file mode 100644 index 000000000000..ecd600aba825 Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/ul.b3dm differ diff --git a/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/ur.b3dm b/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/ur.b3dm new file mode 100644 index 000000000000..7dd42a0fdf4b Binary files /dev/null and b/Apps/SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/ur.b3dm differ diff --git a/Apps/Sandcastle/gallery/3D Tiles Adjust Height.html b/Apps/Sandcastle/gallery/3D Tiles Adjust Height.html index ae52fbe99fb3..cc692f918503 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Adjust Height.html +++ b/Apps/Sandcastle/gallery/3D Tiles Adjust Height.html @@ -56,7 +56,10 @@ var toolbar = document.getElementById('toolbar'); Cesium.knockout.applyBindings(viewModel, toolbar); -var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3883) }); +var tileset = new Cesium.Cesium3DTileset({ + url: '../../SampleData/Cesium3DTiles/Tilesets/Tileset/tileset.json' +}); + tileset.readyPromise.then(function(tileset) { viewer.scene.primitives.add(tileset); viewer.zoomTo(tileset, new Cesium.HeadingPitchRange(0.0, -0.5, tileset.boundingSphere.radius * 2.0)); diff --git a/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html b/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html index 5583d1c8c76c..a21c1175f048 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html +++ b/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html @@ -84,7 +84,9 @@ var viewer = new Cesium.Viewer('cesiumContainer'); viewer.clock.currentTime = new Cesium.JulianDate(2457522.154792); -var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3875) }); +var tileset = new Cesium.Cesium3DTileset({ + url: '../../SampleData/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tileset.json' +}); viewer.scene.primitives.add(tileset); viewer.zoomTo(tileset, new Cesium.HeadingPitchRange(0.0, -0.3, 0.0)); diff --git a/Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html b/Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html index fde98cb3c120..a08d7e367b89 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html +++ b/Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html @@ -207,7 +207,7 @@ // Power Plant design model provided by Bentley Systems var bimUrl = Cesium.IonResource.fromAssetId(3837); var pointCloudUrl = Cesium.IonResource.fromAssetId(3838); -var instancedUrl = Cesium.IonResource.fromAssetId(3876); +var instancedUrl = '../../SampleData/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json'; var modelUrl = '../../SampleData/models/CesiumAir/Cesium_Air.glb'; loadTileset(bimUrl); diff --git a/Apps/Sandcastle/gallery/3D Tiles Formats.html b/Apps/Sandcastle/gallery/3D Tiles Formats.html index 7a1afdba6146..7f92ad641a65 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Formats.html +++ b/Apps/Sandcastle/gallery/3D Tiles Formats.html @@ -45,46 +45,46 @@ tilesets: [ { name: 'Tileset', - resource: Cesium.IonResource.fromAssetId(3883) + resource: '../../SampleData/Cesium3DTiles/Tilesets/Tileset/tileset.json' }, { name: 'Translucent', - resource: Cesium.IonResource.fromAssetId(3871) + resource: '../../SampleData/Cesium3DTiles/Batched/BatchedTranslucent/tileset.json' }, { name: 'Translucent/Opaque', - resource: Cesium.IonResource.fromAssetId(3872) + resource: '../../SampleData/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/tileset.json' }, { name: 'Multi-color', - resource: Cesium.IonResource.fromAssetId(3870) + resource: '../../SampleData/Cesium3DTiles/Batched/BatchedColors/tileset.json' }, { name: 'Request Volume', - resource: Cesium.IonResource.fromAssetId(3884) + resource: '../../SampleData/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/tileset.json' }, { name: 'Batched', - resource: Cesium.IonResource.fromAssetId(3873) + resource: '../../SampleData/Cesium3DTiles/Batched/BatchedWithBatchTable/tileset.json' }, { name: 'Instanced', - resource: Cesium.IonResource.fromAssetId(3877) + resource: '../../SampleData/Cesium3DTiles/Instanced/InstancedWithBatchTable/tileset.json' }, { name: 'Instanced/Orientation', - resource: Cesium.IonResource.fromAssetId(3876) + resource: '../../SampleData/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json' }, { name: 'Composite', - resource: Cesium.IonResource.fromAssetId(3874) + resource: '../../SampleData/Cesium3DTiles/Composite/Composite/tileset.json' }, { name: 'PointCloud', - resource: Cesium.IonResource.fromAssetId(3881) + resource: '../../SampleData/Cesium3DTiles/PointCloud/PointCloudRGB/tileset.json' }, { name: 'PointCloudConstantColor', - resource: Cesium.IonResource.fromAssetId(3879) + resource: '../../SampleData/Cesium3DTiles/PointCloud/PointCloudConstantColor/tileset.json' }, { name: 'PointCloudNormals', - resource: Cesium.IonResource.fromAssetId(3880) + resource: '../../SampleData/Cesium3DTiles/PointCloud/PointCloudNormals/tileset.json' }, { name: 'PointCloudBatched', - resource: Cesium.IonResource.fromAssetId(3878) + resource: '../../SampleData/Cesium3DTiles/PointCloud/PointCloudBatched/tileset.json' }, { name: 'PointCloudDraco', - resource: Cesium.IonResource.fromAssetId(4702) + resource: '../../SampleData/Cesium3DTiles/PointCloud/PointCloudDraco/tileset.json' } ], selectedTileset: undefined, diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html index fbeeef9b3266..b05b21fe675c 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html +++ b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html @@ -32,7 +32,9 @@ var viewer = new Cesium.Viewer('cesiumContainer'); viewer.clock.currentTime = new Cesium.JulianDate(2457522.154792); -var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3882) }); +var tileset = new Cesium.Cesium3DTileset({ + url: '../../SampleData/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/tileset.json' +}); viewer.scene.primitives.add(tileset); viewer.zoomTo(tileset, new Cesium.HeadingPitchRange(0.0, -1.0, 50.0)); diff --git a/Apps/Sandcastle/gallery/development/Many Clipping Planes.html b/Apps/Sandcastle/gallery/development/Many Clipping Planes.html index a60855a39bfb..bfd05742592f 100644 --- a/Apps/Sandcastle/gallery/development/Many Clipping Planes.html +++ b/Apps/Sandcastle/gallery/development/Many Clipping Planes.html @@ -153,7 +153,7 @@ var modelUrl = '../../SampleData/models/CesiumAir/Cesium_Air.glb'; var agiHqUrl = Cesium.IonResource.fromAssetId(3836); -var instancedUrl = Cesium.IonResource.fromAssetId(3876); +var instancedUrl = '../../SampleData/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json'; var pointCloudUrl = Cesium.IonResource.fromAssetId(3844); function loadModel(url) { @@ -226,9 +226,7 @@ }); } else if (newValue === clipObjects[3]) { // i3dm - instancedUrl.then(function(resource) { - return loadTileset(resource); - }).then(function() { + loadTileset(instancedUrl).then(function() { tileset.clippingPlanes.modelMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(tileset.boundingSphere.center); }); } else if (newValue === clipObjects[4]) { diff --git a/Apps/Sandcastle/gallery/development/Picking.html b/Apps/Sandcastle/gallery/development/Picking.html index e65a0c7bcd12..6137a0fcd6f3 100644 --- a/Apps/Sandcastle/gallery/development/Picking.html +++ b/Apps/Sandcastle/gallery/development/Picking.html @@ -308,7 +308,7 @@ text : 'Batched 3D Model', onselect : function() { tileset = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ - url : Cesium.IonResource.fromAssetId(3883) + url: '../../SampleData/Cesium3DTiles/Tilesets/Tileset/tileset.json' })); tileset.readyPromise.then(function() { @@ -336,7 +336,7 @@ text : 'Instanced 3D Model', onselect : function() { tileset = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ - url : Cesium.IonResource.fromAssetId(3877) + url : '../../SampleData/Cesium3DTiles/Instanced/InstancedWithBatchTable/tileset.json' })); tileset.readyPromise.then(function() { @@ -364,7 +364,7 @@ text : 'Point cloud', onselect : function() { tileset = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ - url : Cesium.IonResource.fromAssetId(3881) + url : '../../SampleData/Cesium3DTiles/PointCloud/PointCloudRGB/tileset.json' })); tileset.readyPromise.then(function() { diff --git a/Apps/Sandcastle/gallery/development/Shadows.html b/Apps/Sandcastle/gallery/development/Shadows.html index 0c05f58107b5..4b296c811d03 100644 --- a/Apps/Sandcastle/gallery/development/Shadows.html +++ b/Apps/Sandcastle/gallery/development/Shadows.html @@ -306,7 +306,7 @@ '3D Tiles' : { 'centerLongitude' : -1.31968, 'centerLatitude' : 0.698874, - 'tileset' : Cesium.IonResource.fromAssetId(3883) + 'tileset' : '../../SampleData/Cesium3DTiles/Tilesets/Tileset/tileset.json' } } }; diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco/tileset.json index 6b0a5b7d6673..11de73fc9939 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDraco/tileset.json @@ -21,7 +21,7 @@ }, "geometricError": 0, "content": { - "url": "pointCloudDraco.pnts" + "uri": "pointCloudDraco.pnts" } } } diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoBatched/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoBatched/tileset.json index e71709086ee0..82d9458ff8b0 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoBatched/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoBatched/tileset.json @@ -21,7 +21,7 @@ }, "geometricError": 0, "content": { - "url": "pointCloudDracoBatched.pnts" + "uri": "pointCloudDracoBatched.pnts" } } } diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoPartial/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoPartial/tileset.json index bc108b27d011..41670e14b08f 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoPartial/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudDracoPartial/tileset.json @@ -21,7 +21,7 @@ }, "geometricError": 0, "content": { - "url": "pointCloudDracoPartial.pnts" + "uri": "pointCloudDracoPartial.pnts" } } }