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 1.0 Changes #3039

Merged
merged 60 commits into from
Oct 29, 2015
Merged

glTF 1.0 Changes #3039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
eaf23c1
Merge remote-tracking branch 'agi/ground-primitive'
Jul 28, 2015
7ebfa1f
Added WebStorm project to gitignore.
Sep 16, 2015
e60f0a5
Merge remote-tracking branch 'agi/master'
Sep 16, 2015
2aeaedf
Updated EXT_binary_glTF to KHR_binary_glTF
Sep 17, 2015
bcdeb78
Added unit tests for KHR_binary_glTF extension.
Sep 18, 2015
96572e7
Updated cesium to have attributes, program, uniform and states direct…
Sep 30, 2015
46ea15d
Fixed creation of extensionsUsed.
Sep 30, 2015
c829656
For all 1.0 and later models, we now assume rotations are quaternions.
Oct 7, 2015
2f53201
Removed instanceSkin and moved its children to the node directly.
Oct 9, 2015
d53b0e1
Removed instanceTechnique and moved children to material.
Oct 12, 2015
5444396
Added preprocessing of KHR_materials_common extension
Oct 14, 2015
c1138ee
Merge remote-tracking branch 'agi/master'
Oct 14, 2015
d951171
Merge branch 'master' into glTF-1.0
Oct 14, 2015
ea0b96b
Fixed comment.
Oct 14, 2015
21d8260
Fixed a bunch of warnings and used constants.
Oct 14, 2015
85bc2ed
Merge remote-tracking branch 'agi/master'
Oct 14, 2015
3c3920c
Merge branch 'master' into glTF-1.0
Oct 14, 2015
312bc79
Removed test model and fixed error.
Oct 14, 2015
89b8736
Added vertex shader generation.
Oct 14, 2015
7f14148
Added ability to load a generated shader directly from the source str…
Oct 14, 2015
795d72c
Added uniforms to fragment shader.
Oct 15, 2015
20aaf79
Pretty much nothing.
Oct 15, 2015
12931c9
Adds majority of fragment shader generation. Still need to finish poi…
Oct 15, 2015
f01ca03
Added point and spot lights. All shader generation is untested.
Oct 15, 2015
110ab96
Shaders now compile. Still need to add diffuse light.
Oct 15, 2015
abedc25
Finished up shader generation. Still need to do skinning and handle t…
Oct 15, 2015
c6d1b86
Got skinning to work.
Oct 15, 2015
56ed580
Got alpha working for colors.
Oct 15, 2015
de5feba
Added double sided support.
Oct 15, 2015
fe520c8
Added phong shader.
Oct 16, 2015
f2dedf5
Fixed a bunch of things from feedback.
Oct 16, 2015
9184670
Fixed comment.
Oct 16, 2015
94328c1
Added support for node property of technique parameters. This got dir…
Oct 19, 2015
96361f4
Mode shader cleanup.
Oct 19, 2015
581a397
Updated unit test models to glTF v1.0 (except for a test model).
Oct 21, 2015
e1f4e66
Updated Sandcastle models and example.
Oct 21, 2015
4907ee1
Fixed a few errors with specular textures and a build error.
Oct 21, 2015
902adaf
Fixed development sandcastle example and tweaked constant lighting sh…
Oct 27, 2015
c4829e5
Merge remote-tracking branch 'agi/master'
Oct 27, 2015
45a3caf
Merge branch 'master' into glTF-1.0
Oct 27, 2015
6c4903f
Throw exception when we can't load a model because of an invalid exte…
Oct 27, 2015
6595b7d
Added gray material if we don't have a technique.
Oct 27, 2015
e4648ff
Added support for new revision of KHR_materials_common extension.
Oct 28, 2015
91a1275
Fixed issue with double sided materials.
Oct 28, 2015
333b0d0
Allows us to load models with no indices.
Oct 28, 2015
db26b99
Added test for KHR_materials_common model.
Oct 28, 2015
6f5aaa9
Tweak
pjcozzi Oct 29, 2015
90489b5
Fixes from PR comments.
Oct 29, 2015
b539813
Fixed shader issue on Mac.
Oct 29, 2015
798cb2a
Merged
Oct 29, 2015
02be44f
Update CHANGES.md
Oct 29, 2015
e6ea58e
Added deprecation warning for CESIUM_binary_glTf and cleaned up doc c…
Oct 29, 2015
82d3433
Merge remote-tracking branch 'agi/master'
Oct 29, 2015
6462364
Merged master.
Oct 29, 2015
999f3f3
Added unit tests that tests the majority of KHR_materials_common scen…
Oct 29, 2015
b809eee
Added proposed mime types.
Oct 29, 2015
a11148b
Changed Milk Truck to use a KHR_materials_common version in Sandcastle.
Oct 29, 2015
4151533
Fixed spot lights and added tests for spot lights and transparency.
Oct 29, 2015
9d4e6c4
Clean up README.md
pjcozzi Oct 29, 2015
7da25eb
Fix picking Sandcastle example
pjcozzi Oct 29, 2015
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
Binary file removed Apps/SampleData/models/CesiumAir/Cesium_Air.bgltf
View file
Open in desktop
Binary file not shown.
Binary file added Apps/SampleData/models/CesiumAir/Cesium_Air.glb
View file
Open in desktop
Binary file not shown.
607 changes: 329 additions & 278 deletions Apps/SampleData/models/CesiumAir/Cesium_Air.gltf
View file
Open in desktop

Large diffs are not rendered by default.

Binary file renamed ...a/models/CesiumGround/Cesium_Ground.bgltf → ...ata/models/CesiumGround/Cesium_Ground.glb
View file
Open in desktop
Binary file not shown.
581 changes: 328 additions & 253 deletions Apps/SampleData/models/CesiumGround/Cesium_Ground.gltf
View file
Open in desktop

Large diffs are not rendered by default.

Binary file renamed ...pleData/models/CesiumMan/Cesium_Man.bgltf → ...ampleData/models/CesiumMan/Cesium_Man.glb
View file
Open in desktop
Binary file not shown.
683 changes: 274 additions & 409 deletions Apps/SampleData/models/CesiumMan/Cesium_Man.gltf
View file
Open in desktop

Large diffs are not rendered by default.

Binary file renamed ...els/CesiumMilkTruck/CesiumMilkTruck.bgltf → ...s/CesiumMilkTruck/CesiumMilkTruck-kmc.glb
View file
Open in desktop
Binary file not shown.
807 changes: 807 additions & 0 deletions Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck-kmc.gltf
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.dae
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@
<light id="Light-polyRender006" name="Render">
<technique_common>
<ambient>
<color sid="ambient_light_rgb">0 0 0</color>
<color sid="ambient_light_rgb">0.2 0.2 0.2</color>
</ambient>
</technique_common>
</light>
Expand Down
Binary file added Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.glb
View file
Open in desktop
Binary file not shown.
Loading