diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-05 21:52:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 21:52:39 +0100 |
| commit | 13aaa7312427e98661dba0183cbbee6bbc8f6542 (patch) | |
| tree | 5431544904e0ced5217295f750ecabd0d24ea950 /scene/resources/skeleton_modification_3d_jiggle.cpp | |
| parent | c7fefe50daebe2f3ae568baaa888ddb3cddfe5e1 (diff) | |
| parent | acbd24ea842cb90ab49cd66d5dc7220e57c73f29 (diff) | |
Merge pull request #54573 from nekomatata/query-parameters
Diffstat (limited to 'scene/resources/skeleton_modification_3d_jiggle.cpp')
| -rw-r--r-- | scene/resources/skeleton_modification_3d_jiggle.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scene/resources/skeleton_modification_3d_jiggle.cpp b/scene/resources/skeleton_modification_3d_jiggle.cpp index a6bcb0176a..2535f2b987 100644 --- a/scene/resources/skeleton_modification_3d_jiggle.cpp +++ b/scene/resources/skeleton_modification_3d_jiggle.cpp @@ -206,8 +206,12 @@ void SkeletonModification3DJiggle::_execute_jiggle_joint(int p_joint_idx, Node3D Transform3D new_bone_trans_world = stack->skeleton->global_pose_to_world_transform(new_bone_trans); Transform3D dynamic_position_world = stack->skeleton->global_pose_to_world_transform(Transform3D(Basis(), jiggle_data_chain[p_joint_idx].dynamic_position)); - bool ray_hit = space_state->intersect_ray(new_bone_trans_world.origin, dynamic_position_world.get_origin(), - ray_result, Set<RID>(), collision_mask); + PhysicsDirectSpaceState3D::RayParameters ray_params; + ray_params.from = new_bone_trans_world.origin; + ray_params.to = dynamic_position_world.get_origin(); + ray_params.collision_mask = collision_mask; + + bool ray_hit = space_state->intersect_ray(ray_params, ray_result); if (ray_hit) { jiggle_data_chain[p_joint_idx].dynamic_position = jiggle_data_chain[p_joint_idx].last_noncollision_position; |