Skip to content

Commit 0921129

Browse files
committed
use collider state
1 parent c1359f7 commit 0921129

File tree

1 file changed

+29
-5
lines changed

1 file changed

+29
-5
lines changed

genesis/utils/path_planing.py

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,10 @@ def _func_check_collision(
200200
obj_geom_end: ti.int32 = -1,
201201
):
202202
is_collision_detected = False
203-
for i_c in range(self._solver.collider.n_contacts[i_b]):
203+
for i_c in range(self._solver.collider._collider_state.n_contacts[i_b]):
204204
if not is_collision_detected:
205-
i_ga = self._solver.collider.contact_data[i_c, i_b].geom_a
206-
i_gb = self._solver.collider.contact_data[i_c, i_b].geom_b
205+
i_ga = self._solver.collider._collider_state.contact_data[i_c, i_b].geom_a
206+
i_gb = self._solver.collider._collider_state.contact_data[i_c, i_b].geom_b
207207

208208
is_ignored = False
209209
for i_p in range(ignore_geom_pairs.shape[0]):
@@ -366,7 +366,19 @@ def _kernel_rrt_step1(
366366
# set the steer result and collision check for i_b
367367
for i_q in range(self._entity.n_qs):
368368
self._solver.qpos[i_q + self._entity._q_start, i_b] = steer_result[i_q]
369-
self._solver._func_forward_kinematics_entity(self._entity._idx_in_solver, i_b)
369+
self._solver._func_forward_kinematics_entity(
370+
self._entity._idx_in_solver,
371+
i_b,
372+
self._solver.links_state,
373+
self._solver.links_info,
374+
self._solver.joints_state,
375+
self._solver.joints_info,
376+
self._solver.dofs_state,
377+
self._solver.dofs_info,
378+
self._solver.entities_info,
379+
self._solver._rigid_global_info,
380+
self._solver._static_rigid_sim_config,
381+
)
370382
self._solver._func_update_geoms(i_b)
371383

372384
@ti.kernel
@@ -686,7 +698,19 @@ def _kernel_rrt_connect_step1(
686698
# set the steer result and collision check for i_b
687699
for i_q in range(self._entity.n_qs):
688700
self._solver.qpos[i_q + self._entity._q_start, i_b] = steer_result[i_q]
689-
self._solver._func_forward_kinematics_entity(self._entity._idx_in_solver, i_b)
701+
self._solver._func_forward_kinematics_entity(
702+
self._entity._idx_in_solver,
703+
i_b,
704+
self._solver.links_state,
705+
self._solver.links_info,
706+
self._solver.joints_state,
707+
self._solver.joints_info,
708+
self._solver.dofs_state,
709+
self._solver.dofs_info,
710+
self._solver.entities_info,
711+
self._solver._rigid_global_info,
712+
self._solver._static_rigid_sim_config,
713+
)
690714
self._solver._func_update_geoms(i_b)
691715

692716
@ti.kernel

0 commit comments

Comments
 (0)