From 3e6f8e9a8da4d48dceccc0ade7fcd14148573a4f Mon Sep 17 00:00:00 2001 From: Jerry Gamache Date: Fri, 2 Aug 2024 14:14:14 -0400 Subject: [PATCH] Added uinames to ambiguously named nodes --- libraries/bxdf/disney_brdf_2012.mtlx | 2 +- libraries/bxdf/disney_brdf_2015.mtlx | 2 +- libraries/bxdf/gltf_pbr.mtlx | 16 +- libraries/bxdf/lama/lama_sss.mtlx | 2 +- libraries/bxdf/open_pbr_surface.mtlx | 2 +- .../open_pbr_to_standard_surface.mtlx | 2 +- .../standard_surface_to_gltf_pbr.mtlx | 2 +- .../standard_surface_to_open_pbr.mtlx | 2 +- .../translation/standard_surface_to_usd.mtlx | 2 +- libraries/bxdf/usd_preview_surface.mtlx | 24 +- libraries/cmlib/cmlib_defs.mtlx | 40 +- libraries/nprlib/nprlib_defs.mtlx | 4 +- libraries/pbrlib/pbrlib_defs.mtlx | 30 +- libraries/stdlib/stdlib_defs.mtlx | 494 +++++++++--------- 14 files changed, 312 insertions(+), 312 deletions(-) diff --git a/libraries/bxdf/disney_brdf_2012.mtlx b/libraries/bxdf/disney_brdf_2012.mtlx index d65e7dbc55..48e113d832 100644 --- a/libraries/bxdf/disney_brdf_2012.mtlx +++ b/libraries/bxdf/disney_brdf_2012.mtlx @@ -1,6 +1,6 @@ - + diff --git a/libraries/bxdf/disney_brdf_2015.mtlx b/libraries/bxdf/disney_brdf_2015.mtlx index 916c7d55af..5568791e42 100644 --- a/libraries/bxdf/disney_brdf_2015.mtlx +++ b/libraries/bxdf/disney_brdf_2015.mtlx @@ -1,6 +1,6 @@ - + diff --git a/libraries/bxdf/gltf_pbr.mtlx b/libraries/bxdf/gltf_pbr.mtlx index 390ca6e2a3..533f26ca6c 100644 --- a/libraries/bxdf/gltf_pbr.mtlx +++ b/libraries/bxdf/gltf_pbr.mtlx @@ -1,6 +1,6 @@ - + @@ -325,7 +325,7 @@ Node: Supplemental Node Multiply a color4 image modulated by uniform color and geometry color. Default uniform and geometry colors are 1,1,1,1 which results in no change to the image. --> - + @@ -384,7 +384,7 @@ Node: color3 image lookup which matches glTF --> - + @@ -439,7 +439,7 @@ Node: color4 image lookup which matches glTF --> - + @@ -494,7 +494,7 @@ Node: float image lookup which matches glTF --> - + @@ -549,7 +549,7 @@ Node: vector3 image lookup which matches glTF --> - + @@ -599,7 +599,7 @@ Node: normalmap image lookup which matches glTF --> - + @@ -652,7 +652,7 @@ Node: normalmap image lookup which matches glTF --> - + diff --git a/libraries/bxdf/lama/lama_sss.mtlx b/libraries/bxdf/lama/lama_sss.mtlx index ded26871ff..a114711566 100644 --- a/libraries/bxdf/lama/lama_sss.mtlx +++ b/libraries/bxdf/lama/lama_sss.mtlx @@ -1,6 +1,6 @@ - + - diff --git a/libraries/bxdf/translation/open_pbr_to_standard_surface.mtlx b/libraries/bxdf/translation/open_pbr_to_standard_surface.mtlx index c884a5fb8b..d24dcf9295 100644 --- a/libraries/bxdf/translation/open_pbr_to_standard_surface.mtlx +++ b/libraries/bxdf/translation/open_pbr_to_standard_surface.mtlx @@ -1,7 +1,7 @@ - + diff --git a/libraries/bxdf/translation/standard_surface_to_gltf_pbr.mtlx b/libraries/bxdf/translation/standard_surface_to_gltf_pbr.mtlx index 461e918400..632f17f28c 100644 --- a/libraries/bxdf/translation/standard_surface_to_gltf_pbr.mtlx +++ b/libraries/bxdf/translation/standard_surface_to_gltf_pbr.mtlx @@ -1,7 +1,7 @@ - + diff --git a/libraries/bxdf/translation/standard_surface_to_open_pbr.mtlx b/libraries/bxdf/translation/standard_surface_to_open_pbr.mtlx index b454af4384..06ff7ad7c2 100644 --- a/libraries/bxdf/translation/standard_surface_to_open_pbr.mtlx +++ b/libraries/bxdf/translation/standard_surface_to_open_pbr.mtlx @@ -1,7 +1,7 @@ - + diff --git a/libraries/bxdf/translation/standard_surface_to_usd.mtlx b/libraries/bxdf/translation/standard_surface_to_usd.mtlx index 099465e369..52a10c40f7 100644 --- a/libraries/bxdf/translation/standard_surface_to_usd.mtlx +++ b/libraries/bxdf/translation/standard_surface_to_usd.mtlx @@ -1,7 +1,7 @@ - + diff --git a/libraries/bxdf/usd_preview_surface.mtlx b/libraries/bxdf/usd_preview_surface.mtlx index 7106da779b..4f4569b9ba 100644 --- a/libraries/bxdf/usd_preview_surface.mtlx +++ b/libraries/bxdf/usd_preview_surface.mtlx @@ -6,7 +6,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -50,43 +50,43 @@ - + - + - + - + - + - + - + - + diff --git a/libraries/cmlib/cmlib_defs.mtlx b/libraries/cmlib/cmlib_defs.mtlx index 0f73109ea7..2e7449d753 100644 --- a/libraries/cmlib/cmlib_defs.mtlx +++ b/libraries/cmlib/cmlib_defs.mtlx @@ -7,102 +7,102 @@ Declarations of the default color transforms in MaterialX. --> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/libraries/nprlib/nprlib_defs.mtlx b/libraries/nprlib/nprlib_defs.mtlx index bb6d2e8ff0..492d57ef39 100644 --- a/libraries/nprlib/nprlib_defs.mtlx +++ b/libraries/nprlib/nprlib_defs.mtlx @@ -21,7 +21,7 @@ Node: The current scene view direction, as defined by the shading environment. --> - + @@ -31,7 +31,7 @@ Return the geometric facing ratio, computed as the dot product between the view direction and geometric normal. --> - + diff --git a/libraries/pbrlib/pbrlib_defs.mtlx b/libraries/pbrlib/pbrlib_defs.mtlx index 2e71f80611..4d840a9127 100644 --- a/libraries/pbrlib/pbrlib_defs.mtlx +++ b/libraries/pbrlib/pbrlib_defs.mtlx @@ -23,7 +23,7 @@ Node: A BSDF node for diffuse reflection. --> - + @@ -36,7 +36,7 @@ Node: A BSDF node for Burley diffuse reflection. --> - + @@ -48,7 +48,7 @@ Node: A BSDF node for diffuse transmission. --> - + @@ -59,7 +59,7 @@ Node: A reflection/transmission BSDF node based on a microfacet model and a Fresnel curve for dielectrics. --> - + @@ -77,7 +77,7 @@ Node: A reflection BSDF node based on a microfacet model and a Fresnel curve for conductors/metals. --> - + @@ -94,7 +94,7 @@ Node: A reflection/transmission BSDF node based on a microfacet model and a generalized Schlick Fresnel curve. --> - + @@ -114,7 +114,7 @@ Node: A subsurface scattering BSDF for true subsurface scattering. --> - + @@ -127,7 +127,7 @@ Node: A microfacet BSDF for the back-scattering properties of cloth-like materials. --> - + @@ -144,7 +144,7 @@ Node: An EDF node for uniform emission. --> - + @@ -153,7 +153,7 @@ Node: Constructs an EDF emitting light inside a cone around the normal direction. --> - + @@ -165,7 +165,7 @@ Node: Constructs an EDF emitting light according to a measured IES light profile. --> - + @@ -177,7 +177,7 @@ Modifies an EDF with a directional factor. Attenuates the emission distribution of the base EDF according to a generalized Schlick fresnel function. --> - + @@ -193,7 +193,7 @@ Node: Constructs a VDF for pure light absorption. --> - + @@ -203,7 +203,7 @@ Constructs a VDF scattering light for a participating medium, based on the Henyey-Greenstein phase function. --> - + @@ -397,7 +397,7 @@ Node: Converts the artistic parameterization reflectivity and edge_color to complex IOR values. --> - + diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx index 943e36ec88..e396f5c68f 100644 --- a/libraries/stdlib/stdlib_defs.mtlx +++ b/libraries/stdlib/stdlib_defs.mtlx @@ -84,7 +84,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -207,7 +207,7 @@ Samples data from a single image, with provisions for tiling and offsetting the image across uv space. --> - + @@ -221,7 +221,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -249,7 +249,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -277,7 +277,7 @@ - + @@ -298,7 +298,7 @@ representation of the images along each of the three respective coordinate axes, computing an adjustable weighted blend of the three samples using the geometric normal. --> - + @@ -316,7 +316,7 @@ - + @@ -334,7 +334,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -469,37 +469,37 @@ Node: A left-to-right bilinear value ramp. --> - + - + - + - + - + - + @@ -510,37 +510,37 @@ Node: A top-to-bottom bilinear value ramp. --> - + - + - + - + - + - + @@ -551,7 +551,7 @@ Node: Supplemental Node A 4-corner bilinear value ramp. --> - + @@ -559,7 +559,7 @@ - + @@ -567,7 +567,7 @@ - + @@ -575,7 +575,7 @@ - + @@ -583,7 +583,7 @@ - + @@ -591,7 +591,7 @@ - + @@ -604,42 +604,42 @@ Node: A left-right split matte, split at a specified u value. --> - + - + - + - + - + - + @@ -650,42 +650,42 @@ Node: A top-bottom split matte, split at a specified v value. --> - + - + - + - + - + - + @@ -697,67 +697,67 @@ Node: 2D Perlin noise in 1, 2, 3 or 4 channels. --> - + - + - + - + - + - + - + - + - + - + - + @@ -768,67 +768,67 @@ Node: 3D Perlin noise in 1, 2, 3 or 4 channels. --> - + - + - + - + - + - + - + - + - + - + - + @@ -839,7 +839,7 @@ Node: 3D Fractal noise in 1, 2, 3 or 4 channels. --> - + @@ -847,7 +847,7 @@ - + @@ -855,7 +855,7 @@ - + @@ -863,7 +863,7 @@ - + @@ -871,7 +871,7 @@ - + @@ -879,7 +879,7 @@ - + @@ -887,7 +887,7 @@ - + @@ -895,7 +895,7 @@ - + @@ -903,7 +903,7 @@ - + @@ -911,7 +911,7 @@ - + @@ -919,7 +919,7 @@ - + @@ -932,7 +932,7 @@ Node: 2D cellular noise in 1 channel. --> - + @@ -941,7 +941,7 @@ Node: 3D cellular noise in 1 channel. --> - + @@ -950,17 +950,17 @@ Node: 2D Worley (voronoi) noise in 1, 2 or 3 channels. --> - + - + - + @@ -970,17 +970,17 @@ Node: 3D Worley (voronoi) noise in 1, 2 or 3 channels. --> - + - + - + @@ -1003,7 +1003,7 @@ The output is 1 channel, with controls to adjust the output range. --> - + @@ -1022,7 +1022,7 @@ Node: The 3d flavor of . --> - + @@ -1041,14 +1041,14 @@ Node: Produces a randomized float, based on an 'input' signal and 'seed' value. --> - + - + @@ -1060,7 +1060,7 @@ Node: Produces a randomized RGB color, based on an 'input' signal and 'seed' value. --> - + @@ -1071,7 +1071,7 @@ - + @@ -1178,7 +1178,7 @@ Creates a black and white pattern of circles with a defined tiling and size (diameter). Pattern can be regular or staggered. --> - + @@ -1192,7 +1192,7 @@ Creates a black and white pattern of cloverleafs with a defined tiling and size (diameter of the circles circumscribing the shape). Pattern can be regular or staggered. --> - + @@ -1206,7 +1206,7 @@ Creates a black and white pattern of hexagons with a defined tiling and size (diameter of the circles circumscribing the shape). Pattern can be regular or staggered. --> - + @@ -1265,11 +1265,11 @@ Node: The full 2D or 3D texture coordinates associated with the currently processed data. --> - + - + @@ -1279,15 +1279,15 @@ The color associated with the current geometry at the current position, generally bound via per-vertex color values. --> - + - + - + @@ -1296,47 +1296,47 @@ Node: The value of the specified geometric property for the current geometry. --> - + - + - + - + - + - + - + - + - + @@ -1363,7 +1363,7 @@ Computes the ambient occlusion (0-1 float) at the current surface point. Larger values represent greater accessibility to ambient light, 0 means "fully occluded". --> - + @@ -1834,27 +1834,27 @@ Node: The per-channel absolute value of the incoming float/color/vector. --> - + - + - + - + - + - + @@ -2023,57 +2023,57 @@ Raise incoming float/color/vector values to the "in2" power. Negative "in1" values will result in negative output values. ie. out = sign(in1)*pow(abs(in1),in2) --> - + - + - + - + - + - + - + - + - + - + - + @@ -2515,17 +2515,17 @@ Node: Perform a dot product of two 2-4 channel vectors --> - + - + - + @@ -2535,7 +2535,7 @@ Node: Perform a cross product of two vectors --> - + @@ -2545,7 +2545,7 @@ Node: Transform a vector3 coordinate from one named space to another. --> - + @@ -2556,7 +2556,7 @@ Node: Transform a vector from one named space to another. --> - + @@ -2566,7 +2566,7 @@ Node: Transform a normal vector from one named space to another. --> - + @@ -2577,22 +2577,22 @@ Node: Transform a vector by a matrix. --> - + - + - + - + @@ -2602,7 +2602,7 @@ Node: Transform a normal vector from object or tangent space into "world" space. --> - + @@ -2610,7 +2610,7 @@ - + @@ -2649,11 +2649,11 @@ Node: Invert an incoming matrix. --> - + - + @@ -2662,7 +2662,7 @@ Node: Rotate a vector2 value about the origin. --> - + @@ -2672,7 +2672,7 @@ Node: Rotate a vector3 value about a specified unit axis vector --> - + @@ -2688,7 +2688,7 @@ -pivot, translate, rotate, scale, +pivot which does not introduce texture shear. Default is 0 "SRT" for backward compatibility. --> - + @@ -2703,7 +2703,7 @@ Generate a triangle wave from the given scalar input. The generated wave ranges from zero to one and repeats on integer boundaries. --> - + @@ -2832,67 +2832,67 @@ Outputs a smooth (hermite-interpolated) remapping of input values from low-high to output 0-1. --> - + - + - + - + - + - + - + - + - + - + - + @@ -2906,32 +2906,32 @@ lookup on input knot values and a forward spline through output knot values. All channels of the input will be remapped using the same curve. --> - + - + - + - + - + - + @@ -2957,19 +2957,19 @@ Nodes: and Convert an incoming color between RGB and HSV space, with H and S ranging from 0-1. --> - + - + - + - + @@ -3167,12 +3167,12 @@ to HSV, adding amount.x to the hue, multiplying the saturation by amount.y, multiplying the value by amount.z, then converting back to RGB. --> - + - + @@ -3202,7 +3202,7 @@ Combines various adjustment nodes into one, artist-friendly color correction node. The color4 signature does not touch the alpha channel. --> - + @@ -3214,7 +3214,7 @@ - + @@ -3235,7 +3235,7 @@ Node: Multiply the R or RGB channels of the input by the Alpha channel of the input. --> - + @@ -3245,7 +3245,7 @@ Divide the R or RGB channels of the input by the Alpha channel of the input. If the Alpha value is zero, it is passed through unchanged. --> - + @@ -3422,7 +3422,7 @@ F+B(1-f)/b if f+b>1 alpha: min(f+b,1) --> - + @@ -3628,138 +3628,138 @@ Node: Output the value of in1 if value1>value2, or the value of in2 if value1<=value2. --> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3769,138 +3769,138 @@ Node: Output the value of in1 if value1>=value2, or the value of in2 if value1 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3910,206 +3910,206 @@ Node: Output the value of in1 if value1==value2, or the value of in2 if value1!=value2. --> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4618,14 +4618,14 @@ Node Combine the the three vectors3 from stream into a matrix 33. --> - + - + @@ -4633,7 +4633,7 @@ - + @@ -4756,7 +4756,7 @@ Node: Convert a scalar height map to a normal map of type vector3. --> - +