Merge branch 'network'

Mergint updates to the stim::obj class.

Merge branch 'network'
Mergint updates to the stim::obj class.
David Mayerich
2 parents edd4ab2d 271708c4
Showing 2 changed files with 74 additions and 3 deletions Show diff stats
stim/math/spharmonics.h
stim/visualization/obj.h
 #ifndef STIM_SPH_HARMONICS
 #define STIM_SPH_HARMONICS
-
+#include <stim/math/mathvec.h>
 #include <boost/math/special_functions/spherical_harmonic.hpp>
 #include <vector>
@@ -8,6 +8,8 @@
 #include <stim/parser/parser.h>
 #include <stim/math/mathvec.h>
+#include <ANN/ANN.h>
+
 namespace stim{
 /** This class provides an interface for loading, saving, and working with Wavefront OBJ files.
@@ -41,7 +43,11 @@ protected:
 		using vec<T>::size;
 		using vec<T>::at;
+		//basic constructors (call the stim::vector constructors)
 		vertex(){}
+		vertex(T x, T y) : stim::vec<T>(x, y){}
+		vertex(T x, T y, T z) : stim::vec<T>(x, y, z){}
+		vertex(T x, T y, T z, T w) : stim::vec<T>(x, y, z, w){}
 		//constructor creates a vertex from a line string
 		vertex(std::string line){
@@ -446,10 +452,10 @@ public:
 		}
 		std::string line;
+		getline(infile, line);		//get the first line
 		while(infile){
-			//create a variable to store a single line
-			getline(infile, line);
+
 			//get the token representing the first parameter
 			token_type token = get_token(line);
@@ -475,7 +481,14 @@ public:
 				F.push_back(geometry(line));
 				break;
+			case OBJ_L:
+				L.push_back(geometry(line));
+				break;
+
 			};
+
+			//get the next line
+			getline(infile, line);
 		}
@@ -528,6 +541,64 @@ public:
 		return c;
 	}
+	/// Returns the number of lines in the OBJ structure
+	unsigned int numL(){
+		return L.size();
+	}
+
+	/// Returns all points in the line corresponding to a given index
+
+	/// @param i is the index of the desired line
+	std::vector< stim::vec<T> > getL_V(unsigned int i){
+
+		//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;
+
+		//set the size of the vector
+		l.resize(nP);
+
+		//copy the points from the point list to the stim vector
+		unsigned int pi;
+		for(unsigned int p = 0; p < nP; p++){
+
+			//get the index of the geometry point
+			pi = L[i][p][0] - 1;
+
+			//get the coordinates of the current point
+			stim::vec<T> newP = V[pi];
+
+			//copy the point into the vector
+			l[p] = newP;
+		}
+
+		return l;
+
+	}
+
+	/// Returns the vertex indices for the specified line
+	/// @param i is the index of the line
+	std::vector< unsigned int > getL_Vi(unsigned int i){
+
+		unsigned int nP = L[i].size();
+
+		std::vector< unsigned int > l;
+
+		//set the size of the vector
+		l.resize(nP);
+
+		//copy the indices from the geometry structure to the array
+		for(unsigned int p = 0; p < nP; p++){
+			
+			l[p] = L[i][p][0];
+
+		}
+
+		return l;
+
+	}
 };