Add creatematrix nodes to build matrices from vectors #1553

friedererdmann · 2023-10-05T14:26:50Z

Hello,

I'm opening this PR to add creatematrix, a constructor for Matrix33 from 3 Vector3s, Matrix44 from 4 Vector3s and Matrix44 from 4 Vector4s from the specification document (https://github.com/AcademySoftwareFoundation/MaterialX/blob/main/documents/Specification/MaterialX.Specification.md#math-nodes).

A typical usecase where constructing a Matrix33 can be useful would be to be able to build the tangent to world matrix to translate Normals as shown in this picture:

linux-foundation-easycla · 2023-10-05T14:26:54Z

The committers listed above are authorized under a signed CLA.

✅ login: friedererdmann / name: Frieder Erdmann (11599c0, 08a6d57, e55cd26, a5119c7, fb071c4, eab31db, 28cce2d, 71b8efa, a20052b, 1ebc4d9, 43ca8cf, c871d4f, d7b0264)
✅ login: jstone-lucasfilm / name: Jonathan Stone (cc7df02, 8f6c0c8, ace738c, 307755f, 76f6eb4, cf770c5, 6d98ae3, d68ce31, 50f5188, dc6438f, a1be340, c7e788d)

added signature for vector4

kwokcb · 2023-10-05T16:14:18Z

Hi @friedererdmann,

I think all you really need is oslc, and mdlc to see if the code compiles (OSL, MDL). The generateShader.py script allows for a validator program to run for generated code, where you can use glslValidator with MSL.
If you want to render, the testing executable info can be found here
MSL rendering needs a Mac :) and can be tested with MaterialXGraphEditor or MaterialXView on the test file.
You probably want to check for the render executable for MDL. It used to be df_cuda.
If you want to test ESSL, you can use the Web Viewer but you'll need to do a WASM/Javascript build. Probably not worth the time.

Hope this helps.

added usage of different signatures

friedererdmann · 2023-10-12T08:32:52Z

This is ready for review now! Thanks for the guidance with testing Bernard!

kwokcb

This looks great. Thanks for being so thorough with the testing :).

Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>

friedererdmann · 2023-11-01T16:58:21Z

Hey :) Just checking if this can be merged into the repo? (I don't have the rights to merge myself and not sure if I missed anything in the contribution guidelines!)

jstone-lucasfilm · 2023-11-01T17:27:55Z

Thanks for the reminder, @friedererdmann, and sorry for the delay in review. I'll plan to take a close look soon!

Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>

jstone-lucasfilm

This looks great to me, @friedererdmann, and I had just one recommendation for the naming of outputs.

libraries/stdlib/stdlib_defs.mtlx

jstone-lucasfilm

This looks great to me, thanks @friedererdmann!

* Add enumeration support to web viewer (AcademySoftwareFoundation#1632) - Scan for `enum` and `enumvalues` if attributes exist on input. If no `enumvalues` exist then map to "default" of 0..<enum list size>. - Create a drop-down for each enumerated input. * Initial nprlib with viewdirection node (AcademySoftwareFoundation#1631) This changelist introduces an NPR (non-photorealistic rendering) data library to MaterialX, initially consisting of a single `viewdirection` node. The NPR data library is designed for the portable expression of artistic, non-physically-based materials, with common examples being cartoon shading, architectural diagrams, and edge highlighting. In future versions of MaterialX, we expect this data library to be extended with additional primitives and artist-facing graphs as they are requested by the graphics community and approved by the MaterialX TSC. For shader generation, MaterialX initially supports the NPR data library in GLSL, ESSL, MSL, and OSL, with MDL being omitted for now, based on intentional restrictions in its design philosophy. * Improve shader generation for viewdirection This changelist improves shader generation logic for the new viewdirection node, allowing it to work correctly in derived hardware languages such as ESSL. * Add creatematrix nodes to build matrices from vectors (AcademySoftwareFoundation#1553) I'm opening this PR to add creatematrix, a constructor for Matrix33 from 3 Vector3s, Matrix44 from 4 Vector3s and Matrix44 from 4 Vector4s from the specification document (https://github.com/AcademySoftwareFoundation/MaterialX/blob/main/documents/Specification/MaterialX.Specification.md#math-nodes). --------- Co-authored-by: Jonathan Stone <jstone@lucasfilm.com> Co-authored-by: Frieder Erdmann <55715326+friedererdmann@users.noreply.github.com>

This changelist fixes a handful of minor typos in shader generation, introduced in AcademySoftwareFoundation#1355 and AcademySoftwareFoundation#1553.

This changelist fixes a handful of minor typos in shader generation, introduced in #1355 and #1553.

* Improvements to noise implementations (AcademySoftwareFoundation#1653) - Leverage node graphs to share the conversion aspects of noise implementations across languages. - Simplify noise unit tests to cover only unique implementations. * Fix shader generation typos This changelist fixes a handful of minor typos in shader generation, introduced in AcademySoftwareFoundation#1355 and AcademySoftwareFoundation#1553. * Add frame capture to web viewer (AcademySoftwareFoundation#1636) Add frame capture code to trigger on 'f' key. This is the same key as used for the desktop viewer. * Document format updates This changelist applies the mxformat.py script to the libraries and resources folders in the repository, updating formatting for a handful of documents. --------- Co-authored-by: Jonathan Stone <jstone@lucasfilm.com>

* Web viewer formatting improvements and fixes (AcademySoftwareFoundation#1635) - Add colouring to items and folders which can be set vis CSS. This makes it easier to tell what areas are under what folders. - Fix string disable setting (was using old API). - Fix parenting of enum widgets to be under current folder instead of top level. * Add HwImplementation class This changelist adds an intermediate HwImplementation class, allowing the sharing of common features between node implementations in hardware shading languages. * Merge geometry node implementations This changelist merges the implementations of geometry nodes across hardware shading languages, allowing a greater degree of code sharing. * Merge application node implementations This changelist merges the implementations of application and NPR nodes across hardware shading languages, allowing a greater degree of code sharing. * Add vector2 variant of normalmap (AcademySoftwareFoundation#1355) The materialx specification defines the scale attribute of the normalmap to be either a float or a vector2 but the vector2 variant was missing from the implementation. This PR adds it. * Renderable logic improvements to web viewer (AcademySoftwareFoundation#1644) - Adds in proper parsing of renderable elements vs always just picking the first surface shader found. - The test suite files which have (multiple) nodegraph outputs and top level outputs will now load properly. - Adds in UI to mark folders as renderable (using a shaderball icon) - Adds in "soloing" capability to allow picking a renderable and have it show up on all geometry. When nothing is solo'ed the default material assignment is used. - Includes fixes for: - Dag path assignment matching . - Missing exposure of NodeGraph::getDownStreamPorts() in JS. - Addressing the big performance hit when binding materials to geometry in ThreeJS. The code by default is some quite slow code for reflection / debugging purposes which is now turned off. Chess set load is seconds vs minutes. This affects the 'solo'ing workflow significantly as each switch is a geometry re-bind. If the material is not already cached then slow code will be hit which can cause seconds to pass when selecting a new material -- which appears like a "hang" from a user perspective. * Fix irradiance generation in MaterialXView (AcademySoftwareFoundation#1647) This changelist fixes a regression to environment irradiance generation in MaterialXView, caused by a change to image caching logic for GLSL rendering in MaterialX 1.38.8. This fix restores the ability to render environment maps that are missing their pre-generated irradiance data, with irradiance being generated on the fly via spherical harmonics. * Add UI limits for useSpecularWorkflow and normal in UsdPreviewSurface (AcademySoftwareFoundation#1646) UsdPreviewSurface allows useSpecularWorkflow to be 0 or 1. Normals should have values between -1 to 1, inclusive. This PR puts these limits into place. * Unify noise unit tests This changelist merges two sets of noise unit tests into a single document, and aligns their implementations for clarity. * Static analysis optimizations This changelist addresses a handful of static analysis optimizations flagged by PVS-Studio and cppcheck, including the following: - Pass immutable std::string, FilePath, and FileSearchPath arguments by const reference. - Mark immutable ShaderGenerator references as const. - Prefer std::string::empty over comparison against an empty string. - Remove unused private methods Graph::findLinkId, Graph::findInput, and Graph::selectMaterial. - Remove variable assignments with no impact on code behavior. * Improvements to noise implementations (AcademySoftwareFoundation#1653) - Leverage node graphs to share the conversion aspects of noise implementations across languages. - Simplify noise unit tests to cover only unique implementations. * Fix shader generation typos This changelist fixes a handful of minor typos in shader generation, introduced in AcademySoftwareFoundation#1355 and AcademySoftwareFoundation#1553. * Add frame capture to web viewer (AcademySoftwareFoundation#1636) Add frame capture code to trigger on 'f' key. This is the same key as used for the desktop viewer. * Document format updates This changelist applies the mxformat.py script to the libraries and resources folders in the repository, updating formatting for a handful of documents. * Add versioning rules to Developer Guide (AcademySoftwareFoundation#1664) This changelist adds two new sections to the Developer Guide, describing the categories of changes to the MaterialX API and data libraries that are allowed in version upgrades. * Improve robustness of TypeDesc pointer comparisons (AcademySoftwareFoundation#1665) - The globals presets defined for TypeDesc are pointers which may not be shared between shared modules. This occurs for instance in Python where the pointers are declared locally for each module. - Any pointer comparison between the same TypeDesc preset can thus result in a failure status. * Improvements to smoothstep implementations - Leverage node graphs to share the conversion aspects of smoothstep implementations across languages. - Simplify smoothstep unit tests to cover only unique implementations. * Update changelog for recent work * Update comments in stdlib_ng.mtlx This changelist updates the comments in stdlib_ng, aligning them with the conventions for nodegraph definitions in the data libraries. * Fix orphaned links when deleting node in graph editor (AcademySoftwareFoundation#1667) This PR introduces fixes related to the removal of orphaned links when deleting a node in the Graph Editor: - remove the attribute `INTERFACE_NAME_ATTRIBUTE` of input pins that were connected to the deleted node (Fixes AcademySoftwareFoundation#1577) - iterate over all of the output pins instead of only handling the first one. (Fixes AcademySoftwareFoundation#1666) * Add facingratio node to nprlib (AcademySoftwareFoundation#1671) This changelist adds a `facingratio` node to the NPR data library, providing an additional intermediate node for building NPR graphs. * Add geometry drag & drop to web viewer (AcademySoftwareFoundation#1663) - Add support to recognize dropping of individual geometry (glb) files. - Minor cleanup to stop if no MTLX or GLB files loaded. * Apply JavaScript formatting This changelist applies automated formatting to the MaterialX JavaScript codebase, aligning it with the 4-space indentation and Allman braces used in MaterialX C++. * Add missing classification of VolumeShader nodes (AcademySoftwareFoundation#1675) ShaderNodes.cpp had missing classification information for Volume Shaders. This PR is a simple addition of that classification. * Add invert node to specification (AcademySoftwareFoundation#1676) The node exists in the standard library code, but is missing from the specification. * Improvements to facingratio - Fix syntax of input default values. - Use the invert node in facingratio for compactness. - Clarify the edge brighten example material. * Always build GLFW as a static library (AcademySoftwareFoundation#1680) Currently the embedded glfw build for MaterialXGraphEditor inherits the value of BUILD_SHARED_LIBS from MATERIALX_BUILD_SHARED_LIBS, but we're not installing libglfw, per AcademySoftwareFoundation#1245 the intention was to statically link. --------- Co-authored-by: Jonathan Stone <jstone@lucasfilm.com> Co-authored-by: mnikelsky <michael.nikelsky@autodesk.com> Co-authored-by: Eric Haines <erich@acm.org> Co-authored-by: Leo Belda <leo.belda@wanadoo.fr> Co-authored-by: Dhruv Govil <dgovil2@apple.com> Co-authored-by: ld-kerley <154285602+ld-kerley@users.noreply.github.com>

Added constructor for Matrix33 from 3 Vector3s

11599c0

friedererdmann marked this pull request as draft October 5, 2023 14:33

friedererdmann and others added 3 commits October 5, 2023 16:57

fixed typo in genosl_impl

08a6d57

fixed missing xml end tag in genmsl

e55cd26

renamed node to creatematrix

a5119c7

added signature for vector4

friedererdmann changed the title ~~WIP: Added constructor for Matrix33 from 3 Vector3s~~ WIP: Added creatematrix node to construct matrix from vector3 and vector4 Oct 5, 2023

friedererdmann added 9 commits October 10, 2023 15:27

Implemented missing interface, various bug fixes

fb071c4

Added matrix44 nodes to test material

eab31db

fixed glsl and msl duplicate file import

28cce2d

added usage of different signatures

formal test cases for creatematrix implementations

71b8efa

fixed nodedef name, fixed test output

a20052b

fixed mdl call

1ebc4d9

fixed include statement in osl code

43ca8cf

removed include of matrix33 in osl

c871d4f

fixed typo in signature of osl

d7b0264

friedererdmann changed the title ~~WIP: Added creatematrix node to construct matrix from vector3 and vector4~~ Added creatematrix node to construct matrix from vector3 and vector4 Oct 11, 2023

friedererdmann marked this pull request as ready for review October 11, 2023 16:35

kwokcb approved these changes Oct 12, 2023

View reviewed changes

jstone-lucasfilm added 3 commits October 15, 2023 14:04

Merge branch 'main' into main

cc7df02

Remove extra newlines

8f6c0c8

Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>

Merge branch 'main' into main

ace738c

jstone-lucasfilm added 3 commits November 1, 2023 10:28

Merge branch 'main' into main

307755f

Remove UI properties

76f6eb4

Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>

Fix typo

cf770c5

Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>

jstone-lucasfilm changed the title ~~Added creatematrix node to construct matrix from vector3 and vector4~~ Add creatematrix nodes to build matrices from vectors Nov 1, 2023

jstone-lucasfilm added 3 commits November 1, 2023 13:22

Add newline

6d98ae3

Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>

Remove extra newline

d68ce31

Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>

Use non-zero test inputs

50f5188

Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>

jstone-lucasfilm reviewed Nov 2, 2023

View reviewed changes

libraries/stdlib/stdlib_defs.mtlx Outdated Show resolved Hide resolved

jstone-lucasfilm added 3 commits November 29, 2023 08:14

Merge branch 'main' into main

dc6438f

Merge branch 'main' into main

a1be340

Use standard output names

c7e788d

jstone-lucasfilm approved these changes Jan 4, 2024

View reviewed changes

jstone-lucasfilm merged commit 5def239 into AcademySoftwareFoundation:main Jan 4, 2024
31 checks passed

jstone-lucasfilm mentioned this pull request Jan 4, 2024

add combine9 and combine16 so we can create matrices #912

Closed

jstone-lucasfilm mentioned this pull request Jan 17, 2024

Fix shader generation typos #1654

Merged

jstone-lucasfilm added a commit that referenced this pull request Jan 17, 2024

Fix shader generation typos

0375249

This changelist fixes a handful of minor typos in shader generation, introduced in #1355 and #1553.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add creatematrix nodes to build matrices from vectors #1553

Add creatematrix nodes to build matrices from vectors #1553

friedererdmann commented Oct 5, 2023 •

edited

Loading

linux-foundation-easycla bot commented Oct 5, 2023 •

edited

Loading

kwokcb commented Oct 5, 2023

friedererdmann commented Oct 12, 2023 •

edited

Loading

kwokcb left a comment

friedererdmann commented Nov 1, 2023

jstone-lucasfilm commented Nov 1, 2023

jstone-lucasfilm left a comment

jstone-lucasfilm left a comment

Add creatematrix nodes to build matrices from vectors #1553

Add creatematrix nodes to build matrices from vectors #1553

Conversation

friedererdmann commented Oct 5, 2023 • edited Loading

linux-foundation-easycla bot commented Oct 5, 2023 • edited Loading

kwokcb commented Oct 5, 2023

friedererdmann commented Oct 12, 2023 • edited Loading

kwokcb left a comment

Choose a reason for hiding this comment

friedererdmann commented Nov 1, 2023

jstone-lucasfilm commented Nov 1, 2023

jstone-lucasfilm left a comment

Choose a reason for hiding this comment

jstone-lucasfilm left a comment

Choose a reason for hiding this comment

friedererdmann commented Oct 5, 2023 •

edited

Loading

linux-foundation-easycla bot commented Oct 5, 2023 •

edited

Loading

friedererdmann commented Oct 12, 2023 •

edited

Loading