Skip to content

Trajectory Scalar/Vector Combined

Craig McDonald requested to merge feature/trajectory-combined into devel

Description

This merge request contains three different groups of changes.

  1. The classes TrajectoryScalar and TrajectoryVector were combined into one class named Trajectory, because the separation was unnecessary and cumbersome. The two derived classes LinearTrajectoryScalar/Vector and MinJerkTrajectoryScalar/Vector were then able to be combined into LinearTrajectory and MinJerkTrajectory, respectively.

  2. The HapticWall class made use of the Trajectory classes in order to have moving walls. I think this will eventually useful for certain kinds of guidance/assistance. However, this code can easily be generalized to all Geometry objects that have a Position property, so it was moved into GeometryBase. I've made an issue to move this into its own class. #259

  3. Additional comments added to remove compiler warnings for documentation.

What to focus on

  • Examples and Sandbox programs relying on the trajectory classes are not affected.
Edited by Craig McDonald

Merge request reports