adding normalmap variant taking a vector2 as input for scale as speci…

…fied in order to being able to fix normal maps with different orientations

libraries/stdlib/genglsl/mx_normalmap.glsl

@@ -14,3 +14,20 @@ void mx_normalmap(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,
  // Normalize the result.
  result = normalize(value);
 }
+
+void mx_normalmap_vector2(vec3 value, int map_space, vec2 normal_scale, vec3 N, vec3 T, out vec3 result)
+{
+ // Decode the normal map.
+ value = (value == vec3(0.0f)) ? vec3(0.0, 0.0, 1.0) : value * 2.0 - 1.0;
+
+ // Transform from tangent space if needed.
+ if (map_space == 0)
+ {
+ vec3 B = normalize(cross(N, T));
+ value.xy *= normal_scale;
+ value = T * value.x + B * value.y + N * value.z;
+ }
+
+ // Normalize the result.
+ result = normalize(value);
+}

libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx

@@ -43,6 +43,8 @@
 
  <!-- <normalmap> -->
  <implementation name="IM_normalmap_genglsl" nodedef="ND_normalmap" file="mx_normalmap.glsl" function="mx_normalmap" target="genglsl" />
+ <implementation name="IM_normalmap_vector2_genglsl" nodedef="ND_normalmap_vector2" file="mx_normalmap.glsl" function="mx_normalmap_vector2" target="genglsl" />
+
 
  <!-- ======================================================================== -->
  <!-- Procedural nodes -->

libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx

@@ -45,7 +45,7 @@
 
  <!-- <normalmap> -->
  <implementation name="IM_normalmap_genmdl" nodedef="ND_normalmap" sourcecode="mx::stdlib::mx_normalmap(mxp_in:{{in}}, mxp_space:{{space}}, mxp_scale:{{scale}}, mxp_normal:{{normal}}, mxp_tangent:{{tangent}})" target="genmdl" />
-
+ <implementation name="IM_normalmap_genmdl_vector2" nodedef="ND_normalmap_vector2" sourcecode="mx::stdlib::mx_normalmap_vector2(mxp_in:{{in}}, mxp_space:{{space}}, mxp_scale:{{scale}}, mxp_normal:{{normal}}, mxp_tangent:{{tangent}})" target="genmdl" />
  <!-- ======================================================================== -->
  <!-- Procedural nodes -->
  <!-- ======================================================================== -->

libraries/stdlib/genmsl/mx_normalmap.metal

@@ -14,3 +14,20 @@ void mx_normalmap(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,
  // Normalize the result.
  result = normalize(value);
 }
+
+void mx_normalmap_vector2(vec3 value, int map_space, vec2 normal_scale, vec3 N, vec3 T, out vec3 result)
+{
+ // Decode the normal map.
+ value = all(value == vec3(0.0f)) ? vec3(0.0, 0.0, 1.0) : value * 2.0 - 1.0;
+
+ // Transform from tangent space if needed.
+ if (map_space == 0)
+ {
+ vec3 B = normalize(cross(N, T));
+ value.xy *= normal_scale;
+ value = T * value.x + B * value.y + N * value.z;
+ }
+
+ // Normalize the result.
+ result = normalize(value);
+}

libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx

@@ -43,6 +43,7 @@
 
  <!-- <normalmap> -->
  <implementation name="IM_normalmap_genmsl" nodedef="ND_normalmap" file="mx_normalmap.metal" function="mx_normalmap" target="genmsl" />
+ <implementation name="IM_normalmap_vector2_genmsl" nodedef="ND_normalmap_vector2" file="mx_normalmap.metal" function="mx_normalmap_vector2" target="genmsl" />
 
  <!-- ======================================================================== -->
  <!-- Procedural nodes -->

libraries/stdlib/genosl/mx_normalmap.osl

@@ -15,3 +15,21 @@ void mx_normalmap(vector value, string map_space, float normal_scale, vector N,
  result = normalize(n);
  }
 }
+
+void mx_normalmap_vector2(vector value, string map_space, vector2 normal_scale, vector N, vector U, output vector result)
+{
+ // Tangent space
+ if (map_space == "tangent")
+ {
+ vector v = value * 2.0 - 1.0;
+ vector T = normalize(U - dot(U, N) * N);
+ vector B = normalize(cross(N, T));
+ result = normalize(T * v[0] * normal_scale[0] + B * v[1] * normal_scale[1] + N * v[2]);
+ }
+ // Object space
+ else
+ {
+ vector n = value * 2.0 - 1.0;
+ result = normalize(n);
+ }
+}

libraries/stdlib/genosl/stdlib_genosl_impl.mtlx

@@ -45,7 +45,7 @@
 
  <!-- <normalmap> -->
  <implementation name="IM_normalmap_genosl" nodedef="ND_normalmap" file="mx_normalmap.osl" function="mx_normalmap" target="genosl" />
-
+ <implementation name="IM_normalmap_vector2_genosl" nodedef="ND_normalmap_vector2" file="mx_normalmap.osl" function="mx_normalmap_vector2" target="genosl" />
  <!-- ======================================================================== -->
  <!-- Procedural nodes -->
  <!-- ======================================================================== -->

libraries/stdlib/stdlib_defs.mtlx

@@ -2287,6 +2287,14 @@
  <input name="tangent" type="vector3" defaultgeomprop="Tworld" />
  <output name="out" type="vector3" defaultinput="normal" />
  </nodedef>
+ <nodedef name="ND_normalmap_vector2" node="normalmap" nodegroup="math">
+ <input name="in" type="vector3" value="0.5, 0.5, 1.0" />
+ <input name="space" type="string" value="tangent" enum="tangent, object" uniform="true" />
+ <input name="scale" type="vector2" value="1.0, 1.0" />
+ <input name="normal" type="vector3" defaultgeomprop="Nworld" />
+ <input name="tangent" type="vector3" defaultgeomprop="Tworld" />
+ <output name="out" type="vector3" defaultinput="normal" />
+ </nodedef>
 
  <!--
  Node: <transpose>

source/MaterialXGenMdl/mdl/materialx/stdlib.mdl

@@ -2029,6 +2029,33 @@ export float3 mx_normalmap(
  }
 }
 
+export float3 mx_normalmap_vector2(
+ float3 mxp_in = float3(0.5, 0.5, 1.0),
+ uniform string mxp_space = string("tangent")
+ [[
+ anno::description("Enumeration {tangent, object}.")
+ ]],
+ float2 mxp_scale = float2(1.0, 1.0),
+ float3 mxp_normal = float3(::state::transform_normal(::state::coordinate_internal,::state::coordinate_world,::state::normal())),
+ float3 mxp_tangent = float3(state::transform_vector(::state::coordinate_internal,::state::coordinate_world,::state::texture_tangent_u(0)))
+)
+ [[
+ anno::description("Node Group: math")
+ ]]
+{
+ if (mxp_space == "tangent")
+ {
+ float3 v = mxp_in * 2.0 - 1.0;
+ float3 binormal = ::math::normalize(::math::cross(mxp_normal, mxp_tangent));
+ return ::math::normalize(mxp_tangent * v.x * mxp_scale.x + binormal * v.y * mxp_scale.y + mxp_normal * v.z);
+ }
+ else
+ {
+ float3 n = mxp_in * 2.0 - 1.0;
+ return ::math::normalize(n);
+ }
+}
+
 export float3x3 mx_transpose_matrix33(
  float3x3 mxp_in = float3x3(1.0,0.0,0.0, 0.0,1.0,0.0, 0.0,0.0,1.0)
 )