Skip to content
Snippets Groups Projects

Improve armar7 platform movement

Merged Tobias Gröger requested to merge feature/improve-armar7-platform-movement into master
All threads resolved!
Compare and Show latest version
2 files
+ 19
7
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -92,10 +92,20 @@ namespace armarx
rtGetControlStruct().velocityY,
rtGetControlStruct().velocityRotation);
Eigen::VectorXf result = ramp.update(x, timeSinceLastIteration.toSecondsDouble());
target->velocityX = result(0);
target->velocityY = result(1);
target->velocityRotation = result(2);
if (x.norm() < 100)
{
target->velocityX = 0;
target->velocityY = 0;
target->velocityRotation = 0;
}
else
{
Eigen::VectorXf result = ramp.update(x, timeSinceLastIteration.toSecondsDouble());
target->velocityX = result(0);
target->velocityY = result(1);
target->velocityRotation = result(2);
}
}
}
@@ -149,7 +159,7 @@ namespace armarx
state += delta / factor;
if (target == Eigen::Vector3f(0, 0, 0))
if (target == Eigen::Vector3f::Zero() && state != Eigen::Vector3f::Zero())
{
// if (state.norm() >= oldState.norm())
// {
Loading