public final class Vert extends HasPoint {
public Point p;
public Point getPoint() { return p; }
+ private Vert(Point p, E e) { this(p); }
private Vert(Point p) {
this.p = p;
if (pointset.get(p) != null) throw new Error();
return null;
}
+ public E getE(Point p2) {
+ Vert v = pointset.get(p2);
+ if (v==null) return null;
+ return getE(v);
+ }
public E getE(Vert p2) {
E e = this.e;
do {
}
boolean shattered = false;
- public Vert shatter() { return shatter(register(midpoint()), null, null); }
- public Vert shatter(Vert mid, BindingGroup bg1, BindingGroup bg2) {
+ public Point shatter() { return shatter(midpoint(), null, null); }
+ public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2) {
if (shattered) return mid;
shattered = true;
if (bg1==null) bg1 = new BindingGroup();
if (bg2==null) bg2 = new BindingGroup();
- for(E e : bg.es) e.shatter(register(e.midpoint()), bg1, bg2);
+ for(E e : bg.es) e.shatter(e.midpoint(), bg1, bg2);
pair.shatter();
destroy();
- newT(r.p, p1.p, mid.p, null);
- newT(r.p, mid.p, p2.p, null);
+ newT(r.p, p1.p, mid, null);
+ newT(r.p, mid, p2.p, null);
bg1.add(p1.getE(mid));
- bg2.add(mid.getE(p2));
+ bg2.add(p2.getE(mid).pair);
return mid;
}
}
/** creates an isolated edge out in the middle of space */
- public E(Vert p1, Vert p2) {
- if (p1==p2) throw new Error("attempt to create edge with single vertex: " + p1);
- this.p1 = p1;
- this.p2 = p2;
+ public E(Point p1, Point p2) {
+ if (pointset.get(p1) != null) throw new Error();
+ if (pointset.get(p2) != null) throw new Error();
+ this.p1 = new Vert(p1, this);
+ this.p2 = new Vert(p2, this);
this.prev = this.next = this.pair = new E(this, this, this);
sync();
}
/** adds a new half-edge from prev.p2 to p2 */
- public E(E prev, Vert p2) {
+ public E(E prev, Point p) {
+ Vert p2;
+ p2 = pointset.get(p);
+ if (p2 == null) p2 = new Vert(p, this);
this.p1 = prev.p2;
this.p2 = p2;
this.prev = prev;
e = v2.getE(v1);
if (e != null) return e;
}
- if (v1 != null) return new E(v1.getFreeIncident(), register(p2));
- if (v2 != null) return new E(v2.getFreeIncident(), register(p1)).pair;
- return new E(register(p1), register(p2));
+ if (v1 != null) return new E(v1.getFreeIncident(), p2);
+ if (v2 != null) return new E(v2.getFreeIncident(), p1).pair;
+ return new E(p1, p2);
}
public T newT(Point p1, Point p2, Point p3, Vec norm) {
if (norm != null) {