Add support for normal maps in mujoco file format plugin

PiperOrigin-RevId: 771992722
Change-Id: Ifeae9e12f1071018112e697402361caa84095ff2

src/experimental/usd/plugins/mjcf/mujoco_to_usd.cc

@@ -21,6 +21,7 @@
 #include <utility>
 #include <vector>
 
+#include <mujoco/mjspec.h>
 #include <mujoco/mujoco.h>
 #include "third_party/mujoco/src/experimental/usd/mjcPhysics/tokens.h"
 #include "mjcf/utils.h"
@@ -94,6 +95,7 @@ TF_DEFINE_PRIVATE_TOKENS(kTokens,
                          ((inputsMetallic, "inputs:metallic"))
                          (repeat)
                          ((sourceMesh, pxr::UsdGeomTokens->Mesh))
+                         ((inputsNormal, "inputs:normal"))
                         );
 
 // Using to satisfy TF_REGISTRY_FUNCTION macro below and avoid operating in PXR_NS.
@@ -630,12 +632,10 @@ class ModelWriter {
     }
   }
 
-  pxr::SdfPath AddTextureShader(const pxr::SdfPath &material_path,
+  pxr::SdfPath AddUVTextureShader(const pxr::SdfPath &material_path,
-                                const char *texture_file) {
+                                  const pxr::TfToken &name) {
-    // Shader "uvmap"
     pxr::SdfPath uvmap_shader_path =
-        CreatePrimSpec(data_, material_path, pxr::TfToken("uvmap"),
+        CreatePrimSpec(data_, material_path, name, pxr::UsdShadeTokens->Shader);
-                       pxr::UsdShadeTokens->Shader);
 
     pxr::SdfPath uvmap_info_id_attr = CreateAttributeSpec(
         data_, uvmap_shader_path, pxr::UsdShadeTokens->infoId,
@@ -652,10 +652,15 @@ class ModelWriter {
         CreateAttributeSpec(data_, uvmap_shader_path, kTokens->outputsSt,
                             pxr::SdfValueTypeNames->Float2);
 
-    // Shader "texture"
+    return uvmap_st_output_attr;
+  }
+
+  pxr::SdfPath AddTextureShader(const pxr::SdfPath &material_path,
+                                const char *texture_file,
+                                const pxr::TfToken &name,
+                                const pxr::SdfPath &uvmap_st_output_attr) {
     pxr::SdfPath texture_shader_path =
-        CreatePrimSpec(data_, material_path, pxr::TfToken("texture"),
+        CreatePrimSpec(data_, material_path, name, pxr::UsdShadeTokens->Shader);
-                       pxr::UsdShadeTokens->Shader);
     pxr::SdfPath texture_info_id_attr = CreateAttributeSpec(
         data_, texture_shader_path, pxr::UsdShadeTokens->infoId,
         pxr::SdfValueTypeNames->Token, pxr::SdfVariabilityUniform);
@@ -715,21 +720,44 @@ class ModelWriter {
                             pxr::UsdShadeTokens->outputsDisplacement,
                             pxr::SdfValueTypeNames->Token);
 
+    const pxr::SdfPath &uvmap_st_output_attr =
+        AddUVTextureShader(material_path, pxr::TfToken("uvmap"));
+
+    // Find the normal texture if specified.
+    const mjStringVec &textures = *(material->textures);
+    if (mjTEXROLE_NORMAL < textures.size()) {
+      std::string normal_texture_name = textures[mjTEXROLE_NORMAL];
+      mjsTexture *normal_texture = mjs_asTexture(
+          mjs_findElement(spec_, mjOBJ_TEXTURE, normal_texture_name.c_str()));
+      if (normal_texture) {
+        pxr::SdfPath normal_attr = CreateAttributeSpec(
+            data_, preview_surface_shader_path, kTokens->inputsNormal,
+            pxr::SdfValueTypeNames->Normal3f);
+        // Create the normal map shader and connect its output to the preview
+        // surface normal attr.
+        pxr::SdfPath normal_map_output_attr =
+            AddTextureShader(material_path, normal_texture->file->c_str(),
+                             pxr::TfToken("normal"), uvmap_st_output_attr);
+        AddAttributeConnection(data_, normal_attr, normal_map_output_attr);
+      }
+    }
+
     pxr::SdfPath diffuse_color_attr = CreateAttributeSpec(
         data_, preview_surface_shader_path, kTokens->inputsDiffuseColor,
         pxr::SdfValueTypeNames->Color3f);
 
     // Find the main texture if specified.
-    std::string main_texture_name = (*material->textures)[mjTEXROLE_RGB];
+    std::string main_texture_name = textures[mjTEXROLE_RGB];
     mjsTexture *main_texture = mjs_asTexture(
         mjs_findElement(spec_, mjOBJ_TEXTURE, main_texture_name.c_str()));
     if (main_texture) {
       // Create the texture shader and connect it to the diffuse color
       // attribute.
-      pxr::SdfPath texture_rgb_output_attr =
+      pxr::SdfPath texture_diffuse_output_attr =
-          AddTextureShader(material_path, main_texture->file->c_str());
+          AddTextureShader(material_path, main_texture->file->c_str(),
+                           pxr::TfToken("diffuse"), uvmap_st_output_attr);
       AddAttributeConnection(data_, diffuse_color_attr,
-                             texture_rgb_output_attr);
+                             texture_diffuse_output_attr);
     } else {
       // If no texture is specified, use the rgba diffuse color.
       SetAttributeDefault(data_, diffuse_color_attr,

test/experimental/usd/plugins/mjcf/mjcf_file_format_test.cc

@@ -148,15 +148,28 @@ TEST_F(MjcfSdfFileFormatPluginTest, TestMaterials) {
   EXPECT_PRIM_VALID(stage,
                     "/mesh_test/Materials/material_texture/PreviewSurface");
   EXPECT_PRIM_VALID(stage, "/mesh_test/Materials/material_texture/uvmap");
-  EXPECT_PRIM_VALID(stage, "/mesh_test/Materials/material_texture/texture");
+  EXPECT_PRIM_VALID(stage, "/mesh_test/Materials/material_texture/diffuse");
   ExpectAttributeHasConnection(
       stage,
       "/mesh_test/Materials/material_texture/"
       "PreviewSurface.inputs:diffuseColor",
-      "/mesh_test/Materials/material_texture/texture.outputs:rgb");
+      "/mesh_test/Materials/material_texture/diffuse.outputs:rgb");
   ExpectAttributeEqual(
-      stage, "/mesh_test/Materials/material_texture/texture.inputs:file",
+      stage, "/mesh_test/Materials/material_texture/diffuse.inputs:file",
       pxr::SdfAssetPath("textures/cube.png"));
+
+  EXPECT_PRIM_VALID(stage, "/mesh_test/Materials/material_layered");
+  EXPECT_PRIM_VALID(stage, "/mesh_test/Materials/material_layered/uvmap");
+  EXPECT_PRIM_VALID(stage, "/mesh_test/Materials/material_layered/diffuse");
+  EXPECT_PRIM_VALID(stage, "/mesh_test/Materials/material_layered/normal");
+  ExpectAttributeHasConnection(
+    stage,
+    "/mesh_test/Materials/material_layered/"
+    "PreviewSurface.inputs:normal",
+    "/mesh_test/Materials/material_layered/normal.outputs:rgb");
+  ExpectAttributeEqual(
+    stage, "/mesh_test/Materials/material_layered/normal.inputs:file",
+    pxr::SdfAssetPath("textures/normal.png"));
 }
 
 TEST_F(MjcfSdfFileFormatPluginTest, TestGeomRgba) {

test/experimental/usd/plugins/mjcf/testdata/materials.xml

@@ -1,8 +1,14 @@
 <mujoco model="mesh test">
   <asset>
-    <texture name="texture" file="textures/cube.png" type="2d" />
+    <texture name="diffuse_tex" file="textures/cube.png" type="2d" />
+    <texture name="normal_tex" file="textures/normal.png" type="2d" />
     <material name="material_red" rgba="0.8 0 0 1" />
-    <material name="material_texture" texture="texture" />
+    <material name="material_texture" texture="diffuse_tex" />
+    <material name="material_layered">
+      <layer texture="diffuse_tex" role="rgb"/>
+      <layer texture="normal_tex" role="normal"/>
+    </material>
+    2d texture="diffuse" normal="normal" />
     <mesh name="tetrahedron" vertex="0 0 0  1 0 0  0 1 0  0 0 1"/>
   </asset>
   <worldbody>