Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

glTF 2.0 in samples generator #139

Merged
merged 24 commits into from
Aug 31, 2018
Merged

glTF 2.0 in samples generator #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9d81d57
Temp for 2.0
lilleyse Oct 17, 2017
d4f2ee8
Merge branch 'master' into 2.0-samples-generator
lilleyse Feb 18, 2018
6649987
More 2.0 upgrades
lilleyse Feb 19, 2018
9127051
Add RTC_CENTER tileset and tilesets with URI content
ggetz Jul 5, 2018
d71c110
Default to batchTable extension
ggetz Jul 6, 2018
421afe5
Rest of urls -> uri
ggetz Jul 6, 2018
d719e84
Doc fix
lilleyse Jul 8, 2018
99b8705
Cleanup 1.0 version changes
ggetz Jul 9, 2018
7cd3634
Merge pull request #149 from AnalyticalGraphicsInc/3d-tiles-1.0-updates
lilleyse Jul 9, 2018
26be429
Remove CESIUM_RTC extension
lilleyse Jul 28, 2018
ff4600e
Fixed commented tilesets
lilleyse Jul 29, 2018
15c28ca
Remove gltf z up
lilleyse Jul 29, 2018
ef62b72
Remove b3db with quantization
lilleyse Jul 29, 2018
dde49b4
RTC fixes
lilleyse Jul 29, 2018
901f864
Cleanup
lilleyse Jul 29, 2018
6dd7bef
Fix eslint
lilleyse Jul 29, 2018
a163afe
Fix random seed order
lilleyse Jul 30, 2018
e28c5d9
Merge branch 'master' into 2.0-samples-generator
lilleyse Jul 30, 2018
ba0ee07
Fix deprecated tilesets - need to use tileset transform instead of RT…
lilleyse Jul 30, 2018
0e3dcb3
Fix geometric error on tileset of tilesets example
lilleyse Mar 27, 2018
3a59a95
Updated gltf-pipeline
lilleyse Aug 14, 2018
906a819
Add extras to tileset
Aug 29, 2018
c2769f4
Merge pull request #153 from OmarShehata/add-extras
lilleyse Aug 31, 2018
0382822
Merge branch 'master' into 2.0-samples-generator
lilleyse Aug 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
493 changes: 243 additions & 250 deletions samples-generator/bin/3d-tiles-samples-generator.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file removed samples-generator/data/box-z-up.glb
View file
Open in desktop
Binary file not shown.
Binary file modified samples-generator/data/box.glb
View file
Open in desktop
Binary file not shown.
Binary file modified samples-generator/data/building.glb
View file
Open in desktop
Binary file not shown.
Binary file modified samples-generator/data/dragon_high.glb
View file
Open in desktop
Binary file not shown.
Binary file modified samples-generator/data/dragon_low.glb
View file
Open in desktop
Binary file not shown.
Binary file modified samples-generator/data/dragon_medium.glb
View file
Open in desktop
Binary file not shown.
238 changes: 50 additions & 188 deletions samples-generator/data/house/door0.gltf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"accessors": {
"accessor_index_0": {
"bufferView": "bufferView_1",
"accessors": [
{
"bufferView": 1,
"byteOffset": 0,
"byteStride": 0,
"componentType": 5123,
"count": 72,
"type": "SCALAR",
Expand All @@ -14,10 +13,9 @@
45
]
},
"accessor_position": {
"bufferView": "bufferView_0",
{
"bufferView": 0,
"byteOffset": 0,
"byteStride": 0,
"componentType": 5126,
"count": 46,
"min": [
Expand All @@ -32,10 +30,9 @@
],
"type": "VEC3"
},
"accessor_normal": {
"bufferView": "bufferView_0",
{
"bufferView": 0,
"byteOffset": 552,
"byteStride": 0,
"componentType": 5126,
"count": 46,
"type": "VEC3",
Expand All @@ -50,214 +47,79 @@
1
]
}
},
],
"asset": {
"generator": "OBJ2GLTF",
"premultipliedAlpha": true,
"profile": {
"api": "WebGL",
"version": "1.0"
},
"version": "1.0"
"version": "2.0"
},
"buffers": {
"buffer_0": {
"type": "arraybuffer",
"buffers": [
{
"byteLength": 1248,
"uri": "data:application/octet-stream;base64,6UW9vqERqD+HpnC/6UW9vqERqD/eH4u/6UW9vgAAAADeH4u/6UW9vgAAAACHpnC/6UW9vqERqD/eH4u/6UW9PqERqD/eH4u/7fVePhXjND/eH4u/7fVePpmCkz/eH4u/6UW9vgAAAADeH4u/6UW9PgAAAADeH4u/6UW9PqERqD/eH4u/6UW9PqERqD+HpnC/6UW9PgAAAACHpnC/6UW9PgAAAADeH4u/6UW9PqERqD+HpnC/6UW9vqERqD+HpnC/6UW9vgAAAACHpnC/6UW9PgAAAACHpnC/6UW9vgAAAACHpnC/6UW9vgAAAADeH4u/6UW9PgAAAADeH4u/6UW9PgAAAACHpnC/6UW9PqERqD+HpnC/6UW9PqERqD/eH4u/6UW9vqERqD/eH4u/6UW9vqERqD+HpnC/hpJpvpmCkz987YG/hpJpvhXjND987YG/hpJpvhXjND/eH4u/hpJpvpmCkz/eH4u/7fVePpmCkz987YG/7fVePhXjND987YG/hpJpvhXjND987YG/hpJpvpmCkz987YG/hpJpvhXjND987YG/7fVePhXjND987YG/7fVePhXjND/eH4u/hpJpvhXjND/eH4u/7fVePpmCkz987YG/hpJpvpmCkz987YG/hpJpvpmCkz/eH4u/7fVePpmCkz/eH4u/7fVePhXjND/eH4u/7fVePhXjND987YG/7fVePpmCkz987YG/7fVePpmCkz/eH4u/AACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAAAAgAAAAAAAAIC/AAAAgAAAAAAAAIC/AAAAgAAAAAAAAIC/AAAAgAAAAAAAAIC/AAAAgAAAAAAAAIC/AAAAgAAAAAAAAIC/AACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAAAAgAAAAAAAAIC/AAAAgAAAAAAAAIC/AAAAgAAAAAAAAIC/AAAAgAAAAAAAAIC/AAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAAABAAIAAAACAAMABAAFAAYABAAGAAcABQAIAAQABQAJAAgACgALAAwACgAMAA0ADgAPABAADgAQABEAEgATABQAEgAUABUAFgAXABgAFgAYABkAGgAbABwAGgAcAB0AHgAfACAAHgAgACEAIgAjACQAIgAkACUAJgAnACgAJgAoACkAKgArACwAKgAsAC0A"
}
},
"bufferViews": {
"bufferView_0": {
"buffer": "buffer_0",
],
"bufferViews": [
{
"buffer": 0,
"byteLength": 1104,
"byteOffset": 0,
"target": 34962
"target": 34962,
"byteStride": 12
},
"bufferView_1": {
"buffer": "buffer_0",
{
"buffer": 0,
"byteLength": 144,
"byteOffset": 1104,
"target": 34963
}
},
"images": {},
"materials": {
"material_Material.002": {
"name": "Material.002",
"extensions": {},
"values": {
"ambient": [
1,
1,
1,
1
],
"diffuse": [
],
"materials": [
{
"pbrMetallicRoughness": {
"baseColorFactor": [
0.45435,
0.245963,
0.171126,
1
],
"emission": [
0,
0,
0,
1
],
"specular": [
0,
0,
0,
1
],
"shininess": 96.078431,
"transparency": 1
"metallicFactor": 0,
"roughnessFactor": 1
},
"technique": "technique0"
"emissiveFactor": [
0,
0,
0
],
"alphaMode": "OPAQUE",
"doubleSided": false
}
},
"meshes": {
"mesh_door0": {
"name": "door0",
],
"meshes": [
{
"primitives": [
{
"attributes": {
"POSITION": "accessor_position",
"NORMAL": "accessor_normal"
"POSITION": 1,
"NORMAL": 2
},
"indices": "accessor_index_0",
"material": "material_Material.002",
"indices": 0,
"material": 0,
"mode": 4
}
]
}
},
"nodes": {
"rootNode": {
"children": [],
"meshes": [
"mesh_door0"
],
"matrix": [
1,
0,
0,
0,
0,
1,
0,
0,
0,
0,
1,
0,
0,
0,
0,
1
]
],
"nodes": [
{
"mesh": 0
}
},
"samplers": {},
"scene": "scene_door0",
"scenes": {
"scene_door0": {
],
"scene": 0,
"scenes": [
{
"nodes": [
"rootNode"
0
]
}
},
"textures": {},
"extensionsUsed": [],
"animations": {},
"cameras": {},
"techniques": {
"technique0": {
"attributes": {
"a_position": "position",
"a_normal": "normal"
},
"parameters": {
"modelViewMatrix": {
"semantic": "MODELVIEW",
"type": 35676
},
"projectionMatrix": {
"semantic": "PROJECTION",
"type": 35676
},
"normalMatrix": {
"semantic": "MODELVIEWINVERSETRANSPOSE",
"type": 35675
},
"ambient": {
"type": 35666
},
"diffuse": {
"type": 35666
},
"emission": {
"type": 35666
},
"specular": {
"type": 35666
},
"shininess": {
"type": 5126
},
"transparency": {
"type": 5126
},
"position": {
"semantic": "POSITION",
"type": 35665
},
"normal": {
"semantic": "NORMAL",
"type": 35665
}
},
"program": "program0",
"states": {
"enable": [
2884,
2929
]
},
"uniforms": {
"u_modelViewMatrix": "modelViewMatrix",
"u_projectionMatrix": "projectionMatrix",
"u_normalMatrix": "normalMatrix",
"u_ambient": "ambient",
"u_diffuse": "diffuse",
"u_emission": "emission",
"u_specular": "specular",
"u_shininess": "shininess",
"u_transparency": "transparency"
}
}
},
"programs": {
"program0": {
"attributes": [
"a_position",
"a_normal"
],
"fragmentShader": "fragmentShader0",
"vertexShader": "vertexShader0"
}
},
"shaders": {
"vertexShader0": {
"type": 35633,
"uri": "data:text/plain;base64,cHJlY2lzaW9uIGhpZ2hwIGZsb2F0Owp1bmlmb3JtIG1hdDQgdV9tb2RlbFZpZXdNYXRyaXg7CnVuaWZvcm0gbWF0NCB1X3Byb2plY3Rpb25NYXRyaXg7CnVuaWZvcm0gbWF0MyB1X25vcm1hbE1hdHJpeDsKYXR0cmlidXRlIHZlYzMgYV9wb3NpdGlvbjsKdmFyeWluZyB2ZWMzIHZfcG9zaXRpb25FQzsKYXR0cmlidXRlIHZlYzMgYV9ub3JtYWw7CnZhcnlpbmcgdmVjMyB2X25vcm1hbDsKdm9pZCBtYWluKHZvaWQpIHsKICB2ZWM0IHBvcyA9IHVfbW9kZWxWaWV3TWF0cml4ICogdmVjNChhX3Bvc2l0aW9uLDEuMCk7CiAgdl9wb3NpdGlvbkVDID0gcG9zLnh5ejsKICBnbF9Qb3NpdGlvbiA9IHVfcHJvamVjdGlvbk1hdHJpeCAqIHBvczsKICB2X25vcm1hbCA9IHVfbm9ybWFsTWF0cml4ICogYV9ub3JtYWw7Cn0K"
},
"fragmentShader0": {
"type": 35632,
"uri": "data:text/plain;base64,cHJlY2lzaW9uIGhpZ2hwIGZsb2F0Owp1bmlmb3JtIHZlYzQgdV9hbWJpZW50Owp1bmlmb3JtIHZlYzQgdV9kaWZmdXNlOwp1bmlmb3JtIHZlYzQgdV9lbWlzc2lvbjsKdW5pZm9ybSB2ZWM0IHVfc3BlY3VsYXI7CnVuaWZvcm0gZmxvYXQgdV9zaGluaW5lc3M7CnVuaWZvcm0gZmxvYXQgdV90cmFuc3BhcmVuY3k7CnZhcnlpbmcgdmVjMyB2X3Bvc2l0aW9uRUM7CnZhcnlpbmcgdmVjMyB2X25vcm1hbDsKdm9pZCBtYWluKHZvaWQpIHsKICB2ZWMzIG5vcm1hbCA9IG5vcm1hbGl6ZSh2X25vcm1hbCk7CiAgdmVjNCBkaWZmdXNlID0gdV9kaWZmdXNlOwogIHZlYzMgZGlmZnVzZUxpZ2h0ID0gdmVjMygwLjAsIDAuMCwgMC4wKTsKICB2ZWMzIHNwZWN1bGFyID0gdV9zcGVjdWxhci5yZ2I7CiAgdmVjMyBzcGVjdWxhckxpZ2h0ID0gdmVjMygwLjAsIDAuMCwgMC4wKTsKICB2ZWMzIGVtaXNzaW9uID0gdV9lbWlzc2lvbi5yZ2I7CiAgdmVjMyBhbWJpZW50ID0gdV9hbWJpZW50LnJnYjsKICB2ZWMzIHZpZXdEaXIgPSAtbm9ybWFsaXplKHZfcG9zaXRpb25FQyk7CiAgdmVjMyBhbWJpZW50TGlnaHQgPSB2ZWMzKDAuMCwgMC4wLCAwLjApOwogIGFtYmllbnRMaWdodCArPSB2ZWMzKDAuMiwgMC4yLCAwLjIpOwogIHZlYzMgbCA9IHZlYzMoMC4wLCAwLjAsIDEuMCk7CiAgZGlmZnVzZUxpZ2h0ICs9IHZlYzMoMS4wLCAxLjAsIDEuMCkgKiBtYXgoZG90KG5vcm1hbCxsKSwgMC4pOwogIHZlYzMgaCA9IG5vcm1hbGl6ZShsICsgdmlld0Rpcik7CiAgZmxvYXQgc3BlY3VsYXJJbnRlbnNpdHkgPSBtYXgoMC4sIHBvdyhtYXgoZG90KG5vcm1hbCwgaCksIDAuKSwgdV9zaGluaW5lc3MpKTsKICBzcGVjdWxhckxpZ2h0ICs9IHZlYzMoMS4wLCAxLjAsIDEuMCkgKiBzcGVjdWxhckludGVuc2l0eTsKICB2ZWMzIGNvbG9yID0gdmVjMygwLjAsIDAuMCwgMC4wKTsKICBjb2xvciArPSBkaWZmdXNlLnJnYiAqIGRpZmZ1c2VMaWdodDsKICBjb2xvciArPSBzcGVjdWxhciAqIHNwZWN1bGFyTGlnaHQ7CiAgY29sb3IgKz0gZW1pc3Npb247CiAgY29sb3IgKz0gYW1iaWVudCAqIGFtYmllbnRMaWdodDsKICBnbF9GcmFnQ29sb3IgPSB2ZWM0KGNvbG9yICogZGlmZnVzZS5hLCBkaWZmdXNlLmEgKiB1X3RyYW5zcGFyZW5jeSk7Cn0K"
}
},
"skins": {},
"extensions": {}
]
}
Loading