-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20 from AnalyticalGraphicsInc/master
Merge latest Cesium into master
- Loading branch information
Showing
426 changed files
with
52,796 additions
and
8,287 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
Binary file added
BIN
+18.7 KB
Apps/SampleData/models/CesiumBalloon/CesiumBalloonPrint_singleDot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Large diffs are not rendered by default.
Oops, something went wrong.
270 changes: 270 additions & 0 deletions
270
Apps/SampleData/models/ShadowTester/Shadow_Tester_2.gltf
Large diffs are not rendered by default.
Oops, something went wrong.
270 changes: 270 additions & 0 deletions
270
Apps/SampleData/models/ShadowTester/Shadow_Tester_3.gltf
Large diffs are not rendered by default.
Oops, something went wrong.
268 changes: 268 additions & 0 deletions
268
Apps/SampleData/models/ShadowTester/Shadow_Tester_4.gltf
Large diffs are not rendered by default.
Oops, something went wrong.
270 changes: 270 additions & 0 deletions
270
Apps/SampleData/models/ShadowTester/Shadow_Tester_Point.gltf
Large diffs are not rendered by default.
Oops, something went wrong.
325 changes: 325 additions & 0 deletions
325
Apps/SampleData/models/ShadowTester/Shadow_Transparent.gltf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,325 @@ | ||
| { | ||
| "accessors": { | ||
| "accessor_21": { | ||
| "bufferView": "bufferView_29", | ||
| "byteOffset": 0, | ||
| "byteStride": 0, | ||
| "componentType": 5123, | ||
| "count": 36, | ||
| "type": "SCALAR" | ||
| }, | ||
| "accessor_23": { | ||
| "bufferView": "bufferView_30", | ||
| "byteOffset": 0, | ||
| "byteStride": 12, | ||
| "componentType": 5126, | ||
| "count": 36, | ||
| "max": [ | ||
| 5.477869987487793, | ||
| 5.477869987487793, | ||
| 5.477869987487793 | ||
| ], | ||
| "min": [ | ||
| -5.477869987487793, | ||
| -5.477869987487793, | ||
| -5.477869987487793 | ||
| ], | ||
| "type": "VEC3" | ||
| }, | ||
| "accessor_25": { | ||
| "bufferView": "bufferView_30", | ||
| "byteOffset": 432, | ||
| "byteStride": 12, | ||
| "componentType": 5126, | ||
| "count": 36, | ||
| "max": [ | ||
| 1, | ||
| 1, | ||
| 1 | ||
| ], | ||
| "min": [ | ||
| -1, | ||
| -1, | ||
| -1 | ||
| ], | ||
| "type": "VEC3" | ||
| }, | ||
| "accessor_27": { | ||
| "bufferView": "bufferView_30", | ||
| "byteOffset": 864, | ||
| "byteStride": 8, | ||
| "componentType": 5126, | ||
| "count": 36, | ||
| "max": [ | ||
| 1, | ||
| 1 | ||
| ], | ||
| "min": [ | ||
| 0, | ||
| 0 | ||
| ], | ||
| "type": "VEC2" | ||
| } | ||
| }, | ||
| "animations": {}, | ||
| "asset": { | ||
| "generator": "collada2gltf@", | ||
| "premultipliedAlpha": true, | ||
| "profile": { | ||
| "api": "WebGL", | ||
| "version": "1.0.2" | ||
| }, | ||
| "version": "1.0" | ||
| }, | ||
| "bufferViews": { | ||
| "bufferView_29": { | ||
| "buffer": "Shadow_Transparent", | ||
| "byteLength": 72, | ||
| "byteOffset": 0, | ||
| "target": 34963 | ||
| }, | ||
| "bufferView_30": { | ||
| "buffer": "Shadow_Transparent", | ||
| "byteLength": 1152, | ||
| "byteOffset": 72, | ||
| "target": 34962 | ||
| } | ||
| }, | ||
| "buffers": { | ||
| "Shadow_Transparent": { | ||
| "byteLength": 1224, | ||
| "type": "arraybuffer", | ||
| "uri": "data:application/octet-stream;base64,AAABAAIAAwAEAAUABgAHAAgACQAKAAsADAANAA4ADwAQABEAEgATABQAFQAWABcAGAAZABoAGwAcAB0AHgAfACAAIQAiACMAtkqvwLZKr0C2Sq9AtkqvwLZKr0C2Sq/AtkqvwLZKr8C2Sq/AtkqvQLZKr0C2Sq9AtkqvQLZKr0C2Sq/AtkqvwLZKr0C2Sq/AtkqvQLZKr8C2Sq9AtkqvQLZKr8C2Sq/AtkqvQLZKr0C2Sq/AtkqvwLZKr8C2Sq9AtkqvwLZKr8C2Sq/AtkqvQLZKr8C2Sq/AtkqvwLZKr0C2Sq/AtkqvQLZKr0C2Sq/AtkqvQLZKr8C2Sq/AtkqvQLZKr0C2Sq9AtkqvwLZKr0C2Sq9AtkqvwLZKr8C2Sq9AtkqvwLZKr8C2Sq9AtkqvwLZKr0C2Sq9AtkqvwLZKr8C2Sq/AtkqvwLZKr0C2Sq9AtkqvQLZKr0C2Sq9AtkqvwLZKr0C2Sq/AtkqvQLZKr0C2Sq9AtkqvQLZKr8C2Sq9AtkqvQLZKr0C2Sq/AtkqvQLZKr8C2Sq9AtkqvwLZKr8C2Sq9AtkqvQLZKr8C2Sq/AtkqvwLZKr8C2Sq/AtkqvwLZKr0C2Sq/AtkqvQLZKr8C2Sq/AtkqvQLZKr8C2Sq9AtkqvQLZKr0C2Sq9AtkqvwLZKr8C2Sq9AAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AACAPwAAgD8AAIA/AAAAAAAAAAAAAAAAAACAPwAAgD8AAIA/AAAAAAAAAAAAAAAAAACAPwAAgD8AAIA/AAAAAAAAAAAAAAAAAACAPwAAgD8AAIA/AAAAAAAAAAAAAAAAAACAPwAAgD8AAIA/AAAAAAAAAAAAAAAAAACAPwAAgD8AAIA/AAAAAAAAAAAAAAAAAAAAAAAAgD8AAIA/AACAPwAAAAAAAAAAAAAAAAAAgD8AAIA/AACAPwAAAAAAAAAAAAAAAAAAgD8AAIA/AACAPwAAAAAAAAAAAAAAAAAAgD8AAIA/AACAPwAAAAAAAAAAAAAAAAAAgD8AAIA/AACAPwAAAAAAAAAAAAAAAAAAgD8AAIA/AACAPwAAAAAAAAAA" | ||
| } | ||
| }, | ||
| "images": { | ||
| "transparent_png": { | ||
| "name": "transparent_png", | ||
| "uri": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4AQPDyY2cEtWNAAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAA/klEQVR42u3UwQkAIAwEwSjpv+VYgp+AojMF5HEsGRVRwbemCQSAABAAAkAACAABIAAEgAAQAAJAAAgAAfCcbLozTHlM+QAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABCAABIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABMBWNt0pU/oACAABIAAEgAAQAAJAAAgAASAABIAAuMkCvXoFAaBKcrIAAAAASUVORK5CYII=" | ||
| } | ||
| }, | ||
| "materials": { | ||
| "Material_001-effect": { | ||
| "name": "Material_001", | ||
| "technique": "technique0", | ||
| "values": { | ||
| "ambient": [ | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 1 | ||
| ], | ||
| "diffuse": "texture_transparent_png", | ||
| "emission": [ | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 1 | ||
| ], | ||
| "shininess": 50, | ||
| "specular": [ | ||
| 0.5, | ||
| 0.5, | ||
| 0.5, | ||
| 1 | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "meshes": { | ||
| "Cube_001-mesh": { | ||
| "name": "Cube.001", | ||
| "primitives": [ | ||
| { | ||
| "attributes": { | ||
| "NORMAL": "accessor_25", | ||
| "POSITION": "accessor_23", | ||
| "TEXCOORD_0": "accessor_27" | ||
| }, | ||
| "indices": "accessor_21", | ||
| "material": "Material_001-effect", | ||
| "mode": 4 | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "nodes": { | ||
| "Cube": { | ||
| "children": [], | ||
| "matrix": [ | ||
| 1, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 1, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 1, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 1 | ||
| ], | ||
| "meshes": [ | ||
| "Cube_001-mesh" | ||
| ], | ||
| "name": "Cube" | ||
| }, | ||
| "node_1": { | ||
| "children": [ | ||
| "Cube" | ||
| ], | ||
| "matrix": [ | ||
| 1, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| -1, | ||
| 0, | ||
| 0, | ||
| 1, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 1 | ||
| ], | ||
| "name": "Y_UP_Transform" | ||
| } | ||
| }, | ||
| "programs": { | ||
| "program_0": { | ||
| "attributes": [ | ||
| "a_normal", | ||
| "a_position", | ||
| "a_texcoord0" | ||
| ], | ||
| "fragmentShader": "Shadow_Transparent0FS", | ||
| "vertexShader": "Shadow_Transparent0VS" | ||
| } | ||
| }, | ||
| "samplers": { | ||
| "sampler_0": { | ||
| "magFilter": 9729, | ||
| "minFilter": 9729, | ||
| "wrapS": 10497, | ||
| "wrapT": 10497 | ||
| } | ||
| }, | ||
| "scene": "defaultScene", | ||
| "scenes": { | ||
| "defaultScene": { | ||
| "nodes": [ | ||
| "node_1" | ||
| ] | ||
| } | ||
| }, | ||
| "shaders": { | ||
| "Shadow_Transparent0FS": { | ||
| "type": 35632, | ||
| "uri": "data:text/plain;base64,cHJlY2lzaW9uIGhpZ2hwIGZsb2F0Owp2YXJ5aW5nIHZlYzMgdl9ub3JtYWw7CnVuaWZvcm0gdmVjNCB1X2FtYmllbnQ7CnZhcnlpbmcgdmVjMiB2X3RleGNvb3JkMDsKdW5pZm9ybSBzYW1wbGVyMkQgdV9kaWZmdXNlOwp1bmlmb3JtIHZlYzQgdV9lbWlzc2lvbjsKdW5pZm9ybSB2ZWM0IHVfc3BlY3VsYXI7CnVuaWZvcm0gZmxvYXQgdV9zaGluaW5lc3M7CnZvaWQgbWFpbih2b2lkKSB7CnZlYzMgbm9ybWFsID0gbm9ybWFsaXplKHZfbm9ybWFsKTsKdmVjNCBjb2xvciA9IHZlYzQoMC4sIDAuLCAwLiwgMC4pOwp2ZWM0IGRpZmZ1c2UgPSB2ZWM0KDAuLCAwLiwgMC4sIDEuKTsKdmVjNCBlbWlzc2lvbjsKdmVjNCBhbWJpZW50Owp2ZWM0IHNwZWN1bGFyOwphbWJpZW50ID0gdV9hbWJpZW50OwpkaWZmdXNlID0gdGV4dHVyZTJEKHVfZGlmZnVzZSwgdl90ZXhjb29yZDApOwplbWlzc2lvbiA9IHVfZW1pc3Npb247CnNwZWN1bGFyID0gdV9zcGVjdWxhcjsKZGlmZnVzZS54eXogKj0gbWF4KGRvdChub3JtYWwsdmVjMygwLiwwLiwxLikpLCAwLik7CmNvbG9yLnh5eiArPSBkaWZmdXNlLnh5ejsKY29sb3IueHl6ICs9IGVtaXNzaW9uLnh5ejsKY29sb3IgPSB2ZWM0KGNvbG9yLnJnYiAqIGRpZmZ1c2UuYSwgZGlmZnVzZS5hKTsKZ2xfRnJhZ0NvbG9yID0gY29sb3I7Cn0K" | ||
| }, | ||
| "Shadow_Transparent0VS": { | ||
| "type": 35633, | ||
| "uri": "data:text/plain;base64,cHJlY2lzaW9uIGhpZ2hwIGZsb2F0OwphdHRyaWJ1dGUgdmVjMyBhX3Bvc2l0aW9uOwphdHRyaWJ1dGUgdmVjMyBhX25vcm1hbDsKdmFyeWluZyB2ZWMzIHZfbm9ybWFsOwp1bmlmb3JtIG1hdDMgdV9ub3JtYWxNYXRyaXg7CnVuaWZvcm0gbWF0NCB1X21vZGVsVmlld01hdHJpeDsKdW5pZm9ybSBtYXQ0IHVfcHJvamVjdGlvbk1hdHJpeDsKYXR0cmlidXRlIHZlYzIgYV90ZXhjb29yZDA7CnZhcnlpbmcgdmVjMiB2X3RleGNvb3JkMDsKdm9pZCBtYWluKHZvaWQpIHsKdmVjNCBwb3MgPSB1X21vZGVsVmlld01hdHJpeCAqIHZlYzQoYV9wb3NpdGlvbiwxLjApOwp2X25vcm1hbCA9IHVfbm9ybWFsTWF0cml4ICogYV9ub3JtYWw7CnZfdGV4Y29vcmQwID0gYV90ZXhjb29yZDA7CmdsX1Bvc2l0aW9uID0gdV9wcm9qZWN0aW9uTWF0cml4ICogcG9zOwp9Cg==" | ||
| } | ||
| }, | ||
| "skins": {}, | ||
| "techniques": { | ||
| "technique0": { | ||
| "attributes": { | ||
| "a_normal": "normal", | ||
| "a_position": "position", | ||
| "a_texcoord0": "texcoord0" | ||
| }, | ||
| "parameters": { | ||
| "ambient": { | ||
| "type": 35666 | ||
| }, | ||
| "diffuse": { | ||
| "type": 35678 | ||
| }, | ||
| "emission": { | ||
| "type": 35666 | ||
| }, | ||
| "modelViewMatrix": { | ||
| "semantic": "MODELVIEW", | ||
| "type": 35676 | ||
| }, | ||
| "normal": { | ||
| "semantic": "NORMAL", | ||
| "type": 35665 | ||
| }, | ||
| "normalMatrix": { | ||
| "semantic": "MODELVIEWINVERSETRANSPOSE", | ||
| "type": 35675 | ||
| }, | ||
| "position": { | ||
| "semantic": "POSITION", | ||
| "type": 35665 | ||
| }, | ||
| "projectionMatrix": { | ||
| "semantic": "PROJECTION", | ||
| "type": 35676 | ||
| }, | ||
| "shininess": { | ||
| "type": 5126 | ||
| }, | ||
| "specular": { | ||
| "type": 35666 | ||
| }, | ||
| "texcoord0": { | ||
| "semantic": "TEXCOORD_0", | ||
| "type": 35664 | ||
| } | ||
| }, | ||
| "program": "program_0", | ||
| "states": { | ||
| "enable": [ | ||
| 2929, | ||
| 3042 | ||
| ], | ||
| "functions": { | ||
| "blendEquationSeparate": [ | ||
| 32774, | ||
| 32774 | ||
| ], | ||
| "blendFuncSeparate": [ | ||
| 1, | ||
| 771, | ||
| 1, | ||
| 771 | ||
| ], | ||
| "depthMask": false | ||
| } | ||
| }, | ||
| "uniforms": { | ||
| "u_ambient": "ambient", | ||
| "u_diffuse": "diffuse", | ||
| "u_emission": "emission", | ||
| "u_modelViewMatrix": "modelViewMatrix", | ||
| "u_normalMatrix": "normalMatrix", | ||
| "u_projectionMatrix": "projectionMatrix", | ||
| "u_shininess": "shininess", | ||
| "u_specular": "specular" | ||
| } | ||
| } | ||
| }, | ||
| "textures": { | ||
| "texture_transparent_png": { | ||
| "format": 6408, | ||
| "internalFormat": 6408, | ||
| "sampler": "sampler_0", | ||
| "source": "transparent_png", | ||
| "target": 3553, | ||
| "type": 5121 | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.