Changed the position vector creation method to use a circle instead of square an…

…d added cyl2cart and cart2cyl functions to vec3

Changed the position vector creation method to use a circle instead of square an…
…d added cyl2cart and cart2cyl functions to vec3
Pavel Govyadinov
1 parent af825cb9
Showing 3 changed files with 27 additions and 4 deletions Show diff stats
stim/gl/gl_spider.h
stim/gl/gl_texture.h
stim/math/vec3.h
@@ -419,12 +419,16 @@ class gl_spider // : public virtual gl_texture&lt;T&gt;
                         ver = stim::rect<float>(mag,                    ///generate anoth     er rectangle that's perpendicular the first but parallel to the cart vector.
         	                pos, dir,
 	                        hor.n()); 
+									///The first vector is always in the center.
                         UpdateBuffer(0.0, 0.0+0*n_pixels);
 			for(int i = 1; i < numSamplesPos; i++)		///for the number of position samples
 			{
 				stim::vec3<float> temp = uniformRandVector();	///generate a random point on a plane.
-				temp = temp*delta*2.0 - delta;		///scale the point and center it around 0.0
+				temp[0] = temp[0]*delta;
+				temp[1] = temp[1]*2*stim::PI;
+				
 				temp[2] = 0.0;
+				temp = temp.cyl2cart();
 				pV.push_back(temp);				///save the point for further use.
                 		hor = stim::rect<float>(mag,			///generate a rectangle with the new vector as a normal.
 					 temp, dir,
@@ -878,7 +882,7 @@ class gl_spider // : public virtual gl_texture&lt;T&gt;
 			iter_dir = 0;
 			iter_siz = 0;
 #endif
-			stepsize = 3.0;
+			stepsize = 10.0;
 			n_pixels = 16.0;
 			srand(100);	
@@ -64,7 +64,7 @@ class gl_texture : public virtual image_stack&lt;T, F&gt;
 			case 4:
 				return GL_RGBA;
 			default:
-				std::cout<<"Error in stim::gl_texture - unable to guess texture format based on number of channels ("<<R[4]<<")"<<std::endl;
+				std::cout<<"Error in stim::gl_texture - unable to guess texture format based on number of channels" << std::endl;
 				exit(1);
 			}
 		}
@@ -236,7 +236,7 @@ class gl_texture : public virtual image_stack&lt;T, F&gt;
 			if(texID == 0) generate_texture();					//generate the texture if it doesn't already exist
 			else{
 				std::cout<<"Texture has already been attached to a context."<<std::endl;
-				exit(1);
+				//exit(1);     Why do we need to quit if it's attached. print the message and continue.
 			}
 		}
@@ -80,6 +80,15 @@ public:
 		return sph;
 	}
+	CUDA_CALLABLE vec3<T> cart2cyl() const{
+		vec3<T> cyl;
+		cyl.ptr[0] = sqrt(pow(ptr[0],2) + pow(ptr[1],2));
+		cyl.ptr[1] = atan(ptr[1]/ptr[0]);
+		cyl.ptr[2] = ptr[2];
+
+		return cyl;
+	}
+
 	/// Convert the vector from cartesian to spherical coordinates (r, theta, phi -> x, y, z where theta = [0, 2*pi])
 	CUDA_CALLABLE vec3<T> sph2cart() const{
 		vec3<T> cart;
@@ -90,6 +99,16 @@ public:
 		return cart;
 	}
+	/// Convert the vector from cylindrical to cart coordinates (r, theta, z -> x, y, z where theta = [0, 2*pi])
+	CUDA_CALLABLE vec3<T> cyl2cart() const{
+		vec3<T> cart;
+		cart.ptr[0] = ptr[0] * std::cos(ptr[1]);
+		cart.ptr[1] = ptr[0] * std::sin(ptr[1]);
+		cart.ptr[2] = ptr[2];
+
+		return cart;
+	}
+
 	/// Computes the normalized vector (where each coordinate is divided by the L2 norm)
 	CUDA_CALLABLE vec3<T> norm() const{
         vec3<T> result;