X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvector.h;h=67d9aa92f8e0f0d82ebb7bf2fdff4c7febe63277;hb=5d8c9e52606315fbfe857f2715b8f051b4f97491;hp=62438986ef653bd0462d9e600e307105ce592ba3;hpb=6c1279871f6bb86bc59e2561b6a7f74ab081f71e;p=architektonas

diff --git a/src/vector.h b/src/vector.h
index 6243898..67d9aa9 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -4,7 +4,7 @@
 // Various structures used for 3 dimensional imaging
 //
 // by James Hammons
-// (C) 2001, 2014 Underground Software
+// (C) 2001, 2018 Underground Software
 //
 
 #ifndef __VECTOR_H__
@@ -13,32 +13,36 @@
 // What we'll do here is create the vector type and use typedef to alias Point
 // to it. Yeah, that's it.
 
+class Vector;
+typedef Vector Point;
+
 class Vector
 {
 	public:
 		Vector(double xx = 0, double yy = 0, double zz = 0);
-		Vector(Vector tail, Vector head);		// Create vector from two points
+		Vector(Vector tail, Vector head);	// Create vector from two points
+		Vector(const Vector &v);
 		void SetAngleAndLength(double angle, double length);
 		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 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);
@@ -49,6 +53,7 @@ class Vector
 
 		static double Dot(Vector v1, Vector v2);
 		static double Magnitude(Vector v1, Vector v2);
+		static double Angle(Point p1, Point p2);
 		static double Parameter(Vector v1, Vector v2, Vector p);
 		static Vector Normal(Vector v1, Vector v2);
 		static double AngleBetween(Vector a, Vector b);
@@ -57,6 +62,4 @@ class Vector
 		double x, y, z;
 };
 
-typedef Vector Point;
-
 #endif	// __VECTOR_H__