Skip to content

Commit c2cbd43

Browse files
lukemckinstrylukemckinstry
committed
Merge remote-tracking branch 'origin' into cesium.com
2 parents 19659cf + 10b0ebf commit c2cbd43

File tree

137 files changed

+11010
-7090
lines changed

Some content is hidden

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

137 files changed

+11010
-7090
lines changed

‎Apps/SampleData/Cesium3DTiles/Voxel/VoxelBox3DTiles/subtrees/0.0.0.subtree‎

144 Bytes
Binary file not shown.

‎Apps/SampleData/Cesium3DTiles/Voxel/VoxelBox3DTiles/subtrees/0/0/0/0.json‎

100644100755
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
{
22
"tileAvailability": {
3-
"availableCount": 1,
43
"constant": 1
54
},
6-
"contentAvailability": {
7-
"availableCount": 1,
5+
"contentAvailability": [{
86
"constant": 1
9-
},
7+
}],
108
"childSubtreeAvailability": {
11-
"availableCount": 0,
129
"constant": 0
1310
}
1411
}

‎Apps/SampleData/Cesium3DTiles/Voxel/VoxelBox3DTiles/tiles/0/0/0/0.gltf‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
{
2+
"asset": {
3+
"version": "2.0"
4+
},
5+
"extensionsUsed": [
6+
"EXT_primitive_voxels",
7+
"EXT_structural_metadata"
8+
],
9+
"extensionsRequired": [
10+
"EXT_primitive_voxels",
11+
"EXT_structural_metadata"
12+
],
13+
"extensions": {
14+
"EXT_structural_metadata": {
15+
"schema": {
16+
"classes": {
17+
"voxel": {
18+
"properties": {
19+
"a": {
20+
"type": "VEC4",
21+
"componentType": "FLOAT32"
22+
}
23+
}
24+
}
25+
}
26+
},
27+
"propertyAttributes": [
28+
{
29+
"class": "voxel",
30+
"properties": {
31+
"a": {
32+
"attribute": "_DATA"
33+
}
34+
}
35+
}
36+
]
37+
}
38+
},
39+
"scene": 0,
40+
"scenes": [
41+
{
42+
"nodes": [
43+
0
44+
]
45+
}
46+
],
47+
"nodes": [
48+
{
49+
"mesh": 0
50+
}
51+
],
52+
"meshes": [
53+
{
54+
"primitives": [
55+
{
56+
"attributes": {
57+
"_DATA": 0
58+
},
59+
"mode": 2147483647,
60+
"extensions": {
61+
"EXT_primitive_voxels": {
62+
"shape": 0,
63+
"dimensions": [
64+
2,
65+
2,
66+
2
67+
]
68+
},
69+
"EXT_structural_metadata": {
70+
"propertyAttributes": [0]
71+
}
72+
}
73+
}
74+
]
75+
}
76+
],
77+
"accessors": [
78+
{
79+
"bufferView": 0,
80+
"byteOffset": 0,
81+
"componentType": 5126,
82+
"count": 8,
83+
"max": [
84+
1.0, 1.0, 1.0, 1.0
85+
],
86+
"min": [
87+
0.0, 0.0, 0.0, 0.0
88+
],
89+
"type": "VEC4"
90+
}
91+
],
92+
"bufferViews": [
93+
{
94+
"buffer": 0,
95+
"byteOffset": 0,
96+
"byteLength": 128
97+
}
98+
],
99+
"buffers": [
100+
{
101+
"uri": "a.bin",
102+
"byteLength": 128
103+
}
104+
]
105+
}

‎Apps/SampleData/Cesium3DTiles/Voxel/VoxelBox3DTiles/tiles/0/0/0/0.json‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎Apps/SampleData/Cesium3DTiles/Voxel/VoxelBox3DTiles/tiles/0/0/0/a.bin‎

96 Bytes
Binary file not shown.

‎Apps/SampleData/Cesium3DTiles/Voxel/VoxelBox3DTiles/tileset.json‎

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"voxel": {
99
"properties": {
1010
"a": {
11-
"type": "SCALAR",
11+
"type": "VEC4",
1212
"componentType": "FLOAT32"
1313
}
1414
}
@@ -46,10 +46,10 @@
4646
1.0
4747
]
4848
},
49-
"geometricError": 0.0,
49+
"geometricError": 16.0,
5050
"refine": "REPLACE",
5151
"content": {
52-
"uri": "tiles/{level}/{x}/{y}/{z}.json",
52+
"uri": "tiles/{level}/{x}/{y}/{z}.gltf",
5353
"extensions": {
5454
"3DTILES_content_voxels": {
5555
"dimensions": [
@@ -63,7 +63,7 @@
6363
},
6464
"implicitTiling": {
6565
"subdivisionScheme": "OCTREE",
66-
"subtreeLevels": 3,
66+
"subtreeLevels": 1,
6767
"availableLevels": 1,
6868
"subtrees": {
6969
"uri": "subtrees/{level}/{x}/{y}/{z}.json"

‎Apps/SampleData/Cesium3DTiles/Voxel/VoxelCylinder3DTiles/subtrees/0.0.0.subtree‎

144 Bytes
Binary file not shown.

‎Apps/SampleData/Cesium3DTiles/Voxel/VoxelCylinder3DTiles/subtrees/0/0/0/0.json‎

100644100755
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
{
22
"tileAvailability": {
3-
"availableCount": 1,
43
"constant": 1
54
},
6-
"contentAvailability": {
7-
"availableCount": 1,
5+
"contentAvailability": [{
86
"constant": 1
9-
},
7+
}],
108
"childSubtreeAvailability": {
11-
"availableCount": 0,
129
"constant": 0
1310
}
1411
}

‎Apps/SampleData/Cesium3DTiles/Voxel/VoxelCylinder3DTiles/tiles/0/0/0/0.gltf‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
{
2+
"asset": {
3+
"version": "2.0"
4+
},
5+
"extensionsUsed": [
6+
"KHR_implicit_shapes",
7+
"EXT_implicit_cylinder_region",
8+
"EXT_primitive_voxels",
9+
"EXT_structural_metadata"
10+
],
11+
"extensionsRequired": [
12+
"KHR_implicit_shapes",
13+
"EXT_implicit_cylinder_region",
14+
"EXT_primitive_voxels"
15+
],
16+
"extensions": {
17+
"KHR_implicit_shapes": {
18+
"shapes": [
19+
{
20+
"type": "cylinder region",
21+
"extensions": {
22+
"EXT_implicit_cylinder_region": {
23+
"minRadius": 0,
24+
"maxRadius": 1,
25+
"height": 2
26+
}
27+
}
28+
}
29+
]
30+
},
31+
"EXT_structural_metadata": {
32+
"schema": {
33+
"classes": {
34+
"voxel": {
35+
"properties": {
36+
"a": {
37+
"type": "VEC4",
38+
"componentType": "FLOAT32"
39+
}
40+
}
41+
}
42+
}
43+
},
44+
"propertyAttributes": [
45+
{
46+
"class": "voxel",
47+
"properties": {
48+
"a": {
49+
"attribute": "_DATA"
50+
}
51+
}
52+
}
53+
]
54+
}
55+
},
56+
"scene": 0,
57+
"scenes": [
58+
{
59+
"nodes": [
60+
0
61+
]
62+
}
63+
],
64+
"nodes": [
65+
{
66+
"mesh": 0
67+
}
68+
],
69+
"meshes": [
70+
{
71+
"primitives": [
72+
{
73+
"attributes": {
74+
"_DATA": 0
75+
},
76+
"mode": 2147483647,
77+
"extensions": {
78+
"EXT_primitive_voxels": {
79+
"shape": 0,
80+
"dimensions": [
81+
2,
82+
2,
83+
2
84+
]
85+
},
86+
"EXT_structural_metadata": {
87+
"propertyAttributes": [0]
88+
}
89+
}
90+
}
91+
]
92+
}
93+
],
94+
"accessors": [
95+
{
96+
"bufferView": 0,
97+
"byteOffset": 0,
98+
"componentType": 5126,
99+
"count": 8,
100+
"max": [
101+
1.0, 1.0, 1.0, 1.0
102+
],
103+
"min": [
104+
0.0, 0.0, 0.0, 0.0
105+
],
106+
"type": "VEC4"
107+
}
108+
],
109+
"bufferViews": [
110+
{
111+
"buffer": 0,
112+
"byteOffset": 0,
113+
"byteLength": 128
114+
}
115+
],
116+
"buffers": [
117+
{
118+
"uri": "a.bin",
119+
"byteLength": 128
120+
}
121+
]
122+
}

‎Apps/SampleData/Cesium3DTiles/Voxel/VoxelCylinder3DTiles/tiles/0/0/0/0.json‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)