fixed output textures count

This commit is contained in:
matlabbe
2017-06-09 17:51:13 -04:00
parent 4ac422314d
commit e321e1bb2c
2 changed files with 2 additions and 1 deletions

View File

@@ -2027,7 +2027,7 @@ void concatenateTextureMaterials(pcl::TextureMesh & mesh, const cv::Size & image
rowCount = float(textureSize)/(scale*float(h)); rowCount = float(textureSize)/(scale*float(h));
factor+=epsilon; // search the maximum perfect fit factor+=epsilon; // search the maximum perfect fit
} }
int outputTextures = (materials / (colCount*rowCount))+1; int outputTextures = (materials / (colCount*rowCount)) + (materials % (colCount*rowCount) > 0?1:0);
UDEBUG("materials=%d col=%d row=%d output textures=%d factor=%f scale=%f", materials, colCount, rowCount, outputTextures, factor-epsilon, scale); UDEBUG("materials=%d col=%d row=%d output textures=%d factor=%f scale=%f", materials, colCount, rowCount, outputTextures, factor-epsilon, scale);
UASSERT(mesh.tex_coordinates.size() == mesh.tex_materials.size() && mesh.tex_polygons.size() == mesh.tex_materials.size()); UASSERT(mesh.tex_coordinates.size() == mesh.tex_materials.size() && mesh.tex_polygons.size() == mesh.tex_materials.size());

View File

@@ -3604,6 +3604,7 @@ std::vector<cv::Mat> ExportCloudsDialog::mergeTextures(
} }
} }
} }
UDEBUG("globalTextures=%d", (int)globalTextures.size());
return globalTextures; return globalTextures;
} }