X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=b774066000443e5e9cb28c6922b12f1e56006e14;hp=6c663d01f36ffe372c05b78547611b3c58cc2681;hb=b6875b8bd79c804e15eb75bc64044ca2c770b07d;hpb=116e33cf3c02f4935571766ed5509d0ed95551b8 diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index 6c663d0..b774066 100644 --- a/src/edu/berkeley/qfat/Main.java +++ b/src/edu/berkeley/qfat/Main.java @@ -209,11 +209,6 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener } } - for(Mesh.Vert vert : goal.vertices()) { - System.out.println("error: " + vert.quadric().preAndPostMultiply(vert.p)); - } - - //xMesh.Vert mid = lbf.getE(mbn).shatter(); // rescale to match volume @@ -269,7 +264,8 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener r1 = r1 - (float)Math.floor(r1); r1 = r1 * (float)0.01; r1 = r1 - (float)0.005; - Vec v = p.watchback().minus(p.p).norm().times(r1); + + Vec v = p.nearest_vert_in_other_mesh().minus(p.p).norm().times(r1); //v = p.norm().times(v.dot(p.norm()));