Commit 49c663b9 authored by wangdawei's avatar wangdawei

test

parent aa88961b
...@@ -490,7 +490,7 @@ bool AdjustPPK::LoadMesh(const string &streamPath, boost::shared_ptr<VoxelMapMat ...@@ -490,7 +490,7 @@ bool AdjustPPK::LoadMesh(const string &streamPath, boost::shared_ptr<VoxelMapMat
LOG(INFO) << "mesh to load: " << streamPath; LOG(INFO) << "mesh to load: " << streamPath;
VoxelMapMatcherOption option; VoxelMapMatcherOption option;
option.option.filter_resolution = 0.8; option.option.filter_resolution = 1.2;
option.option.cloud_range = 80; option.option.cloud_range = 80;
option.fast_option.accepted_score = 0.4; option.fast_option.accepted_score = 0.4;
option.fast_option.accepted_low_score = 0.5; option.fast_option.accepted_low_score = 0.5;
......
...@@ -160,20 +160,17 @@ void MeshArea::backendFunc(uint8_t type, Vector2d point) ...@@ -160,20 +160,17 @@ void MeshArea::backendFunc(uint8_t type, Vector2d point)
double MeshArea::AreaAvgGridCnt(const Vector3d &pose) double MeshArea::AreaAvgGridCnt(const Vector3d &pose)
{ {
if(!inited_){ if(!inited_){
return false; return 0;
} }
double total = 0; double total = 0;
Vector2i shiftedIndexToLoad = Vector2i shiftedIndexToLoad =
calShiftedIndex(pose.x(), pose.y()); calShiftedIndex(pose.x(), pose.y());
for(unsigned int i = 0; i < loadNeighbors_.size(); i++){ const BlockContent &blockContent = blockAreaTable_[shiftedIndexToLoad.x()][shiftedIndexToLoad.y()];
Vector2i curr_index = shiftedIndexToLoad + loadNeighbors_[i];
const BlockContent &blockContent = blockAreaTable_[curr_index.x()][curr_index.y()];
if(blockContent.blockState == CurrMesh && if(blockContent.blockState == CurrMesh &&
blockContent.block->isLoad()){ blockContent.block->isLoad()){
total += blockContent.block->GetGridSize(); total = blockContent.block->GetGridSize();
}
} }
return total / loadNeighbors_.size(); return total;
} }
void MeshArea::loadArea(const Vector2d &bl) void MeshArea::loadArea(const Vector2d &bl)
......
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