423A35C7/pytorch3d
1
0
Fork 0
mirror of https://github.com/facebookresearch/pytorch3d.git synced 2025-08-02 20:02:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

avoid recalculating normals for simple move

Browse Source 
Summary: If offset_verts_ is used to move meshes with a single vector, the normals won't change so don't need to recalculate. I am planning to allow user-specified vertex normals. This change means that user-specified vertex normals won't get overwritten when they don't need to be.

Reviewed By: nikhilaravi

Differential Revision: D27765256

fbshipit-source-id: f6e4d308ac9ac023030325cb75a18d39b966cf88
This commit is contained in:
Jeremy Reizenstein 2021-05-04 05:35:24 -07:00 committed by Facebook GitHub Bot
parent 17633808d8
commit 502f15aca7
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pytorch3d/structures/meshes.py
View File

@ -1263,7 +1263,10 @@ class Meshes(object):
""" """
verts_packed = self.verts_packed() verts_packed = self.verts_packed()
if vert_offsets_packed.shape == (3,): if vert_offsets_packed.shape == (3,):
update_normals = False
vert_offsets_packed = vert_offsets_packed.expand_as(verts_packed) vert_offsets_packed = vert_offsets_packed.expand_as(verts_packed)
else:
update_normals = True
if vert_offsets_packed.shape != verts_packed.shape: if vert_offsets_packed.shape != verts_packed.shape:
raise ValueError("Verts offsets must have dimension (all_v, 3).") raise ValueError("Verts offsets must have dimension (all_v, 3).")
# update verts packed # update verts packed
@ -1284,12 +1287,12 @@ class Meshes(object):
# update face areas and normals and vertex normals # update face areas and normals and vertex normals
# only if the original attributes are computed # only if the original attributes are computed
if any( if update_normals and any(
v is not None v is not None
for v in [self._faces_areas_packed, self._faces_normals_packed] for v in [self._faces_areas_packed, self._faces_normals_packed]
): ):
self._compute_face_areas_normals(refresh=True) self._compute_face_areas_normals(refresh=True)
if self._verts_normals_packed is not None: if update_normals and self._verts_normals_packed is not None:
self._compute_vertex_normals(refresh=True) self._compute_vertex_normals(refresh=True)
return self return self

9
tests/test_meshes.py
View File

@ -486,6 +486,7 @@ class TestMeshes(TestCaseMixin, unittest.TestCase):
self.assertClose( self.assertClose(
new_mesh.verts_normals_list()[i], new_mesh.verts_normals_list()[i],
new_mesh_naive.verts_normals_list()[i], new_mesh_naive.verts_normals_list()[i],
atol=1e-6,
) )
self.assertClose( self.assertClose(
new_mesh.faces_normals_list()[i], new_mesh.faces_normals_list()[i],
@ -533,10 +534,14 @@ class TestMeshes(TestCaseMixin, unittest.TestCase):
# check face areas, normals and vertex normals # check face areas, normals and vertex normals
self.assertClose( self.assertClose(
new_mesh.verts_normals_packed(), new_mesh_naive.verts_normals_packed() new_mesh.verts_normals_packed(),
new_mesh_naive.verts_normals_packed(),
atol=1e-6,
) )
self.assertClose( self.assertClose(
new_mesh.verts_normals_padded(), new_mesh_naive.verts_normals_padded() new_mesh.verts_normals_padded(),
new_mesh_naive.verts_normals_padded(),
atol=1e-6,
) )
self.assertClose( self.assertClose(
new_mesh.faces_normals_packed(), new_mesh_naive.faces_normals_packed() new_mesh.faces_normals_packed(), new_mesh_naive.faces_normals_packed()