X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FPoint.java;h=20048e46a0ee404ac80755411a5efd3ba0098ee5;hp=5511e4415673013873e8ff9ce7c3d8cb77895164;hb=20fe91a50615c12bdfdec4a72665ff92a700abd5;hpb=0f9ce20a060db6537a47b549cbf24fd268699ac6

diff --git a/src/edu/berkeley/qfat/geom/Point.java b/src/edu/berkeley/qfat/geom/Point.java
index 5511e44..20048e4 100644
--- a/src/edu/berkeley/qfat/geom/Point.java
+++ b/src/edu/berkeley/qfat/geom/Point.java
@@ -1,22 +1,34 @@
 package edu.berkeley.qfat.geom;
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 
 /** point in 3-space; immutable */
-public final class Point implements HasBoundingBox {
+public final class Point extends HasPoint implements HasBoundingBox {
+
+    public static final Point ZERO = new Point(0,0,0);
+
     public final float x, y, z;
+
     public Point(double x, double y, double z) { this((float)x, (float)y, (float)z); }
     public Point(float x, float y, float z) { this.x = x; this.y = y; this.z = z; }
-    public float distance(Point p) { return distance(p.x, p.y, p.z); }
-    public float distance(float ox, float oy, float oz) { return (float)Math.sqrt((x-ox)*(x-ox)+(y-oy)*(y-oy)+(z-oz)*(z-oz)); }
-    public Point times(Matrix m) { return m.times(this); }
+
+    public static final Point ORIGIN = new Point(0,0,0);
+
+    public float distance(Point p) { return (float)Math.sqrt((x-p.x)*(x-p.x)+(y-p.y)*(y-p.y)+(z-p.z)*(z-p.z)); }
+
     public Vec minus(Point p) { return new Vec(x-p.x, y-p.y, z-p.z); }
     public Point plus(Vec v) { return new Point(x+v.x, y+v.y, z+v.z); }
-    public boolean equals(Object o) { return o!=null && (o instanceof Point) && ((Point)o).x==x && ((Point)o).y==y && ((Point)o).z==z; }
-    public void glVertex(GL gl) { _glVertex(gl); }
-    private void _glVertex(GL gl) { gl.glVertex3f(x, y, z); }
+    public Point midpoint(Point p) { return new Point((x+p.x)/2, (y+p.y)/2, (z+p.z)/2); }
+
+    public void glVertex(GL gl) { gl.glVertex3f(x, y, z); }
+
     public String toString() { return "("+x+","+y+","+z+")"; }
+
+    public boolean equals(Object o) { return o!=null && (o instanceof Point) && ((Point)o).x==x && ((Point)o).y==y && ((Point)o).z==z; }
     public int hashCode() { return Float.floatToIntBits(x) ^ Float.floatToIntBits(y) ^ Float.floatToIntBits(z); }
 
+    public Point getPoint() { return this; }
+
     public float getMaxX() { return x; }
     public float getMinX() { return x; }
     public float getMaxY() { return y; }
@@ -24,3 +36,4 @@ public final class Point implements HasBoundingBox {
     public float getMaxZ() { return z; }
     public float getMinZ() { return z; }
 }
+