checkpoint

[anneal.git] / src / edu / berkeley / qfat / Main.java

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index c330958..5896167 100644 (file)
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -272,7 +272,11 @@ public class Main extends MeshViewer {
         int oldverts = verts;
         System.out.println("doubling vertices.");
         PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
-        for(Mesh.E e : tile.edges()) es.add(e);
+        for(Mesh.T t : tile) {
+            es.add(t.e1());
+            es.add(t.e2());
+            es.add(t.e3());
+        }
         for(int i=0; i<oldverts; i++) {
             Mesh.E e = es.poll();
             verts++;
@@ -403,10 +407,14 @@ public class Main extends MeshViewer {
             tile.recomputeAllFundamentalQuadrics();
             repaint();
             goal.applyQuadricToNeighborAll();
+
+            safeTriangles.clear();
+            for(Mesh.T t : tile) safeTriangles.add(t);
             }
        }
     }
 
+
     public static void main(String[] s) throws Exception {
         StlFile stlf = new StlFile();
         stlf.load("fish.stl");