projects
/
anneal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
0c9e521
..
ae499b2
100644
(file)
--- a/
src/edu/berkeley/qfat/Main.java
+++ b/
src/edu/berkeley/qfat/Main.java
@@
-214,23
+214,23
@@
public class Main extends MeshViewer {
if ((t1.v1().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
(t1.v2().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
(t1.v3().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
if ((t1.v1().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
(t1.v2().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
(t1.v3().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
- t1.e1().bindEdge(t2.e3());
- t1.e2().bindEdge(t2.e2());
- t1.e3().bindEdge(t2.e1());
+ t2.e3().bindEdge(t1.e1(), m);
+ t2.e2().bindEdge(t1.e2(), m);
+ t2.e1().bindEdge(t1.e3(), m);
}
if ((t1.v2().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
(t1.v3().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
(t1.v1().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
}
if ((t1.v2().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
(t1.v3().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
(t1.v1().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
- t1.e2().bindEdge(t2.e3());
- t1.e3().bindEdge(t2.e2());
- t1.e1().bindEdge(t2.e1());
+ t2.e3().bindEdge(t1.e2(), m);
+ t2.e2().bindEdge(t1.e3(), m);
+ t2.e1().bindEdge(t1.e1(), m);
}
if ((t1.v3().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
(t1.v1().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
(t1.v2().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
}
if ((t1.v3().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
(t1.v1().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
(t1.v2().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
- t1.e3().bindEdge(t2.e3());
- t1.e1().bindEdge(t2.e2());
- t1.e2().bindEdge(t2.e1());
+ t2.e3().bindEdge(t1.e3(), m);
+ t2.e2().bindEdge(t1.e1(), m);
+ t2.e1().bindEdge(t1.e2(), m);
}
}
}
}
@@
-281,7
+281,9
@@
public class Main extends MeshViewer {
Mesh.E e = es.poll();
verts++;
//System.out.println("shatter " + e);
Mesh.E e = es.poll();
verts++;
//System.out.println("shatter " + e);
- e.shatter(e.midpoint(), null, null, true, true);
+ //e.shatter(e.midpoint(), null, null, true, true);
+
+ //e.shatter(e.midpoint(), null, null, true, false);
Thread.yield();
repaint();
}
Thread.yield();
repaint();
}
@@
-392,12
+394,13
@@
public class Main extends MeshViewer {
if (t.aspect() < 0.1 && e.length()>e.next.length() && e.length()>e.prev.length()) es.add(e);
}
}
if (t.aspect() < 0.1 && e.length()>e.next.length() && e.length()>e.prev.length()) es.add(e);
}
}
-
+ /*
for(int i=0; i<5; i++) {
Mesh.E e = es.poll();
if (e==null) break;
e.shatter();
}
for(int i=0; i<5; i++) {
Mesh.E e = es.poll();
if (e==null) break;
e.shatter();
}
+ */
tile.rebindPoints();
System.out.println("temp="+temp + " ratio="+(Math.ceil(acceptance*100)) + " " +
tile.rebindPoints();
System.out.println("temp="+temp + " ratio="+(Math.ceil(acceptance*100)) + " " +