X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FVec.java;h=979cf2d914aeac420d0e37c8ad747e52bc91c775;hp=007291127ce31c66eb993d1b7900c1b55a74eda5;hb=20fe91a50615c12bdfdec4a72665ff92a700abd5;hpb=8333b6805df84244a7524fbdc58e9a6820fb0b6c diff --git a/src/edu/berkeley/qfat/geom/Vec.java b/src/edu/berkeley/qfat/geom/Vec.java index 0072911..979cf2d 100644 --- a/src/edu/berkeley/qfat/geom/Vec.java +++ b/src/edu/berkeley/qfat/geom/Vec.java @@ -1,16 +1,21 @@ package edu.berkeley.qfat.geom; import javax.media.opengl.*; +import javax.media.opengl.glu.*; /** vector in 3-space; immutable */ public final class Vec { + + public static final Vec ZERO = new Vec(0,0,0); + public final float x, y, z; public Vec(double x, double y, double z) { this((float)x, (float)y, (float)z); } public Vec(float x, float y, float z) { this.x = x; this.y = y; this.z = z; } public Vec(Point p1, Point p2) { this(p2.x-p1.x, p2.y-p1.y, p2.z-p1.z); } public Vec cross(Vec v) { return new Vec(y*v.z-z*v.y, z*v.x-x*v.z, x*v.y-y*v.x); } public Vec plus(Vec v) { return new Vec(x+v.x, y+v.y, z+v.z); } + public Point plus(Point p) { return p.plus(this); } + public Vec minus(Vec v) { return new Vec(x-v.x, y-v.y, z-v.z); } public Vec norm() { return mag()==0 ? this : div(mag()); } - public Vec times(Matrix m) { return m.apply(this); } public float mag() { return (float)Math.sqrt(x*x+y*y+z*z); } public float dot(Vec v) { return x*v.x + y*v.y + z*v.z; } public Vec times(float mag) { return new Vec(x*mag, y*mag, z*mag); }