Merged in issue_21 (pull request #103)

Add wooden_case models with different types of pegs (#21)
This commit is contained in:
Nathan Koenig 2014-10-29 15:33:06 -07:00
commit 027771438c
4 changed files with 44 additions and 14 deletions

View File

@ -0,0 +1,16 @@
<?xml version="1.0"?>
<model>
<name>Wooden case with metal peg</name>
<version>1.0</version>
<sdf version='1.5'>model.sdf</sdf>
<author>
<name>Steve Peters</name>
<email>scpeters@osrfoundation.org</email>
</author>
<description>
The wooden ARAT case with with a single metal peg.
</description>
</model>

View File

@ -1,22 +1,21 @@
<?xml version="1.0" ?>
<sdf version="1.5">
<model name="metal_peg_board">
<model name="wooden_case_metal_peg">
<include>
<name>wooden_board</name>
<uri>model://wooden_board</uri>
<pose>0 0 0 0 0 0</pose>
<name>wooden_case</name>
<uri>model://wooden_case</uri>
</include>
<include>
<name>peg</name>
<uri>model://metal_peg</uri>
<pose>0 0.116 0 0 0 0</pose>
<pose>0.365774 0.216 0.01905 0 0 0</pose>
</include>
<joint name="board_peg" type="revolute">
<parent>wooden_board::base</parent>
<joint name="case_peg" type="revolute">
<child>peg::link</child>
<parent>wooden_case::lid</parent>
<axis>
<xyz>0 0 1</xyz>
<limit>

View File

@ -0,0 +1,16 @@
<?xml version="1.0"?>
<model>
<name>Wooden case with wooden peg</name>
<version>1.0</version>
<sdf version='1.5'>model.sdf</sdf>
<author>
<name>Steve Peters</name>
<email>scpeters@osrfoundation.org</email>
</author>
<description>
The wooden ARAT case with with a single wooden peg.
</description>
</model>

View File

@ -1,22 +1,21 @@
<?xml version="1.0" ?>
<sdf version="1.5">
<model name="wooden_peg_board">
<model name="wooden_case_wooden_peg">
<include>
<name>wooden_board</name>
<uri>model://wooden_board</uri>
<pose>0 0 0 0 0 0</pose>
<name>wooden_case</name>
<uri>model://wooden_case</uri>
</include>
<include>
<name>peg</name>
<uri>model://wooden_peg</uri>
<pose>0 0.116 0 0 0 0</pose>
<pose>0.365774 0.216 0.01905 0 0 0</pose>
</include>
<joint name="board_peg" type="revolute">
<parent>wooden_board::base</parent>
<joint name="case_peg" type="revolute">
<child>peg::link</child>
<parent>wooden_case::lid</parent>
<axis>
<xyz>0 0 1</xyz>
<limit>