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.

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

[glTF] Implement glTF2.0 common materials, clean up loadMaterials(). #11485

Merged
merged 5 commits into from
Jun 11, 2017

Conversation

donmccurdy
Copy link
Collaborator

Changes:

  • Implement glTF2.0 KHR_materials_common extension.
  • Implement glTF2.0 KHR_lights extension (no longer part of common materials).
  • Isolate WebGL technique code in its own extension object.
  • Clean up loadMaterials() a bit.
  • Update docs.

All currently-supported examples work as before. I don't have official examples for common materials or lights yet, but went ahead and updated the Duck model using the blender extension.

Sorry that the diff is unreadable... loadMaterials needed a bit of un-nesting. The gist of the changes' structure is shown here:

https://github.com/donmccurdy/three.js/blob/fb2066bb899f55d4a9ddf519cf4d0298e99aafca/examples/js/loaders/GLTF2Loader.js#L1914-L1934

/cc @takahirox

@mrdoob
Copy link
Owner

mrdoob commented Jun 11, 2017

Looks good!

@mrdoob mrdoob merged commit 28ba5ed into mrdoob:dev Jun 11, 2017
@mrdoob
Copy link
Owner

mrdoob commented Jun 11, 2017

Thanks!

@donmccurdy donmccurdy deleted the feat-gltf2-common-materials branch August 12, 2017 05:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants