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
/
geom
/
Point.java
diff --git
a/src/edu/berkeley/qfat/geom/Point.java
b/src/edu/berkeley/qfat/geom/Point.java
index
d53a2e8
..
f011243
100644
(file)
--- a/
src/edu/berkeley/qfat/geom/Point.java
+++ b/
src/edu/berkeley/qfat/geom/Point.java
@@
-36,7
+36,9
@@
public final class Point implements HasBoundingBox, AffineConstraint, HasPoint {
public Point getProjection(Point p) { return this; }
public AffineConstraint intersect(AffineConstraint c, float epsilon) {
public Point getProjection(Point p) { return this; }
public AffineConstraint intersect(AffineConstraint c, float epsilon) {
- if (c.getProjection(this).distance(this) <= epsilon) return this;
+ Point p2 = c.getProjection(this);
+ if (p2==null) return AffineConstraint.NONE;
+ if (p2.distance(this) <= epsilon) return this;
return AffineConstraint.NONE;
}
public AffineConstraint multiply(Matrix m) { return m.times(this); }
return AffineConstraint.NONE;
}
public AffineConstraint multiply(Matrix m) { return m.times(this); }