added the ability to quickly render networks in OpenGL, renamed the bounding box class

David Mayerich
1 parent 649a5e34
Showing 5 changed files with 26 additions and 14 deletions Show diff stats
stim/biomodels/network.h
stim/visualization/aabb.h → stim/visualization/aaboundingbox.h
stim/visualization/cylinder.h
stim/visualization/gl_aabb.h → stim/visualization/gl_aaboundingbox.h
stim/visualization/gl_network.h
@@ -301,6 +301,11 @@ public:
 		return R;		//return the resulting network
 	}
  
+	/// Returns the number of magnitude values stored in each edge. This should be uniform across the network.
+	unsigned nmags(){
+		return E[0].nmags();
+	}
+
  
 };		//end stim::network class
 };		//end stim namespace
@@ -6,14 +6,14 @@ namespace stim{
  
 /// This class describes a structure for an axis-aligned bounding box
 template< typename T >
-class aabb{
+class aaboundingbox{
  
 public:
 	bool set;				//has the bounding box been set to include any points?
 	stim::vec<T> A;			//minimum point in the bounding box
 	stim::vec<T> B;			//maximum point in the bounding box
  
-	aabb(){					//constructor generates an empty bounding box
+	aaboundingbox(){					//constructor generates an empty bounding box
 		set = false;
 	}
  
@@ -187,6 +187,11 @@ class cylinder
 			mags[p][m] = val;
 		}
  
+		/// Returns the number of magnitude values at each point
+		unsigned nmags(){
+			return mags[0].size();
+		}
+
  
  
 		///returns the position of the point with a given pvalue and theta on the surface
 #ifndef STIM_GL_AABB
 #define STIM_GL_AABB
  
-#include "aabb.h"
-#include "GL/gl.h"
+#include <stim/visualization/aaboundingbox.h>
+#include <GL/gl.h>
  
 namespace stim{
  
 template <typename T>
-class gl_aabb : public aabb<T>{
+class gl_aaboundingbox : public aaboundingbox<T>{
  
 public:
  
 	//default constructor
-	gl_aabb() : stim::aabb<T>(){}
+	gl_aaboundingbox() : stim::aaboundingbox<T>(){}
  
 	//constructor takes an AABB
-	gl_aabb(stim::aabb<T> b) : stim::aabb<T>(b){}
+	gl_aaboundingbox(stim::aaboundingbox<T> b) : stim::aaboundingbox<T>(b){}
  
  
 	/// Specifies vertices of the bounding box using CW winding. Use GL_LINE_LOOP for wireframe or GL_QUADS for a solid.
@@ -2,7 +2,7 @@
 #define STIM_GL_NETWORK
  
 #include <stim/biomodels/network.h>
-#include "aabb.h"
+#include <stim/visualization/aaboundingbox.h>
  
 namespace stim{
  
@@ -29,9 +29,9 @@ public:
  
 	/// Fills the parameters with the minimum and maximum spatial positions in the network,
 	///     specifying a bounding box for the network geometry
-	aabb<T> boundingbox(){
+	aaboundingbox<T> boundingbox(){
  
-		aabb<T> bb;								//create a bounding box
+		aaboundingbox<T> bb;								//create a bounding box
  
 		//loop through every edge
 		for(unsigned e = 0; e < E.size(); e++){
@@ -44,16 +44,18 @@ public:
 	}
  
 	/// Render the network centerline as a series of line strips.
-	void glCenterline(){
+
+	/// @param m specifies the magnitude value used as the vertex weight (radius, error, etc.)
+	void glCenterline(unsigned m = 0){
  
 		if(!glIsList(dlist)){					//if dlist isn't a display list, create it
 			dlist = glGenLists(1);				//generate a display list
 			glNewList(dlist, GL_COMPILE);		//start a new display list
 			for(unsigned e = 0; e < E.size(); e++){				//for each edge in the network
 				glBegin(GL_LINE_STRIP);
-				for(unsigned p = 0; p < E[e].size(); p++){		//for each point on that edge
-					glVertex3f(E[e][p][0], E[e][p][1], E[e][p][2]);
-					glTexCoord1f(E[e].ri(p));
+				for(unsigned p = 0; p < E[e].size(); p++){				//for each point on that edge
+					glVertex3f(E[e][p][0], E[e][p][1], E[e][p][2]);		//set the vertex position based on the current point
+					glTexCoord1f(E[e].ri(p, m));						//set the texture coordinate based on the specified magnitude index
 				}
 				glEnd();
 			}