From 0424e2edb2122e17e62b2f831d0f85b9e760ee8b Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 23 Oct 2014 01:44:52 -0700 Subject: [PATCH 1/4] Add wooden_case models with different types of pegs --- wooden_case_metal_peg/model.config | 16 +++++++++++++++ wooden_case_metal_peg/model.rsdf | 30 +++++++++++++++++++++++++++++ wooden_case_metal_peg/model.sdf | 30 +++++++++++++++++++++++++++++ wooden_case_wooden_peg/model.config | 16 +++++++++++++++ wooden_case_wooden_peg/model.rsdf | 30 +++++++++++++++++++++++++++++ wooden_case_wooden_peg/model.sdf | 30 +++++++++++++++++++++++++++++ 6 files changed, 152 insertions(+) create mode 100644 wooden_case_metal_peg/model.config create mode 100644 wooden_case_metal_peg/model.rsdf create mode 100644 wooden_case_metal_peg/model.sdf create mode 100644 wooden_case_wooden_peg/model.config create mode 100644 wooden_case_wooden_peg/model.rsdf create mode 100644 wooden_case_wooden_peg/model.sdf diff --git a/wooden_case_metal_peg/model.config b/wooden_case_metal_peg/model.config new file mode 100644 index 0000000..c219a24 --- /dev/null +++ b/wooden_case_metal_peg/model.config @@ -0,0 +1,16 @@ + + + + Wooden case with metal peg + 1.0 + model.sdf + + + Steve Peters + scpeters@osrfoundation.org + + + + The wooden ARAT case with with a single metal peg. + + diff --git a/wooden_case_metal_peg/model.rsdf b/wooden_case_metal_peg/model.rsdf new file mode 100644 index 0000000..704352f --- /dev/null +++ b/wooden_case_metal_peg/model.rsdf @@ -0,0 +1,30 @@ + + + + + + wooden_case + model://wooden_case + 0 0 0 0 0 0 + + + + peg + model://metal_peg + 0.365774 0.216 0.01905 0 0 0 + + + + peg::link + wooden_case::lid + + 0 0 1 + + 0 + 0 + + + + + + diff --git a/wooden_case_metal_peg/model.sdf b/wooden_case_metal_peg/model.sdf new file mode 100644 index 0000000..704352f --- /dev/null +++ b/wooden_case_metal_peg/model.sdf @@ -0,0 +1,30 @@ + + + + + + wooden_case + model://wooden_case + 0 0 0 0 0 0 + + + + peg + model://metal_peg + 0.365774 0.216 0.01905 0 0 0 + + + + peg::link + wooden_case::lid + + 0 0 1 + + 0 + 0 + + + + + + diff --git a/wooden_case_wooden_peg/model.config b/wooden_case_wooden_peg/model.config new file mode 100644 index 0000000..5079537 --- /dev/null +++ b/wooden_case_wooden_peg/model.config @@ -0,0 +1,16 @@ + + + + Wooden case with wooden peg + 1.0 + model.sdf + + + Steve Peters + scpeters@osrfoundation.org + + + + The wooden ARAT case with with a single wooden peg. + + diff --git a/wooden_case_wooden_peg/model.rsdf b/wooden_case_wooden_peg/model.rsdf new file mode 100644 index 0000000..c59f0b5 --- /dev/null +++ b/wooden_case_wooden_peg/model.rsdf @@ -0,0 +1,30 @@ + + + + + + wooden_case + model://wooden_case + 0 0 0 0 0 0 + + + + peg + model://wooden_peg + 0.365774 0.216 0.01905 0 0 0 + + + + peg::link + wooden_case::lid + + 0 0 1 + + 0 + 0 + + + + + + diff --git a/wooden_case_wooden_peg/model.sdf b/wooden_case_wooden_peg/model.sdf new file mode 100644 index 0000000..c59f0b5 --- /dev/null +++ b/wooden_case_wooden_peg/model.sdf @@ -0,0 +1,30 @@ + + + + + + wooden_case + model://wooden_case + 0 0 0 0 0 0 + + + + peg + model://wooden_peg + 0.365774 0.216 0.01905 0 0 0 + + + + peg::link + wooden_case::lid + + 0 0 1 + + 0 + 0 + + + + + + From 87bc295c659908cba5dc8041ed4389c3018a4e65 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 23 Oct 2014 01:46:48 -0700 Subject: [PATCH 2/4] Remove rsdf files that don't actually use erb --- metal_peg_board/model.rsdf | 30 ------------------------------ wooden_case_metal_peg/model.rsdf | 30 ------------------------------ wooden_case_wooden_peg/model.rsdf | 30 ------------------------------ wooden_peg_board/model.rsdf | 30 ------------------------------ 4 files changed, 120 deletions(-) delete mode 100644 metal_peg_board/model.rsdf delete mode 100644 wooden_case_metal_peg/model.rsdf delete mode 100644 wooden_case_wooden_peg/model.rsdf delete mode 100644 wooden_peg_board/model.rsdf diff --git a/metal_peg_board/model.rsdf b/metal_peg_board/model.rsdf deleted file mode 100644 index b65c077..0000000 --- a/metal_peg_board/model.rsdf +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - wooden_board - model://wooden_board - 0 0 0 0 0 0 - - - - peg - model://metal_peg - 0 0.116 0 0 0 0 - - - - wooden_board::base - peg::link - - 0 0 1 - - 0 - 0 - - - - - - diff --git a/wooden_case_metal_peg/model.rsdf b/wooden_case_metal_peg/model.rsdf deleted file mode 100644 index 704352f..0000000 --- a/wooden_case_metal_peg/model.rsdf +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - wooden_case - model://wooden_case - 0 0 0 0 0 0 - - - - peg - model://metal_peg - 0.365774 0.216 0.01905 0 0 0 - - - - peg::link - wooden_case::lid - - 0 0 1 - - 0 - 0 - - - - - - diff --git a/wooden_case_wooden_peg/model.rsdf b/wooden_case_wooden_peg/model.rsdf deleted file mode 100644 index c59f0b5..0000000 --- a/wooden_case_wooden_peg/model.rsdf +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - wooden_case - model://wooden_case - 0 0 0 0 0 0 - - - - peg - model://wooden_peg - 0.365774 0.216 0.01905 0 0 0 - - - - peg::link - wooden_case::lid - - 0 0 1 - - 0 - 0 - - - - - - diff --git a/wooden_peg_board/model.rsdf b/wooden_peg_board/model.rsdf deleted file mode 100644 index 9de3554..0000000 --- a/wooden_peg_board/model.rsdf +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - wooden_board - model://wooden_board - 0 0 0 0 0 0 - - - - peg - model://wooden_peg - 0 0.116 0 0 0 0 - - - - wooden_board::base - peg::link - - 0 0 1 - - 0 - 0 - - - - - - From b12a6a73b6edfd390f199ee9a97a9bdb1d4e4b37 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 29 Oct 2014 14:53:28 -0700 Subject: [PATCH 3/4] Remove un-needed pose tags --- wooden_case_metal_peg/model.sdf | 1 - wooden_case_wooden_peg/model.sdf | 1 - 2 files changed, 2 deletions(-) diff --git a/wooden_case_metal_peg/model.sdf b/wooden_case_metal_peg/model.sdf index 704352f..609b828 100644 --- a/wooden_case_metal_peg/model.sdf +++ b/wooden_case_metal_peg/model.sdf @@ -5,7 +5,6 @@ wooden_case model://wooden_case - 0 0 0 0 0 0 diff --git a/wooden_case_wooden_peg/model.sdf b/wooden_case_wooden_peg/model.sdf index c59f0b5..ed81c35 100644 --- a/wooden_case_wooden_peg/model.sdf +++ b/wooden_case_wooden_peg/model.sdf @@ -5,7 +5,6 @@ wooden_case model://wooden_case - 0 0 0 0 0 0 From 73167b4ae7f4b0852e82fd5e8d4a3c0d1651f470 Mon Sep 17 00:00:00 2001 From: Nathan Koenig Date: Wed, 29 Oct 2014 15:33:06 -0700 Subject: [PATCH 4/4] Close branch issue_21