Initial commit legacy materials #1398
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit includes: - all Legacy (Protein) classes - procedural nodes (checker, noise, turbulence 2d/3d) - utilities (stain, normals combine nodes) For now all nodes are under "adsk_legacy" group, except the turbulence ones that might be ok to be added to the standard lib. Becasue of a bug in the handling of namespaces in the Graph Editor all namespaces are set to "". Bug: AcademySoftwareFoundation#1695
|
@zicher3d can you include an example mtlx for legacy |
|
Will do. I have one that works in MaterialX viewer. I need to update it. |
Comment on lines
+11
to
+12
| <implementation name="IM_turbulence2d_float_genglsl" nodedef="ND_turbulence2d_float" file="mx_turbulence2d_float.glsl" function="mx_turbulence2d_float" target="genglsl" /> | ||
| <implementation name="IM_turbulence3d_float_genglsl" nodedef="ND_turbulence3d_float" file="mx_turbulence3d_float.glsl" function="mx_turbulence3d_float" target="genglsl" /> |
There was a problem hiding this comment.
did we already determine that the noise functions in question here are not available through the existing stdlib noise()?
There was a problem hiding this comment.
Yes, the current stdlib noise types are Perlin, Cell, Worley and Fractal
| <materialx version="1.38"> | ||
| <!-- | ||
| DESCRIPTION: Nodegraphs for Autodesk Legacy Material Classes | ||
| VERSION: 0.9.0 |
There was a problem hiding this comment.
we might want to revisit our version numbers
There was a problem hiding this comment.
Definetly. We can discuss that. Also I think we need an SHA value. Not sure about that process yet.
| <materialx version="1.38"> | ||
| <!-- | ||
| DESCRIPTION: Node Definitions for Autodesk Legacy Material Classes | ||
| VERSION: 0.9.0 |
There was a problem hiding this comment.
revisit the version number
This includes a single MTLX file and a set of textures. The MTLX file can be loaded in MaterialX Viewer and materials selected from the UI
|
Added a commit for the sample file, and related textures |
Adding values to all inputs to avoid warnings. This files generates no warning messages when loaded in MaterialX viewer Also fixing a small typo in the defs file
This is a USD test file that can be loaded in usdview to test the same materials that the legacy_materials_test.mtlx tests in MaterialX viewer. Open the file in usdview, select the ShaderBall object and in the Meta data panel you can select a variant for each material class. The legacy materials node defs are also updated to remove a stub for namespace that was causing trouble in usdview (but was ok in MaterialX viewer). A typo in the comments was also fixed.
Stubs for implementation of: - turbulence2d_float - turbulence3d_float in OSL and MDL. Currently returning a solid color. This is just to check the build warnings.
Just a test to see if hardcoded expected skip count does influence overall implementation counters and failure to match. Testing for glsl only.
This reverts commit 12e011f.
Tests were failing because the node turbulence2D was defined but never used in any TestSuite file. Adding a other.mtlx as a container for these orphans nodes. Note that for consistency I also added turbulence3d in there, even if not necessary as it's used in the main material test file.
ashwinbhat
approved these changes
Mar 13, 2024
|
Let's squash the commits from this PR and merge. |
nicolassavva-autodesk
approved these changes
Mar 13, 2024
| --> | ||
|
|
||
| <!-- <Color Stain> --> | ||
| <nodedef name="ND_legacy_stain_color3" node="legacy_stain" version="1.0" isdefaultversion="true" nodegroup="adsk_legacy" namespace="" > |
There was a problem hiding this comment.
some node versions are 1.0 while others are set to 0.1 in this set.
let's be consistent with whatever we decide to use for the first drop.
ashwinbhat
pushed a commit
that referenced
this pull request
Apr 9, 2024
* Initial commit legacy materials This commit includes: - all Legacy (Protein) classes - procedural nodes (checker, noise, turbulence 2d/3d) - utilities (stain, normals combine nodes) For now all nodes are under "adsk_legacy" group, except the turbulence ones that might be ok to be added to the standard lib. Becasue of a bug in the handling of namespaces in the Graph Editor all namespaces are set to "". Bug: AcademySoftwareFoundation#1695 * Test files for legacy material This includes a single MTLX file and a set of textures. The MTLX file can be loaded in MaterialX Viewer and materials selected from the UI * Adding values to test file Adding values to all inputs to avoid warnings. This files generates no warning messages when loaded in MaterialX viewer Also fixing a small typo in the defs file * USD test file This is a USD test file that can be loaded in usdview to test the same materials that the legacy_materials_test.mtlx tests in MaterialX viewer. Open the file in usdview, select the ShaderBall object and in the Meta data panel you can select a variant for each material class. The legacy materials node defs are also updated to remove a stub for namespace that was causing trouble in usdview (but was ok in MaterialX viewer). A typo in the comments was also fixed. * Stubs for OSL and MDL turbulence noise Stubs for implementation of: - turbulence2d_float - turbulence3d_float in OSL and MDL. Currently returning a solid color. This is just to check the build warnings. * Test for matching implementation count Just a test to see if hardcoded expected skip count does influence overall implementation counters and failure to match. Testing for glsl only. * Revert "Test for matching implementation count" This reverts commit 12e011f. * Added test mtlx file for unused nodedefs Tests were failing because the node turbulence2D was defined but never used in any TestSuite file. Adding a other.mtlx as a container for these orphans nodes. Note that for consistency I also added turbulence3d in there, even if not necessary as it's used in the main material test file.
ashwinbhat
pushed a commit
that referenced
this pull request
Apr 12, 2024
* Initial commit legacy materials This commit includes: - all Legacy (Protein) classes - procedural nodes (checker, noise, turbulence 2d/3d) - utilities (stain, normals combine nodes) For now all nodes are under "adsk_legacy" group, except the turbulence ones that might be ok to be added to the standard lib. Becasue of a bug in the handling of namespaces in the Graph Editor all namespaces are set to "". Bug: AcademySoftwareFoundation#1695 * Test files for legacy material This includes a single MTLX file and a set of textures. The MTLX file can be loaded in MaterialX Viewer and materials selected from the UI * Adding values to test file Adding values to all inputs to avoid warnings. This files generates no warning messages when loaded in MaterialX viewer Also fixing a small typo in the defs file * USD test file This is a USD test file that can be loaded in usdview to test the same materials that the legacy_materials_test.mtlx tests in MaterialX viewer. Open the file in usdview, select the ShaderBall object and in the Meta data panel you can select a variant for each material class. The legacy materials node defs are also updated to remove a stub for namespace that was causing trouble in usdview (but was ok in MaterialX viewer). A typo in the comments was also fixed. * Stubs for OSL and MDL turbulence noise Stubs for implementation of: - turbulence2d_float - turbulence3d_float in OSL and MDL. Currently returning a solid color. This is just to check the build warnings. * Test for matching implementation count Just a test to see if hardcoded expected skip count does influence overall implementation counters and failure to match. Testing for glsl only. * Revert "Test for matching implementation count" This reverts commit 12e011f. * Added test mtlx file for unused nodedefs Tests were failing because the node turbulence2D was defined but never used in any TestSuite file. Adding a other.mtlx as a container for these orphans nodes. Note that for consistency I also added turbulence3d in there, even if not necessary as it's used in the main material test file.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit includes:
For now all nodes are under "adsk_legacy" group, except the turbulence ones that might be ok to be added to the standard lib.
Because of a bug in the handling of namespaces in the Graph Editor all namespaces are set to "".
Bug: AcademySoftwareFoundation#1695