Fix hole filling, broke in a03ea60, 89f1bf1

nmoehrle · Jul 20, 2016 · 544f371 · 544f371
1 parent d512755
commit 544f371
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/libs/tex/generate_texture_patches.cpp b/libs/tex/generate_texture_patches.cpp
@@ -255,7 +255,7 @@ bool fill_hole(std::vector<std::size_t> const & hole, UniGraph const & graph,
         std::size_t vi0 = border[j];
         std::size_t vi1 = border[(j + 1) % border.size()];
         std::vector<VertexProjectionInfo> const & vpi0 = vertex_projection_infos->at(vi0);
-        std::vector<VertexProjectionInfo> const & vpi1 = vertex_projection_infos->at(vi0);
+        std::vector<VertexProjectionInfo> const & vpi1 = vertex_projection_infos->at(vi1);
         /* According to the previous checks (vertex class within the origial
          * mesh and boundary) there already has to be at least one projection
          * of each border vertex. */

diff --git a/libs/tex/local_seam_leveling.cpp b/libs/tex/local_seam_leveling.cpp
@@ -154,6 +154,7 @@ local_seam_leveling(UniGraph const & graph, mve::TriangleMesh::ConstPtr mesh,
     /* Sample vertex colors. */
     for (std::size_t i = 0; i < vertex_colors.size(); ++i) {
         std::vector<VertexProjectionInfo> const & projection_infos = vertex_projection_infos[i];
+        if (projection_infos.size() <= 1) continue;
 
         math::Accum<math::Vec3f> color_accum(math::Vec3f(0.0f));
         for (VertexProjectionInfo const & projection_info : projection_infos) {
@@ -162,6 +163,8 @@ local_seam_leveling(UniGraph const & graph, mve::TriangleMesh::ConstPtr mesh,
             math::Vec3f color = texture_patch->get_pixel_value(projection_info.projection);
             color_accum.add(color, 1.0f);
         }
+	if (color_accum.w == 0.0f) continue;
+
         vertex_colors[i] = color_accum.normalized();
 
         for (VertexProjectionInfo const & projection_info : projection_infos) {
@@ -193,6 +196,7 @@ local_seam_leveling(UniGraph const & graph, mve::TriangleMesh::ConstPtr mesh,
         if (texture_patch->get_label() != 0) {
             texture_patch->prepare_blending_mask(STRIP_SIZE);
         }
+
         texture_patch->blend(image);
         texture_patch->release_blending_mask();
         texture_patch_counter.inc();