From 33fcd7732290bcd1c7108ba9388af173fd139ee2 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 17 Dec 2007 22:59:02 -0800 Subject: [PATCH] checkpoint i think it works! darcs-hash:20071218065902-5007d-500328d8cbb6fb391111bde17a502cd9b17e28fd.gz --- src/edu/berkeley/qfat/Main.java | 8 +- src/edu/berkeley/qfat/Mesh.java | 96 +++++++++++------------ src/edu/berkeley/qfat/geom/BindingGroup.java | 2 + src/edu/berkeley/qfat/geom/HasBindingGroup.java | 9 ++- 4 files changed, 62 insertions(+), 53 deletions(-) diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index ae499b2..8fcb0ab 100644 --- a/src/edu/berkeley/qfat/Main.java +++ b/src/edu/berkeley/qfat/Main.java @@ -86,16 +86,16 @@ public class Main extends MeshViewer { float halfup = 0; translations = new Matrix[] { - + /* Matrix.translate(new Vec(lshift, depth, halfup)), Matrix.translate(new Vec(rshift, depth, halfup)), Matrix.translate(new Vec(lshift, -depth, halfup)), Matrix.translate(new Vec(rshift, -depth, halfup)), + */ - /* Matrix.translate(new Vec(0, depth, halfup)), Matrix.translate(new Vec(0, -depth, halfup)), - */ + Matrix.translate(new Vec(lshift, 0, height)), Matrix.translate(new Vec(rshift, 0, height)), @@ -283,7 +283,7 @@ public class Main extends MeshViewer { //System.out.println("shatter " + e); //e.shatter(e.midpoint(), null, null, true, true); - //e.shatter(e.midpoint(), null, null, true, false); + e.shatter(); Thread.yield(); repaint(); } diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index b6ff386..64724a6 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -305,11 +305,6 @@ public class Mesh implements Iterable { e.p2.bindTo(Matrix.ONE, ebound.p1); } } - public void shatter(BindingGroup bg1, BindingGroup bg2, boolean triangles) { - for(E e : set) { - e.shatter(e.midpoint(), bg1, bg2, triangles); - } - } } /** [UNIQUE] an edge */ @@ -327,16 +322,20 @@ public class Mesh implements Iterable { public boolean intersects(T t) { return t.intersects(p1.p, p2.p); } public void bindingGroupChanged(edu.berkeley.qfat.geom.BindingGroup newBindingGroup_) { + edu.berkeley.qfat.geom.BindingGroup newBindingGroup = (edu.berkeley.qfat.geom.BindingGroup)newBindingGroup_; if (newBindingGroup==null) return; if (this==newBindingGroup.getMaster()) return; - /* for(E eother : (Iterable)newBindingGroup) { - this.next.bindTo(newBindingGroup.getMatrix(eother), eother.next); - this.prev.bindTo(newBindingGroup.getMatrix(eother), eother.prev); + if (next==null || prev==null) continue; + if (eother.next==null || eother.prev==null) continue; + if (next.isBoundTo(eother.pair.prev.pair) && !prev.isBoundTo(eother.pair.next.pair)) + prev.bindTo(next.getBindingMatrix(eother.pair.prev.pair), eother.pair.next.pair); + if (!next.isBoundTo(eother.pair.prev.pair) && prev.isBoundTo(eother.pair.next.pair)) + next.bindTo(prev.getBindingMatrix(eother.pair.next.pair), eother.pair.prev.pair); } - */ + } public float stretchRatio() { @@ -394,40 +393,46 @@ public class Mesh implements Iterable { } } - 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) { - return shatter(mid, bg1, bg2, triangles, false); - } - public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2, boolean triangles, boolean leader) { - if (shattered || destroyed) return mid; + public Point shatter() { + if (shattered || destroyed) return null; shattered = true; - - Vertex r = next.p2; - E next = this.next; - E prev = this.prev; - - int old_colorclass = t==null ? 0 : t.colorclass; - if (bg1==null) bg1 = new BindingGroup(); - if (bg2==null) bg2 = new BindingGroup(); - 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); + E first = null; + E firste = null; + E firstx = null; + E firstq = null; + for(E e : (Iterable)getBoundPeers()) { + E enext = e.next; + E eprev = e.prev; + E pnext = e.pair.next; + E pprev = e.pair.prev; + Point mid = e.midpoint(); + Vertex r = e.next.p2; + Vertex l = e.pair.next.p2; + e.destroy(); + e.pair.destroy(); + newT(r.p, e.p1.p, mid, null, 0); + newT(r.p, mid, e.p2.p, null, 0); + newT(l.p, mid, e.p1.p, null, 0); + newT(l.p, e.p2.p, mid, null, 0); + /* + */ } - pair.shatter(); - destroy(); - - if (triangles) { - newT(r.p, p1.p, mid, null, old_colorclass); - newT(r.p, mid, p2.p, null, old_colorclass); - bg1.add(p1.getE(mid)); - bg2.add(p2.getE(mid).pair); - if (leader) p1.getE(mid).shatter(); + for(E e : (Iterable)getBoundPeers()) { + Point mid = e.midpoint(); + if (first==null) { + first = e.p1.getE(mid); + firste = e; + firstx = e.pair; + firstq = e.p2.getE(mid).pair; + continue; + } + e.p1.getE(mid). bindTo(e.getBindingMatrix(firste), first); + e.p1.getE(mid).pair. bindTo(e.getBindingMatrix(firste), first.pair); + e.p2.getE(mid).pair. bindTo(e.getBindingMatrix(firste), firstq); + e.p2.getE(mid).pair.pair.bindTo(e.getBindingMatrix(firste), firstq.pair); + //e.p1.getE(mid).pair.prev.bindTo(e.pair.getBindingMatrix(firstx), first.pair.prev); } - return mid; + return null; } public boolean destroyed = false; @@ -646,14 +651,9 @@ public class Mesh implements Iterable { public void reinsert() { triangles.remove(this); triangles.add(this); } public boolean shouldBeDrawn() { - /* - if (e1().bind_to==null) return false; - if (e2().bind_to==null) return false; - if (e3().bind_to==null) return false; - if (e1().bind_to.set.size() == 0) return false; - if (e2().bind_to.set.size() == 0) return false; - if (e3().bind_to.set.size() == 0) return false; - */ + if (e1().bindingGroupSize() <= 1) return false; + if (e2().bindingGroupSize() <= 1) return false; + if (e3().bindingGroupSize() <= 1) return false; return true; } diff --git a/src/edu/berkeley/qfat/geom/BindingGroup.java b/src/edu/berkeley/qfat/geom/BindingGroup.java index aec9329..5f6bf2b 100644 --- a/src/edu/berkeley/qfat/geom/BindingGroup.java +++ b/src/edu/berkeley/qfat/geom/BindingGroup.java @@ -12,6 +12,8 @@ public class BindingGroup implements Iterable { matrices.put(master, Matrix.ONE); } + public int size() { return matrices.size(); } + public void merge(BindingGroup bg, Matrix m) { if (bg==this) throw new Error(); for(HasBindingGroup hbg : bg.matrices.keySet()) { diff --git a/src/edu/berkeley/qfat/geom/HasBindingGroup.java b/src/edu/berkeley/qfat/geom/HasBindingGroup.java index 5b761a3..064b657 100644 --- a/src/edu/berkeley/qfat/geom/HasBindingGroup.java +++ b/src/edu/berkeley/qfat/geom/HasBindingGroup.java @@ -31,12 +31,19 @@ public abstract class HasBindingGroup { other.bindingGroup.merge(bindingGroup, bindingMatrix); } + public int bindingGroupSize() { + if (bindingGroup == null) return 1; + return bindingGroup.size(); + } + + public Matrix getBindingMatrix() { if (bindingGroup==null) return Matrix.ONE; return bindingGroup.getMatrix(this); } public Matrix getBindingMatrix(HasBindingGroup other) { + if (other==this) return Matrix.ONE; return bindingGroup.getMatrix(this, other); } @@ -53,7 +60,7 @@ public abstract class HasBindingGroup { } public boolean isBoundTo(HasBindingGroup t) { - return bindingGroup.contains(t); + return t==this || (bindingGroup!=null && bindingGroup.contains(t)); } public Iterable getBoundPeers() { -- 1.7.10.4