Fix CI.

Author: duburcqa

genesis/engine/entities/fem_entity.py

@@ -407,7 +407,7 @@ def sample(self):
                 # the solver will use 0 UVs for rendering. A mesh with 0 UVs means that no tangent directions can be recomputed,
                 # thus texture mapping and anisotropic surfaces will not work properly.
                 self._uvs = None
-                if mesh.visual.uv is not None:
+                if isinstance(mesh.visual, trimesh.visual.texture.TextureVisuals) and mesh.visual.uv is not None:
                     self._uvs = mesh.visual.uv.astype(gs.np_float, copy=True)
             else:
                 gs.raise_exception(f"Cloth material only supports Mesh morph. Got: {self.morph}.")

genesis/engine/mesh.py

@@ -241,12 +241,13 @@ def from_trimesh(
 
         mesh = mesh.copy(**(dict(include_cache=True) if isinstance(mesh, trimesh.Trimesh) else {}))
 
-        try:  # always parse uvs because roughness and normal map also need uvs
+        # Always parse uvs if available because roughness and normal map also need uvs.
+        # Note that some visual may not have uv, e.g. ColorVisuals.
+        uvs = None
+        if isinstance(mesh.visual, trimesh.visual.texture.TextureVisuals) and mesh.visual.uv is not None:
+            # Note that 'trimesh' uses uvs starting from top left corner.
             uvs = mesh.visual.uv.copy()
-            uvs[:, 1] = 1.0 - uvs[:, 1]  # trimesh uses uvs starting from top left corner
-        except AttributeError:
-            # Visual may not have uv, e.g. ColorVisuals
-            uvs = None
+            uvs[:, 1] = 1.0 - uvs[:, 1]
 
         metadata = metadata or {}
         must_update_surface = True

genesis/ext/pyrender/mesh.py

@@ -269,7 +269,7 @@ def _get_trimesh_props(mesh, smooth=False, material=None):
         # Process texture colors
         if mesh.visual.kind == "texture":
             # Configure UV coordinates
-            if mesh.visual.uv is not None:
+            if isinstance(mesh.visual, trimesh.visual.texture.TextureVisuals) and mesh.visual.uv is not None:
                 uv = mesh.visual.uv.copy()
                 if smooth:
                     texcoords = uv

genesis/utils/element.py

@@ -60,17 +60,15 @@ def mesh_to_elements(file, pos=(0, 0, 0), scale=1.0, tet_cfg=dict()):
 
     verts += np.array(pos)
 
-    # Extract UVs from mesh before tetrahedralization
-    # (tetgen preserves original vertices at start of output array)
-    n_original = len(mesh.vertices)
-    try:
-        original_uvs = mesh.visual.uv.copy()
-        original_uvs = original_uvs.astype(gs.np_float)
-    except AttributeError:
-        original_uvs = None
-
-    # Build full UV array: original vertices get their UVs, interior vertices get zeros
-    uvs = np.pad(original_uvs, ((0, len(verts) - n_original), (0, 0)))
+    # Build full UV array
+    uvs = None
+    if isinstance(mesh.visual, trimesh.visual.texture.TextureVisuals) and mesh.visual.uv is not None:
+        # Extract UVs from mesh before tetrahedralization.
+        # Note that 'tetgen' preserves original vertices at start of output array.
+        uvs_orig = mesh.visual.uv.astype(gs.np_float, copy=False)
+
+        # Original vertices get their UVs, interior vertices get zeros
+        uvs = np.pad(uvs_orig, ((0, len(verts) - len(mesh.vertices)), (0, 0)))
 
     return verts, elems, uvs
 

tests/utils.py

@@ -38,7 +38,7 @@
 DEFAULT_BRANCH_NAME = "main"
 
 HUGGINGFACE_ASSETS_REVISION = "ca29b66018b449a37738257a3a76a78529d29bcc"
-HUGGINGFACE_SNAPSHOT_REVISION = "c6ea95b0eeacd54bbf5aafb23646d5d6f89e1d45"
+HUGGINGFACE_SNAPSHOT_REVISION = "0cf1780dd70b67dc426023cd97738037f0d834e3"
 
 MESH_EXTENSIONS = (".mtl", *MESH_FORMATS, *GLTF_FORMATS, *USD_FORMATS)
 IMAGE_EXTENSIONS = (".png", ".jpg")