|
3 | 3 | #include <memory>
|
4 | 4 | #include <optional>
|
5 | 5 | #include <string>
|
6 |
| -#include <vector> |
7 | 6 |
|
8 | 7 | #include "drake/common/autodiff.h"
|
9 | 8 | #include "drake/common/nice_type_name.h"
|
| 9 | +#include "drake/multibody/tree/frame_base.h" |
10 | 10 | #include "drake/multibody/tree/frame_body_pose_cache.h"
|
11 | 11 | #include "drake/multibody/tree/multibody_element.h"
|
12 | 12 | #include "drake/multibody/tree/multibody_tree_indexes.h"
|
@@ -50,15 +50,12 @@ template<typename T> class RigidBody;
|
50 | 50 | ///
|
51 | 51 | /// @tparam_default_scalar
|
52 | 52 | template <typename T>
|
53 |
| -class Frame : public MultibodyElement<T> { |
| 53 | +class Frame : public FrameBase<T> { |
54 | 54 | public:
|
55 | 55 | DRAKE_NO_COPY_NO_MOVE_NO_ASSIGN(Frame);
|
56 | 56 |
|
57 | 57 | ~Frame() override;
|
58 | 58 |
|
59 |
| - /// Returns this %Frame's unique index. |
60 |
| - FrameIndex index() const { return this->template index_impl<FrameIndex>(); } |
61 |
| - |
62 | 59 | /// Returns a const reference to the body associated to this %Frame.
|
63 | 60 | const RigidBody<T>& body() const {
|
64 | 61 | return body_;
|
@@ -566,7 +563,7 @@ class Frame : public MultibodyElement<T> {
|
566 | 563 | explicit Frame(
|
567 | 564 | const std::string& name, const RigidBody<T>& body,
|
568 | 565 | std::optional<ModelInstanceIndex> model_instance = {})
|
569 |
| - : MultibodyElement<T>(model_instance.value_or(body.model_instance())), |
| 566 | + : FrameBase<T>(model_instance.value_or(body.model_instance())), |
570 | 567 | name_(internal::DeprecateWhenEmptyName(name, "Frame")),
|
571 | 568 | body_(body) {}
|
572 | 569 |
|
|
0 commit comments