Skip to content

Commit

Permalink
Merge pull request #208 from AlexAntn/master
Browse files Browse the repository at this point in the history 
removed collisions from upper_arms
  • Loading branch information
@traversaro
traversaro authored Aug 31, 2021
2 parents e0f80a0 + 6e3e42e commit 36ca1b9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 80 deletions.
40 changes: 0 additions & 40 deletions simmechanics/data/icub3/ICUB_3_all_options.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -787,45 +787,5 @@ XMLBlobs:
<gazebo reference="r_wrist_yaw">
<implicitSpringDamper>1</implicitSpringDamper>
</gazebo>
- |
<gazebo reference="r_upper_arm">
<selfCollide>true</selfCollide>
<collision>
<surface>
<contact>
<collide_without_contact>true</collide_without_contact>
<ode/>
</contact>
<friction>
<ode/>
</friction>
</surface>
</collision>
<sensor name='r_upper_arm_collision_sensor' type='contact'>
<contact>
<collision>collision_right</collision>
</contact>
</sensor>
</gazebo>
- |
<gazebo reference="l_upper_arm">
<selfCollide>true</selfCollide>
<collision>
<surface>
<contact>
<collide_without_contact>true</collide_without_contact>
<ode/>
</contact>
<friction>
<ode/>
</friction>
</surface>
</collision>
<sensor name='l_upper_arm_collision_sensor' type='contact'>
<contact>
<collision>collision_left</collision>
</contact>
</sensor>
</gazebo>
40 changes: 0 additions & 40 deletions simmechanics/data/icub3/ICUB_3_all_options_gazebo.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -875,46 +875,6 @@ XMLBlobs:
<gazebo reference="r_wrist_yaw">
<implicitSpringDamper>1</implicitSpringDamper>
</gazebo>
- |
<gazebo reference="r_upper_arm">
<selfCollide>true</selfCollide>
<collision>
<surface>
<contact>
<collide_without_contact>true</collide_without_contact>
<ode/>
</contact>
<friction>
<ode/>
</friction>
</surface>
</collision>
<sensor name='r_upper_arm_collision_sensor' type='contact'>
<contact>
<collision>collision_right</collision>
</contact>
</sensor>
</gazebo>
- |
<gazebo reference="l_upper_arm">
<selfCollide>true</selfCollide>
<collision>
<surface>
<contact>
<collide_without_contact>true</collide_without_contact>
<ode/>
</contact>
<friction>
<ode/>
</friction>
</surface>
</collision>
<sensor name='l_upper_arm_collision_sensor' type='contact'>
<contact>
<collision>collision_left</collision>
</contact>
</sensor>
</gazebo>



0 comments on commit 36ca1b9

Please sign in to comment.