p04798526
/
OmniGibson
mirror of https://github.com/StanfordVL/OmniGibson.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #889 from StanfordVL/small-fixes 

Various small fixes
This commit is contained in:
Cem Gökmen 2024-09-18 23:28:19 -07:00 committed by GitHub
parent 15f190baf4 700abcc25d
commit 52af9efeb3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
omnigibson/prims/entity_prim.py
View File

@ -1378,7 +1378,6 @@ class EntityPrim(XFormPrim):
Returns:
bool: Whether self-collisions are enabled for this prim or not
"""
assert self.articulated, "Cannot get self-collision for non-articulated EntityPrim!"
return lazy.omni.isaac.core.utils.prims.get_prim_property(
self.articulation_root_path, "physxArticulation:enabledSelfCollisions"
)
@ -1391,7 +1390,6 @@ class EntityPrim(XFormPrim):
Args:
flag (bool): Whether self collisions are enabled for this prim or not
"""
assert self.articulated, "Cannot set self-collision for non-articulated EntityPrim!"
lazy.omni.isaac.core.utils.prims.set_prim_property(
self.articulation_root_path, "physxArticulation:enabledSelfCollisions", flag
)

6
omnigibson/utils/usd_utils.py
View File

@ -361,7 +361,7 @@ class RigidContactAPIImpl:
interesting_col_paths = [
p for p in self._PATH_TO_COL_IDX[scene_idx].keys() if column_prim_paths is None or p in column_prim_paths
]
interesting_columns = [list(GripperRigidContactAPI.get_body_col_idx(pp))[1] for pp in interesting_col_paths]
interesting_columns = [list(self.get_body_col_idx(pp))[1] for pp in interesting_col_paths]
# Get the interesting-columns from the impulse matrix
interesting_impulse_columns = impulses[:, interesting_columns]
@ -369,9 +369,7 @@ class RigidContactAPIImpl:
interesting_impulse_columns.ndim == 2
), f"Impulse matrix should be 2D, found shape {interesting_impulse_columns.shape}"
interesting_row_idxes = th.nonzero(th.any(interesting_impulse_columns > 0, dim=1)).flatten()
interesting_row_paths = [
GripperRigidContactAPI.get_row_idx_prim_path(scene_idx, i) for i in interesting_row_idxes
]
interesting_row_paths = [self.get_row_idx_prim_path(scene_idx, i) for i in interesting_row_idxes]
# Filter out idxes by whether or not the row path is in the row prim paths list
if row_prim_paths is not None: