X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FPoint.java;h=d53a2e8079a989c86e855d0464b0eb052c4e975f;hb=8cb2aceb7c2b140b70b9955f1a0a6f2524f2314e;hp=bb149bed08f9d2c3f3611c591e7ad5ca96e8fa6d;hpb=eabe4f7acd947415f183290dc3269b2502a25a1c;p=anneal.git diff --git a/src/edu/berkeley/qfat/geom/Point.java b/src/edu/berkeley/qfat/geom/Point.java index bb149be..d53a2e8 100644 --- a/src/edu/berkeley/qfat/geom/Point.java +++ b/src/edu/berkeley/qfat/geom/Point.java @@ -3,7 +3,7 @@ import javax.media.opengl.*; import javax.media.opengl.glu.*; /** point in 3-space; immutable */ -public final class Point extends HasPoint implements HasBoundingBox, AffineConstraint { +public final class Point implements HasBoundingBox, AffineConstraint, HasPoint { public static final Point ZERO = new Point(0,0,0); @@ -37,9 +37,9 @@ public final class Point extends HasPoint implements HasBoundingBox, AffineConst public Point getProjection(Point p) { return this; } public AffineConstraint intersect(AffineConstraint c, float epsilon) { if (c.getProjection(this).distance(this) <= epsilon) return this; - System.err.println("off by: " + c.getProjection(this).distance(this)); - return new AffineConstraint.Nothing(); + return AffineConstraint.NONE; } public AffineConstraint multiply(Matrix m) { return m.times(this); } + }