split non manif properly, corrected wrong assert)

maggio-a · Oct 5, 2018 · bebf1b7 · bebf1b7
1 parent ae87b37
commit bebf1b7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/src/mesh_graph.cpp b/src/mesh_graph.cpp
@@ -484,11 +484,11 @@ bool BuildShell(Mesh& shell, FaceGroup& fg, ParameterizationGeometry targetGeome
 
     tri::UpdateTopology<Mesh>::FaceFace(shell);
 
-    int splitCount = tri::Clean<Mesh>::SplitNonManifoldVertex(shell, 0.15);
-    if (splitCount > 0) {
+    int splitCount;
+    while ((splitCount = tri::Clean<Mesh>::SplitNonManifoldVertex(shell, 0.15)) > 0) {
         std::cout << "Mesh was not vertex-manifold, " << splitCount << " vertices split" << std::endl;
+        tri::Allocator<Mesh>::CompactEveryVector(shell);
     }
-    tri::Allocator<Mesh>::CompactEveryVector(shell);
     //tri::io::Exporter<Mesh>::Save(shell, "shell.obj", tri::io::Mask::IOM_ALL);
 
     auto ia = GetFaceIndexAttribute(shell);
@@ -687,6 +687,7 @@ bool BuildShell(Mesh& shell, FaceGroup& fg, ParameterizationGeometry targetGeome
                     // compute the singular values of the transformation matrix, s2 > s1
                     // ref for the formula: smith&schaefer 2015 bijective,
                     Eigen::Matrix2d phi = ComputeTransformationMatrix(x10, x20, u10, u20);
+
                     double bcplus  = std::pow(phi(0, 1) + phi(1, 0), 2.0);
                     double bcminus = std::pow(phi(0, 1) - phi(1, 0), 2.0);
                     double adplus  = std::pow(phi(0, 0) + phi(1, 1), 2.0);
@@ -695,7 +696,7 @@ bool BuildShell(Mesh& shell, FaceGroup& fg, ParameterizationGeometry targetGeome
                     double s_max = 0.5 * (std::sqrt(bcplus + adminus) + std::sqrt(bcminus + adplus));
 
                     double interpolationFactor = 1.0 - (s_min / s_max);
-                    ensure_condition(interpolationFactor > 0);
+                    ensure_condition(interpolationFactor >= 0);
                     ensure_condition(interpolationFactor <= 1);
                     ensure_condition(std::isfinite(interpolationFactor));
 

diff --git a/src/parameterization.cpp b/src/parameterization.cpp
@@ -705,7 +705,10 @@ int ParameterizerObject::PlaceCutWithConesUntilThreshold(double conformalScaling
 
     tri::Clean<Mesh>::RemoveDuplicateVertex(shell);
     tri::UpdateTopology<Mesh>::FaceFace(shell);
-    tri::Clean<Mesh>::SplitNonManifoldVertex(shell, 0.15);
+    int splitCount;
+    while ((splitCount = tri::Clean<Mesh>::SplitNonManifoldVertex(shell, 0.15)) > 0) {
+        tri::Allocator<Mesh>::CompactEveryVector(shell);
+    }
     tri::Allocator<Mesh>::CompactEveryVector(shell);
 
     ComputeBoundaryInfo(shell);

diff --git a/src/texture_optimization.cpp b/src/texture_optimization.cpp
@@ -792,7 +792,7 @@ RasterizationBasedPacker::PackingStats Pack(GraphHandle graph, const PackingOpti
         packingParam.pad = 2;
     } else {
         sizeUnit = 2048;
-        packingParam.pad = 8;
+        packingParam.pad = 4;
     }
 
     std::vector<Point2i> containerVec;

diff --git a/viewer/viewer.cpp b/viewer/viewer.cpp
@@ -74,8 +74,15 @@ int MainCmd(Mesh& m, GraphHandle graph, TextureObjectHandle textureObject, Args
     int c = ParameterizeGraph(gm, strategy, tolerance);
     if (c > 0) std::cout << "WARNING: " << c << " regions were not parameterized correctly" << std::endl;
 
-    PackingOptions opts = { RasterizationBasedPacker::Parameters::CostFuncEnum::MinWastedSpace, true, true, true, false };
-    Pack(gm.Graph(), opts);
+    if (gm.Graph()->Count() < 500) {
+        std::cout << "Packing " << gm.Graph()->Count() << " regions in low resolution with permutations" << std::endl;
+        PackingOptions opts = { RasterizationBasedPacker::Parameters::CostFuncEnum::MinWastedSpace, true, true, true, false };
+        Pack(gm.Graph(), opts);
+    } else {
+        std::cout << "Packing " << gm.Graph()->Count() << " regions in high resolution" << std::endl;
+        PackingOptions opts = { RasterizationBasedPacker::Parameters::CostFuncEnum::MinWastedSpace, false, false, true, false };
+        Pack(gm.Graph(), opts);
+    }
 
     std::cout << "Rendering texture..." << std::endl;
     TextureObjectHandle newTexture = RenderTexture(m, textureObject, args.filter, InterpolationMode::Linear, nullptr);
@@ -169,7 +176,10 @@ int main(int argc, char *argv[])
     if (zeroArea > 0)
         std::cout << "Removed " << zeroArea << " zero area faces" << std::endl;
 
-    int numVertexSplit = tri::Clean<Mesh>::SplitNonManifoldVertex(m, 0);
+    int numVertexSplit = 0;
+    int nv;
+    while ((nv = tri::Clean<Mesh>::SplitNonManifoldVertex(m, 0)) > 0)
+        numVertexSplit += nv;
     if (numVertexSplit > 0)
         std::cout << "Mesh was not vertex manifold, split " << numVertexSplit << " vertices" << std::endl;