projects
/
anneal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b424ccb
)
checkpoint
author
adam
<adam@megacz.com>
Wed, 5 Dec 2007 05:59:35 +0000
(21:59 -0800)
committer
adam
<adam@megacz.com>
Wed, 5 Dec 2007 05:59:35 +0000
(21:59 -0800)
darcs-hash:
20071205055935
-5007d-
fb24a9e4dbcfcfbebbb441906381ff3500ebe651
.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
84cb091
..
d1fda3c
100644
(file)
--- a/
src/edu/berkeley/qfat/Mesh.java
+++ b/
src/edu/berkeley/qfat/Mesh.java
@@
-125,6
+125,7
@@
public class Mesh implements Iterable<Mesh.T> {
public final class Vert extends HasPoint {
public Point p;
public Point getPoint() { return p; }
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();
private Vert(Point p) {
this.p = p;
if (pointset.get(p) != null) throw new Error();
@@
-415,16
+416,20
@@
public class Mesh implements Iterable<Mesh.T> {
}
/** creates an isolated edge out in the middle of space */
}
/** 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 */
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;
this.p1 = prev.p2;
this.p2 = p2;
this.prev = prev;
@@
-540,9
+545,9
@@
public class Mesh implements Iterable<Mesh.T> {
e = v2.getE(v1);
if (e != null) return e;
}
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) {
}
public T newT(Point p1, Point p2, Point p3, Vec norm) {
if (norm != null) {