|
|
@ -6,9 +6,7 @@ template <class T, unsigned SIZE> |
|
|
|
LinearJointTrajectory::LinearJointTrajectory( |
|
|
|
unsigned int steps_, |
|
|
|
float totalTime_, |
|
|
|
Vec<float,SIZE> jointMovement, |
|
|
|
Vec<float,SIZE> maxJointVelocityPerStep, |
|
|
|
Vec<float,SIZE> maxJointAccelarationPerStep |
|
|
|
Vec<float,SIZE> jointMovement |
|
|
|
) |
|
|
|
{ |
|
|
|
Vec< float, SIZE> velocity = jointMovement / steps * 1.5f; |
|
|
@ -16,8 +14,6 @@ LinearJointTrajectory::LinearJointTrajectory( |
|
|
|
steps_, |
|
|
|
totalTime_, |
|
|
|
jointMovement, |
|
|
|
maxJointVelocityPerStep, |
|
|
|
maxJointAccelarationPerStep, |
|
|
|
velocity); |
|
|
|
} |
|
|
|
|
|
|
@ -26,12 +22,10 @@ LinearJointTrajectory::LinearJointTrajectory( |
|
|
|
unsigned int steps_, |
|
|
|
float totalTime_, |
|
|
|
Vec<float,SIZE> jointMovement, |
|
|
|
Vec<float,SIZE> maxJointVelocityPerStep, |
|
|
|
Vec<float,SIZE> maxJointAccelarationPerStep, |
|
|
|
Vec<float,SIZE> velocity |
|
|
|
) |
|
|
|
{ |
|
|
|
super(steps_, totalTime_, jointMovement, maxJointVelocityPerStep, maxJointAccelarationPerStep); |
|
|
|
super(steps_, totalTime_, jointMovement); |
|
|
|
|
|
|
|
if ( velocity > jointMovement/totalTime) |
|
|
|
{ |
|
|
|