Skip to content

Commit e6e0ef6

Browse files
pjcozzipjcozzi
authored
Merge pull request #4991 from AnalyticalGraphicsInc/new-tilesets
3D Tiles - Newly generated tilesets
2 parents b8acd84 + 5d40569 commit e6e0ef6

File tree

159 files changed

+723
-568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+723
-568
lines changed

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

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252

5353
var styles = [];
5454
function addStyle(name, style) {
55+
style.pointSize = Cesium.defaultValue(style.pointSize, 5.0);
5556
styles.push({
5657
name : name,
5758
style : style
@@ -120,48 +121,39 @@
120121
});
121122

122123
addStyle('Arc Trigonometric Functions', {
123-
color : "color() * acos(degrees(${temperature})) + color() * asin(${temperature}) + color() * atan(${temperature}) + color() * atan2(${POSITION}[0],${temperature})",
124-
pointSize : "5"
124+
color : "color() * acos(degrees(${temperature})) + color() * asin(${temperature}) + color() * atan(${temperature}) + color() * atan2(${POSITION}[0],${temperature})"
125125
});
126126

127127
addStyle('Sqrt', {
128-
color : "color() * sqrt(${temperature})",
129-
pointSize : "5"
128+
color : "color() * sqrt(${temperature})"
130129
});
131130

132131
addStyle('Sign', {
133-
color : "rgb(sign(${POSITION}[0]) * 255, sign(${POSITION}[1]) * 255, sign(${POSITION}[2]) * 255)",
134-
pointSize : "5"
132+
color : "rgb(sign(${POSITION}[0]) * 255, sign(${POSITION}[1]) * 255, sign(${POSITION}[2]) * 255)"
135133
});
136134

137135
addStyle('Rounding Functions', {
138-
color : "rgb(floor(${POSITION}[0]) * 255, ceil(${POSITION}[1]) * 255, round(${POSITION}[2]) * 255)",
139-
pointSize : "5"
136+
color : "rgb(floor(${POSITION}[0]) * 255, ceil(${POSITION}[1]) * 255, round(${POSITION}[2]) * 255)"
140137
});
141138

142139
addStyle('Exp and Log Functions', {
143-
color : "rgb(log(${POSITION}[0]) * 255, log2(${POSITION}[1]) * 255 + exp2(${POSITION}[1]) * 255, exp(${POSITION}[2]) * 255)",
144-
pointSize : "5"
140+
color : "rgb(log(${POSITION}[0]) * 255, log2(${POSITION}[1]) * 255 + exp2(${POSITION}[1]) * 255, exp(${POSITION}[2]) * 255)"
145141
});
146142

147143
addStyle('Fractional Part', {
148-
color : "rgb(fract(${POSITION}[0]) * 255, fract(${POSITION}[1]) * 255, fract(${POSITION}[2]) * 255)",
149-
pointSize : "5"
144+
color : "rgb(fract(${POSITION}[0]) * 255, fract(${POSITION}[1]) * 255, fract(${POSITION}[2]) * 255)"
150145
});
151146

152147
addStyle('Pow', {
153-
color : "color() * pow(${temperature}, 3)",
154-
pointSize : "5"
148+
color : "color() * pow(${temperature}, 3)"
155149
});
156150

157151
addStyle('Min and Max', {
158-
color : "rgb(min(${POSITION}.x, 0.75) * 255, max(${POSITION}.z, 0.25) * 255, 255)",
159-
pointSize : "5"
152+
color : "rgb(min(${POSITION}.x, 0.75) * 255, max(${POSITION}.z, 0.25) * 255, 255)"
160153
});
161154

162155
addStyle('Clamp and Mix', {
163-
color : "color() * clamp(${temperature}, 0.1, 0.2)",
164-
pointSize : "mix(${temperature}, 2.0, 0.5) * 0.2"
156+
color : "color() * clamp(${temperature}, 0.1, 0.2)"
165157
});
166158

167159
addStyle('Secondary Color', {

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
url: '../../../Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchTable/'
7373
}, {
7474
name: 'Instanced/Orientation',
75-
url: '../../../Specs/Data/Cesium3DTiles/Instanced/InstancedOrientationWithBatchTable/'
75+
url: '../../../Specs/Data/Cesium3DTiles/Instanced/InstancedOrientation/'
7676
}, {
7777
name: 'Composite',
7878
url: '../../../Specs/Data/Cesium3DTiles/Composite/Composite/'
@@ -170,8 +170,10 @@
170170
}
171171

172172
// evaluate feature description
173-
if (Cesium.defined(tileset.style.meta.description)) {
174-
console.log("Description : " + tileset.style.meta.description.evaluate(scene.frameState, feature));
173+
if (Cesium.defined(tileset.style)) {
174+
if (Cesium.defined(tileset.style.meta.description)) {
175+
console.log('Description : ' + tileset.style.meta.description.evaluate(scene.frameState, feature));
176+
}
175177
}
176178
}
177179
}, Cesium.ScreenSpaceEventType.LEFT_CLICK);

‎Source/Scene/Cesium3DTileBatchTable.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ define([
7474
* @private
7575
*/
7676
this.batchTableJson = batchTableJson;
77+
7778
/**
7879
* @private
7980
*/

‎Source/Scene/PointCloud3DTileContent.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,9 @@ define([
847847
colorStyleFunction = style.getColorShaderFunction('getColorFromStyle', 'czm_tiles3d_style_', shaderState);
848848
showStyleFunction = style.getShowShaderFunction('getShowFromStyle', 'czm_tiles3d_style_', shaderState);
849849
pointSizeStyleFunction = style.getPointSizeShaderFunction('getPointSizeFromStyle', 'czm_tiles3d_style_', shaderState);
850-
styleTranslucent = shaderState.translucent;
850+
if (defined(colorStyleFunction) && shaderState.translucent) {
851+
styleTranslucent = true;
852+
}
851853
}
852854

853855
content._styleTranslucent = styleTranslucent;

‎Source/Widgets/CesiumInspector/Cesium3DTilesInspectorViewModel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ define([
431431
if (defined(current) && defined(current._batchTable) && !current._batchTable.isDestroyed()) {
432432
// Restore original color to feature that is no longer selected
433433
var frameState = that._scene.frameState;
434-
if (!that._colorOverriden) {
434+
if (!that._colorOverriden && defined(that._style)) {
435435
current.color = that._style.color.evaluateColor(frameState, current, scratchColor);
436436
} else {
437437
current.color = oldColor;
@@ -586,7 +586,7 @@ define([
586586

587587
// set feature again so pick coloring is set
588588
var temp = this._feature;
589-
this._feature = undefined;
589+
this._feature = undefined;
590590
this._feature = temp;
591591
}
592592
}

‎Specs/Data/Cesium3DTiles/Batched/BatchedColors/batchedColors.b3dm

-6.7 KB
Binary file not shown.

‎Specs/Data/Cesium3DTiles/Batched/BatchedColors/tileset.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
"maximum": 9
99
},
1010
"Longitude": {
11-
"minimum": -1.3196957429116396,
12-
"maximum": -1.3196641554181918
11+
"minimum": -1.3196972173766555,
12+
"maximum": -1.3196683129064435
1313
},
1414
"Latitude": {
15-
"minimum": 0.6988601375872411,
16-
"maximum": 0.6988869857121214
15+
"minimum": 0.698861998722264,
16+
"maximum": 0.6988888301460953
1717
},
1818
"Height": {
19-
"minimum": 6,
20-
"maximum": 14
19+
"minimum": 6.929546581581235,
20+
"maximum": 13.581844886764884
2121
}
2222
},
2323
"geometricError": 70,

‎Specs/Data/Cesium3DTiles/Batched/BatchedColorsMix/batchedColorsMix.b3dm

22.5 KB
Binary file not shown.

‎Specs/Data/Cesium3DTiles/Batched/BatchedNoBuildings/tileset.json renamed to ‎Specs/Data/Cesium3DTiles/Batched/BatchedColorsMix/tileset.json

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,16 @@
88
"maximum": 9
99
},
1010
"Longitude": {
11-
"minimum": -1.3196930452470341,
12-
"maximum": -1.3196617964314208
11+
"minimum": -1.3196972173766555,
12+
"maximum": -1.3196683129064435
1313
},
1414
"Latitude": {
15-
"minimum": 0.6988594477444204,
16-
"maximum": 0.698883763781271
15+
"minimum": 0.698861998722264,
16+
"maximum": 0.6988888301460953
1717
},
1818
"Height": {
19-
"minimum": 6,
20-
"maximum": 14
21-
},
22-
"info": {
23-
"minimum": null,
24-
"maximum": null
25-
},
26-
"rooms": {
27-
"minimum": null,
28-
"maximum": null
19+
"minimum": 6.929546581581235,
20+
"maximum": 13.581844886764884
2921
}
3022
},
3123
"geometricError": 70,
@@ -43,7 +35,7 @@
4335
},
4436
"geometricError": 0,
4537
"content": {
46-
"url": "batchedNoBuildings.b3dm"
38+
"url": "batchedColorsMix.b3dm"
4739
}
4840
}
4941
}

‎Specs/Data/Cesium3DTiles/Batched/BatchedColorsTranslucent/batchedColorsTranslucent.b3dm

19.7 KB
Binary file not shown.

‎Specs/Data/Cesium3DTiles/Instanced/InstancedOct32POrientationWithBatchTable/tileset.json renamed to ‎Specs/Data/Cesium3DTiles/Batched/BatchedColorsTranslucent/tileset.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,37 @@
55
"properties": {
66
"id": {
77
"minimum": 0,
8-
"maximum": 99
8+
"maximum": 9
99
},
1010
"Longitude": {
11-
"minimum": -1.3197004048940548,
12-
"maximum": -1.3196602716044172
11+
"minimum": -1.3196972173766555,
12+
"maximum": -1.3196683129064435
1313
},
1414
"Latitude": {
15-
"minimum": 0.6988585409308616,
16-
"maximum": 0.6988894207110236
15+
"minimum": 0.698861998722264,
16+
"maximum": 0.6988888301460953
1717
},
1818
"Height": {
19-
"minimum": 0,
20-
"maximum": 80
19+
"minimum": 6.929546581581235,
20+
"maximum": 13.581844886764884
2121
}
2222
},
23-
"geometricError": 40,
24-
"refine": "add",
23+
"geometricError": 70,
2524
"root": {
25+
"refine": "add",
2626
"boundingVolume": {
2727
"region": [
2828
-1.3197004795898053,
2929
0.6988582109,
3030
-1.3196595204101946,
3131
0.6988897891,
3232
0,
33-
80
33+
20
3434
]
3535
},
3636
"geometricError": 0,
3737
"content": {
38-
"url": "instancedOct32POrientationWithBatchTable.i3dm"
38+
"url": "batchedColorsTranslucent.b3dm"
3939
}
4040
}
4141
}

‎Specs/Data/Cesium3DTiles/Batched/BatchedDeprecated/batchedDeprecated.b3dm

14.4 KB
Binary file not shown.

‎Specs/Data/Cesium3DTiles/Instanced/InstancedQuantizedOct32POrientationWithBatchTable/tileset.json renamed to ‎Specs/Data/Cesium3DTiles/Batched/BatchedDeprecated/tileset.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,37 @@
55
"properties": {
66
"id": {
77
"minimum": 0,
8-
"maximum": 99
8+
"maximum": 9
99
},
1010
"Longitude": {
11-
"minimum": -1.3197004048940548,
12-
"maximum": -1.3196602716044172
11+
"minimum": -1.3196972173766555,
12+
"maximum": -1.3196718547473905
1313
},
1414
"Latitude": {
15-
"minimum": 0.6988585409308616,
16-
"maximum": 0.6988894207110236
15+
"minimum": 0.6988624606923348,
16+
"maximum": 0.6988888301460953
1717
},
1818
"Height": {
19-
"minimum": 0,
20-
"maximum": 80
19+
"minimum": 6.2074098233133554,
20+
"maximum": 12.83180232718587
2121
}
2222
},
23-
"geometricError": 40,
24-
"refine": "add",
23+
"geometricError": 70,
2524
"root": {
25+
"refine": "add",
2626
"boundingVolume": {
2727
"region": [
2828
-1.3197004795898053,
2929
0.6988582109,
3030
-1.3196595204101946,
3131
0.6988897891,
3232
0,
33-
80
33+
20
3434
]
3535
},
3636
"geometricError": 0,
3737
"content": {
38-
"url": "instancedQuantizedOct32POrientationWithBatchTable.i3dm"
38+
"url": "batchedDeprecated.b3dm"
3939
}
4040
}
4141
}

‎Specs/Data/Cesium3DTiles/Batched/BatchedNoBatchIds/batchedNoBatchIds.b3dm

13 KB
Binary file not shown.

‎Specs/Data/Cesium3DTiles/Batched/BatchedNoBatchIds/tileset.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"asset": {
3+
"version": "0.0"
4+
},
5+
"geometricError": 70,
6+
"root": {
7+
"refine": "add",
8+
"boundingVolume": {
9+
"region": [
10+
-1.3197004795898053,
11+
0.6988582109,
12+
-1.3196595204101946,
13+
0.6988897891,
14+
0,
15+
20
16+
]
17+
},
18+
"geometricError": 0,
19+
"content": {
20+
"url": "batchedNoBatchIds.b3dm"
21+
}
22+
}
23+
}

‎Specs/Data/Cesium3DTiles/Batched/BatchedNoBuildings/batchedNoBuildings.b3dm

-9.76 KB
Binary file not shown.

‎Specs/Data/Cesium3DTiles/Batched/BatchedTextured/batchedTextured.b3dm

-325 Bytes
Binary file not shown.

‎Specs/Data/Cesium3DTiles/Batched/BatchedTextured/tileset.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@
33
"version": "0.0"
44
},
55
"properties": {
6+
"id": {
7+
"minimum": 0,
8+
"maximum": 9
9+
},
610
"Longitude": {
7-
"minimum": -1.3196975700111178,
8-
"maximum": -1.3196648446060844
11+
"minimum": -1.3196972173766555,
12+
"maximum": -1.3196718547473905
913
},
1014
"Latitude": {
11-
"minimum": 0.6988688652634713,
12-
"maximum": 0.698886371486204
15+
"minimum": 0.6988624606923348,
16+
"maximum": 0.6988888301460953
1317
},
1418
"Height": {
15-
"minimum": 6.161747192963958,
16-
"maximum": 12.778013898059726
19+
"minimum": 6.2074098233133554,
20+
"maximum": 12.83180232718587
1721
}
1822
},
1923
"geometricError": 70,

‎Specs/Data/Cesium3DTiles/Batched/BatchedTranslucent/batchedTranslucent.b3dm

4.13 KB
Binary file not shown.

‎Specs/Data/Cesium3DTiles/Batched/BatchedTranslucent/tileset.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
"maximum": 9
99
},
1010
"Longitude": {
11-
"minimum": -1.3196812329810825,
12-
"maximum": -1.3196599624193912
11+
"minimum": -1.3196972173766555,
12+
"maximum": -1.3196718547473905
1313
},
1414
"Latitude": {
15-
"minimum": 0.6988634273243843,
16-
"maximum": 0.6988863863403311
15+
"minimum": 0.6988624606923348,
16+
"maximum": 0.6988888301460953
1717
},
1818
"Height": {
19-
"minimum": 6,
20-
"maximum": 14
19+
"minimum": 6.2074098233133554,
20+
"maximum": 12.83180232718587
2121
}
2222
},
2323
"geometricError": 70,

‎Specs/Data/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/batchedTranslucentOpaqueMix.b3dm

3.05 KB
Binary file not shown.

‎Specs/Data/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/tileset.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
"maximum": 9
99
},
1010
"Longitude": {
11-
"minimum": -1.3197000541327293,
12-
"maximum": -1.3196647916486712
11+
"minimum": -1.3196972173766555,
12+
"maximum": -1.3196718547473905
1313
},
1414
"Latitude": {
15-
"minimum": 0.6988632475321589,
16-
"maximum": 0.6988890296629459
15+
"minimum": 0.6988624606923348,
16+
"maximum": 0.6988888301460953
1717
},
1818
"Height": {
19-
"minimum": 6,
20-
"maximum": 14
19+
"minimum": 6.2074098233133554,
20+
"maximum": 12.83180232718587
2121
}
2222
},
2323
"geometricError": 70,

‎Specs/Data/Cesium3DTiles/Batched/BatchedWGS84/batchedWGS84.b3dm

14.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)