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

Add support for material variants #4528

Merged
merged 23 commits into from
Aug 17, 2022
Merged

Add support for material variants #4528

merged 23 commits into from
Aug 17, 2022

Commits on Aug 16, 2022

  1. Add support for KHR_materials_variants 

    The API lives entirely in the GLB container, allowing the user to get the list of variants and apply it to a mesh.
The variants are parsed, and the data for the variants are stored on the resource level of the container, thus avoiding any intrusion into any engine types.
    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    b17724c View commit details
    Browse the repository at this point in the history

  2. Refactored the default material index so it doesn't have to live in t… 

    …he material itself.
    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    c6c9c99 View commit details
    Browse the repository at this point in the history

  3. Fix ordering of mesh -> variant mapping using the mesh id as a key

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    0426d2c View commit details
    Browse the repository at this point in the history

  4. Removed redundant parameter.

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    4d7c48e View commit details
    Browse the repository at this point in the history

  5. Add more commonly used use-case for applying material variants to ent… 

    …ire entity.
    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    b273a0e View commit details
    Browse the repository at this point in the history

  6. Add documentation for getMaterialVariants

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    f7b340a View commit details
    Browse the repository at this point in the history

  7. Added JSDoc for material variant API

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    a33ef55 View commit details
    Browse the repository at this point in the history

  8. Removed unnecessary code

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    e6b5028 View commit details
    Browse the repository at this point in the history

  9. Add guard for trying to use variants that doesn't exist

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    91a55ab View commit details
    Browse the repository at this point in the history

  10. Lint

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    83380da View commit details
    Browse the repository at this point in the history

  11. Change getMaterialVariants to return only the keys.

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    8e18198 View commit details
    Browse the repository at this point in the history

  12. Created private function to actually apply the material variants inte… 

    …rnally, as well as debug warn if the variant can't be found.
    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    57ea3dc View commit details
    Browse the repository at this point in the history

  13. Simplify reading the extension data.

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    908e816 View commit details
    Browse the repository at this point in the history

  14. Change the mesh variants and mesh default materials to be objects, no… 

    …t slices.
    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    dac55ee View commit details
    Browse the repository at this point in the history

  15. Fix documentation.

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    8561bcc View commit details
    Browse the repository at this point in the history

  16. Remove TS usage from documentation

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    9dd691a View commit details
    Browse the repository at this point in the history

  17. Fix comments

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    c65993e View commit details
    Browse the repository at this point in the history

  18. Added API for resetting variants, which applies to when an invalid va… 

    …riant is applied as well.

Also fixed lint.
    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    15ea69e View commit details
    Browse the repository at this point in the history

  19. Remove reset from public API 

    Also provide documentation clarifying that the name is optional, and if not provided resets the material variants.
    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    4e42c4f View commit details
    Browse the repository at this point in the history

  20. Fix doc

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    fadf1e1 View commit details
    Browse the repository at this point in the history

  21. Remove extra _resetMaterial* function

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    825c3c8 View commit details
    Browse the repository at this point in the history

  22. Make the variant selection inside _applyMaterialVariant instead.

    @GSterbrant
    GSterbrant committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    3845ae4 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2022

  1. Moved assert to outside of condition

    @GSterbrant
    GSterbrant committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    10c8224 View commit details
    Browse the repository at this point in the history