Commit 0c3b9349 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #1842 from soyersoyer:cpp11

parents 7c619cba 8a4c85b0
...@@ -37,18 +37,8 @@ Ptr<Params> Params::defaultParams() ...@@ -37,18 +37,8 @@ Ptr<Params> Params::defaultParams()
p.icpAngleThresh = (float)(30. * CV_PI / 180.); // radians p.icpAngleThresh = (float)(30. * CV_PI / 180.); // radians
p.icpDistThresh = 0.1f; // meters p.icpDistThresh = 0.1f; // meters
// first non-zero numbers are accepted
const int iters[] = {10, 5, 4, 0};
for(size_t i = 0; i < sizeof(iters)/sizeof(int); i++) p.icpIterations = {10, 5, 4};
{
if(iters[i])
{
p.icpIterations.push_back(iters[i]);
}
else
break;
}
p.pyramidLevels = (int)p.icpIterations.size(); p.pyramidLevels = (int)p.icpIterations.size();
p.tsdf_min_camera_movement = 0.f; //meters, disabled p.tsdf_min_camera_movement = 0.f; //meters, disabled
...@@ -80,19 +70,7 @@ Ptr<Params> Params::coarseParams() ...@@ -80,19 +70,7 @@ Ptr<Params> Params::coarseParams()
{ {
Ptr<Params> p = defaultParams(); Ptr<Params> p = defaultParams();
// first non-zero numbers are accepted p->icpIterations = {5, 3, 2};
const int iters[] = {5, 3, 2};
p->icpIterations.clear();
for(size_t i = 0; i < sizeof(iters)/sizeof(int); i++)
{
if(iters[i])
{
p->icpIterations.push_back(iters[i]);
}
else
break;
}
p->pyramidLevels = (int)p->icpIterations.size(); p->pyramidLevels = (int)p->icpIterations.size();
float volSize = 3.f; float volSize = 3.f;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment