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
1 file
+ 27
0
Compare changes
  • Side-by-side
  • Inline
@@ -140,7 +140,34 @@ namespace armarx
float oriFactor = std::abs(delta(2)) / maxOrientationAcceleration / dt;
factor = std::max(factor, oriFactor);
if (factor < 1)
{
throw LocalException("Error factor negative!");
}
Eigen::Vector3f oldState = state;
state += delta / factor;
if (target == Eigen::Vector3f::Zero() && state != Eigen::Vector3f::Zero())
{
// if (state.norm() >= oldState.norm())
// {
ARMARX_RT_LOGF_IMPORTANT("Target %.04f %.04f %.04f", target(0), target(1), target(2));
ARMARX_RT_LOGF_IMPORTANT(
"OStte %.04f %.04f %.04f", oldState(0), oldState(1), oldState(2));
ARMARX_RT_LOGF_IMPORTANT("State %.04f %.04f %.04f", state(0), state(1), state(2));
ARMARX_RT_LOGF_IMPORTANT("Delta %.04f %.04f %.04f", delta(0), delta(1), delta(2));
ARMARX_RT_LOGF_IMPORTANT("Factor %.04f", factor);
if (state.norm() > oldState.norm())
{
ARMARX_RT_LOGF_IMPORTANT("!!!!NORM INVALID!!!!");
}
// throw LocalException("haeee");
// }
}
return state;
}
Loading