From 02992bd1d0fe67e47c209b66591eb185bc5791a9 Mon Sep 17 00:00:00 2001 From: Jeremy Nimmer Date: Mon, 25 Mar 2024 09:58:08 -0700 Subject: [PATCH] [models] Move allegro_hand_description into drake_models (#21184) --- BUILD.bazel | 1 - examples/allegro_hand/BUILD.bazel | 39 +- .../allegro_hand/joint_control/BUILD.bazel | 2 +- .../allegro_single_object_simulation.cc | 4 +- .../run_allegro_constant_load_demo.cc | 4 +- .../allegro_hand}/test/parse_test.cc | 17 +- manipulation/models/BUILD.bazel | 1 - .../allegro_hand_description/BUILD.bazel | 65 -- .../allegro_hand_description/LICENSE.TXT | 11 - .../sdf/allegro_hand_description_left.sdf | 853 ------------------ .../sdf/allegro_hand_description_right.sdf | 852 ----------------- .../urdf/allegro_hand_description_left.urdf | 716 --------------- .../urdf/allegro_hand_description_right.urdf | 716 --------------- tools/workspace/drake_models/repository.bzl | 4 +- .../workspace/drake_models/test/parse_test.py | 5 + 15 files changed, 59 insertions(+), 3231 deletions(-) rename {manipulation/models/allegro_hand_description => examples/allegro_hand}/test/parse_test.cc (79%) delete mode 100644 manipulation/models/allegro_hand_description/BUILD.bazel delete mode 100644 manipulation/models/allegro_hand_description/LICENSE.TXT delete mode 100644 manipulation/models/allegro_hand_description/sdf/allegro_hand_description_left.sdf delete mode 100644 manipulation/models/allegro_hand_description/sdf/allegro_hand_description_right.sdf delete mode 100644 manipulation/models/allegro_hand_description/urdf/allegro_hand_description_left.urdf delete mode 100644 manipulation/models/allegro_hand_description/urdf/allegro_hand_description_right.urdf diff --git a/BUILD.bazel b/BUILD.bazel index 674d25fb0763..3043caaa775f 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -56,7 +56,6 @@ filegroup( "//examples/quadrotor:models", "//examples/scene_graph:models", "//examples/simple_gripper:simple_gripper_models", - "//manipulation/models/allegro_hand_description:models", "//manipulation/models/franka_description:models", "//manipulation/models/iiwa_description:models", "//manipulation/models/jaco_description:models", diff --git a/examples/allegro_hand/BUILD.bazel b/examples/allegro_hand/BUILD.bazel index dcbd498807ae..6fd1866eb8fa 100644 --- a/examples/allegro_hand/BUILD.bazel +++ b/examples/allegro_hand/BUILD.bazel @@ -10,6 +10,31 @@ package( default_visibility = [":__subpackages__"], ) +filegroup( + name = "models", + srcs = [ + "@drake_models//:allegro_hand_description/meshes/allegro.mtl", + "@drake_models//:allegro_hand_description/meshes/base_link.obj", + "@drake_models//:allegro_hand_description/meshes/base_link_left.obj", + "@drake_models//:allegro_hand_description/meshes/link_0.0.obj", + "@drake_models//:allegro_hand_description/meshes/link_1.0.obj", + "@drake_models//:allegro_hand_description/meshes/link_12.0_left.obj", + "@drake_models//:allegro_hand_description/meshes/link_12.0_right.obj", + "@drake_models//:allegro_hand_description/meshes/link_13.0.obj", + "@drake_models//:allegro_hand_description/meshes/link_14.0.obj", + "@drake_models//:allegro_hand_description/meshes/link_15.0.obj", + "@drake_models//:allegro_hand_description/meshes/link_15.0_tip.obj", + "@drake_models//:allegro_hand_description/meshes/link_2.0.obj", + "@drake_models//:allegro_hand_description/meshes/link_3.0.obj", + "@drake_models//:allegro_hand_description/meshes/link_3.0_tip.obj", + "@drake_models//:allegro_hand_description/sdf/allegro_hand_description_left.sdf", # noqa + "@drake_models//:allegro_hand_description/sdf/allegro_hand_description_right.sdf", # noqa + "@drake_models//:allegro_hand_description/urdf/allegro_hand_description_left.urdf", # noqa + "@drake_models//:allegro_hand_description/urdf/allegro_hand_description_right.urdf", # noqa + ], + visibility = ["//visibility:public"], +) + drake_cc_library( name = "allegro_common", srcs = ["allegro_common.cc"], @@ -36,7 +61,7 @@ drake_cc_binary( name = "run_allegro_constant_load_demo", srcs = ["run_allegro_constant_load_demo.cc"], data = [ - "//manipulation/models/allegro_hand_description:models", + ":models", ], deps = [ "//common:add_text_logging_gflags", @@ -62,4 +87,16 @@ drake_cc_googletest( ], ) +drake_cc_googletest( + name = "parse_test", + data = [ + ":models", + ], + deps = [ + "//common:find_resource", + "//multibody/parsing", + "//multibody/plant", + ], +) + add_lint_tests(enable_clang_format_lint = False) diff --git a/examples/allegro_hand/joint_control/BUILD.bazel b/examples/allegro_hand/joint_control/BUILD.bazel index 0ec88186ce82..a700888d94f2 100644 --- a/examples/allegro_hand/joint_control/BUILD.bazel +++ b/examples/allegro_hand/joint_control/BUILD.bazel @@ -17,7 +17,7 @@ drake_cc_binary( srcs = ["allegro_single_object_simulation.cc"], data = [ ":simple_mug.sdf", - "//manipulation/models/allegro_hand_description:models", + "//examples/allegro_hand:models", ], deps = [ "//common:add_text_logging_gflags", diff --git a/examples/allegro_hand/joint_control/allegro_single_object_simulation.cc b/examples/allegro_hand/joint_control/allegro_single_object_simulation.cc index 89a28a0544a0..edff25499655 100644 --- a/examples/allegro_hand/joint_control/allegro_single_object_simulation.cc +++ b/examples/allegro_hand/joint_control/allegro_single_object_simulation.cc @@ -90,11 +90,11 @@ void DoMain() { std::string hand_model_url; if (FLAGS_use_right_hand) { hand_model_url = - "package://drake/manipulation/models/" + "package://drake_models/" "allegro_hand_description/sdf/allegro_hand_description_right.sdf"; } else { hand_model_url = - "package://drake/manipulation/models/" + "package://drake_models/" "allegro_hand_description/sdf/allegro_hand_description_left.sdf"; } diff --git a/examples/allegro_hand/run_allegro_constant_load_demo.cc b/examples/allegro_hand/run_allegro_constant_load_demo.cc index eb3f1b4f4129..54ca6cc1dc14 100644 --- a/examples/allegro_hand/run_allegro_constant_load_demo.cc +++ b/examples/allegro_hand/run_allegro_constant_load_demo.cc @@ -57,10 +57,10 @@ void DoMain() { std::string hand_url; if (FLAGS_use_right_hand) { - hand_url = "package://drake/manipulation/models/" + hand_url = "package://drake_models/" "allegro_hand_description/sdf/allegro_hand_description_right.sdf"; } else { - hand_url = "package://drake/manipulation/models/" + hand_url = "package://drake_models/" "allegro_hand_description/sdf/allegro_hand_description_left.sdf"; } multibody::Parser(&plant).AddModelsFromUrl(hand_url); diff --git a/manipulation/models/allegro_hand_description/test/parse_test.cc b/examples/allegro_hand/test/parse_test.cc similarity index 79% rename from manipulation/models/allegro_hand_description/test/parse_test.cc rename to examples/allegro_hand/test/parse_test.cc index b2bed3899912..416cc0f528e5 100644 --- a/manipulation/models/allegro_hand_description/test/parse_test.cc +++ b/examples/allegro_hand/test/parse_test.cc @@ -19,20 +19,21 @@ class ParseTest : public testing::TestWithParam {}; TEST_P(ParseTest, Quantities) { const std::string file_extension = GetParam(); - const std::string path_right = FindResourceOrThrow( - fmt::format("drake/manipulation/models/allegro_hand_description/{}/" + const std::string url_right = + fmt::format("package://drake_models/allegro_hand_description/{}/" "allegro_hand_description_right.{}", - file_extension, file_extension)); - const std::string path_left = FindResourceOrThrow( - fmt::format("drake/manipulation/models/allegro_hand_description/{}/" + file_extension, file_extension); + const std::string url_left = + fmt::format("package://drake_models/allegro_hand_description/{}/" "allegro_hand_description_left.{}", - file_extension, file_extension)); + file_extension, file_extension); MultibodyPlant plant(0.0); Parser parser(&plant); const ModelInstanceIndex right_hand_index = - parser.AddModels(path_right).at(0); - const ModelInstanceIndex left_hand_index = parser.AddModels(path_left).at(0); + parser.AddModelsFromUrl(url_right).at(0); + const ModelInstanceIndex left_hand_index = + parser.AddModelsFromUrl(url_left).at(0); plant.Finalize(); // MultibodyPlant always creates at least two model instances, one for the diff --git a/manipulation/models/BUILD.bazel b/manipulation/models/BUILD.bazel index 68efb9c4c598..2a63d888423a 100644 --- a/manipulation/models/BUILD.bazel +++ b/manipulation/models/BUILD.bazel @@ -5,7 +5,6 @@ install( name = "install_data", visibility = ["//visibility:public"], deps = [ - "//manipulation/models/allegro_hand_description:install_data", "//manipulation/models/franka_description:install_data", "//manipulation/models/iiwa_description:install_data", "//manipulation/models/jaco_description:install_data", diff --git a/manipulation/models/allegro_hand_description/BUILD.bazel b/manipulation/models/allegro_hand_description/BUILD.bazel deleted file mode 100644 index 4c98ae679d27..000000000000 --- a/manipulation/models/allegro_hand_description/BUILD.bazel +++ /dev/null @@ -1,65 +0,0 @@ -load( - "//tools/skylark:drake_cc.bzl", - "drake_cc_googletest", -) -load("//tools/skylark:drake_data.bzl", "models_filegroup") -load("//tools/install:install_data.bzl", "install_data") -load("//tools/lint:lint.bzl", "add_lint_tests") - -package(default_visibility = [":__subpackages__"]) - -models_filegroup( - name = "glob_models", - extra_srcs = [ - "LICENSE.TXT", - ], -) - -install_data( - name = "install_data", - data = [":glob_models"], - visibility = ["//visibility:public"], -) - -filegroup( - name = "models", - srcs = [ - ":glob_models", - "@drake_models//:allegro_hand_description/meshes/allegro.mtl", - "@drake_models//:allegro_hand_description/meshes/base_link.obj", - "@drake_models//:allegro_hand_description/meshes/base_link_left.obj", - "@drake_models//:allegro_hand_description/meshes/link_0.0.obj", - "@drake_models//:allegro_hand_description/meshes/link_1.0.obj", - "@drake_models//:allegro_hand_description/meshes/link_12.0_left.obj", - "@drake_models//:allegro_hand_description/meshes/link_12.0_right.obj", - "@drake_models//:allegro_hand_description/meshes/link_13.0.obj", - "@drake_models//:allegro_hand_description/meshes/link_14.0.obj", - "@drake_models//:allegro_hand_description/meshes/link_15.0.obj", - "@drake_models//:allegro_hand_description/meshes/link_15.0_tip.obj", - "@drake_models//:allegro_hand_description/meshes/link_2.0.obj", - "@drake_models//:allegro_hand_description/meshes/link_3.0.obj", - "@drake_models//:allegro_hand_description/meshes/link_3.0_tip.obj", - ], - visibility = ["//visibility:public"], -) - -# TODO(jwnimmer-tri) Fix Anzu to not need this. -alias( - name = "prod_models", - actual = ":models", - visibility = ["//visibility:public"], -) - -# === test/ === - -drake_cc_googletest( - name = "parse_test", - data = [":models"], - deps = [ - "//common:find_resource", - "//multibody/parsing", - "//multibody/plant", - ], -) - -add_lint_tests() diff --git a/manipulation/models/allegro_hand_description/LICENSE.TXT b/manipulation/models/allegro_hand_description/LICENSE.TXT deleted file mode 100644 index 962d17b46a1f..000000000000 --- a/manipulation/models/allegro_hand_description/LICENSE.TXT +++ /dev/null @@ -1,11 +0,0 @@ -This folder contains a model of the Allegro hand. The files were originally -taken from -https://github.com/felixduvallet/allegro-hand-ros/tree/master/allegro_hand_description,SHA c414ffb. -The original license for these files is BSD, expressed in -http://wiki.ros.org/allegro_hand_ros - -Since obtaining the model files from the above-mentioned source, they were -substantially modified for use by Drake. For example, the original STL mesh -files were converted to OBJ files, and various inertia properties, motor -damping and motor effort values were modified. Our changes are covered by -Drake's license terms (see LICENSE.TXT in Drake's root folder). diff --git a/manipulation/models/allegro_hand_description/sdf/allegro_hand_description_left.sdf b/manipulation/models/allegro_hand_description/sdf/allegro_hand_description_left.sdf deleted file mode 100644 index 22b5422564de..000000000000 --- a/manipulation/models/allegro_hand_description/sdf/allegro_hand_description_left.sdf +++ /dev/null @@ -1,853 +0,0 @@ - - - - - - - 0.4154 - - 2.089e-03 - -0.003635e-03 - 0.2233e-03 - 1.829e-03 - -0.01756e-03 - 0.4825e-03 - - - - -0.0093 0 0.0475 0 0 0 - - - 0.0408 0.113 0.095 - - - - - 0 0 0.095 -1.5708 0 0 - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/base_link_left.obj - - - - - - 0 0.0435 0.093458 -0.087267 0 0 - - 0.0119 - - 1.954e-06 - 0.003034e-06 - 0.08923e-06 - 1.179e-06 - -0.03707e-06 - 1.497e-06 - - - - 0 0 0.0082 0 0 0 - - - 0.0196 0.0275 0.0164 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_0.0.obj - - - - - - link_8 - hand_root - - 0 -0.087156 -0.996195 - - -0.47 - 0.47 - 0.7 - - - 1.5e-2 - - - - - 0 0.044929 0.109796 -0.087267 0 0 - - 0.065 - - 7.192e-05 - 0 - 0 - 7.438e-05 - 0.07322e-05 - 0.5406e-05 - - - - 0 0 0.027 0 0 0 - - - 0.0196 0.0275 0.054 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_1.0.obj - - - - - - link_9 - link_8 - - 0 0.996195 -0.087156 - - -0.196 - 1.61 - 0.7 - - - 1.5e-2 - - - - - 0 0.049636 0.16359 -0.087267 0 0 - - 0.0355 - - 3.169e-05 - 0.0001071e-05 - -0.0004913e-05 - 3.105e-05 - 0.003875e-05 - 0.3203e-05 - - - - 0 0 0.0192 0 0 0 - - - 0.0196 0.0275 0.0384 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_2.0.obj - - - - - - link_10 - link_9 - - 0 0.996195 -0.087156 - - -0.174 - 1.709 - 0.7 - - - 1.5e-2 - - - - - 0 0.052983 0.201844 -0.087267 0 0 - - 0.0264 - - 1.263e-05 - 0.00021e-05 - -0.00098e-05 - 1.182e-05 - -0.0013e-05 - 0.2484e-05 - - - - 0 0 0.01335 0 0 0 - - - 0.0196 0.0275 0.0267 - - - - - 0 0 0.0267 0 0 0 - - - 0.012 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_3.0.obj - - - - - 0 0 0.0267 0 0 0 - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_3.0_tip.obj - - - - - - link_11 - link_10 - - 0 0.996195 -0.087156 - - -0.227 - 1.618 - 0.7 - - - 1.5e-2 - - - - - -0.0182 -0.019333 0.049013 -3.14159 -1.48353 -1.5708 - - 0.0176 - - 0.8139e-05 - 0.2552e-05 - 0.3899e-05 - 1.314e-05 - -0.1463e-05 - 1.002e-05 - - - - -0.0179 0.009 0.0145 0 0 0 - - - 0.0358 0.034 0.0455 - - - - - 0 0 0 3.14159 0 0 - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_12.0_left.obj - - - - - - link_12 - hand_root - - -0 -0.087156 0.996195 - - 0.263 - 1.396 - 0.7 - - - 1.5e-2 - - - - - -0.0132 -0.056728 0.018638 -3.14159 -1.48353 -1.5708 - - 0.0119 - - 1.926e-06 - 0.00305e-06 - 0.08866e-06 - 1.153e-06 - -0.03645e-06 - 1.496e-06 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_13.0.obj - - - - - - link_13 - link_12 - - 0 0.996195 0.087156 - - -0.105 - 1.163 - 0.7 - - - 1.5e-2 - - - - - -0.0132 -0.074361 0.017096 -3.14159 -1.48353 -1.5708 - - 0.038 - - 3.670e-05 - 0.0001e-05 - 0.01485e-05 - 3.540e-05 - -0.0037e-05 - 0.3633e-05 - - - - 0 0 0.0257 0 0 0 - - - 0.0196 0.0275 0.0514 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_14.0.obj - - - - - - link_14 - link_13 - - -1 0 -0 - - -0.189 - 1.644 - 0.7 - - - 1.5e-2 - - - - - -0.0132 -0.125565 0.012616 -3.14159 -1.48353 -1.5708 - - 0 0 0.012781 0 0 0 - 0.0556 - - 7.054e-05 - 0 - 0 - 6.564e-05 - -0.0033e-05 - 1.954e-05 - - - - 0 0 0.02115 0 0 0 - - - 0.0196 0.0275 0.0423 - - - - - 0 0 0.0423 0 0 0 - - - 0.012 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_15.0.obj - - - - - 0 0 0.0423 0 0 0 - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_15.0_tip.obj - - - - - - link_15 - link_14 - - -1 0 -0 - - -0.162 - 1.719 - 0.7 - - - 1.5e-2 - - - - - 0 0 0.0957 0 0 0 - - 0.0119 - - 1.954e-06 - 0.003034e-06 - 0.08923e-06 - 1.179e-06 - -0.03707e-06 - 1.497e-06 - - - - 0 0 0.0082 0 0 0 - - - 0.0196 0.0275 0.0164 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_0.0.obj - - - - - - link_4 - hand_root - - 0 0 -1 - - -0.47 - 0.47 - 0.7 - - - 1.5e-2 - - - - - 0 0 0.1121 0 0 0 - - 0.065 - - 7.192e-05 - 0 - 0 - 7.438e-05 - 0.07322e-05 - 0.5406e-05 - - - - 0 0 0.027 0 0 0 - - - 0.0196 0.0275 0.054 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_1.0.obj - - - - - - link_5 - link_4 - - 0 1 0 - - -0.196 - 1.61 - 0.7 - - - 1.5e-2 - - - - - 0 0 0.1661 0 0 0 - - 0.0355 - - 3.169e-05 - 0.0001071e-05 - -0.0004913e-05 - 3.105e-05 - 0.003875e-05 - 0.3203e-05 - - - - 0 0 0.0192 0 0 0 - - - 0.0196 0.0275 0.0384 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_2.0.obj - - - - - - link_6 - link_5 - - 0 1 0 - - -0.174 - 1.709 - 0.7 - - - 1.5e-2 - - - - - 0 0 0.2045 0 0 0 - - 0.0264 - - 1.263e-05 - 0.00021e-05 - -0.00098e-05 - 1.182e-05 - -0.0013e-05 - 0.2484e-05 - - - - 0 0 0.01335 0 0 0 - - - 0.0196 0.0275 0.0267 - - - - - 0 0 0.0267 0 0 0 - - - 0.012 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_3.0.obj - - - - - 0 0 0.0267 0 0 0 - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_3.0_tip.obj - - - - - - link_7 - link_6 - - 0 1 0 - - -0.227 - 1.618 - 0.7 - - - 1.5e-2 - - - - - 0 -0.0435 0.093458 0.087267 0 0 - - 0.0119 - - 1.954e-06 - 0.003034e-06 - 0.08923e-06 - 1.179e-06 - -0.03707e-06 - 1.497e-06 - - - - 0 0 0.0082 0 0 0 - - - 0.0196 0.0275 0.0164 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_0.0.obj - - - - - - link_0 - hand_root - - 0 0.087156 -0.996195 - - -0.47 - 0.47 - 0.7 - - - 1.5e-2 - - - - - 0 -0.044929 0.109796 0.087267 0 0 - - 0.065 - - 7.192e-05 - 0 - 0 - 7.438e-05 - 0.07322e-05 - 0.5406e-05 - - - - 0 0 0.027 0 0 0 - - - 0.0196 0.0275 0.054 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_1.0.obj - - - - - - link_1 - link_0 - - 0 0.996195 0.087156 - - -0.196 - 1.61 - 0.7 - - - 1.5e-2 - - - - - 0 -0.049636 0.16359 0.087267 0 0 - - 0.0355 - - 3.169e-05 - 0.0001071e-05 - -0.0004913e-05 - 3.105e-05 - 0.003875e-05 - 0.3203e-05 - - - - 0 0 0.0192 0 0 0 - - - 0.0196 0.0275 0.0384 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_2.0.obj - - - - - - link_2 - link_1 - - 0 0.996195 0.087156 - - -0.174 - 1.709 - 0.7 - - - 1.5e-2 - - - - - 0 -0.052983 0.201844 0.087267 0 0 - - 0.0264 - - 1.263e-05 - 0.00021e-05 - -0.00098e-05 - 1.182e-05 - -0.0013e-05 - 0.2484e-05 - - - - 0 0 0.01335 0 0 0 - - - 0.0196 0.0275 0.0267 - - - - - 0 0 0.0267 0 0 0 - - - 0.012 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_3.0.obj - - - - - 0 0 0.0267 0 0 0 - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_3.0_tip.obj - - - - - - link_3 - link_2 - - 0 0.996195 0.087156 - - -0.227 - 1.618 - 0.7 - - - 1.5e-2 - - - - - diff --git a/manipulation/models/allegro_hand_description/sdf/allegro_hand_description_right.sdf b/manipulation/models/allegro_hand_description/sdf/allegro_hand_description_right.sdf deleted file mode 100644 index 264bc87f9425..000000000000 --- a/manipulation/models/allegro_hand_description/sdf/allegro_hand_description_right.sdf +++ /dev/null @@ -1,852 +0,0 @@ - - - - - - - 0.4154 - - 2.089e-03 - -0.003635e-03 - 0.2233e-03 - 1.829e-03 - -0.01756e-03 - 0.4825e-03 - - - - -0.0093 0 0.0475 0 0 0 - - - 0.0408 0.113 0.095 - - - - - 0 0 0.095 0 0 0 - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/base_link.obj - - - - - - 0 0.0435 0.093458 -0.087267 0 0 - - 0.0119 - - 1.954e-06 - 0.003034e-06 - 0.08923e-06 - 1.179e-06 - -0.03707e-06 - 1.497e-06 - - - - 0 0 0.0082 0 0 0 - - - 0.0196 0.0275 0.0164 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_0.0.obj - - - - - - link_0 - hand_root - - 0 0.087156 0.996195 - - -0.47 - 0.47 - 0.7 - - - 1.5e-2 - - - - - 0 0.044929 0.109796 -0.087267 0 0 - - 0.065 - - 7.192e-05 - 0 - 0 - 7.438e-05 - 0.07322e-05 - 0.5406e-05 - - - - 0 0 0.027 0 0 0 - - - 0.0196 0.0275 0.054 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_1.0.obj - - - - - - link_1 - link_0 - - 0 0.996195 -0.087156 - - -0.196 - 1.61 - 0.7 - - - 1.5e-2 - - - - - 0 0.049636 0.16359 -0.087267 0 0 - - 0.0355 - - 3.169e-05 - 0.0001071e-05 - -0.0004913e-05 - 3.105e-05 - 0.003875e-05 - 0.3203e-05 - - - - 0 0 0.0192 0 0 0 - - - 0.0196 0.0275 0.0384 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_2.0.obj - - - - - - link_2 - link_1 - - 0 0.996195 -0.087156 - - -0.174 - 1.709 - 0.7 - - - 1.5e-2 - - - - - 0 0.052983 0.201844 -0.087267 0 0 - - 0.0264 - - 1.263e-05 - 0.00021e-05 - -0.00098e-05 - 1.182e-05 - -0.0013e-05 - 0.2484e-05 - - - - 0 0 0.01335 0 0 0 - - - 0.0196 0.0275 0.0267 - - - - - 0 0 0.0267 0 0 0 - - - 0.012 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_3.0.obj - - - - - 0 0 0.0267 0 0 0 - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_3.0_tip.obj - - - - - - link_3 - link_2 - - 0 0.996195 -0.087156 - - -0.227 - 1.618 - 0.7 - - - 1.5e-2 - - - - - -0.0182 0.019333 0.049013 3.14159 -1.48353 1.5708 - - 0.0176 - - 0.8139e-05 - 0.2552e-05 - 0.3899e-05 - 1.314e-05 - -0.1463e-05 - 1.002e-05 - - - - -0.0179 0.009 0.0145 0 0 0 - - - 0.0358 0.034 0.0455 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_12.0_right.obj - - - - - - link_12 - hand_root - - 0 -0.087156 -0.996195 - - 0.263 - 1.396 - 0.7 - - - 1.5e-2 - - - - - -0.0132 0.056728 0.018638 3.14159 -1.48353 1.5708 - - 0.0119 - - 1.926e-06 - 0.00305e-06 - 0.08866e-06 - 1.153e-06 - -0.03645e-06 - 1.496e-06 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_13.0.obj - - - - - - link_13 - link_12 - - 0 0.996195 -0.087156 - - -0.105 - 1.163 - 0.7 - - - 1.5e-2 - - - - - -0.0132 0.074361 0.017096 3.14159 -1.48353 1.5708 - - 0.038 - - 3.670e-05 - 0.0001e-05 - 0.01485e-05 - 3.540e-05 - -0.0037e-05 - 0.3633e-05 - - - - 0 0 0.0257 0 0 0 - - - 0.0196 0.0275 0.0514 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_14.0.obj - - - - - - link_14 - link_13 - - 1 0 0 - - -0.189 - 1.644 - 0.7 - - - 1.5e-2 - - - - - -0.0132 0.125565 0.012616 3.14159 -1.48353 1.5708 - - 0 0 0.012781 0 0 0 - 0.0556 - - 7.054e-05 - 0 - 0 - 6.564e-05 - -0.0033e-05 - 1.954e-05 - - - - 0 0 0.02115 0 0 0 - - - 0.0196 0.0275 0.0423 - - - - - 0 0 0.0423 0 0 0 - - - 0.012 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_15.0.obj - - - - - 0 0 0.0423 0 0 0 - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_15.0_tip.obj - - - - - - link_15 - link_14 - - 1 0 0 - - -0.162 - 1.719 - 0.7 - - - 1.5e-2 - - - - - 0 0 0.0957 0 0 0 - - 0.0119 - - 1.954e-06 - 0.003034e-06 - 0.08923e-06 - 1.179e-06 - -0.03707e-06 - 1.497e-06 - - - - 0 0 0.0082 0 0 0 - - - 0.0196 0.0275 0.0164 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_0.0.obj - - - - - - link_4 - hand_root - - 0 0 1 - - -0.47 - 0.47 - 0.7 - - - 1.5e-2 - - - - - 0 0 0.1121 0 0 0 - - 0.065 - - 7.192e-05 - 0 - 0 - 7.438e-05 - 0.07322e-05 - 0.5406e-05 - - - - 0 0 0.027 0 0 0 - - - 0.0196 0.0275 0.054 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_1.0.obj - - - - - - link_5 - link_4 - - 0 1 0 - - -0.196 - 1.61 - 0.7 - - - 1.5e-2 - - - - - 0 0 0.1661 0 0 0 - - 0.0355 - - 3.169e-05 - 0.0001071e-05 - -0.0004913e-05 - 3.105e-05 - 0.003875e-05 - 0.3203e-05 - - - - 0 0 0.0192 0 0 0 - - - 0.0196 0.0275 0.0384 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_2.0.obj - - - - - - link_6 - link_5 - - 0 1 0 - - -0.174 - 1.709 - 0.7 - - - 1.5e-2 - - - - - 0 0 0.2045 0 0 0 - - 0.0264 - - 1.263e-05 - 0.00021e-05 - -0.00098e-05 - 1.182e-05 - -0.0013e-05 - 0.2484e-05 - - - - 0 0 0.01335 0 0 0 - - - 0.0196 0.0275 0.0267 - - - - - 0 0 0.0267 0 0 0 - - - 0.012 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_3.0.obj - - - - - 0 0 0.0267 0 0 0 - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_3.0_tip.obj - - - - - - link_7 - link_6 - - 0 1 0 - - -0.227 - 1.618 - 0.7 - - - 1.5e-2 - - - - - 0 -0.0435 0.093458 0.087267 0 0 - - 0.0119 - - 1.954e-06 - 0.003034e-06 - 0.08923e-06 - 1.179e-06 - -0.03707e-06 - 1.497e-06 - - - - 0 0 0.0082 0 0 0 - - - 0.0196 0.0275 0.0164 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_0.0.obj - - - - - - link_8 - hand_root - - 0 -0.087156 0.996195 - - -0.47 - 0.47 - 0.7 - - - 1.5e-2 - - - - - 0 -0.044929 0.109796 0.087267 0 0 - - 0.065 - - 7.192e-05 - 0 - 0 - 7.438e-05 - 0.07322e-05 - 0.5406e-05 - - - - 0 0 0.027 0 0 0 - - - 0.0196 0.0275 0.054 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_1.0.obj - - - - - - link_9 - link_8 - - 0 0.996195 0.087156 - - -0.196 - 1.61 - 0.7 - - - 1.5e-2 - - - - - 0 -0.049636 0.16359 0.087267 0 0 - - 0.0355 - - 3.169e-05 - 0.0001071e-05 - -0.0004913e-05 - 3.105e-05 - 0.003875e-05 - 0.3203e-05 - - - - 0 0 0.0192 0 0 0 - - - 0.0196 0.0275 0.0384 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_2.0.obj - - - - - - link_10 - link_9 - - 0 0.996195 0.087156 - - -0.174 - 1.709 - 0.7 - - - 1.5e-2 - - - - - 0 -0.052983 0.201844 0.087267 0 0 - - 0.0264 - - 1.263e-05 - 0.00021e-05 - -0.00098e-05 - 1.182e-05 - -0.0013e-05 - 0.2484e-05 - - - - 0 0 0.01335 0 0 0 - - - 0.0196 0.0275 0.0267 - - - - - 0 0 0.0267 0 0 0 - - - 0.012 - - - - - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_3.0.obj - - - - - 0 0 0.0267 0 0 0 - - - 1 1 1 - package://drake_models/allegro_hand_description/meshes/link_3.0_tip.obj - - - - - - link_11 - link_10 - - 0 0.996195 0.087156 - - -0.227 - 1.618 - 0.7 - - - 1.5e-2 - - - - - diff --git a/manipulation/models/allegro_hand_description/urdf/allegro_hand_description_left.urdf b/manipulation/models/allegro_hand_description/urdf/allegro_hand_description_left.urdf deleted file mode 100644 index e75fd51cadce..000000000000 --- a/manipulation/models/allegro_hand_description/urdf/allegro_hand_description_left.urdf +++ /dev/null @@ -1,716 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/manipulation/models/allegro_hand_description/urdf/allegro_hand_description_right.urdf b/manipulation/models/allegro_hand_description/urdf/allegro_hand_description_right.urdf deleted file mode 100644 index c0533f28de3b..000000000000 --- a/manipulation/models/allegro_hand_description/urdf/allegro_hand_description_right.urdf +++ /dev/null @@ -1,716 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/workspace/drake_models/repository.bzl b/tools/workspace/drake_models/repository.bzl index 196b87daa63c..54ee2667f9bc 100644 --- a/tools/workspace/drake_models/repository.bzl +++ b/tools/workspace/drake_models/repository.bzl @@ -6,8 +6,8 @@ def drake_models_repository( github_archive( name = name, repository = "RobotLocomotion/models", - commit = "9b274a2570ddefc4140e4b98bcf248003289b870", - sha256 = "214bf8a757cacea053ed04e666681e34df2e550c5b95df3a6ca8f151a6b550bd", # noqa + commit = "199f3e5a8c868ed459f05e73e5eee65da843ffdd", + sha256 = "c09e320a42d7ce6db2e1f622898726c5853db5ee0faf23715f9d3c2274a53ac7", # noqa build_file = ":package.BUILD.bazel", mirrors = mirrors, ) diff --git a/tools/workspace/drake_models/test/parse_test.py b/tools/workspace/drake_models/test/parse_test.py index 847220b8dc2a..93ae3e402afb 100644 --- a/tools/workspace/drake_models/test/parse_test.py +++ b/tools/workspace/drake_models/test/parse_test.py @@ -62,6 +62,11 @@ def test_all_models(self): "package://drake_models/atlas/atlas_minimal_contact.urdf", "package://drake_models/atlas/robotiq.urdf", "package://drake_models/atlas/robotiq_simple.urdf", + # We don't have any tracking issue for fixing the allegro models, + # because we don't use them for anything we care about. If someone + # wants to fix the warnings, be our guest. + "package://drake_models/allegro_hand_description/urdf/allegro_hand_description_left.urdf", # noqa + "package://drake_models/allegro_hand_description/urdf/allegro_hand_description_right.urdf", # noqa ] self.assertFalse(set(models_with_warnings) - set(all_models))