Merge branch 'master' of https://github.com/erwincoumans/bullet3
This commit is contained in:
@@ -12,7 +12,6 @@
|
||||
<visual>
|
||||
<origin rpy="0 0 0" xyz="0 0 0.043794"/>
|
||||
<geometry>
|
||||
|
||||
<mesh filename="chassis.stl" scale="1 1 1"/>
|
||||
</geometry>
|
||||
<material name="yellow">
|
||||
@@ -22,14 +21,10 @@
|
||||
<collision>
|
||||
<origin rpy="-1.57 0 0" xyz="0 0 0.043794"/>
|
||||
<geometry>
|
||||
|
||||
<mesh filename="chassis_vhacd_mod.obj" scale="1 1 1"/>
|
||||
</geometry>
|
||||
</collision>
|
||||
</link>
|
||||
|
||||
|
||||
|
||||
<link name="FR_hip_motor">
|
||||
<contact>
|
||||
<lateral_friction value="1"/>
|
||||
@@ -123,9 +118,7 @@
|
||||
<mesh filename="lower_leg_3.stl" scale="1 1 1"/>
|
||||
</geometry>
|
||||
</collision>
|
||||
|
||||
</link>
|
||||
|
||||
<joint name="FR_lower_leg_2_upper_leg_joint" type="continuous">
|
||||
<axis xyz="1 0 0"/>
|
||||
<parent link="FR_upper_leg"/>
|
||||
|
||||
Reference in New Issue
Block a user