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

JSON support for MaterialX (Prototype) #43

Closed
wants to merge 23 commits into from
Closed

JSON support for MaterialX (Prototype) #43

wants to merge 23 commits into from

Commits on Aug 24, 2023

  1. First trial.

    @kwokcb
    kwokcb committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    d809c0d View commit details
    Browse the repository at this point in the history

  2. Add in graph content pruning flag.

    @kwokcb
    kwokcb committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    dd2d75c View commit details
    Browse the repository at this point in the history

  3. Add indent and add sample save w and w/o graphs.

    @kwokcb
    kwokcb committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    dc4e46f View commit details
    Browse the repository at this point in the history

  4. Fix file case.

    @kwokcb
    kwokcb committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    6e0ae50 View commit details
    Browse the repository at this point in the history

  5. More build fixes.

    @kwokcb
    kwokcb committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    1ab3bc2 View commit details
    Browse the repository at this point in the history

  6. Add JSON read support.

    @kwokcb
    kwokcb committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    e29d409 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. Merge branch 'AcademySoftwareFoundation:main' into MaterialXJSON

    @kwokcb
    kwokcb authored Aug 26, 2023
    Configuration menu
    Copy the full SHA
    5811574 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Remove "@" characters and scope non attributes with the category for … 

    …uniquesness: "<category>:<name>". This is similar to how USD ads some scoping.

Size with layout is about 1/3 larger. If no formattting can be smaller.
    @kwokcb
    kwokcb committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    7ccf0bc View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. Small fix to output dumps.

    @kwokcb
    kwokcb committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    5136347 View commit details
    Browse the repository at this point in the history

  2. Minro formatting.

    @kwokcb
    kwokcb committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    41ac2cc View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Merge branch 'AcademySoftwareFoundation:main' into MaterialXJSON

    @kwokcb
    kwokcb authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    61f506b View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Merge branch 'main' into MaterialXJSON

    @kwokcb
    kwokcb committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    f70c1db View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Cleanup and add Python and JSON APis. 

    Add example marble as json.
    @kwokcb
    kwokcb committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    bbde408 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'AcademySoftwareFoundation:main' into MaterialXJSON

    @kwokcb
    kwokcb authored Sep 8, 2023
    Configuration menu
    Copy the full SHA
    8f80746 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'AcademySoftwareFoundation:main' into MaterialXJSON

    @kwokcb
    kwokcb authored Sep 8, 2023
    Configuration menu
    Copy the full SHA
    362bf6f View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Merge branch 'AcademySoftwareFoundation:main' into MaterialXJSON

    @kwokcb
    kwokcb authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    20b97c4 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. Merge branch 'AcademySoftwareFoundation:main' into MaterialXJSON

    @kwokcb
    kwokcb authored Oct 20, 2023
    Configuration menu
    Copy the full SHA
    8282da1 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Merge branch 'AcademySoftwareFoundation:main' into MaterialXJSON

    @kwokcb
    kwokcb authored Nov 3, 2023
    Configuration menu
    Copy the full SHA
    22ad5e2 View commit details
    Browse the repository at this point in the history

  2. Docs fix.

    @kwokcb
    kwokcb committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    e5b6a01 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'AcademySoftwareFoundation:main' into MaterialXJSON

    @kwokcb
    kwokcb authored Nov 3, 2023
    Configuration menu
    Copy the full SHA
    f0cf4f1 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Merge branch 'AcademySoftwareFoundation:main' into MaterialXJSON

    @kwokcb
    kwokcb authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    f58900c View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Merge branch 'AcademySoftwareFoundation:main' into MaterialXJSON

    @kwokcb
    kwokcb authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    919674c View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Merge (#45) 

    * Improvements to GitHub CI

- Add a MacOS build with Xcode 15 and Python 3.12.
- Add INL files to the Clang Format step.
- Simplify CMake build steps.

* Update JavaScript packages

This changelist updates all referenced JavaScript packages to their latest version via 'npm update'.

* Update three.js to r152

This changelist updates the version of three.js to r152 in the MaterialX Web Viewer, making a handful of adjustments to account for changes in texture storage conventions.

* Web viewer HDRI improvements

- Load HDR images in half-float format, improving render performance and browser compatibility.
- Clarify HDR image names.

* Fix for custom node groups in graph editor menu (AcademySoftwareFoundation#1617)

Currently if you have node definitions added to groups that aren't in the fixed list that MaterialXGraphEditor understands, then they won't be added to the menu.

---------

Co-authored-by: Jonathan Stone <jstone@lucasfilm.com>
Co-authored-by: ld-kerley <154285602+ld-kerley@users.noreply.github.com>
    @kwokcb @jstone-lucasfilm @ld-kerley
    3 people authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    c9c4598 View commit details
    Browse the repository at this point in the history