Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 3 additions & 0 deletions scripts/demos/pick_and_place.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,9 @@ def _setup_scene(self):
pos = cloner.grid_transforms(self.scene.num_envs, self.scene.cfg.env_spacing, device=self.device)[0]
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions(global_prim_paths=["/World/ground"])
# add articulation to scene
self.scene.articulations["pick_and_place"] = self.pick_and_place
self.scene.rigid_objects["cube"] = self.cube
Expand Down
3 changes: 2 additions & 1 deletion scripts/tutorials/06_deploy/anymal_c_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ def _setup_scene(self):
pos = cloner.grid_transforms(self.scene.num_envs, self.scene.cfg.env_spacing, device=self.device)[0]
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)
if self.device == "cpu":
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions(global_prim_paths=[self.cfg.terrain.prim_path])
light_cfg = sim_utils.DomeLightCfg(intensity=2000.0, color=(0.75, 0.75, 0.75))
light_cfg.func("/World/Light", light_cfg)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Fixed
^^^^^

* Fixed ineffective joint actuation in direct-workflow PhysX environments by filtering collisions between
replicas on all simulation devices.
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ def _setup_scene(self):
pos = cloner.grid_transforms(self.scene.num_envs, self.scene.cfg.env_spacing, device=self.device)[0]
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)
# we need to explicitly filter collisions for CPU simulation
if self.device == "cpu":
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions(global_prim_paths=[self.cfg.terrain.prim_path])
# add lights
light_cfg = sim_utils.DomeLightCfg(intensity=2000.0, color=(0.75, 0.75, 0.75))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ def _setup_scene(self):
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)

if self.device == "cpu":
# we need to explicitly filter collisions for CPU simulation
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions()

self.scene.articulations["robot"] = self._robot
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ def _setup_scene(self):
pos = cloner.grid_transforms(self.scene.num_envs, self.scene.cfg.env_spacing, device=self.device)[0]
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)
# we need to explicitly filter collisions for CPU simulation
if self.device == "cpu":
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions(global_prim_paths=["/World/ground"])

# add articulation to scene
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ def _setup_scene(self):
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)

# we need to explicitly filter collisions for CPU simulation
if self.device == "cpu":
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions(global_prim_paths=[self.cfg.terrain.prim_path])

# add lights
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ def _setup_scene(self):
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)

if self.device == "cpu":
# we need to explicitly filter collisions for CPU simulation
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions(global_prim_paths=[])

# add articulation and sensors to scene
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ def _setup_scene(self):
pos = cloner.grid_transforms(self.scene.num_envs, self.scene.cfg.env_spacing, device=self.device)[0]
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)
# we need to explicitly filter collisions for CPU simulation
if self.device == "cpu":
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions(global_prim_paths=[])

# add articulation to scene
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ def _setup_scene(self):
pos = cloner.grid_transforms(self.scene.num_envs, self.scene.cfg.env_spacing, device=self.device)[0]
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions(global_prim_paths=["/World/ground"])
# add articulation to scene - we must register to scene to randomize with EventManager
self.scene.articulations["right_robot"] = self.right_hand
self.scene.articulations["left_robot"] = self.left_hand
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ def _setup_scene(self):
pos = cloner.grid_transforms(self.scene.num_envs, self.scene.cfg.env_spacing, device=self.device)[0]
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)
# we need to explicitly filter collisions for CPU simulation
if self.device == "cpu":
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions(global_prim_paths=[self.cfg.terrain.prim_path])
# add articulation to scene
self.scene.articulations["robot"] = self.robot
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ def _setup_scene(self):
pos = cloner.grid_transforms(self.scene.num_envs, self.scene.cfg.env_spacing, device=self.device)[0]
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)
# we need to explicitly filter collisions for CPU simulation
if self.device == "cpu":
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions(global_prim_paths=[])
# add articulation to scene
self.scene.articulations["robot"] = self.robot
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ def _setup_scene(self):
pos = cloner.grid_transforms(self.scene.num_envs, self.scene.cfg.env_spacing, device=self.device)[0]
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions(global_prim_paths=[])
# add articulation to scene - we must register to scene to randomize with EventManager
self.scene.articulations["robot"] = self.hand
self.scene.rigid_objects["object"] = self.object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ def _setup_scene(self):
pos = cloner.grid_transforms(self.scene.num_envs, self.scene.cfg.env_spacing, device=self.device)[0]
plan = cloner.clone_plan_from_env_0(src, dest, self.scene.num_envs, self.device, pos)
cloner.replicate(plan, stage=self.scene.stage)
# PhysX replication requires explicit collision filtering between environments.
if "physx" in self.scene.physics_backend:
self.scene.filter_collisions(global_prim_paths=["/World/ground"])
# add articulation to scene - we must register to scene to randomize with EventManager
self.scene.articulations["robot"] = self.hand
self.scene.rigid_objects["object"] = self.object
Expand Down
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Loading