organization

dmayerich
1 parent a47a23a9
Showing 21 changed files with 12 additions and 170 deletions Show diff stats
rts/cuda_callable.h → rts/cuda/callable.h
rts/cuda_handle_error.h → rts/cuda/error.h
rts/cuda_timer.h → rts/cuda/timer.h
envi/EnviClose.h → rts/envi/EnviClose.h
envi/EnviFid.h → rts/envi/EnviFid.h
envi/EnviHeader.h → rts/envi/EnviHeader.h
envi/EnviOpen.h → rts/envi/EnviOpen.h
envi/EnviRead.h → rts/envi/EnviRead.h
envi/EnviWrite.h → rts/envi/EnviWrite.h
envi/rtsEnvi.h → rts/envi/envi.h
rts/rtsComplex.h → rts/math/complex.h
rts/legendre.h → rts/math/legendre.h
rts/rtsMatrix.h → rts/math/matrix.h
rts/rtsPoint.h → rts/math/point.h
rts/rtsQuad.h → rts/math/quad.h
rts/rtsQuaternion.h → rts/math/quaternion.h
rts/sbessel.h → rts/math/spherical_bessel.h
rts/rtsVector.h → rts/math/vector.h
rts/material.h → rts/optics/material.h
rts/rect.h
 #ifndef RTS_LEGENDRE_H
 #define RTS_LEGENDRE_H
  
-#include "rts/cuda_callable.h"
+#include "rts/cuda/callable.h"
  
 namespace rts{
  
@@ -2,9 +2,9 @@
 #define RTS_RECT_H
  
 //enable CUDA_CALLABLE macro
-#include "rts/cuda_callable.h"
-#include "rts/rtsVector.h"
-#include "rts/rtsPoint.h"
+#include "rts/cuda/callable.h"
+#include "rts/math/vector.h"
+#include "rts/math/point.h"
 #include <iostream>
  
 namespace rts{
@@ -105,7 +105,7 @@ struct rtsQuad
 		rts::rtsPoint<T, N> result;
 		//given the two parameters a, b = [0 1], returns the position in world space
 		result = A + X * a + Y * b;
-		
+
 		return result;
 	}
  
@@ -155,4 +155,4 @@ std::ostream&amp; operator&lt;&lt;(std::ostream&amp; os, rts::rtsQuad&lt;T, N&gt; R)
 }
  
  
-#endif
 \ No newline at end of file
+#endif
-#include "rtsMatrix.h"
+#include "rts/math/matrix.h"
  
 #ifndef RTS_QUATERNION_H
 #define RTS_QUATERNION_H
@@ -19,7 +19,7 @@ public:
 	void CreateRotation(T theta, rtsVector<T, 3> axis);
 	rtsQuaternion<T> operator*(rtsQuaternion<T> &rhs);
 	rtsMatrix<T, 3> toMatrix();
-	
+
  
 	rtsQuaternion();
 	rtsQuaternion(T w, T x, T y, T z);
@@ -60,7 +60,7 @@ rtsQuaternion&lt;T&gt; rtsQuaternion&lt;T&gt;::operator *(rtsQuaternion&lt;T&gt; &amp;param)
  
 	A = (w + x)*(param.w + param.x);
 	B = (z - y)*(param.y - param.z);
-	C = (w - x)*(param.y + param.z); 
+	C = (w - x)*(param.y + param.z);
 	D = (y + z)*(param.w - param.x);
 	E = (x + z)*(param.x + param.y);
 	F = (x - z)*(param.x - param.y);
@@ -69,8 +69,8 @@ rtsQuaternion&lt;T&gt; rtsQuaternion&lt;T&gt;::operator *(rtsQuaternion&lt;T&gt; &amp;param)
  
 	rtsQuaternion<T> result;
 	result.w = B + (-E - F + G + H) /2;
-	result.x = A - (E + F + G + H)/2; 
-	result.y = C + (E - F + G - H)/2; 
+	result.x = A - (E + F + G + H)/2;
+	result.y = C + (E - F + G - H)/2;
 	result.z = D + (E - F - G + H)/2;
  
 	return result;
@@ -8,7 +8,7 @@
 #include <complex>
 #include <algorithm>
 #include <sstream>
-#include "rts/rtsComplex.h"
+#include "rts/math/complex.h"
  
 #define PI  3.14159
  
-#ifndef RTS_RECT_H
-#define RTS_RECT_H
-
-//enable CUDA_CALLABLE macro
-#include "rts/cuda_callable.h"
-#include "rts/rtsVector.h"
-#include "rts/rtsPoint.h"
-#include <iostream>
-
-namespace rts{
-
-//template for a rectangle class in ND space
-template <class T, int N>
-struct rect
-{
-	/*
-		C------------------>O
-		^                   ^
-		|                   |
-		Y                   |
-		|                   |
-		|                   |
-		A---------X-------->B
-	*/
-
-	/*T A[N];
-	T B[N];
-	T C[N];*/
-
-	rts::rtsPoint<T, N> A;
-	rts::rtsVector<T, N> X;
-	rts::rtsVector<T, N> Y;
-
-
-	CUDA_CALLABLE rect()
-	{
-
-	}
-
-	CUDA_CALLABLE rect(rtsPoint<T, N> a, rtsPoint<T, N> b, rtsPoint<T, N> c)
-	{
-
-		A = a;
-		X = b - a;
-		Y = c - a;
-
-	}
-
-	CUDA_CALLABLE rect(rts::rtsPoint<T, N> pMin, rts::rtsPoint<T, N> pMax, rts::rtsVector<T, N> normal)
-	{
-
-        //assign the corner rtsPoint
-        A = pMin;
-
-        //compute the vector from pMin to pMax
-        rts::rtsVector<T, 3> v0;
-        v0 = pMax - pMin;
-
-        //compute the cross product of A and the plane normal
-        rts::rtsVector<T, 3> v1;
-        v1 = v0.cross(normal);
-
-
-        //calculate rtsPoint B
-        rts::rtsPoint<T, 3> B;
-        B = A + v0 * 0.5 + v1 * 0.5;
-
-        //calculate rtsPoint C
-        rts::rtsPoint<T, 3> C;
-        C = A  + v0 * 0.5 - v1 * 0.5;
-
-        //calculate X and Y
-        X = B - A;
-        Y = C - A;
-
-
-
-
-	}
-
-	/*CUDA_CALLABLE rect(rts::rtsPoint<T, N> p, rts::vector<T, N> x, rts::vector<T, N> y, T sx, T sy)
-	{
-		//This constructor creates a rect given a position, orientation, and size
-		//	p	= center position of the rect
-		//	x	= x-axis for the rectangle
-		//	y	= y-axis for the rectangle
-		//	sx	= size of the rect along the A-B axis
-		//	sy	= size of the rect along the A-C axis
-
-		//normalize x and y
-		rts::vector<T, N> nx = x.norm();
-		rts::vector<T, N> ny = y.norm();
-
-		//compute X and Y
-		X = sx * x;
-		Y = sy * y;
-
-		//compute A
-		A = p - 0.5 * X - 0.5 * Y;
-
-	}*/
-
-	CUDA_CALLABLE rts::rtsPoint<T, N> p(T a, T b)
-	{
-		rts::rtsPoint<T, N> result;
-		//given the two parameters a, b = [0 1], returns the position in world space
-		result = A + X * a + Y * b;
-		
-		return result;
-	}
-
-	CUDA_CALLABLE rts::rtsPoint<T, N> operator()(T a, T b)
-	{
-		return p(a, b);
-	}
-
-	std::string toStr()
-	{
-		std::stringstream ss;
-
-		ss<<"A = "<<A<<std::endl;
-		ss<<"B = "<<A + X<<std::endl;
-		ss<<"C = "<<A + X + Y<<std::endl;
-		ss<<"D = "<<A + Y<<std::endl;
-
-        return ss.str();
-
-	}
-
-	CUDA_CALLABLE rect<T, N> operator*(T rhs)
-	{
-		//scales the plane by a scalar value
-
-		//compute the center rtsPoint
-		rts::rtsPoint<T, N> c = A + X*0.5 + Y*0.5;
-
-		//create the new rectangle
-		rect<T, N> result;
-		result.X = X * rhs;
-		result.Y = Y * rhs;
-		result.A = c - result.X*0.5 - result.Y*0.5;
-
-		return result;
-
-	}
-};
-
-}	//end namespace rts
-
-template <typename T, int N>
-std::ostream& operator<<(std::ostream& os, rts::rect<T, N> R)
-{
-    os<<R.toStr();
-    return os;
-}
-
-
-#endif
 \ No newline at end of file