Merge pull request #2533 from erwincoumans/master

also enable simplified convex decomposition collision meshes for xarm…
This commit is contained in:
erwincoumans 2019-12-09 08:53:27 -08:00 committed by GitHub
commit 1b8d7be2b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -45,7 +45,7 @@
</visual>
<collision>
<geometry>
<mesh filename="package://xarm_description/meshes/xarm6/visual/base.stl"/>
<mesh filename="package://xarm_description/meshes/xarm6/collision/base_vhacd.obj"/>
</geometry>
<origin rpy="0 0 0" xyz="0 0 0"/>
</collision>
@ -65,7 +65,7 @@
</visual>
<collision>
<geometry>
<mesh filename="package://xarm_description/meshes/xarm6/visual/link1.stl"/>
<mesh filename="package://xarm_description/meshes/xarm6/collision/link1_vhacd.obj"/>
</geometry>
<origin rpy="0 0 0" xyz="0 0 0"/>
</collision>
@ -93,7 +93,7 @@
</visual>
<collision>
<geometry>
<mesh filename="package://xarm_description/meshes/xarm6/visual/link2.stl"/>
<mesh filename="package://xarm_description/meshes/xarm6/collision/link2_vhacd.obj"/>
</geometry>
<origin rpy="0 0 0" xyz="0 0 0"/>
</collision>
@ -121,7 +121,7 @@
</visual>
<collision>
<geometry>
<mesh filename="package://xarm_description/meshes/xarm6/visual/link3.stl"/>
<mesh filename="package://xarm_description/meshes/xarm6/collision/link3_vhacd.obj"/>
</geometry>
<origin rpy="0 0 0" xyz="0 0 0"/>
</collision>
@ -149,7 +149,7 @@
</visual>
<collision>
<geometry>
<mesh filename="package://xarm_description/meshes/xarm6/visual/link4.stl"/>
<mesh filename="package://xarm_description/meshes/xarm6/collision/link4_vhacd.obj"/>
</geometry>
<origin rpy="0 0 0" xyz="0 0 0"/>
</collision>
@ -177,7 +177,7 @@
</visual>
<collision>
<geometry>
<mesh filename="package://xarm_description/meshes/xarm6/visual/link5.stl"/>
<mesh filename="package://xarm_description/meshes/xarm6/collision/link5_vhacd.obj"/>
</geometry>
<origin rpy="0 0 0" xyz="0 0 0"/>
</collision>
@ -205,7 +205,7 @@
</visual>
<collision>
<geometry>
<mesh filename="package://xarm_description/meshes/xarm6/visual/link6.stl"/>
<mesh filename="package://xarm_description/meshes/xarm6/collision/link6_vhacd.obj"/>
</geometry>
<origin rpy="0 0 0" xyz="0 0 0"/>
</collision>