Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions tests/testMaterial.py
Original file line number Diff line number Diff line change
Expand Up @@ -899,11 +899,27 @@ def test_mesh_subsets_materials(self):
self.assertTrue(subset_001_prim.IsA(UsdGeom.Subset))
self.check_material_binding(subset_001_prim, material_green)

subset = UsdGeom.Subset(subset_001_prim)
element_type = subset.GetElementTypeAttr().Get()
self.assertEqual(element_type, UsdGeom.Tokens.face)
family_name = subset.GetFamilyNameAttr().Get()
self.assertEqual(family_name, UsdShade.Tokens.materialBind)
family_type = subset.GetFamilyType(UsdGeom.Mesh(box_materials_prim), family_name)
self.assertEqual(family_type, UsdGeom.Tokens.partition)

subset_002_prim = box_materials_prim.GetChild("GeomSubset_002")
self.assertTrue(subset_002_prim.IsValid())
self.assertTrue(subset_002_prim.IsA(UsdGeom.Subset))
self.check_material_binding(subset_002_prim, material_red)

subset = UsdGeom.Subset(subset_002_prim)
element_type = subset.GetElementTypeAttr().Get()
self.assertEqual(element_type, UsdGeom.Tokens.face)
family_name = subset.GetFamilyNameAttr().Get()
self.assertEqual(family_name, UsdShade.Tokens.materialBind)
family_type = subset.GetFamilyType(UsdGeom.Mesh(box_materials_prim), family_name)
self.assertEqual(family_type, UsdGeom.Tokens.partition)

link_mesh_dae_prim = link_mesh_obj_prim.GetChild("link_mesh_dae")
box_materials_prim = link_mesh_dae_prim.GetChild("box_two_materials")
self.assertTrue(box_materials_prim.IsValid())
Expand All @@ -915,7 +931,23 @@ def test_mesh_subsets_materials(self):
self.assertTrue(subset_001_prim.IsA(UsdGeom.Subset))
self.check_material_binding(subset_001_prim, material_red_1)

subset = UsdGeom.Subset(subset_001_prim)
element_type = subset.GetElementTypeAttr().Get()
self.assertEqual(element_type, UsdGeom.Tokens.face)
family_name = subset.GetFamilyNameAttr().Get()
self.assertEqual(family_name, UsdShade.Tokens.materialBind)
family_type = subset.GetFamilyType(UsdGeom.Mesh(box_materials_prim), family_name)
self.assertEqual(family_type, UsdGeom.Tokens.partition)

subset_002_prim = box_materials_prim.GetChild("GeomSubset_002")
self.assertTrue(subset_002_prim.IsValid())
self.assertTrue(subset_002_prim.IsA(UsdGeom.Subset))
self.check_material_binding(subset_002_prim, material_green_1)

subset = UsdGeom.Subset(subset_002_prim)
element_type = subset.GetElementTypeAttr().Get()
self.assertEqual(element_type, UsdGeom.Tokens.face)
family_name = subset.GetFamilyNameAttr().Get()
self.assertEqual(family_name, UsdShade.Tokens.materialBind)
family_type = subset.GetFamilyType(UsdGeom.Mesh(box_materials_prim), family_name)
self.assertEqual(family_type, UsdGeom.Tokens.partition)
1 change: 1 addition & 0 deletions urdf_usd_converter/_impl/conversion_collada.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ def _convert_mesh(
geom_subset.GetIndicesAttr().Set(Vt.IntArray(face_indices))
geom_subset.GetElementTypeAttr().Set(UsdGeom.Tokens.face)
geom_subset.GetFamilyNameAttr().Set(UsdShade.Tokens.materialBind)
geom_subset.SetFamilyType(usd_mesh, UsdShade.Tokens.materialBind, UsdGeom.Tokens.partition)
subset_offset += face_offset

# Stores the material names referenced by geometry. Each primitive can have its own material.
Expand Down
1 change: 1 addition & 0 deletions urdf_usd_converter/_impl/mesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ def _mesh_subsets_obj(
geom_subset.GetIndicesAttr().Set(face_indices)
geom_subset.GetElementTypeAttr().Set(UsdGeom.Tokens.face)
geom_subset.GetFamilyNameAttr().Set(UsdShade.Tokens.materialBind)
geom_subset.SetFamilyType(mesh, UsdShade.Tokens.materialBind, UsdGeom.Tokens.partition)

# Store the material names for the mesh.
store_mesh_material_reference(input_path, mesh.GetPrim().GetName(), material_names, data)
Expand Down
Loading