Fixed merge conflicts

Pavel Govyadinov
2 parents 3f8943f7 8d55ae06
Showing 2 changed files with 11 additions and 3 deletions Show diff stats
stim/gl/gl_spider.h
stim/math/vec3.h
@@ -317,7 +317,8 @@ class gl_spider // : public virtual gl_texture&lt;T&gt;
 					}
 					stim::vec3<float> v = cyl.surf(pval, result[i][0]);					///find the coordinates of the point at pval on the surface in tissue space.
 					stim::vec3<float> di = cyl.p(pval);							///find the coord of v in tissue space projected on the centerline.
-					float rad = cyl.r(pval)/2;								///find the radius at the pvalue's location
+					float rad = cyl.r(pval);								///find the radius at the pvalue's location
+				//	float rad = cyl.r(pval)/2;								///find the radius at the pvalue's location
 					if(
 					 !(v[0] > size[0] || v[1] > size[1]
 					 || v[2] > size[2] || v[0] < 0
@@ -374,7 +375,7 @@ class gl_spider // : public virtual gl_texture&lt;T&gt;
 		///Stored in a display list.
 		///uses the default d vector <0,0,1>
 		void
-		genDirectionVectors(float solidAngle = stim::PI/2)
+		genDirectionVectors(float solidAngle = 3*stim::PI/4)
 		{
 			//Set up the vectors necessary for Rectangle creation.
@@ -68,7 +68,7 @@ public:
 	}
-	/// Convert the vector from cartesian to spherical coordinates (x, y, z -> r, theta, phi where theta = [0, 2*pi])
+	/// Convert the vector from cartesian to spherical coordinates (x, y, z -> r, theta, phi where theta = [-PI, PI])
 	CUDA_CALLABLE vec3<T> cart2sph() const{
 		vec3<T> sph;
 		sph.ptr[0] = len();
@@ -236,6 +236,13 @@ public:
 		return result;
 	}
+	CUDA_CALLABLE bool operator==(vec3<T> rhs) const{
+		if(rhs[0] == ptr[0] && rhs[1] == ptr[1] && rhs[2] == ptr[2])
+			return true;
+		else
+			return false;	
+	}
+
 //#ifndef __NVCC__
 	/// Outputs the vector as a string
 	std::string str() const{