mirror of
https://github.com/introlab/rtabmap.git
synced 2026-10-12 21:09:50 +08:00
Odometry: fixed Reg/Force3DoF ignored if filters are not used
This commit is contained in:
@@ -592,7 +592,9 @@ Transform Odometry::process(SensorData & data, const Transform & guessIn, Odomet
|
||||
updateKalmanFilter(vx,vy,vz,vroll,vpitch,vyaw);
|
||||
}
|
||||
}
|
||||
else if(particleFilters_.size())
|
||||
else
|
||||
{
|
||||
if(particleFilters_.size())
|
||||
{
|
||||
// Particle filtering
|
||||
UASSERT(particleFilters_.size()==6);
|
||||
@@ -637,18 +639,13 @@ Transform Odometry::process(SensorData & data, const Transform & guessIn, Odomet
|
||||
{
|
||||
info->timeParticleFiltering = time.ticks();
|
||||
}
|
||||
|
||||
if(_force3DoF)
|
||||
{
|
||||
vz = 0.0f;
|
||||
vroll = 0.0f;
|
||||
vpitch = 0.0f;
|
||||
}
|
||||
}
|
||||
else if(!_holonomic)
|
||||
{
|
||||
// arc trajectory around ICR
|
||||
vy = vyaw!=0.0f ? vx / tan((CV_PI-vyaw)/2.0f) : 0.0f;
|
||||
}
|
||||
|
||||
if(_force3DoF)
|
||||
{
|
||||
vz = 0.0f;
|
||||
|
||||
Reference in New Issue
Block a user