Skip to content

Upgrade three.js from r152 to r183#2858

Merged
jstone-lucasfilm merged 6 commits intoAcademySoftwareFoundation:mainfrom
jstone-lucasfilm:dev_three_js
Apr 10, 2026
Merged

Upgrade three.js from r152 to r183#2858
jstone-lucasfilm merged 6 commits intoAcademySoftwareFoundation:mainfrom
jstone-lucasfilm:dev_three_js

Conversation

@jstone-lucasfilm
Copy link
Copy Markdown
Member

@jstone-lucasfilm jstone-lucasfilm commented Apr 8, 2026

This changelist upgrades the three.js dependency in the MaterialX Web Viewer from r152 to r183, adapting to API changes across the intervening releases.

This changelist upgrades the three.js dependency in the MaterialX Web Viewer from r152 to r183, adapting to API changes across the intervening releases.

A new `hwEmitVersionDirective` option has been added to GenOptions, allowing the Web Viewer to skip the `#version` directive in generated shaders, as three.js now manages this detail on its own.
Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>
Copy link
Copy Markdown
Contributor

@kwokcb kwokcb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good in general. I think we want to keep explicit versioning for shaders and not add in the new shader gen option.

Comment thread javascript/package-lock.json
Comment thread source/MaterialXGenGlsl/GlslShaderGenerator.cpp Outdated
This changelist removes the proposed hwEmitVersionDirective flag, replacing its usage with a local edit of source files before they are passed along to Three.js.
Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>
Copy link
Copy Markdown
Contributor

@ashwinbhat ashwinbhat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change to locally remove version directive to support three.js RawShaderMaterial looks good to me.

@jstone-lucasfilm jstone-lucasfilm merged commit b26de54 into AcademySoftwareFoundation:main Apr 10, 2026
36 checks passed
@jstone-lucasfilm jstone-lucasfilm deleted the dev_three_js branch April 10, 2026 15:01
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.

3 participants