From d03b807e8084446bf7f205f717b2af0e0626eeab Mon Sep 17 00:00:00 2001
From: pgovyadi <pgovyadi@gmail.com>
Date: Wed, 27 Jan 2016 13:26:26 -0600
Subject: [PATCH] fixed all the bugs and issue in the plane, rect, and circle classes. Fully functional, but needs cleanup

---
 stim/math/plane.h  | 39 +++++++++++++++++++++++----------------
 stim/math/rect.h   | 23 +++++++++++++++--------
 stim/math/vector.h |  5 +++--
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/stim/math/plane.h b/stim/math/plane.h
index 1b41f45..baa4683 100644
--- a/stim/math/plane.h
+++ b/stim/math/plane.h
@@ -6,11 +6,22 @@
 #include <stim/cuda/cudatools/callable.h>
 #include <stim/math/quaternion.h>
 
+
 namespace stim
 {
-template <typename T> class plane
+template<typename T> class plane;
+}
+
+template<typename T>
+CUDA_CALLABLE stim::plane<T> operator-(stim::plane<T> v);
+
+namespace stim
+{
+
+template <typename T>
+class plane
 {
-	private:
+	protected:
 		stim::vec<T> P;
 		stim::vec<T> N;
 		stim::vec<T> U;
@@ -31,17 +42,11 @@ template <typename T> class plane
 			init();
 		}
 
-		CUDA_CALLABLE plane(vec<T> p)
-		{
-			init();
-			P = p;
-		}
-
 		CUDA_CALLABLE plane(vec<T> n, vec<T> p = vec<T>(0, 0, 0))
 		{
 			init();
 			P = p;
-			rotate(N, n.norm());
+			rotate(n.norm());
 		}
 
 		CUDA_CALLABLE plane(T z_pos)
@@ -60,13 +65,15 @@ template <typename T> class plane
 			{
 				if(n.len() != 0)
 				{
-					rotate(N, n.norm());
+					rotate(n.norm());
+				} else {
+				 	throw 42;
 				}
 			}
-			catch
-			 {
+			catch(int i)
+			{
 				std::cerr << "No plane can be creates as all points a,b,c lie on a straight line" << std::endl;
-			} 
+			}  
 		}
 	
 		template< typename U >
@@ -77,7 +84,7 @@ template <typename T> class plane
 
 		}
 
-		CUDA_CALLABLE vec<T> norm()
+		CUDA_CALLABLE vec<T> n()
 		{
 			return N;
 		}
@@ -160,7 +167,7 @@ template <typename T> class plane
 
 		CUDA_CALLABLE stim::plane<T> operator-()
 		{
-			rts::plane<T> p = *this;
+			stim::plane<T> p = *this;
 
 			//negate the normal vector
 			p.N = -p.N;
@@ -172,7 +179,7 @@ template <typename T> class plane
 			std::stringstream ss;
 			ss<<"P: "<<P<<std::endl;
 			ss<<"N: "<<N<<std::endl;
-			ss<<"D: "<<D;
+			ss<<"U: "<<U;
 			return ss.str();
 		}
 
diff --git a/stim/math/rect.h b/stim/math/rect.h
index e8d5bec..79179f5 100644
--- a/stim/math/rect.h
+++ b/stim/math/rect.h
@@ -1,6 +1,7 @@
 #ifndef STIM_RECT_H
 #define STIM_RECT_H
 
+
 //enable CUDA_CALLABLE macro
 #include <stim/cuda/cudatools/callable.h>
 #include <stim/math/plane.h>
@@ -9,12 +10,13 @@
 #include <iostream>
 #include <iomanip>
 #include <algorithm>
+#include <assert.h>
 
 namespace stim{
 
 //template for a rectangle class in ND space
 template <typename T>
-class rect : public plane <T>
+class rect : plane <T>
 {
 	/*
 		^                   O
@@ -40,6 +42,12 @@ private:
 
 public:
 
+	using stim::plane<T>::n;
+	using stim::plane<T>::P;
+	using stim::plane<T>::N;
+	using stim::plane<T>::U;
+	using stim::plane<T>::rotate;
+
 	///base constructor.
 	CUDA_CALLABLE rect()
 	 : plane<T>()
@@ -84,7 +92,7 @@ public:
 	///@param directionX: u,v,w direction of the X vector.
 	///@param directionY: u,v,w direction of the Y vector.
 	CUDA_CALLABLE rect(vec<T> center, vec<T> directionX, vec<T> directionY )
-		 : plane<T>(p)
+		 : plane<T>((directionX.cross(directionY)).norm(),center)
 	{
 		X = directionX;
 		Y = directionY;
@@ -96,7 +104,7 @@ public:
 	///@param directionX: u,v,w direction of the X vector.
 	///@param directionY: u,v,w direction of the Y vector.
 	CUDA_CALLABLE rect(T size, vec<T> center, vec<T> directionX, vec<T> directionY )
-		: plane<T>(p)
+		: plane<T>((directionX.cross(directionY)).norm(),center)
 	{	
 		X = directionX;
 		Y = directionY;
@@ -108,8 +116,8 @@ public:
 	///@param center: x,y,z location of the center.
 	///@param directionX: u,v,w direction of the X vector.
 	///@param directionY: u,v,w direction of the Y vector.
-	CUDA_CALLABLE rect(vec<T> size, vec<T> center, vec<T> directionX, vec<T> directionY )
-		: plane<T>(p)
+	CUDA_CALLABLE rect(vec<T> size, vec<T> center, vec<T> directionX, vec<T> directionY)
+		: plane<T>((directionX.cross(directionY)).norm(), center)
 	{	
 		X = directionX;
 		Y = directionY;
@@ -136,7 +144,6 @@ public:
 	///general init method that sets a general rectangle.
 	CUDA_CALLABLE void init()
 	{
-		P = vec<T>(0, 0, 0);
 		X = vec<T>(1, 0, 0);
 		Y = vec<T>(0, 1, 0);
 	}
@@ -156,7 +163,7 @@ public:
 	{
 		stim::vec<T> result;
 		//given the two parameters a, b = [0 1], returns the position in world space
-		vec<T> A = P - X * (T)0.5 - Y * (T)0.5;
+		vec<T> A = this->P - X * (T)0.5 - Y * (T)0.5;
 		result = A + X * a + Y * b;
 
 		return result;
@@ -217,7 +224,7 @@ public:
 
 	CUDA_CALLABLE T center(vec<T> p)
 	{
-		C = p;
+		this->P = p;
 	}
 
 	///Returns the maximum distance of the rectangle from a point p to the sides of the rectangle.
diff --git a/stim/math/vector.h b/stim/math/vector.h
index 5034cc1..34d3329 100644
--- a/stim/math/vector.h
+++ b/stim/math/vector.h
@@ -71,8 +71,9 @@ struct vec : public std::vector<T>
 	vec( const vec<T>& other){
 		unsigned int N = other.size();
 		resize(N);							//resize the current vector to match the copy
-		for(unsigned int i=0; i<N; i++)		//copy each element
-			at(i) = other[i];
+		for(unsigned int i=0; i<N; i++){	//copy each element
+			at(i) = other[i];
+		}
 	}
 
 	//I'm not sure what these were doing here.
--
libgit2 0.21.4