i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 09:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Texturing: add distanceToCamPolicy option

Browse Source
This commit is contained in:
matlabbe
2020-11-03 16:11:37 -05:00
parent 596cd10b69
commit e269067d4c
7 changed files with 61 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
corelib/include/rtabmap/core/util3d_surface.h
View File

@@ -148,7 +148,8 @@ pcl::TextureMesh::Ptr RTABMAP_EXP createTextureMesh(
int minClusterSize = 50, // minimum size of polygons clusters textured int minClusterSize = 50, // minimum size of polygons clusters textured
const std::vector<float> & roiRatios = std::vector<float>(), // [left, right, top, bottom] region of interest (in ratios) of the image projected. const std::vector<float> & roiRatios = std::vector<float>(), // [left, right, top, bottom] region of interest (in ratios) of the image projected.
const ProgressState * state = 0, const ProgressState * state = 0,
std::vector<std::map<int, pcl::PointXY> > * vertexToPixels = 0); std::vector<std::map<int, pcl::PointXY> > * vertexToPixels = 0,
bool distanceToCamPolicy = false);
pcl::TextureMesh::Ptr RTABMAP_EXP createTextureMesh( pcl::TextureMesh::Ptr RTABMAP_EXP createTextureMesh(
const pcl::PolygonMesh::Ptr & mesh, const pcl::PolygonMesh::Ptr & mesh,
const std::map<int, Transform> & poses, const std::map<int, Transform> & poses,
@@ -160,7 +161,8 @@ pcl::TextureMesh::Ptr RTABMAP_EXP createTextureMesh(
int minClusterSize = 50, // minimum size of polygons clusters textured int minClusterSize = 50, // minimum size of polygons clusters textured
const std::vector<float> & roiRatios = std::vector<float>(), // [left, right, top, bottom] region of interest (in ratios) of the image projected. const std::vector<float> & roiRatios = std::vector<float>(), // [left, right, top, bottom] region of interest (in ratios) of the image projected.
const ProgressState * state = 0, const ProgressState * state = 0,
std::vector<std::map<int, pcl::PointXY> > * vertexToPixels = 0); std::vector<std::map<int, pcl::PointXY> > * vertexToPixels = 0,
bool distanceToCamPolicy = false);
/** /**
* Remove not textured polygon clusters. If minClusterSize<0, only the largest cluster is kept. * Remove not textured polygon clusters. If minClusterSize<0, only the largest cluster is kept.

12
corelib/src/pcl18/surface/impl/texture_mapping.hpp
View File

@@ -1055,7 +1055,8 @@ pcl::TextureMapping<PointInT>::textureMeshwithMultipleCameras2 (
pcl::TextureMesh &mesh, pcl::TextureMesh &mesh,
const pcl::texture_mapping::CameraVector &cameras, const pcl::texture_mapping::CameraVector &cameras,
const rtabmap::ProgressState * state, const rtabmap::ProgressState * state,
std::vector<std::map<int, pcl::PointXY> > * vertexToPixels) std::vector<std::map<int, pcl::PointXY> > * vertexToPixels,
bool distanceToCamPolicy)
{ {
if (mesh.tex_polygons.size () != 1) if (mesh.tex_polygons.size () != 1)
@@ -1386,10 +1387,15 @@ pcl::TextureMapping<PointInT>::textureMeshwithMultipleCameras2 (
//UDEBUG("Process polygon %d cam =%d distanceToCam=%f", idx_face, current_cam, distanceToCam); //UDEBUG("Process polygon %d cam =%d distanceToCam=%f", idx_face, current_cam, distanceToCam);
if(distanceToCenter <= smallestWeight || (!depthSet && currentDepthSet)) float distance = distanceToCenter;
if(distanceToCamPolicy)
{
distance = distanceToCam;
}
if(distance <= smallestWeight || (!depthSet && currentDepthSet))
{ {
cameraIndex = current_cam; cameraIndex = current_cam;
smallestWeight = distanceToCenter; smallestWeight = distance;
uv_coords[0] = iter->second.uv_coord1; uv_coords[0] = iter->second.uv_coord1;
uv_coords[1] = iter->second.uv_coord2; uv_coords[1] = iter->second.uv_coord2;
uv_coords[2] = iter->second.uv_coord3; uv_coords[2] = iter->second.uv_coord3;

3
corelib/src/pcl18/surface/texture_mapping.h
View File

@@ -366,7 +366,8 @@ namespace pcl
textureMeshwithMultipleCameras2 (pcl::TextureMesh &mesh, textureMeshwithMultipleCameras2 (pcl::TextureMesh &mesh,
const pcl::texture_mapping::CameraVector &cameras, const pcl::texture_mapping::CameraVector &cameras,
const rtabmap::ProgressState * callback = 0, const rtabmap::ProgressState * callback = 0,
std::vector<std::map<int, pcl::PointXY> > * vertexToPixels = 0); std::vector<std::map<int, pcl::PointXY> > * vertexToPixels = 0,
bool distanceToCamPolicy = false);
protected: protected:
/** \brief mesh scale control. */ /** \brief mesh scale control. */

11
corelib/src/util3d_surface.cpp
View File

@@ -676,7 +676,8 @@ pcl::TextureMesh::Ptr createTextureMesh(
int minClusterSize, int minClusterSize,
const std::vector<float> & roiRatios, const std::vector<float> & roiRatios,
const ProgressState * state, const ProgressState * state,
std::vector<std::map<int, pcl::PointXY> > * vertexToPixels) std::vector<std::map<int, pcl::PointXY> > * vertexToPixels,
bool distanceToCamPolicy)
{ {
std::map<int, std::vector<CameraModel> > cameraSubModels; std::map<int, std::vector<CameraModel> > cameraSubModels;
for(std::map<int, CameraModel>::const_iterator iter=cameraModels.begin(); iter!=cameraModels.end(); ++iter) for(std::map<int, CameraModel>::const_iterator iter=cameraModels.begin(); iter!=cameraModels.end(); ++iter)
@@ -697,7 +698,8 @@ pcl::TextureMesh::Ptr createTextureMesh(
minClusterSize, minClusterSize,
roiRatios, roiRatios,
state, state,
vertexToPixels); vertexToPixels,
distanceToCamPolicy);
} }
pcl::TextureMesh::Ptr createTextureMesh( pcl::TextureMesh::Ptr createTextureMesh(
@@ -711,7 +713,8 @@ pcl::TextureMesh::Ptr createTextureMesh(
int minClusterSize, int minClusterSize,
const std::vector<float> & roiRatios, const std::vector<float> & roiRatios,
const ProgressState * state, const ProgressState * state,
std::vector<std::map<int, pcl::PointXY> > * vertexToPixels) std::vector<std::map<int, pcl::PointXY> > * vertexToPixels,
bool distanceToCamPolicy)
{ {
UASSERT(mesh->polygons.size()); UASSERT(mesh->polygons.size());
pcl::TextureMesh::Ptr textureMesh(new pcl::TextureMesh); pcl::TextureMesh::Ptr textureMesh(new pcl::TextureMesh);
@@ -776,7 +779,7 @@ pcl::TextureMesh::Ptr createTextureMesh(
tm.setMaxDepthError(maxDepthError); tm.setMaxDepthError(maxDepthError);
} }
tm.setMinClusterSize(minClusterSize); tm.setMinClusterSize(minClusterSize);
if(tm.textureMeshwithMultipleCameras2(*textureMesh, cameras, state, vertexToPixels)) if(tm.textureMeshwithMultipleCameras2(*textureMesh, cameras, state, vertexToPixels, distanceToCamPolicy))
{ {
// compute normals for the mesh if not already here // compute normals for the mesh if not already here
bool hasNormals = false; bool hasNormals = false;

6
guilib/src/ExportCloudsDialog.cpp
View File

@@ -371,6 +371,7 @@ void ExportCloudsDialog::saveSettings(QSettings & settings, const QString & grou
settings.setValue("mesh_textureMaxAngle", _ui->doubleSpinBox_meshingTextureMaxAngle->value()); settings.setValue("mesh_textureMaxAngle", _ui->doubleSpinBox_meshingTextureMaxAngle->value());
settings.setValue("mesh_textureMinCluster", _ui->spinBox_mesh_minTextureClusterSize->value()); settings.setValue("mesh_textureMinCluster", _ui->spinBox_mesh_minTextureClusterSize->value());
settings.setValue("mesh_textureRoiRatios", _ui->lineEdit_meshingTextureRoiRatios->text()); settings.setValue("mesh_textureRoiRatios", _ui->lineEdit_meshingTextureRoiRatios->text());
settings.setValue("mesh_textureDistanceToCamPolicy", _ui->checkBox_distanceToCamPolicy->isChecked());
settings.setValue("mesh_textureCameraFiltering", _ui->checkBox_cameraFilter->isChecked()); settings.setValue("mesh_textureCameraFiltering", _ui->checkBox_cameraFilter->isChecked());
settings.setValue("mesh_textureCameraFilteringRadius", _ui->doubleSpinBox_cameraFilterRadius->value()); settings.setValue("mesh_textureCameraFilteringRadius", _ui->doubleSpinBox_cameraFilterRadius->value());
settings.setValue("mesh_textureCameraFilteringAngle", _ui->doubleSpinBox_cameraFilterAngle->value()); settings.setValue("mesh_textureCameraFilteringAngle", _ui->doubleSpinBox_cameraFilterAngle->value());
@@ -510,6 +511,7 @@ void ExportCloudsDialog::loadSettings(QSettings & settings, const QString & grou
_ui->doubleSpinBox_meshingTextureMaxAngle->setValue(settings.value("mesh_textureMaxAngle", _ui->doubleSpinBox_meshingTextureMaxAngle->value()).toDouble()); _ui->doubleSpinBox_meshingTextureMaxAngle->setValue(settings.value("mesh_textureMaxAngle", _ui->doubleSpinBox_meshingTextureMaxAngle->value()).toDouble());
_ui->spinBox_mesh_minTextureClusterSize->setValue(settings.value("mesh_textureMinCluster", _ui->spinBox_mesh_minTextureClusterSize->value()).toDouble()); _ui->spinBox_mesh_minTextureClusterSize->setValue(settings.value("mesh_textureMinCluster", _ui->spinBox_mesh_minTextureClusterSize->value()).toDouble());
_ui->lineEdit_meshingTextureRoiRatios->setText(settings.value("mesh_textureRoiRatios", _ui->lineEdit_meshingTextureRoiRatios->text()).toString()); _ui->lineEdit_meshingTextureRoiRatios->setText(settings.value("mesh_textureRoiRatios", _ui->lineEdit_meshingTextureRoiRatios->text()).toString());
_ui->checkBox_distanceToCamPolicy->setChecked(settings.value("mesh_textureDistanceToCamPolicy", _ui->checkBox_distanceToCamPolicy->isChecked()).toBool());
_ui->checkBox_cameraFilter->setChecked(settings.value("mesh_textureCameraFiltering", _ui->checkBox_cameraFilter->isChecked()).toBool()); _ui->checkBox_cameraFilter->setChecked(settings.value("mesh_textureCameraFiltering", _ui->checkBox_cameraFilter->isChecked()).toBool());
_ui->doubleSpinBox_cameraFilterRadius->setValue(settings.value("mesh_textureCameraFilteringRadius", _ui->doubleSpinBox_cameraFilterRadius->value()).toDouble()); _ui->doubleSpinBox_cameraFilterRadius->setValue(settings.value("mesh_textureCameraFilteringRadius", _ui->doubleSpinBox_cameraFilterRadius->value()).toDouble());
_ui->doubleSpinBox_cameraFilterAngle->setValue(settings.value("mesh_textureCameraFilteringAngle", _ui->doubleSpinBox_cameraFilterAngle->value()).toDouble()); _ui->doubleSpinBox_cameraFilterAngle->setValue(settings.value("mesh_textureCameraFilteringAngle", _ui->doubleSpinBox_cameraFilterAngle->value()).toDouble());
@@ -646,6 +648,7 @@ void ExportCloudsDialog::restoreDefaults()
_ui->doubleSpinBox_meshingTextureMaxAngle->setValue(0.0); _ui->doubleSpinBox_meshingTextureMaxAngle->setValue(0.0);
_ui->spinBox_mesh_minTextureClusterSize->setValue(50); _ui->spinBox_mesh_minTextureClusterSize->setValue(50);
_ui->lineEdit_meshingTextureRoiRatios->setText("0.0 0.0 0.0 0.0"); _ui->lineEdit_meshingTextureRoiRatios->setText("0.0 0.0 0.0 0.0");
_ui->checkBox_distanceToCamPolicy->setChecked(false);
_ui->checkBox_cameraFilter->setChecked(false); _ui->checkBox_cameraFilter->setChecked(false);
_ui->doubleSpinBox_cameraFilterRadius->setValue(0); _ui->doubleSpinBox_cameraFilterRadius->setValue(0);
_ui->doubleSpinBox_cameraFilterAngle->setValue(30); _ui->doubleSpinBox_cameraFilterAngle->setValue(30);
@@ -2930,7 +2933,8 @@ bool ExportCloudsDialog::getExportedClouds(
_ui->spinBox_mesh_minTextureClusterSize->value(), _ui->spinBox_mesh_minTextureClusterSize->value(),
roiRatios, roiRatios,
&texturingState, &texturingState,
cameraPoses.size()>1?&textureVertexToPixels:0); // only get vertexToPixels if merged clouds with multi textures cameraPoses.size()>1?&textureVertexToPixels:0, // only get vertexToPixels if merged clouds with multi textures
_ui->checkBox_distanceToCamPolicy->isChecked());
if(_canceled) if(_canceled)
{ {

49
guilib/src/ui/exportCloudsDialog.ui
View File

@@ -23,9 +23,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>-2339</y> <y>-2387</y>
<width>780</width> <width>780</width>
<height>4823</height> <height>4880</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_13"> <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1595,7 +1595,7 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
<layout class="QVBoxLayout" name="verticalLayout_16"> <layout class="QVBoxLayout" name="verticalLayout_16">
<item> <item>
<layout class="QGridLayout" name="gridLayout_15" columnstretch="0,1"> <layout class="QGridLayout" name="gridLayout_15" columnstretch="0,1">
<item row="12" column="0"> <item row="13" column="0">
<widget class="QSpinBox" name="spinBox_textureBrightnessContrastRatioHigh"> <widget class="QSpinBox" name="spinBox_textureBrightnessContrastRatioHigh">
<property name="suffix"> <property name="suffix">
<string> %</string> <string> %</string>
@@ -1608,7 +1608,7 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="1"> <item row="13" column="1">
<widget class="QLabel" name="label_meshingTextureSize_6"> <widget class="QLabel" name="label_meshingTextureSize_6">
<property name="text"> <property name="text">
<string>Brightness and contrast balance high ratio. Only used when textures are merged.</string> <string>Brightness and contrast balance high ratio. Only used when textures are merged.</string>
@@ -1618,7 +1618,7 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="11" column="0">
<widget class="QComboBox" name="comboBox_blendingDecimation"> <widget class="QComboBox" name="comboBox_blendingDecimation">
<item> <item>
<property name="text"> <property name="text">
@@ -1662,14 +1662,14 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
</item> </item>
</widget> </widget>
</item> </item>
<item row="9" column="0"> <item row="10" column="0">
<widget class="QCheckBox" name="checkBox_blending"> <widget class="QCheckBox" name="checkBox_blending">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1"> <item row="11" column="1">
<widget class="QLabel" name="label_exposureFusion_3"> <widget class="QLabel" name="label_exposureFusion_3">
<property name="text"> <property name="text">
<string>Blending decimation. </string> <string>Blending decimation. </string>
@@ -1699,7 +1699,7 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1"> <item row="10" column="1">
<widget class="QLabel" name="label_exposureFusion_2"> <widget class="QLabel" name="label_exposureFusion_2">
<property name="text"> <property name="text">
<string>Blending. Only used with dense reconstruction flavor and if clouds are assembled.</string> <string>Blending. Only used with dense reconstruction flavor and if clouds are assembled.</string>
@@ -1741,7 +1741,7 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="1"> <item row="12" column="1">
<widget class="QLabel" name="label_meshingTextureSize_5"> <widget class="QLabel" name="label_meshingTextureSize_5">
<property name="text"> <property name="text">
<string>Brightness and contrast balance low ratio. Only used when textures are merged.</string> <string>Brightness and contrast balance low ratio. Only used when textures are merged.</string>
@@ -1824,7 +1824,7 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
</item> </item>
</widget> </widget>
</item> </item>
<item row="14" column="0"> <item row="15" column="0">
<widget class="QCheckBox" name="checkBox_exposureFusion"> <widget class="QCheckBox" name="checkBox_exposureFusion">
<property name="text"> <property name="text">
<string/> <string/>
@@ -1854,14 +1854,14 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="9" column="0">
<widget class="QCheckBox" name="checkBox_cameraFilter"> <widget class="QCheckBox" name="checkBox_cameraFilter">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="0"> <item row="12" column="0">
<widget class="QSpinBox" name="spinBox_textureBrightnessContrastRatioLow"> <widget class="QSpinBox" name="spinBox_textureBrightnessContrastRatioLow">
<property name="suffix"> <property name="suffix">
<string> %</string> <string> %</string>
@@ -1884,7 +1884,7 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1"> <item row="9" column="1">
<widget class="QLabel" name="label_meshingTextureSize_3"> <widget class="QLabel" name="label_meshingTextureSize_3">
<property name="text"> <property name="text">
<string>Camera filtering. Some criteria to select which cameras are used for texturing.</string> <string>Camera filtering. Some criteria to select which cameras are used for texturing.</string>
@@ -1894,7 +1894,7 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="1"> <item row="15" column="1">
<widget class="QLabel" name="label_exposureFusion"> <widget class="QLabel" name="label_exposureFusion">
<property name="text"> <property name="text">
<string>Exposure fusion. Only used when textures are merged and brightness/contrast balance ratios are used (merging original texture + 1 for each ratios).</string> <string>Exposure fusion. Only used when textures are merged and brightness/contrast balance ratios are used (merging original texture + 1 for each ratios).</string>
@@ -1978,7 +1978,7 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="1"> <item row="16" column="1">
<widget class="QLabel" name="label_multiband"> <widget class="QLabel" name="label_multiband">
<property name="text"> <property name="text">
<string>MultiBand texturing. Only available on export and RTAB-Map should be built with AliceVision support.</string> <string>MultiBand texturing. Only available on export and RTAB-Map should be built with AliceVision support.</string>
@@ -1988,13 +1988,30 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="0"> <item row="16" column="0">
<widget class="QCheckBox" name="checkBox_multiband"> <widget class="QCheckBox" name="checkBox_multiband">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1">
<widget class="QLabel" name="label_meshingTextureSize_11">
<property name="text">
<string>Distance to camera policy. The closest camera from a polygon is used to texture the polygon. If disabled, the camera for which the polygon projection is the closest of the image center is used to texture the polygon.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="checkBox_distanceToCamPolicy">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>

2
tools/Export/main.cpp
View File

@@ -305,7 +305,7 @@ int main(int argc, char * argv[])
std::multimap<int, Link> links; std::multimap<int, Link> links;
printf("Optimizing the map...\n"); printf("Optimizing the map...\n");
rtabmap.getGraph(optimizedPoses, links, true, true, &nodes, true, true, true, true); rtabmap.getGraph(optimizedPoses, links, true, true, &nodes, true, true, true, true);
printf("Optimizing the map... done (%fs).\n", timer.ticks()); printf("Optimizing the map... done (%fs, poses=%d).\n", timer.ticks(), (int)optimizedPoses.size());
std::string outputDirectory = UDirectory::getDir(dbPath); std::string outputDirectory = UDirectory::getDir(dbPath);
std::string baseName = uSplit(UFile::getName(dbPath), '.').front(); std::string baseName = uSplit(UFile::getName(dbPath), '.').front();