Changes to the rect.h class: Added a new constructor, and some methods for scali…

…ng. Changes to gl_spider.h. Support for two rects that generate the coordinates of the two spider templates and constructors

Changes to the rect.h class: Added a new constructor, and some methods for scali…
…ng. Changes to gl_spider.h. Support for two rects that generate the coordinates of the two spider templates and constructors
Pavel Govyadinov
1 parent eeebe223
Showing 2 changed files with 53 additions and 12 deletions Show diff stats
gl/gl_spider.h
math/rect.h
@@ -2,10 +2,12 @@
 #define STIM_GL_SPIDER_H
 #include <GL/glut.h>
+//#include <GL/glew.h>
+#include "gl_texture.h"
 #include "../visualization/camera.h"
 #include "./error.h"
 #include "../math/vector.h"
-
+#include "../math/rect.h"
 namespace stim
 {
@@ -14,18 +16,20 @@ template&lt;typename T&gt;
 class gl_spider : public virtual gl_texture<T>
 {
 	//doen't use gl_texture really, just needs the GLuint id.
+	//doesn't even need the texture iD really.
 	private:
 		stim::camera rotator;
 		stim::vec<float> position;  	//vector designating the position of the spider.
 		stim::vec<float> direction;	//vector designating the orientation of the spider
 						//always a unit vector.
 		stim::vec<float> magnitude;	//magnitude of the direction vector.
-						//maybe a vector in order to scale the spider
-						// in the x, y, z directions.
-		
+						//mag[0] = length.
+						//mag[1] = width.
 		//				Also maybe we some texture representation of
 		//				of the spider i.e [WH_pxl, BL_pxl, WH_pxl].
-		stim::gl_texture<T>;
+		using gl_texture<T>::texID;
+		stim::rect<float> hor;
+		stim::rect<float> ver;	
 		void
@@ -76,8 +80,28 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 		{
 			/* move to the new position */
 		}
-		
 	public:
+
+		gl_spider()
+		{
+			setPosition(0.0,0.0,0.0);
+			setDirection(1.0,1.0,1.0);
+			setMagnitude(1.0,1.0);
+			stim::vec<float> Y(1.0,0.0,0.0);
+			hor = stim::rect<float>(position, direction, Y);
+			ver = stim::rect<float>(magnitude, position, (Y.cross(direction)).norm());
+		}
+
+		gl_spider(vec<float> pos, vec<float> dir, vec<float> mag)
+		{
+			position = pos;
+			direction = dir;
+			magnitude = mag;
+			vec<float> Y(1.0,0.0,0.0);
+			hor = stim::rect<float>(position, direction, Y);
+			ver = stim::rect<float>(magnitude, position, (Y.cross(direction)).norm());
+		}
+			
 		vec<float>
 		getCurrentPosition()
 		{
@@ -131,15 +155,12 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 		}
 		void
-		setPosition(float x, float y, float z)
+		setMagnitude(float x, float y)
 		{
 			magnitude[0] = x;
 			magnitude[1] = y;
-			magnitude[2] = z;
 		}
-		
-		 		
-}
+};
 }
 #endif
@@ -36,6 +36,7 @@ private:
 		X *= factor;
 		Y *= factor;
 	}
+	
 	CUDA_CALLABLE void normal(vec<T, N> n){		//orient the rectangle along the specified normal
@@ -75,8 +76,27 @@ public:
 		scale(size);	//scale the rectangle
 		normal(n);		//orient
 	}
+	
+	//create a rectangle from a center point, normal, and size
+	CUDA_CALLABLE rect(vec<T,2> size, vec<T, N> c, vec<T, N> n = vec<T, N>(0, 0, 1)){
+		init();			//start with the default setting
+		C = c;
+		scale(size);	//scale the rectangle
+		normal(n);		//orient
+	}
-	//Pavel - write a constructor to create a rectangle given a center point (c), direction vector (v)
+	CUDA_CALLABLE rect(vec<T, N> center, vec<T, N> directionX, vec<T, N> directionY )
+	{
+		C = center;
+		X = directionX;
+		Y = directionY;
+	}
+
+	
+	CUDA_CALLABLE void scale(T factor1, T factor2){
+		X *= factor1;
+		Y *= factor2;
+	}
 	//boolean comparison
 	bool operator==(const rect<T, N> & rhs)