From d664bae4e8045afaaa335c82389a61e67d71676c Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Sun, 7 Jan 2024 11:00:56 -0800 Subject: [PATCH] Add float suffix for clarity --- libraries/stdlib/genglsl/mx_normalmap.glsl | 2 +- libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx | 2 +- libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx | 3 ++- libraries/stdlib/genmsl/mx_normalmap.metal | 2 +- libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx | 2 +- libraries/stdlib/genosl/mx_normalmap.osl | 2 +- libraries/stdlib/genosl/stdlib_genosl_impl.mtlx | 3 ++- source/MaterialXGenMdl/mdl/materialx/stdlib.mdl | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libraries/stdlib/genglsl/mx_normalmap.glsl b/libraries/stdlib/genglsl/mx_normalmap.glsl index eae0692e2e..19e0797c4f 100644 --- a/libraries/stdlib/genglsl/mx_normalmap.glsl +++ b/libraries/stdlib/genglsl/mx_normalmap.glsl @@ -15,7 +15,7 @@ void mx_normalmap_vector2(vec3 value, int map_space, vec2 normal_scale, vec3 N, result = normalize(value); } -void mx_normalmap(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T, out vec3 result) +void mx_normalmap_float(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T, out vec3 result) { mx_normalmap_vector2(value, map_space, vec2(normal_scale), N, T, result); } diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx index b64be51554..570b4f4ed3 100644 --- a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx +++ b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx @@ -42,7 +42,7 @@ - + diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx index 7b3f3e7b8a..c614b38d9e 100644 --- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx +++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx @@ -44,8 +44,9 @@ - + + diff --git a/libraries/stdlib/genmsl/mx_normalmap.metal b/libraries/stdlib/genmsl/mx_normalmap.metal index 5b5d4fb2de..a3ffedaad5 100644 --- a/libraries/stdlib/genmsl/mx_normalmap.metal +++ b/libraries/stdlib/genmsl/mx_normalmap.metal @@ -15,7 +15,7 @@ void mx_normalmap_vector2(vec3 value, int map_space, vec2 normal_scale, vec3 N, result = normalize(value); } -void mx_normalmap(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T, out vec3 result) +void mx_normalmap_float(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T, out vec3 result) { mx_normalmap_vector2(value, map_space, vec2(normal_scale), N, T, result); } diff --git a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx index dad5fad1c5..c23ecdb601 100644 --- a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx +++ b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx @@ -42,7 +42,7 @@ - + diff --git a/libraries/stdlib/genosl/mx_normalmap.osl b/libraries/stdlib/genosl/mx_normalmap.osl index 572e666bd0..bf75781f51 100644 --- a/libraries/stdlib/genosl/mx_normalmap.osl +++ b/libraries/stdlib/genosl/mx_normalmap.osl @@ -16,7 +16,7 @@ void mx_normalmap_vector2(vector value, string map_space, vector2 normal_scale, } } -void mx_normalmap(vector value, string map_space, float normal_scale, vector N, vector U, output vector result) +void mx_normalmap_float(vector value, string map_space, float normal_scale, vector N, vector U, output vector result) { mx_normalmap_vector2(value, map_space, vector2(normal_scale, normal_scale), N, U, result); } diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx index cfadb38808..e5e3154975 100644 --- a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx +++ b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx @@ -44,8 +44,9 @@ - + + diff --git a/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl b/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl index 68092f37d1..708ea15603 100644 --- a/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl +++ b/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl @@ -2087,7 +2087,7 @@ export float3 mx_normalmap_vector2( } } -export float3 mx_normalmap( +export float3 mx_normalmap_float( float3 mxp_in = float3(0.5, 0.5, 1.0), uniform string mxp_space = string("tangent") [[