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