projects
/
anneal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
73ed19a
)
checkpoint
author
adam
<adam@megacz.com>
Mon, 17 Dec 2007 23:27:55 +0000
(15:27 -0800)
committer
adam
<adam@megacz.com>
Mon, 17 Dec 2007 23:27:55 +0000
(15:27 -0800)
darcs-hash:
20071217232755
-5007d-
5b3df822526813f65a1ed1663570d4b1ef2e8469
.gz
src/edu/berkeley/qfat/Mesh.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/qfat/Mesh.java
b/src/edu/berkeley/qfat/Mesh.java
index
edd82d6
..
68e9c23
100644
(file)
--- a/
src/edu/berkeley/qfat/Mesh.java
+++ b/
src/edu/berkeley/qfat/Mesh.java
@@
-354,7
+354,8
@@
public class Mesh implements Iterable<Mesh.T> {
public void bindEdge(E e) { bind_to.add(e); }
public void dobind() { bind_to.dobind(this); }
public void bindEdge(E e) { bind_to.add(e); }
public void dobind() { bind_to.dobind(this); }
- public Point shatter() { return shatter(midpoint(), null, null, true); }
+ public Point shatter() { return shatter(true); }
+ public Point shatter(boolean triangles) { return shatter(midpoint(), null, null, triangles); }
public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2, boolean triangles) {
if (shattered || destroyed) return mid;
shattered = true;
public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2, boolean triangles) {
if (shattered || destroyed) return mid;
shattered = true;
@@
-369,6
+370,10
@@
public class Mesh implements Iterable<Mesh.T> {
BindingGroup old_bind_to = bind_to;
bind_peers.shatter(bg1, bg2, triangles);
old_bind_to.shatter(bg2.other(), bg1.other(), triangles);
BindingGroup old_bind_to = bind_to;
bind_peers.shatter(bg1, bg2, triangles);
old_bind_to.shatter(bg2.other(), bg1.other(), triangles);
+ if (!triangles) {
+ next.shatter(false);
+ prev.shatter(false);
+ }
pair.shatter();
destroy();
pair.shatter();
destroy();