X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fvector.h;h=4504fe4572a8f088407029c0f36342d8d0ae350e;hb=7fde5a077bc9bbce28662fa2e5aa5043f3b4747f;hp=6f6fa06f1b7cda0fcb67ef2a6b5e2cfd03718e82;hpb=c84263bb8b0d16e4c6da49aa0b7d0bc904ae02b1;p=ttedit

diff --git a/src/vector.h b/src/vector.h
index 6f6fa06..4504fe4 100755
--- a/src/vector.h
+++ b/src/vector.h
@@ -1,3 +1,5 @@
+#if 0
+
 //
 // VECTOR.H - vector class definition
 //
@@ -29,7 +31,72 @@ struct vector
 	void operator+=(const vector &v);
 	void operator-=(const vector &v);
 	vector operator*(const double &d);			// Scale vector by amount
-	void zero(const double epsilon);
+	void zero(const double epsilon = 1.0e-6);
+};
+
+#endif	// __VECTOR_H__
+
+#else
+
+//
+// vector.h (Last modified: 6/28/2001)
+//
+// Various structures used for 3 dimensional imaging
+//
+// by James L. Hammons
+// (C) 2001 Underground Software
+//
+
+#ifndef __VECTOR_H__
+#define __VECTOR_H__
+
+// What we'll do here is create the vector type and use typedef to alias Point to it. Yeah, that's it.
+
+class Vector
+{
+	public:
+//		Vector(double xx = 0, double yy = 0, double zz = 0);
+		Vector(double x1 = 0, double y1 = 0, double z1 = 0, double x2 = 0, double y2 = 0, double z2 = 0);
+		Vector(Vector head, Vector tail);		// Create vector from two points
+		Vector operator=(Vector const v);
+		Vector operator+(Vector const v);
+		Vector operator-(Vector const v);
+		Vector operator-(void);					// Unary negation
+		Vector operator*(double const v);		// Vector times constant (double)
+		Vector operator*(float const v);		// Vector times constant (float)
+		Vector operator/(double const v);		// Vector divided by constant (double)
+		Vector operator/(float const v);		// Vector divided by constant (float)
+		Vector operator*(Vector const v);		// Vector product
+		double Dot(Vector const v);				// Dot product
+
+		Vector& operator*=(double const v);		// Vector times constant self-assignment
+		Vector& operator/=(double const v);		// Vector divided by constant self-assignment
+		Vector& operator+=(Vector const v);		// Vector plus Vector self-assignment
+		Vector& operator+=(double const v);		// Vector plus constant self-assignment
+		Vector& operator-=(Vector const v);		// Vector minus Vector self-assignment
+		Vector& operator-=(double const v);		// Vector minus constant self-assignment
+
+		bool operator==(Vector const v);		// Check for equality
+		bool operator!=(Vector const v);		// Check for inequality
+
+		Vector Unit(void);
+		double Magnitude(void);
+		double Angle(void);						// Angle of this vector WRT positive X-axis
+		double Angle(Vector v);					// Angle between these two vectors
+		bool isZero(double epsilon = 1e-6);
+
+		// Class methods
+
+		static double Dot(Vector v1, Vector v2);
+		static double Magnitude(Vector v1, Vector v2);
+
+	public:
+		double x, y, z;
 };
 
+typedef Vector Point;
+
 #endif	// __VECTOR_H__
+
+#endif
+