diff --git a/models/apple/materials/textures/apple.png b/models/apple/materials/textures/apple.png deleted file mode 100644 index 5a0f378daa7b4bd54e1164783fb7e54b75221022..0000000000000000000000000000000000000000 Binary files a/models/apple/materials/textures/apple.png and /dev/null differ diff --git a/models/apple/model.sdf b/models/apple/model.sdf deleted file mode 100644 index 50c2f5a69029647182873a369c4856ac6920b1ce..0000000000000000000000000000000000000000 --- a/models/apple/model.sdf +++ /dev/null @@ -1,24 +0,0 @@ - - - - true - - - 0 0 0 0 0 0 - - - model://apple/meshes/apple.dae - - - - - 0 0 0 0 0 0 - - - model://apple/meshes/apple.dae - - - - - - diff --git a/models/banana/materials/textures/banana.png b/models/banana/materials/textures/banana.png deleted file mode 100644 index c998bf5e0560041c94d99b1915cf14f13422d0c0..0000000000000000000000000000000000000000 Binary files a/models/banana/materials/textures/banana.png and /dev/null differ diff --git a/models/banana/model.sdf b/models/banana/model.sdf deleted file mode 100644 index c620fbefa4364dcee11112c97592fe0adb3dfdfb..0000000000000000000000000000000000000000 --- a/models/banana/model.sdf +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - model://banana/meshes/banana.dae - - - - - - - model://banana/meshes/banana.dae - - - - - - diff --git a/models/coffee/materials/textures/coffee.png b/models/coffee/materials/textures/coffee.png deleted file mode 100644 index ed4585dbf1f7587e3ff166f12cd3a378e820f257..0000000000000000000000000000000000000000 Binary files a/models/coffee/materials/textures/coffee.png and /dev/null differ diff --git a/models/coffee/model.sdf b/models/coffee/model.sdf deleted file mode 100644 index 512a37e662ea074193fd3577144c2f3bda6dc2e9..0000000000000000000000000000000000000000 --- a/models/coffee/model.sdf +++ /dev/null @@ -1,24 +0,0 @@ - - - - true - - - 0 0 0 0 0 0 - - - model://coffee/meshes/coffee.dae - - - - - 0 0 0 0 0 0 - - - model://coffee/meshes/coffee.dae - - - - - - diff --git a/models/apple/.model.sdf.swp b/models/dining-room/.model.sdf.swp similarity index 100% rename from models/apple/.model.sdf.swp rename to models/dining-room/.model.sdf.swp diff --git a/models/dining-room/materials/textures/dining-room.png b/models/dining-room/materials/textures/dining-room.png new file mode 100644 index 0000000000000000000000000000000000000000..b745c145f58d68f463b7edf9aad718bc31e5977f Binary files /dev/null and b/models/dining-room/materials/textures/dining-room.png differ diff --git a/models/dining-room/materials/textures/dining-room_coffee_banana.png b/models/dining-room/materials/textures/dining-room_coffee_banana.png new file mode 100644 index 0000000000000000000000000000000000000000..cd2d2d7f21da460e00292517142e11d38b5bb106 Binary files /dev/null and b/models/dining-room/materials/textures/dining-room_coffee_banana.png differ diff --git a/models/coffee/meshes/coffee.dae b/models/dining-room/meshes/dining-room.dae similarity index 92% rename from models/coffee/meshes/coffee.dae rename to models/dining-room/meshes/dining-room.dae index def1bdef59310296d5ffc0c958ed39eaeaa20e2a..437eb4976fe1de3f374d0b4a9c2b04c81181b528 100644 --- a/models/coffee/meshes/coffee.dae +++ b/models/dining-room/meshes/dining-room.dae @@ -11,21 +11,21 @@ Z_UP - - coffee.png + + dining-room_coffee_banana.png - + - coffee_png + dining-room_png - + - coffee_png-surface + dining-room_png-surface @@ -37,7 +37,7 @@ 1 1 1 1 - + 0.5 0.5 0.5 1 diff --git a/models/banana/model.config b/models/dining-room/model.config similarity index 75% rename from models/banana/model.config rename to models/dining-room/model.config index 2cf859dd76c896b1029f9fde059b6c1bff90a7ad..be5a1c53d96e5305c18a28276e0e3b8d01fbc230 100644 --- a/models/banana/model.config +++ b/models/dining-room/model.config @@ -1,11 +1,11 @@ - banana + dining-room 1.0 model.sdf - banana + dining-room diff --git a/models/living_room/model.sdf b/models/dining-room/model.sdf similarity index 72% rename from models/living_room/model.sdf rename to models/dining-room/model.sdf index ad976490ada65c7552a32dd9e91c66a783df01b9..7c2783cbb2e2efd31743f023c344315fbcd155bc 100644 --- a/models/living_room/model.sdf +++ b/models/dining-room/model.sdf @@ -1,13 +1,13 @@ - + true 0 0 0 0 0 0 - model://living_room/meshes/living_room.dae + model://dining-room/meshes/dining-room.dae @@ -15,7 +15,7 @@ 0 0 0 0 0 0 - model://living_room/meshes/living_room.dae + model://dining-room/meshes/dining-room.dae diff --git a/models/dining_room/materials/textures/dining_room.png b/models/dining_room/materials/textures/dining_room.png deleted file mode 100644 index fb7094f7d6574f920fd22f5c7dd62f120afed9d4..0000000000000000000000000000000000000000 Binary files a/models/dining_room/materials/textures/dining_room.png and /dev/null differ diff --git a/models/dining_room/meshes/dining_room.dae b/models/dining_room/meshes/dining_room.dae deleted file mode 100644 index 2f48ef46f419eb44338f28c3797a03cafb628a56..0000000000000000000000000000000000000000 --- a/models/dining_room/meshes/dining_room.dae +++ /dev/null @@ -1,123 +0,0 @@ - - - - - Blender User - Blender 2.79.0 - - 2020-06-02T16:50:12 - 2020-06-02T16:50:12 - - Z_UP - - - - dining_room.png - - - - - - - - dining_room_png - - - - - dining_room_png-surface - - - - - - 1 1 1 1 - - - 1 1 1 1 - - - - - - 0.5 0.5 0.5 1 - - - 400 - - - 1 - - - - - - - - - - - - - - - - 1 1 -1 1 -1 -1 -1 -0.9999998 -1 -0.9999997 1 -1 1 0.9999995 1 0.9999994 -1.000001 1 -1 -0.9999997 1 -1 1 1 - - - - - - - - - - 0 0 -1 0 0 1 1 0 -2.38419e-7 0 -1 -4.76837e-7 -1 2.38419e-7 -1.49012e-7 2.68221e-7 1 2.38419e-7 0 0 -1 0 0 1 1 -5.96046e-7 3.27825e-7 -4.76837e-7 -1 0 -1 2.38419e-7 -1.19209e-7 2.08616e-7 1 0 - - - - - - - - - - 0 0 1 1 0 1 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0 0 1 1 0 1 1 0 0 1 0 0 0 0 1 0 1 1 1 0 1 1 0 1 1 0 1 1 0 1 1 0 1 1 0 1 0 0 1 0 1 1 1 0 1 1 0 1 - - - - - - - - - - - - - - -

0 0 0 2 0 1 3 0 2 7 1 3 5 1 4 4 1 5 4 2 6 1 2 7 0 2 8 5 3 9 2 3 10 1 3 11 2 4 12 7 4 13 3 4 14 0 5 15 7 5 16 4 5 17 0 6 18 1 6 19 2 6 20 7 7 21 6 7 22 5 7 23 4 8 24 5 8 25 1 8 26 5 9 27 6 9 28 2 9 29 2 10 30 6 10 31 7 10 32 0 11 33 3 11 34 7 11 35

- - - - - - - - - 0.09000003 0 0 0 0 0.09000003 0 0 0 0 0.09000003 0 0 0 0 1 - - - - - - - - - - - - - - diff --git a/models/dining_room/model.config b/models/dining_room/model.config deleted file mode 100644 index 082280f601e15b79ec40d6192f1aa0ad6461077d..0000000000000000000000000000000000000000 --- a/models/dining_room/model.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - dining_room - 1.0 - model.sdf - - - dining_room - - diff --git a/models/fanta/.model.sdf.swp b/models/fanta/.model.sdf.swp deleted file mode 100644 index 60497aa71fda85775ba437522fcec6d055ad7c94..0000000000000000000000000000000000000000 Binary files a/models/fanta/.model.sdf.swp and /dev/null differ diff --git a/models/fanta/materials/textures/fanta.png b/models/fanta/materials/textures/fanta.png deleted file mode 100644 index 9aeca48a65de50e2898ffab4436f5d1ae340c546..0000000000000000000000000000000000000000 Binary files a/models/fanta/materials/textures/fanta.png and /dev/null differ diff --git a/models/fanta/meshes/fanta.dae b/models/fanta/meshes/fanta.dae deleted file mode 100644 index 763727e1bedadeb95d9f294195f60f192fe054af..0000000000000000000000000000000000000000 --- a/models/fanta/meshes/fanta.dae +++ /dev/null @@ -1,123 +0,0 @@ - - - - - Blender User - Blender 2.79.0 - - 2020-06-02T16:50:12 - 2020-06-02T16:50:12 - - Z_UP - - - - fanta.png - - - - - - - - fanta_png - - - - - fanta_png-surface - - - - - - 1 1 1 1 - - - 1 1 1 1 - - - - - - 0.5 0.5 0.5 1 - - - 400 - - - 1 - - - - - - - - - - - - - - - - 1 1 -1 1 -1 -1 -1 -0.9999998 -1 -0.9999997 1 -1 1 0.9999995 1 0.9999994 -1.000001 1 -1 -0.9999997 1 -1 1 1 - - - - - - - - - - 0 0 -1 0 0 1 1 0 -2.38419e-7 0 -1 -4.76837e-7 -1 2.38419e-7 -1.49012e-7 2.68221e-7 1 2.38419e-7 0 0 -1 0 0 1 1 -5.96046e-7 3.27825e-7 -4.76837e-7 -1 0 -1 2.38419e-7 -1.19209e-7 2.08616e-7 1 0 - - - - - - - - - - 0 0 1 1 0 1 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0 0 1 1 0 1 1 0 0 1 0 0 0 0 1 0 1 1 1 0 1 1 0 1 1 0 1 1 0 1 1 0 1 1 0 1 0 0 1 0 1 1 1 0 1 1 0 1 - - - - - - - - - - - - - - -

0 0 0 2 0 1 3 0 2 7 1 3 5 1 4 4 1 5 4 2 6 1 2 7 0 2 8 5 3 9 2 3 10 1 3 11 2 4 12 7 4 13 3 4 14 0 5 15 7 5 16 4 5 17 0 6 18 1 6 19 2 6 20 7 7 21 6 7 22 5 7 23 4 8 24 5 8 25 1 8 26 5 9 27 6 9 28 2 9 29 2 10 30 6 10 31 7 10 32 0 11 33 3 11 34 7 11 35

- - - - - - - - - 0.09000003 0 0 0 0 0.09000003 0 0 0 0 0.09000003 0 0 0 0 1 - - - - - - - - - - - - - - diff --git a/models/fanta/model.config b/models/fanta/model.config deleted file mode 100644 index 4eeb001e2344b7cdf71a3526aa0e8370f394a133..0000000000000000000000000000000000000000 --- a/models/fanta/model.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - fanta - 1.0 - model.sdf - - - fanta - - diff --git a/models/fanta/model.sdf b/models/fanta/model.sdf deleted file mode 100644 index 50483f653ba5eec3b254fedaf1b4491d26e132ab..0000000000000000000000000000000000000000 --- a/models/fanta/model.sdf +++ /dev/null @@ -1,24 +0,0 @@ - - - - true - - - 0 0 0 0 0 0 - - - model://fanta/meshes/fanta.dae - - - - - 0 0 0 0 0 0 - - - model://fanta/meshes/fanta.dae - - - - - - diff --git a/models/kitchen/materials/textures/kitchen_fanta_apple.png b/models/kitchen/materials/textures/kitchen_fanta_apple.png new file mode 100644 index 0000000000000000000000000000000000000000..92bf06b8a3e0337775ac2d0fb378c69cb388b610 Binary files /dev/null and b/models/kitchen/materials/textures/kitchen_fanta_apple.png differ diff --git a/models/kitchen/meshes/kitchen.dae b/models/kitchen/meshes/kitchen.dae index e288299799b774fdab37c1db106244db435e756e..1094beab92c84a861cd2945d8900c967d3dbd3ac 100644 --- a/models/kitchen/meshes/kitchen.dae +++ b/models/kitchen/meshes/kitchen.dae @@ -12,7 +12,7 @@ - kitchen.png + kitchen_fanta_apple.png diff --git a/models/coffee/.model.sdf.swp b/models/living-room/.model.sdf.swp similarity index 100% rename from models/coffee/.model.sdf.swp rename to models/living-room/.model.sdf.swp diff --git a/models/living-room/materials/textures/living-room.png b/models/living-room/materials/textures/living-room.png new file mode 100644 index 0000000000000000000000000000000000000000..ed9fe84cbde08a9bb172a96df62196c2a446c2f1 Binary files /dev/null and b/models/living-room/materials/textures/living-room.png differ diff --git a/models/banana/meshes/banana.dae b/models/living-room/meshes/living-room.dae similarity index 92% rename from models/banana/meshes/banana.dae rename to models/living-room/meshes/living-room.dae index a692b65e0675d7b5c3d737054411b0f5969d5d33..1b5e5046da5a62ff61d1fd38a2506549b2bf4303 100644 --- a/models/banana/meshes/banana.dae +++ b/models/living-room/meshes/living-room.dae @@ -11,21 +11,21 @@ Z_UP - - banana.png + + living-room.png - + - banana_png + living-room_png - + - banana_png-surface + living-room_png-surface @@ -37,7 +37,7 @@ 1 1 1 1 - + 0.5 0.5 0.5 1 diff --git a/models/coffee/model.config b/models/living-room/model.config similarity index 75% rename from models/coffee/model.config rename to models/living-room/model.config index 551b4683d892eeb4694b9b31ccdd626f8a268bd5..d8daba2d66605d4175407d5f6ea363cc3ce49849 100644 --- a/models/coffee/model.config +++ b/models/living-room/model.config @@ -1,11 +1,11 @@ - coffee + living-room 1.0 model.sdf - coffee + living-room diff --git a/models/dining_room/model.sdf b/models/living-room/model.sdf similarity index 72% rename from models/dining_room/model.sdf rename to models/living-room/model.sdf index 9536b9b16a573be80c72dec6c0463190b3c3e825..ae8b73db39f4292aefad94cf3e3efe68fa662574 100644 --- a/models/dining_room/model.sdf +++ b/models/living-room/model.sdf @@ -1,13 +1,13 @@ - + true 0 0 0 0 0 0 - model://dining_room/meshes/dining_room.dae + model://living-room/meshes/living-room.dae @@ -15,7 +15,7 @@ 0 0 0 0 0 0 - model://dining_room/meshes/dining_room.dae + model://living-room/meshes/living-room.dae diff --git a/models/living_room/.model.sdf.swp b/models/living_room/.model.sdf.swp deleted file mode 100644 index 60497aa71fda85775ba437522fcec6d055ad7c94..0000000000000000000000000000000000000000 Binary files a/models/living_room/.model.sdf.swp and /dev/null differ diff --git a/models/living_room/materials/textures/living_room.png b/models/living_room/materials/textures/living_room.png deleted file mode 100644 index 55b89a2650f29d298e25cca98390d802c29a367a..0000000000000000000000000000000000000000 Binary files a/models/living_room/materials/textures/living_room.png and /dev/null differ diff --git a/models/living_room/meshes/living_room.dae b/models/living_room/meshes/living_room.dae deleted file mode 100644 index 160b5d2bd53eb4ebbb39d00cd050e774e29a6bd5..0000000000000000000000000000000000000000 --- a/models/living_room/meshes/living_room.dae +++ /dev/null @@ -1,123 +0,0 @@ - - - - - Blender User - Blender 2.79.0 - - 2020-06-02T16:50:12 - 2020-06-02T16:50:12 - - Z_UP - - - - living_room.png - - - - - - - - living_room_png - - - - - living_room_png-surface - - - - - - 1 1 1 1 - - - 1 1 1 1 - - - - - - 0.5 0.5 0.5 1 - - - 400 - - - 1 - - - - - - - - - - - - - - - - 1 1 -1 1 -1 -1 -1 -0.9999998 -1 -0.9999997 1 -1 1 0.9999995 1 0.9999994 -1.000001 1 -1 -0.9999997 1 -1 1 1 - - - - - - - - - - 0 0 -1 0 0 1 1 0 -2.38419e-7 0 -1 -4.76837e-7 -1 2.38419e-7 -1.49012e-7 2.68221e-7 1 2.38419e-7 0 0 -1 0 0 1 1 -5.96046e-7 3.27825e-7 -4.76837e-7 -1 0 -1 2.38419e-7 -1.19209e-7 2.08616e-7 1 0 - - - - - - - - - - 0 0 1 1 0 1 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0 0 1 1 0 1 1 0 0 1 0 0 0 0 1 0 1 1 1 0 1 1 0 1 1 0 1 1 0 1 1 0 1 1 0 1 0 0 1 0 1 1 1 0 1 1 0 1 - - - - - - - - - - - - - - -

0 0 0 2 0 1 3 0 2 7 1 3 5 1 4 4 1 5 4 2 6 1 2 7 0 2 8 5 3 9 2 3 10 1 3 11 2 4 12 7 4 13 3 4 14 0 5 15 7 5 16 4 5 17 0 6 18 1 6 19 2 6 20 7 7 21 6 7 22 5 7 23 4 8 24 5 8 25 1 8 26 5 9 27 6 9 28 2 9 29 2 10 30 6 10 31 7 10 32 0 11 33 3 11 34 7 11 35

- - - - - - - - - 0.09000003 0 0 0 0 0.09000003 0 0 0 0 0.09000003 0 0 0 0 1 - - - - - - - - - - - - - - diff --git a/models/living_room/model.config b/models/living_room/model.config deleted file mode 100644 index ec94ae8c4c7396447b3d4bd534d3d242379cc115..0000000000000000000000000000000000000000 --- a/models/living_room/model.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - living_room - 1.0 - model.sdf - - - living_room - - diff --git a/models/orange/materials/textures/orange.png b/models/orange/materials/textures/orange.png deleted file mode 100644 index b9be74438b7475805ff2bd6439e334e3abfb9f2d..0000000000000000000000000000000000000000 Binary files a/models/orange/materials/textures/orange.png and /dev/null differ diff --git a/models/orange/meshes/orange.dae b/models/orange/meshes/orange.dae deleted file mode 100644 index b1de704f499a61c7f435e2361a256bcc4852ae25..0000000000000000000000000000000000000000 --- a/models/orange/meshes/orange.dae +++ /dev/null @@ -1,123 +0,0 @@ - - - - - Blender User - Blender 2.79.0 - - 2020-06-02T16:50:12 - 2020-06-02T16:50:12 - - Z_UP - - - - orange.png - - - - - - - - orange_png - - - - - orange_png-surface - - - - - - 1 1 1 1 - - - 1 1 1 1 - - - - - - 0.5 0.5 0.5 1 - - - 400 - - - 1 - - - - - - - - - - - - - - - - 1 1 -1 1 -1 -1 -1 -0.9999998 -1 -0.9999997 1 -1 1 0.9999995 1 0.9999994 -1.000001 1 -1 -0.9999997 1 -1 1 1 - - - - - - - - - - 0 0 -1 0 0 1 1 0 -2.38419e-7 0 -1 -4.76837e-7 -1 2.38419e-7 -1.49012e-7 2.68221e-7 1 2.38419e-7 0 0 -1 0 0 1 1 -5.96046e-7 3.27825e-7 -4.76837e-7 -1 0 -1 2.38419e-7 -1.19209e-7 2.08616e-7 1 0 - - - - - - - - - - 0 0 1 1 0 1 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0 0 1 1 0 1 1 0 0 1 0 0 0 0 1 0 1 1 1 0 1 1 0 1 1 0 1 1 0 1 1 0 1 1 0 1 0 0 1 0 1 1 1 0 1 1 0 1 - - - - - - - - - - - - - - -

0 0 0 2 0 1 3 0 2 7 1 3 5 1 4 4 1 5 4 2 6 1 2 7 0 2 8 5 3 9 2 3 10 1 3 11 2 4 12 7 4 13 3 4 14 0 5 15 7 5 16 4 5 17 0 6 18 1 6 19 2 6 20 7 7 21 6 7 22 5 7 23 4 8 24 5 8 25 1 8 26 5 9 27 6 9 28 2 9 29 2 10 30 6 10 31 7 10 32 0 11 33 3 11 34 7 11 35

- - - - - - - - - 0.09000003 0 0 0 0 0.09000003 0 0 0 0 0.09000003 0 0 0 0 1 - - - - - - - - - - - - - - diff --git a/models/orange/model.config b/models/orange/model.config deleted file mode 100644 index 6d2c838d7bc00bcf5e95541fa86367eaa9242e37..0000000000000000000000000000000000000000 --- a/models/orange/model.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - orange - 1.0 - model.sdf - - - orange - - diff --git a/models/orange/model.sdf b/models/orange/model.sdf deleted file mode 100644 index 631f3fa5f08b8fe542583f96651429b12bb108dc..0000000000000000000000000000000000000000 --- a/models/orange/model.sdf +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - model://orange/meshes/orange.dae - - - - - - - model://orange/meshes/orange.dae - - - - - - diff --git a/models/snickers/.model.sdf.swp b/models/snickers/.model.sdf.swp deleted file mode 100644 index 60497aa71fda85775ba437522fcec6d055ad7c94..0000000000000000000000000000000000000000 Binary files a/models/snickers/.model.sdf.swp and /dev/null differ diff --git a/models/snickers/materials/textures/snickers.png b/models/snickers/materials/textures/snickers.png deleted file mode 100644 index 2e48d4436c040f5aa91ab7cad759d51664e6bed5..0000000000000000000000000000000000000000 Binary files a/models/snickers/materials/textures/snickers.png and /dev/null differ diff --git a/models/snickers/meshes/snickers.dae b/models/snickers/meshes/snickers.dae deleted file mode 100644 index a647921361f5817f8ed09dd0b74842213220cb02..0000000000000000000000000000000000000000 --- a/models/snickers/meshes/snickers.dae +++ /dev/null @@ -1,123 +0,0 @@ - - - - - Blender User - Blender 2.79.0 - - 2020-06-02T16:50:12 - 2020-06-02T16:50:12 - - Z_UP - - - - snickers.png - - - - - - - - snickers_png - - - - - snickers_png-surface - - - - - - 1 1 1 1 - - - 1 1 1 1 - - - - - - 0.5 0.5 0.5 1 - - - 400 - - - 1 - - - - - - - - - - - - - - - - 1 1 -1 1 -1 -1 -1 -0.9999998 -1 -0.9999997 1 -1 1 0.9999995 1 0.9999994 -1.000001 1 -1 -0.9999997 1 -1 1 1 - - - - - - - - - - 0 0 -1 0 0 1 1 0 -2.38419e-7 0 -1 -4.76837e-7 -1 2.38419e-7 -1.49012e-7 2.68221e-7 1 2.38419e-7 0 0 -1 0 0 1 1 -5.96046e-7 3.27825e-7 -4.76837e-7 -1 0 -1 2.38419e-7 -1.19209e-7 2.08616e-7 1 0 - - - - - - - - - - 0 0 1 1 0 1 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0 0 1 1 0 1 1 0 0 1 0 0 0 0 1 0 1 1 1 0 1 1 0 1 1 0 1 1 0 1 1 0 1 1 0 1 0 0 1 0 1 1 1 0 1 1 0 1 - - - - - - - - - - - - - - -

0 0 0 2 0 1 3 0 2 7 1 3 5 1 4 4 1 5 4 2 6 1 2 7 0 2 8 5 3 9 2 3 10 1 3 11 2 4 12 7 4 13 3 4 14 0 5 15 7 5 16 4 5 17 0 6 18 1 6 19 2 6 20 7 7 21 6 7 22 5 7 23 4 8 24 5 8 25 1 8 26 5 9 27 6 9 28 2 9 29 2 10 30 6 10 31 7 10 32 0 11 33 3 11 34 7 11 35

- - - - - - - - - 0.09000003 0 0 0 0 0.09000003 0 0 0 0 0.09000003 0 0 0 0 1 - - - - - - - - - - - - - - diff --git a/models/snickers/model.config b/models/snickers/model.config deleted file mode 100644 index 5d7432ffd2395c597953d5aab6ce30c69ce700fe..0000000000000000000000000000000000000000 --- a/models/snickers/model.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - snickers - 1.0 - model.sdf - - - snickers - - diff --git a/models/snickers/model.sdf b/models/snickers/model.sdf deleted file mode 100644 index a7c6f7ee6f1f195b4795bb0624334898264dcdf6..0000000000000000000000000000000000000000 --- a/models/snickers/model.sdf +++ /dev/null @@ -1,24 +0,0 @@ - - - - true - - - 0 0 0 0 0 0 - - - model://snickers/meshes/snickers.dae - - - - - 0 0 0 0 0 0 - - - model://snickers/meshes/snickers.dae - - - - - - diff --git a/models/dining_room/.model.sdf.swp b/models/storage-room/.model.sdf.swp similarity index 100% rename from models/dining_room/.model.sdf.swp rename to models/storage-room/.model.sdf.swp diff --git a/models/storage-room/materials/textures/storage-room.png b/models/storage-room/materials/textures/storage-room.png new file mode 100644 index 0000000000000000000000000000000000000000..a7ed6be2e5c55d6f001cc007fe5149d1851ca22e Binary files /dev/null and b/models/storage-room/materials/textures/storage-room.png differ diff --git a/models/apple/meshes/apple.dae b/models/storage-room/meshes/storage-room.dae similarity index 92% rename from models/apple/meshes/apple.dae rename to models/storage-room/meshes/storage-room.dae index e475ec5b9996d12de3733ad24253c94c9aeb830d..6a4c4e57cf3b445975154db18be578e68fbe880d 100644 --- a/models/apple/meshes/apple.dae +++ b/models/storage-room/meshes/storage-room.dae @@ -11,21 +11,21 @@ Z_UP - - apple.png + + storage-room.png - + - apple_png + storage-room_png - + - apple_png-surface + storage-room_png-surface @@ -37,7 +37,7 @@ 1 1 1 1 - + 0.5 0.5 0.5 1 diff --git a/models/apple/model.config b/models/storage-room/model.config similarity index 75% rename from models/apple/model.config rename to models/storage-room/model.config index 25ff49e2b8f4a7e220aedf1ea82d2a30678a1001..3fdaa47b9c2726e2fec850a773ab0a177edcea7e 100644 --- a/models/apple/model.config +++ b/models/storage-room/model.config @@ -1,11 +1,11 @@ - apple + storage-room 1.0 model.sdf - apple + storage-room diff --git a/models/storage_room/model.sdf b/models/storage-room/model.sdf similarity index 72% rename from models/storage_room/model.sdf rename to models/storage-room/model.sdf index c7735ade4808ceb0271dea06b400e6a7087506ae..bfe08b06926ae7a31e7a020cddd0e2d2341e7be0 100644 --- a/models/storage_room/model.sdf +++ b/models/storage-room/model.sdf @@ -1,13 +1,13 @@ - + true 0 0 0 0 0 0 - model://storage_room/meshes/storage_room.dae + model://storage-room/meshes/storage-room.dae @@ -15,7 +15,7 @@ 0 0 0 0 0 0 - model://storage_room/meshes/storage_room.dae + model://storage-room/meshes/storage-room.dae diff --git a/models/storage_room/.model.sdf.swp b/models/storage_room/.model.sdf.swp deleted file mode 100644 index 60497aa71fda85775ba437522fcec6d055ad7c94..0000000000000000000000000000000000000000 Binary files a/models/storage_room/.model.sdf.swp and /dev/null differ diff --git a/models/storage_room/materials/textures/storage_room.png b/models/storage_room/materials/textures/storage_room.png deleted file mode 100644 index bcc8fd9bce69d7f8995bad663460eacbec398212..0000000000000000000000000000000000000000 Binary files a/models/storage_room/materials/textures/storage_room.png and /dev/null differ diff --git a/models/storage_room/meshes/storage_room.dae b/models/storage_room/meshes/storage_room.dae deleted file mode 100644 index 55baf7a0e079ff8d8b3d41bf5b97639465cbb4f4..0000000000000000000000000000000000000000 --- a/models/storage_room/meshes/storage_room.dae +++ /dev/null @@ -1,123 +0,0 @@ - - - - - Blender User - Blender 2.79.0 - - 2020-06-02T16:50:12 - 2020-06-02T16:50:12 - - Z_UP - - - - storage_room.png - - - - - - - - storage_room_png - - - - - storage_room_png-surface - - - - - - 1 1 1 1 - - - 1 1 1 1 - - - - - - 0.5 0.5 0.5 1 - - - 400 - - - 1 - - - - - - - - - - - - - - - - 1 1 -1 1 -1 -1 -1 -0.9999998 -1 -0.9999997 1 -1 1 0.9999995 1 0.9999994 -1.000001 1 -1 -0.9999997 1 -1 1 1 - - - - - - - - - - 0 0 -1 0 0 1 1 0 -2.38419e-7 0 -1 -4.76837e-7 -1 2.38419e-7 -1.49012e-7 2.68221e-7 1 2.38419e-7 0 0 -1 0 0 1 1 -5.96046e-7 3.27825e-7 -4.76837e-7 -1 0 -1 2.38419e-7 -1.19209e-7 2.08616e-7 1 0 - - - - - - - - - - 0 0 1 1 0 1 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0 0 1 1 0 1 1 0 0 1 0 0 0 0 1 0 1 1 1 0 1 1 0 1 1 0 1 1 0 1 1 0 1 1 0 1 0 0 1 0 1 1 1 0 1 1 0 1 - - - - - - - - - - - - - - -

0 0 0 2 0 1 3 0 2 7 1 3 5 1 4 4 1 5 4 2 6 1 2 7 0 2 8 5 3 9 2 3 10 1 3 11 2 4 12 7 4 13 3 4 14 0 5 15 7 5 16 4 5 17 0 6 18 1 6 19 2 6 20 7 7 21 6 7 22 5 7 23 4 8 24 5 8 25 1 8 26 5 9 27 6 9 28 2 9 29 2 10 30 6 10 31 7 10 32 0 11 33 3 11 34 7 11 35

- - - - - - - - - 0.09000003 0 0 0 0 0.09000003 0 0 0 0 0.09000003 0 0 0 0 1 - - - - - - - - - - - - - - diff --git a/models/storage_room/model.config b/models/storage_room/model.config deleted file mode 100644 index cc9c02084ad65843d39b3976c3256334b41668af..0000000000000000000000000000000000000000 --- a/models/storage_room/model.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - storage_room - 1.0 - model.sdf - - - storage_room - - diff --git a/models/study/materials/textures/study_orange.png b/models/study/materials/textures/study_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..86054b1f0b89f87e1c2a09bb1584001e01f19de7 Binary files /dev/null and b/models/study/materials/textures/study_orange.png differ diff --git a/models/study/meshes/study.dae b/models/study/meshes/study.dae index 60c892287f984c2acd5f083a8c3f6b59695f0e84..404849b1f9058911805b7abd29305914b3b5e15f 100644 --- a/models/study/meshes/study.dae +++ b/models/study/meshes/study.dae @@ -12,7 +12,7 @@ - study.png + study_orange.png diff --git a/worlds/house1.model b/worlds/house1.model index dcd1df7e6541ef5bf75a39b2acb040bf5057e697..b7024245af697c81bb2e1d0678ef8e3656e6e14c 100644 --- a/worlds/house1.model +++ b/worlds/house1.model @@ -48,50 +48,34 @@ model://turtlebot3_house - - -3.0 0.5 0.1 0.0 0.0 0.0 - model://living_room/ - -7.0 2.0 0.1 0.0 0.0 0.0 - model://storage_room/ + model://storage-room/ - -7.0 -3.5 0.1 0.0 0.0 0.0 + -7.0 -2.0 0.1 0.0 0.0 0.0 model://study/ - 2.0 3.0 0.1 0.0 0.0 0.0 + 0.5 3.0 0.1 0.0 0.0 0.0 model://pantry/ - 5.0 1.5 0.1 0.0 0.0 0.0 - model://dining_room/ + 4.0 1.5 0.1 0.0 0.0 0.0 + model://dining-room/ - 6.0 -2.0 0.1 0.0 0.0 0.0 + 5.5 -1.0 0.1 0.0 0.0 0.0 model://kitchen/ - -4.0 3.5 0.1 0.0 0.0 0.0 - model://apple/ - - - 4.0 4.5 0.1 0.0 0.0 0.0 - model://banana/ - - - -6.0 -0.5 0.1 0.0 0.0 0.0 - model://orange/ - - - 3.5 2 0.1 0.0 0.0 0.0 - model://coffee/ + -3.0 4.2 0.1 0.0 0.0 0.0 + model://living-room/ - + - -2.0 -0.5 0.01 0.0 0.0 0.0 + -2.0 -1.0 0.01 0.0 0.0 0.0 model://turtlebot3_waffle_pi