Merge pull request #226 from dirkholz/fix_quadmesh

jspricke · jspricke · commit 4b7ab13a67b0 · 2013-08-23T08:43:43.000-07:00
fixed bug in quad mesh construction (wrong index order caused invalid quads)
diff --git a/surface/include/pcl/surface/impl/organized_fast_mesh.hpp b/surface/include/pcl/surface/impl/organized_fast_mesh.hpp
@@ -114,9 +114,9 @@ pcl::OrganizedFastMesh<PointInT>::makeQuadMesh (std::vector<pcl::Vertices>& poly
                                      index_down += triangle_pixel_size_,
                                      index_down_right += triangle_pixel_size_)
     {
-      if (isValidQuad (i, index_down, index_right, index_down_right))
+      if (isValidQuad (i, index_right, index_down_right, index_down))
         if (store_shadowed_faces_ || !isShadowedQuad (i, index_right, index_down_right, index_down))
-          addQuad (i, index_down, index_right, index_down_right, idx++, polygons);
+          addQuad (i, index_right, index_down_right, index_down, idx++, polygons);
     }
   }
   polygons.resize (idx);

Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,9 @@ pcl::OrganizedFastMesh<PointInT>::makeQuadMesh (std::vector<pcl::Vertices>& poly`
`114`	`114`	`index_down += triangle_pixel_size_,`
`115`	`115`	`index_down_right += triangle_pixel_size_)`
`116`	`116`	`{`
`117`		`- if (isValidQuad (i, index_down, index_right, index_down_right))`
	`117`	`+ if (isValidQuad (i, index_right, index_down_right, index_down))`
`118`	`118`	`if (store_shadowed_faces_ \|\| !isShadowedQuad (i, index_right, index_down_right, index_down))`
`119`		`- addQuad (i, index_down, index_right, index_down_right, idx++, polygons);`
	`119`	`+ addQuad (i, index_right, index_down_right, index_down, idx++, polygons);`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`polygons.resize (idx);`