Skip to content

Commit d3ad8bd

Browse files
author
Tom Fili
authored
Merge pull request #6862 from AnalyticalGraphicsInc/sandcastle-tilesets
Update ion tilesets to 3D Tiles 1.0
2 parents 4bbf35e + 8699d0f commit d3ad8bd

24 files changed

+133
-49
lines changed

‎Apps/SampleData/Cesium3DTiles/Classification/Photogrammetry/content.b3dm

5.84 KB
Binary file not shown.

‎Apps/SampleData/Cesium3DTiles/Classification/Photogrammetry/tileset.json

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"asset": {
3+
"version": "1.0",
4+
"tilesetVersion": "1.0"
5+
},
6+
"properties": {
7+
"Longitude": {
8+
"minimum": -1.3194245623155147,
9+
"maximum": -1.3194092552469474
10+
},
11+
"Latitude": {
12+
"minimum": 0.6988049305192636,
13+
"maximum": 0.6988185175658763
14+
},
15+
"Height": {
16+
"minimum": 73.0000006258161,
17+
"maximum": 102.999890661765747
18+
}
19+
},
20+
"geometricError": 1000.0,
21+
"root": {
22+
"boundingVolume": {
23+
"region": [-1.3194315762936881, 0.6987998244450816, -1.3194015908860113, 0.6988235397748883, 73.0000006258161, 102.999890661765747]
24+
},
25+
"geometricError": 0,
26+
"refine": "ADD",
27+
"content": {
28+
"uri": "content.b3dm"
29+
}
30+
}
31+
}

‎Apps/SampleData/Cesium3DTiles/Classification/PointCloud/content.geom

856 Bytes
Binary file not shown.

‎Apps/SampleData/Cesium3DTiles/Classification/PointCloud/tileset.json

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"asset": {
3+
"version": "1.0"
4+
},
5+
"geometricError": 1000,
6+
"root": {
7+
"boundingVolume": {
8+
"region": [
9+
0.05106109590840974,
10+
0.8096200283483473,
11+
0.05108367303398731,
12+
0.8096426054739249,
13+
-100,
14+
100
15+
]
16+
},
17+
"transform": [
18+
-0.051050184597015554,
19+
0.9986960892346635,
20+
0,
21+
0,
22+
-0.723088844421502,
23+
-0.03696201415592677,
24+
0.6897654185175668,
25+
0,
26+
0.6888660259628047,
27+
0.035212651943959464,
28+
0.7240329187387035,
29+
0,
30+
4401411.72835101,
31+
224986.24320435512,
32+
4595136.691084024,
33+
1
34+
],
35+
"geometricError": 0,
36+
"refine": "REPLACE",
37+
"content": {
38+
"uri": "content.geom"
39+
}
40+
}
41+
}

‎Apps/Sandcastle/gallery/3D Tiles BIM.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
// Power Plant design model provided by Bentley Systems
3232
var viewer = new Cesium.Viewer('cesiumContainer');
3333

34-
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3837) });
34+
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5743) });
3535

3636
tileset.readyPromise.then(function(tileset) {
3737
viewer.scene.primitives.add(tileset);

‎Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@
205205
}
206206

207207
// Power Plant design model provided by Bentley Systems
208-
var bimUrl = Cesium.IonResource.fromAssetId(3837);
209-
var pointCloudUrl = Cesium.IonResource.fromAssetId(3838);
208+
var bimUrl = Cesium.IonResource.fromAssetId(5743);
209+
var pointCloudUrl = Cesium.IonResource.fromAssetId(5714);
210210
var instancedUrl = '../../SampleData/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json';
211211
var modelUrl = '../../SampleData/models/CesiumAir/Cesium_Air.glb';
212212

‎Apps/Sandcastle/gallery/3D Tiles Feature Picking.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
});
4545

4646
// Load the NYC buildings tileset
47-
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(4693) });
47+
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5741) });
4848
viewer.scene.primitives.add(tileset);
4949

5050
// HTML overlay for showing feature name on mouseover

‎Apps/Sandcastle/gallery/3D Tiles Feature Styling.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
});
4747

4848
// Load the NYC buildings tileset.
49-
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(4693) });
49+
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5741) });
5050
viewer.scene.primitives.add(tileset);
5151

5252
// Color buildings based on their height.

‎Apps/Sandcastle/gallery/3D Tiles Inspector.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
viewer.extend(Cesium.viewerCesium3DTilesInspectorMixin);
3737
var inspectorViewModel = viewer.cesium3DTilesInspector.viewModel;
3838

39-
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(4693) });
39+
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5741) });
4040
viewer.scene.primitives.add(tileset);
4141

4242
tileset.readyPromise.then(function(){

‎Apps/Sandcastle/gallery/3D Tiles Interactivity.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
});
7878

7979
// Load the NYC buildings tileset.
80-
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(4693) });
80+
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5741) });
8181
scene.primitives.add(tileset);
8282
tileset.style = new Cesium.Cesium3DTileStyle({
8383
meta: {

‎Apps/Sandcastle/gallery/3D Tiles Interior.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
var viewer = new Cesium.Viewer('cesiumContainer');
3232

3333
var tileset = new Cesium.Cesium3DTileset({
34-
url: Cesium.IonResource.fromAssetId(3840)
34+
url: Cesium.IonResource.fromAssetId(5742)
3535
});
3636
viewer.scene.primitives.add(tileset);
3737

‎Apps/Sandcastle/gallery/3D Tiles Photogrammetry Classification.html

+7-4
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,21 @@
2828
'use strict';
2929
//Sandcastle_Begin
3030
// An example of using a b3dm tilset to classify another b3dm tileset.
31-
var viewer = new Cesium.Viewer('cesiumContainer');
31+
var viewer = new Cesium.Viewer('cesiumContainer', {
32+
terrainProvider: Cesium.createWorldTerrain()
33+
});
3234

3335
// A normal b3dm tileset of photogrammetry
3436
var tileset = new Cesium.Cesium3DTileset({
35-
url: Cesium.IonResource.fromAssetId(3836)
37+
url: Cesium.IonResource.fromAssetId(5712)
3638
});
3739
viewer.scene.primitives.add(tileset);
3840
viewer.zoomTo(tileset);
3941

42+
var classifcationTilesetUrl = '../../SampleData/Cesium3DTiles/Classification/Photogrammetry/tileset.json';
4043
// A b3dm tileset used to classify the photogrammetry tileset
4144
var classificationTileset = new Cesium.Cesium3DTileset({
42-
url: Cesium.IonResource.fromAssetId(3843),
45+
url: classifcationTilesetUrl,
4346
classificationType: Cesium.ClassificationType.CESIUM_3D_TILE
4447
});
4548
classificationTileset.style = new Cesium.Cesium3DTileStyle({
@@ -49,7 +52,7 @@
4952

5053
// The same b3dm tileset used for classification, but rendered normally for comparison.
5154
var nonClassificationTileset = new Cesium.Cesium3DTileset({
52-
url: Cesium.IonResource.fromAssetId(3843),
55+
url: classifcationTilesetUrl,
5356
show: false
5457
});
5558
nonClassificationTileset.style = new Cesium.Cesium3DTileStyle({

‎Apps/Sandcastle/gallery/3D Tiles Photogrammetry.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@
2626
function startup(Cesium) {
2727
'use strict';
2828
//Sandcastle_Begin
29-
var viewer = new Cesium.Viewer('cesiumContainer');
29+
var viewer = new Cesium.Viewer('cesiumContainer', {
30+
terrainProvider: Cesium.createWorldTerrain()
31+
});
3032

3133
var tileset = new Cesium.Cesium3DTileset({
32-
url: Cesium.IonResource.fromAssetId(3836)
34+
url: Cesium.IonResource.fromAssetId(5712)
3335
});
3436

3537
viewer.scene.primitives.add(tileset);

‎Apps/Sandcastle/gallery/3D Tiles Point Cloud Classification.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131

3232
//Point Cloud by Prof. Peter Allen, Columbia University Robotics Lab. Scanning by Alejandro Troccoli and Matei Ciocarlie.
3333
var tileset = new Cesium.Cesium3DTileset({
34-
url: Cesium.IonResource.fromAssetId(3838)
34+
url: Cesium.IonResource.fromAssetId(5714)
3535
});
3636
viewer.scene.primitives.add(tileset);
3737

3838
// Geometry Tiles are experimental and the format is subject to change in the future.
3939
// For more details, see:
4040
// https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/3d-tiles-next/TileFormats/Geometry
4141
var classificationTileset = new Cesium.Cesium3DTileset({
42-
url: Cesium.IonResource.fromAssetId(3842),
42+
url: '../../SampleData/Cesium3DTiles/Classification/PointCloud/tileset.json',
4343
classificationType: Cesium.ClassificationType.CESIUM_3D_TILE
4444
});
4545
viewer.scene.primitives.add(classificationTileset);

‎Apps/Sandcastle/gallery/3D Tiles Point Cloud Shading.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
var viewModel = {
106106
exampleTypes : pointClouds,
107107
currentExampleType : pointClouds[0],
108-
maximumScreenSpaceError : 8.0,
108+
maximumScreenSpaceError : 16.0,
109109
geometricErrorScale : 1.0,
110110
maximumAttenuation : 0, // Equivalent to undefined
111111
baseResolution : 0, // Equivalent to undefined
@@ -138,10 +138,10 @@
138138
// Mt. St. Helens 3D Tileset generated from LAS provided by https://www.liblas.org/samples/
139139
// This tileset uses replacement refinement and has geometric error approximately equal to
140140
// the average interpoint distance in each tile.
141-
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3844) });
141+
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5713) });
142142
viewer.scene.primitives.add(tileset);
143143

144-
tileset.maximumScreenSpaceError = 8.0;
144+
tileset.maximumScreenSpaceError = 16.0;
145145
tileset.pointCloudShading.maximumAttenuation = undefined; // Will be based on maximumScreenSpaceError instead
146146
tileset.pointCloudShading.baseResolution = undefined;
147147
tileset.pointCloudShading.geometricErrorScale = 1.0;
@@ -154,7 +154,7 @@
154154
function loadChurch() {
155155
// Point Cloud by Prof. Peter Allen, Columbia University Robotics Lab. Scanning by Alejandro Troccoli and Matei Ciocarlie.
156156
// This tileset uses additive refinement and has geometric error based on the bounding box size for each tile.
157-
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3838) });
157+
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5714) });
158158
viewer.scene.primitives.add(tileset);
159159

160160
tileset.maximumScreenSpaceError = 1024.0; // For better performance, due to how this tileset treats geometric error.

‎Apps/Sandcastle/gallery/3D Tiles Point Cloud.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
//Point Cloud by Prof. Peter Allen, Columbia University Robotics Lab. Scanning by Alejandro Troccoli and Matei Ciocarlie.
3030
var viewer = new Cesium.Viewer('cesiumContainer');
3131

32-
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3838) });
32+
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5714) });
3333
viewer.scene.primitives.add(tileset);
3434
viewer.zoomTo(tileset);
3535
//Sandcastle_End

‎Apps/Sandcastle/gallery/3D Tiles Terrain Classification.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
// Vector 3D Tiles are experimental and the format is subject to change in the future.
3939
// For more details, see:
4040
// https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/3d-tiles-next/TileFormats/VectorData
41-
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3841) });
41+
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5737) });
4242
viewer.scene.primitives.add(tileset);
4343

4444
tileset.style = new Cesium.Cesium3DTileStyle({

‎Apps/Sandcastle/gallery/Ambient Occlusion.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
}
6666

6767
// Power Plant design model provided by Bentley Systems
68-
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3837) });
68+
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5743) });
6969
tileset.readyPromise.then(function(tileset) {
7070
viewer.scene.primitives.add(tileset);
7171
}).otherwise(function(error) {

‎Apps/Sandcastle/gallery/Classification Types.html

+5-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@
2727
function startup(Cesium) {
2828
'use strict';
2929
//Sandcastle_Begin
30-
var viewer = new Cesium.Viewer('cesiumContainer');
30+
var viewer = new Cesium.Viewer('cesiumContainer', {
31+
terrainProvider: Cesium.createWorldTerrain()
32+
});
33+
viewer.scene.globe.depthTestAgainstTerrain = false;
3134

32-
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3836) });
35+
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5712) });
3336
viewer.scene.primitives.add(tileset);
3437

3538
tileset.readyPromise.then(function(){

‎Apps/Sandcastle/gallery/Classification.html

+16-13
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,14 @@
5252
function startup(Cesium) {
5353
'use strict';
5454
//Sandcastle_Begin
55-
var viewer = new Cesium.Viewer('cesiumContainer');
55+
var viewer = new Cesium.Viewer('cesiumContainer', {
56+
terrainProvider: Cesium.createWorldTerrain()
57+
});
58+
5659
var scene = viewer.scene;
5760
var camera = scene.camera;
5861

59-
var center = new Cesium.Cartesian3(1216378.730451297, -4736275.917774027, 4081266.871000864);
62+
var center = new Cesium.Cartesian3(1216389.3637977627, -4736323.641980423, 4081321.7428341154);
6063
var modelMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(center);
6164
var hprRotation = Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(2.619728786416368, 0.0, 0.0));
6265
var hpr = Cesium.Matrix4.fromRotationTranslation(hprRotation, new Cesium.Cartesian3(0.0, 0.0, -2.0));
@@ -78,7 +81,7 @@
7881
classificationType : Cesium.ClassificationType.CESIUM_3D_TILE
7982
}));
8083

81-
center = new Cesium.Cartesian3(1216398.6054139996, -4736204.533089285, 4081338.6585485404);
84+
center = new Cesium.Cartesian3(1216409.0189737265, -4736252.144235287, 4081393.6027081604);
8285
modelMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(center);
8386
hprRotation = Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(5.785339046755887, 0.0, 0.0));
8487
hpr = Cesium.Matrix4.fromRotationTranslation(hprRotation, new Cesium.Cartesian3(0.4, 0.0, -2.0));
@@ -99,7 +102,7 @@
99102
classificationType : Cesium.ClassificationType.CESIUM_3D_TILE
100103
}));
101104

102-
center = new Cesium.Cartesian3(1216394.3346955755, -4736207.431365568, 4081336.7768881875);
105+
center = new Cesium.Cartesian3(1216404.8844045496, -4736255.287065536, 4081392.010192471);
103106
modelMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(center);
104107
hprRotation = Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(5.785339046755887, 0.0, 0.0));
105108
hpr = Cesium.Matrix4.fromRotationTranslation(hprRotation, new Cesium.Cartesian3(-0.25, 0.0, -2.0));
@@ -120,7 +123,7 @@
120123
classificationType : Cesium.ClassificationType.CESIUM_3D_TILE
121124
}));
122125

123-
center = new Cesium.Cartesian3(1216388.1664430483, -4736210.034324032, 4081332.9324705894);
126+
center = new Cesium.Cartesian3(1216398.813990024, -4736258.039875737, 4081387.9562678365);
124127
modelMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(center);
125128
var translation = Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(0.0, 0.0, -2.0));
126129
Cesium.Matrix4.multiply(modelMatrix, translation, modelMatrix);
@@ -140,7 +143,7 @@
140143
classificationType : Cesium.ClassificationType.CESIUM_3D_TILE
141144
}));
142145

143-
center = new Cesium.Cartesian3(1216383.1478702603, -4736211.716097012, 4081329.551077661);
146+
center = new Cesium.Cartesian3(1216393.6257790313, -4736259.809075361, 4081384.4858198245);
144147
modelMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(center);
145148
translation = Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(0.0, 0.0, -1.0));
146149
Cesium.Matrix4.multiply(modelMatrix, translation, modelMatrix);
@@ -162,20 +165,20 @@
162165

163166
function highlightBuilding() {
164167
camera.setView({
165-
destination : new Cesium.Cartesian3(1216390.8470847877, -4736277.616363206, 4081242.6450737054),
168+
destination : new Cesium.Cartesian3(1216394.1392207467, -4736348.59346919, 4081293.9160685353),
166169
orientation : {
167-
heading : 5.761321440006161,
168-
pitch : 0.2784799327743841
170+
heading : 0.018509338875732695,
171+
pitch : -0.09272999615872646
169172
}
170173
});
171174
}
172175

173176
function highlightTrees() {
174177
camera.setView({
175-
destination : new Cesium.Cartesian3(1216424.420697336, -4736234.517874706, 4081307.8699144847),
178+
destination : new Cesium.Cartesian3(1216435.0352745096, -4736283.144192113, 4081368.0920420634),
176179
orientation : {
177-
heading : 5.785339046755887,
178-
pitch : -0.2622665042613537
180+
heading : 5.718380792746039,
181+
pitch : -0.3087010195266797
179182
}
180183
});
181184
}
@@ -195,7 +198,7 @@
195198
scene.invertClassificationColor.alpha = parseFloat(value);
196199
}
197200

198-
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3836) });
201+
var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5712) });
199202
scene.primitives.add(tileset);
200203

201204
var viewModel = {

‎Apps/Sandcastle/gallery/Scene Rendering Performance.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ <h4>Max delta time</h4>
105105
// updates to the scene require it to reduce overall CPU usage.
106106
var viewer = new Cesium.Viewer('cesiumContainer', {
107107
requestRenderMode : true,
108-
maximumRenderTimeChange : Infinity
108+
maximumRenderTimeChange : Infinity,
109+
terrainProvider: Cesium.createWorldTerrain()
109110
});
110111

111112
var scene = viewer.scene;
@@ -146,7 +147,7 @@ <h4>Max delta time</h4>
146147
function loadTilesetScenario() {
147148
resetScene();
148149

149-
tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3836) });
150+
tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5712) });
150151
viewer.scene.primitives.add(tileset);
151152
viewer.zoomTo(tileset);
152153
}

‎Apps/Sandcastle/gallery/Terrain Clipping Planes.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
});
165165

166166
// Load tileset
167-
tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(3844) });
167+
tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5713) });
168168
return tileset.readyPromise.then(function() {
169169
tileset.pointCloudShading.attenuation = true;
170170

0 commit comments

Comments
 (0)