From aa67a38cfb22fe42a1b24d1a063973c7079ece43 Mon Sep 17 00:00:00 2001 From: Sanjeev Kumar Date: Mon, 30 Dec 2024 17:17:39 +0100 Subject: [PATCH] Update metadata files name --- .../data/example_location_data1.yaml | 53 ------------- ...=> example_location_data_accessories.yaml} | 21 +++++ ...l => example_location_data_furniture.yaml} | 77 +++++++++++++------ ...a2.yaml => example_object_data_drink.yaml} | 0 ...ta1.yaml => example_object_data_food.yaml} | 2 +- 5 files changed, 77 insertions(+), 76 deletions(-) delete mode 100644 pyrobosim/pyrobosim/data/example_location_data1.yaml rename pyrobosim/pyrobosim/data/{example_location_data2.yaml => example_location_data_accessories.yaml} (62%) rename pyrobosim/pyrobosim/data/{example_location_data3.yaml => example_location_data_furniture.yaml} (59%) rename pyrobosim/pyrobosim/data/{example_object_data2.yaml => example_object_data_drink.yaml} (100%) rename pyrobosim/pyrobosim/data/{example_object_data1.yaml => example_object_data_food.yaml} (85%) diff --git a/pyrobosim/pyrobosim/data/example_location_data1.yaml b/pyrobosim/pyrobosim/data/example_location_data1.yaml deleted file mode 100644 index 44cb65ac..00000000 --- a/pyrobosim/pyrobosim/data/example_location_data1.yaml +++ /dev/null @@ -1,53 +0,0 @@ -table: - footprint: - type: box - dims: [0.9, 1.2] - height: 0.5 - nav_poses: - - position: # left - x: -0.75 - y: 0.0 - - position: # right - x: 0.75 - y: 0.0 - rotation_eul: - yaw: 3.14 - locations: - - name: "tabletop" - footprint: - type: parent - padding: 0.1 - color: [0.2, 0, 0] - -desk: - footprint: - type: polygon - coords: - - [-0.3, -0.3] - - [0.3, -0.3] - - [0.3, 0.3] - - [-0.3, 0.3] - height: 0.3 - locations: - - name: "desktop" - footprint: - type: parent - nav_poses: - - position: # below - x: 0.0 - y: -0.5 - rotation_eul: - yaw: 1.57 - - position: # left - x: -0.5 - y: 0.0 - - position: # above - x: 0.0 - y: 0.5 - rotation_eul: - yaw: -1.57 - - position: # right - x: 0.5 - y: 0.0 - rotation_eul: - yaw: 3.14 \ No newline at end of file diff --git a/pyrobosim/pyrobosim/data/example_location_data2.yaml b/pyrobosim/pyrobosim/data/example_location_data_accessories.yaml similarity index 62% rename from pyrobosim/pyrobosim/data/example_location_data2.yaml rename to pyrobosim/pyrobosim/data/example_location_data_accessories.yaml index d030490a..9ac22ddc 100644 --- a/pyrobosim/pyrobosim/data/example_location_data2.yaml +++ b/pyrobosim/pyrobosim/data/example_location_data_accessories.yaml @@ -1,3 +1,24 @@ +trash_can: + footprint: + type: mesh + model_path: $DATA/sample_models/first_2015_trash_can + mesh_path: meshes/trash_can.dae + locations: + - name: "top" + footprint: + type: parent + padding: 0.05 + nav_poses: + - position: # left + x: -0.5 + y: 0.0 + - position: # right + x: 0.5 + y: 0.0 + rotation_eul: + yaw: 3.14 + color: [0, 0.35, 0.2] + charger: footprint: type: polygon diff --git a/pyrobosim/pyrobosim/data/example_location_data3.yaml b/pyrobosim/pyrobosim/data/example_location_data_furniture.yaml similarity index 59% rename from pyrobosim/pyrobosim/data/example_location_data3.yaml rename to pyrobosim/pyrobosim/data/example_location_data_furniture.yaml index 02b602ba..9b4af23b 100644 --- a/pyrobosim/pyrobosim/data/example_location_data3.yaml +++ b/pyrobosim/pyrobosim/data/example_location_data_furniture.yaml @@ -1,3 +1,57 @@ +table: + footprint: + type: box + dims: [0.9, 1.2] + height: 0.5 + nav_poses: + - position: # left + x: -0.75 + y: 0.0 + - position: # right + x: 0.75 + y: 0.0 + rotation_eul: + yaw: 3.14 + locations: + - name: "tabletop" + footprint: + type: parent + padding: 0.1 + color: [0.2, 0, 0] + +desk: + footprint: + type: polygon + coords: + - [-0.3, -0.3] + - [0.3, -0.3] + - [0.3, 0.3] + - [-0.3, 0.3] + height: 0.3 + locations: + - name: "desktop" + footprint: + type: parent + nav_poses: + - position: # below + x: 0.0 + y: -0.5 + rotation_eul: + yaw: 1.57 + - position: # left + x: -0.5 + y: 0.0 + - position: # above + x: 0.0 + y: 0.5 + rotation_eul: + yaw: -1.57 + - position: # right + x: 0.5 + y: 0.0 + rotation_eul: + yaw: 3.14 + counter: footprint: type: box @@ -44,25 +98,4 @@ counter: y: 0.5 rotation_eul: yaw: -1.57 - color: [0, 0.2, 0] - -trash_can: - footprint: - type: mesh - model_path: $DATA/sample_models/first_2015_trash_can - mesh_path: meshes/trash_can.dae - locations: - - name: "top" - footprint: - type: parent - padding: 0.05 - nav_poses: - - position: # left - x: -0.5 - y: 0.0 - - position: # right - x: 0.5 - y: 0.0 - rotation_eul: - yaw: 3.14 - color: [0, 0.35, 0.2] + color: [0, 0.2, 0] \ No newline at end of file diff --git a/pyrobosim/pyrobosim/data/example_object_data2.yaml b/pyrobosim/pyrobosim/data/example_object_data_drink.yaml similarity index 100% rename from pyrobosim/pyrobosim/data/example_object_data2.yaml rename to pyrobosim/pyrobosim/data/example_object_data_drink.yaml diff --git a/pyrobosim/pyrobosim/data/example_object_data1.yaml b/pyrobosim/pyrobosim/data/example_object_data_food.yaml similarity index 85% rename from pyrobosim/pyrobosim/data/example_object_data1.yaml rename to pyrobosim/pyrobosim/data/example_object_data_food.yaml index 40262557..0ff9c1d9 100644 --- a/pyrobosim/pyrobosim/data/example_object_data1.yaml +++ b/pyrobosim/pyrobosim/data/example_object_data_food.yaml @@ -8,4 +8,4 @@ banana: footprint: type: box dims: [0.05, 0.2] - color: [0.7, 0.7, 0] \ No newline at end of file + color: [0.7, 0.7, 0]