minor bug fixes

Pavel Govyadinov
1 parent 79a9bf3f
Showing 3 changed files with 100 additions and 34 deletions Show diff stats
stim/gl/gl_spider.h
stim/visualization/glObj.h
stim/visualization/obj.h
@@ -245,6 +245,7 @@ class gl_spider
 		///uses the default m <1,1,0>
 		void
 		genMagnitudeVectors(float delta = 0.70)
+//		genMagnitudeVectors(float delta = 0.50)
 		{
  
 			//Set up the vectors necessary for Rectangle creation.
@@ -725,12 +726,12 @@ class gl_spider
 		int
 		Step()
 		{
-		//	Bind();
+			Bind();
 			findOptimalDirection();
 			findOptimalPosition();
 			findOptimalScale();
 	//		branchDetection();
-		//	Unbind();
+			Unbind();
 			return current_cost;
 		}
  
 #ifndef STIM_GLOBJ_H
 #define STIM_GLOBJ_H
  
-#include <stim/visualization/obj.h>
 #include <GL/glew.h>
 #include <GL/glut.h>
 #include <stim/math/vector.h>
+#include <stim/visualization/obj.h>
  
  
 namespace stim
@@ -13,23 +13,25 @@ namespace stim
  *  Assist with the visualization the segmented vessels.
  *  Uses
 */
-
-class objGl : public virtual stim::obj<T>
+template <typename T>
+class glObj : public virtual stim::obj<T>
 {
 private:
 	using stim::obj<T>::L;
 	using stim::obj<T>::P;
 	using stim::obj<T>::F;
-	using vec<T>::size;
-	using vec<T>::at;
+//	using stim::obj<T>::numL();
+//	using std::vector<T>::size;
+//	using std::vector<T>::at;
 	GLuint dList;
  
  
 	void
-	init
+	init()
 	{
-		dList = glGenList(1);
+		dList = glGenLists(1);
 		glListBase(dList);
+
 		glMatrixMode(GL_PROJECTION);
 		glLoadIdentity;
 		glMatrixMode(GL_MODELVIEW);
@@ -40,15 +42,17 @@ private:
 	void
 	Create()
 	{
-		int len = (int) numL();
+		int len = (int) stim::obj<T>::numL();
 		std::vector< stim::vec<float> > line;
 		glNewList(dList, GL_COMPILE);
-		glColor3f(0.5, 1.0, 0.5);
+	//	glColor3f(0.0, 1.0, 0.0);
+		glLineWidth(2.5);
 		for(int i = 0; i < len; i++){
-			line = getL_V(i);
-			glBegin(GL_LINES);
+			line = stim::obj<T>::getL_V(i);
+			glColor3ub(rand()%255, rand()%255, rand()%255);
+			glBegin(GL_LINE_STRIP);
 			for(int j = 0; j < line.size(); j++){
-					glVectex3f(
+					glVertex3f(
 						line[j][0],
 						line[j][1],
 						line[j][2]
@@ -57,16 +61,33 @@ private:
 			glEnd();
 		}
 		glEndList();
+		CHECK_OPENGL_ERROR
 	}
  
 public:
-	objGl(std::string filename)
+	glObj()
 	{
-		stim::obj::load(filename);
-		glPopMatrix();		//Safety Operation to avoid changing the current matrix.
+
+	}
+
+	void
+	createFromSelf()
+	{
+	//	glPopMatrix();
 		init();
 		Create();
-		glPushMatrix();
+	//	glPushMatrix();
+	}
+
+	void
+	createFromFile(std::string filename)
+	{
+		stim::obj<T>::load(filename);
+		glPushMatrix();		//Safety Operation to avoid changing the current matrix.
+		init();
+		Create();
+		glPopMatrix();
+		CHECK_OPENGL_ERROR
 	}
  
  
@@ -74,7 +95,44 @@ public:
 	Render()
 	{
 		glCallList(dList);
+		CHECK_OPENGL_ERROR
 	}
  
+	void
+	RenderLine(int i)
+	{
+		std::vector < stim::vec<T> > line;
+		int len = (int) stim::obj<T>::numL();
+		line = stim::obj<T>::getL_V(i);
+		glColor3f(0.5, 1.0, 0.5);
+		glLineWidth(3.0);
+		glBegin(GL_LINE_STRIP);
+		for(int j = 0; j < line.size(); j++){
+			glVertex3f(
+				line[j][0],
+				line[j][1],
+				line[j][2]
+				);
+		}
+		glEnd();
+	}
+
+	void
+	RenderLine(std::vector< stim::vec<T> > l)
+	{
+		glColor3f(0.5, 1.0, 0.5);
+		glLineWidth(3.0);
+		glBegin(GL_LINE_STRIP);
+		for(int j = 0; j < l.size(); j++){
+			glVertex3f(
+				l[j][0],
+				l[j][1],
+				l[j][2]
+				);
+		}
+		glEnd();
+	}
+
+};
 }
-}
+#endif
@@ -324,26 +324,27 @@ public:
  
 	/// This function terminates drawing of a primitive object, such as a line, face, or point set
 	void End(){
-
 		//copy the current object to the appropriate list
-		switch(current_type){
+		if(current_geo.size() != 0)
+		{
+			switch(current_type){
  
-		case OBJ_NONE:
-			std::cout<<"STIM::OBJ error, objEnd() called before objBegin()."<<std::endl;
-			break;
+			case OBJ_NONE:
+				std::cout<<"STIM::OBJ error, objEnd() called before objBegin()."<<std::endl;
+				break;
  
-		case OBJ_POINTS:
-			P.push_back(current_geo);
-			break;
+			case OBJ_POINTS:
+				P.push_back(current_geo);
+				break;
  
-		case OBJ_LINE:
-			L.push_back(current_geo);
-			break;
+			case OBJ_LINE:
+				L.push_back(current_geo);
+				break;
  
-		case OBJ_FACE:
-			F.push_back(current_geo);
+			case OBJ_FACE:
+				F.push_back(current_geo);
+			}
 		}
-
 		//clear everything
 		current_type = OBJ_NONE;
 		current_geo.clear();
@@ -352,6 +353,12 @@ public:
 		geo_flag_vt = false;
 		geo_flag_vn = false;
 	}
+//temporary convenience method
+	void rev(){
+		if(current_geo.size() != 0)
+		//	current_geo.reverse(current_geo.begin(), current_geo.end());
+			std::reverse(current_geo.begin(), current_geo.end());
+	}
  
 	//output the OBJ structure as a string
 	std::string str(){
@@ -556,7 +563,6 @@ public:
  
 		//get the number of points in the specified line
 		unsigned int nP = L[i].size();
-
 		//create a vector of points
 		std::vector< stim::vec<T> > l;
  
@@ -602,6 +608,7 @@ public:
 		return l;
 	}
  
+
 	/// Returns a vector containing the list of texture coordinates associated with each point of a line.
  
 	/// @param i is the index of the desired line