X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FPoint.java;h=b98fb2d639ec2775cfd1c2cfb8fd9db840e98dd3;hp=57c866795d66156b1479009f7063a636d925518c;hb=14f962b26092736eed3d8bcfd2d5642c4be4e133;hpb=5dc5f8e70f3e4088f0f787e4c5e94d95c7e4c95f diff --git a/src/edu/berkeley/qfat/geom/Point.java b/src/edu/berkeley/qfat/geom/Point.java index 57c8667..b98fb2d 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,7 +37,10 @@ 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; - return null; + System.err.println("off by: " + c.getProjection(this).distance(this)); + return new AffineConstraint.Nothing(); } + public AffineConstraint multiply(Matrix m) { return m.times(this); } + }