Skip to content
Snippets Groups Projects
Commit cc1f60c2 authored by Christoph Kochendoerfer's avatar Christoph Kochendoerfer
Browse files

update after review

parent 79ac383b
No related branches found
No related tags found
1 merge request!14Trajectories
...@@ -132,8 +132,6 @@ struct FollowLateralOffsetSplineControlStrategy : public ControlStrategy ...@@ -132,8 +132,6 @@ struct FollowLateralOffsetSplineControlStrategy : public ControlStrategy
std::vector<mantle_api::SplineSection> lateral_offset_splines; std::vector<mantle_api::SplineSection> lateral_offset_splines;
}; };
// TODO: Create new control strategy for following 3D trajectories with shapes NURBS, polyline, clothoid
struct FollowRouteControlStrategy : public ControlStrategy struct FollowRouteControlStrategy : public ControlStrategy
{ {
FollowRouteControlStrategy() FollowRouteControlStrategy()
...@@ -166,7 +164,7 @@ struct TransitionDynamics ...@@ -166,7 +164,7 @@ struct TransitionDynamics
{ {
Dimension dimension{Dimension::kUndefined}; Dimension dimension{Dimension::kUndefined};
Shape shape{Shape::kUndefined}; Shape shape{Shape::kUndefined};
double value{0}; double value{0.0};
}; };
struct AcquireLaneOffsetControlStrategy : public ControlStrategy struct AcquireLaneOffsetControlStrategy : public ControlStrategy
...@@ -183,19 +181,27 @@ struct AcquireLaneOffsetControlStrategy : public ControlStrategy ...@@ -183,19 +181,27 @@ struct AcquireLaneOffsetControlStrategy : public ControlStrategy
TransitionDynamics transition_dynamics; TransitionDynamics transition_dynamics;
}; };
enum class ReferenceContext
{
kAbsolute = 0,
kRelative
};
struct FollowTrajectoryControlStrategy : public ControlStrategy struct FollowTrajectoryControlStrategy : public ControlStrategy
{ {
// TODO: Extend the FollowTrajectoryControlStrategy to support shapes like NURBS and clothoid
struct TrajectoryTimeReference struct TrajectoryTimeReference
{ {
std::string domainAbsoluteRelative; ReferenceContext domainAbsoluteRelative;
double scale; double scale{0.0};
double offset; double offset{0.0};
}; };
FollowTrajectoryControlStrategy() FollowTrajectoryControlStrategy()
{ {
movement_domain = MovementDomain::kBoth; movement_domain = MovementDomain::kBoth;
type = ControlStrategyType::kAcquireLaneOffset; type = ControlStrategyType::kFollowTrajectory;
} }
Trajectory trajectory; Trajectory trajectory;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment