X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=58961675069379a9aec66e3b10475f96ec60bd7c;hp=0ff0dcf7552578af068ffa8eec5964394af74879;hb=f42953f58e189d611803dcb4661bb840d785c30a;hpb=bc5bc47f080218f91ef987102204775e3e2b6677

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 0ff0dcf..5896167 100644
--- 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++;
@@ -394,7 +398,7 @@ public class Main extends MeshViewer {
             System.out.println("temp="+temp + " ratio="+(Math.ceil(ratio*100)) + " " +
                                "points_per_second=" +
                                (count*1000)/((double)(System.currentTimeMillis()-then)));
-            tile.rebuildPointSet();
+            tile.rebuild();
             repaint();
             //breakit();
             repaint();
@@ -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");