modified to use with the new random.h and modified spharmonics.pdf classes

Pavel Govyadinov
1 parent f37cf039
Showing 1 changed file with 45 additions and 26 deletions Show diff stats
main.cpp
@@ -8,6 +8,7 @@
 #include <stim/visualization/obj.h>
 #include <stim/visualization/gl_spharmonics.h>
 #include <stim/math/constants.h>
+#include <stim/math/random.h>
  
 #define theta_scale		0.01
 #define phi_scale		0.01
@@ -95,6 +96,18 @@ void display(){
 			glVertex3f(0.0, 0.0, 0.0);
 			glVertex3f(0.0, 0.0, 100.0);
 		glEnd();
+
+		glColor3f(1.0f, 0.0f, 0.0f);
+		glBegin(GL_LINES);
+			glVertex3f(0.0, 0.0, 0.0);
+			glVertex3f(100.0, 0.0, 0.0);
+		glEnd();
+
+		glColor3f(0.0f, 0.0f, 1.0f);
+		glBegin(GL_LINES);
+			glVertex3f(0.0, 0.0, 0.0);
+			glVertex3f(0.0, 100.0, 0.0);
+		glEnd();
 	}
  
 	//flush commands on the GPU
@@ -153,7 +166,7 @@ void mouse_drag(int x, int y){
  
 	glutPostRedisplay();
 }
-
+/*
 float uniformRandom()
 {
 	return (  (float)(rand()))/(  (float)(RAND_MAX)); 
@@ -207,7 +220,7 @@ sample_sphere(int num_samples, float radius = 1.0)
  
 	return samples;
 }
-
+*/
 void process_arguments(int argc, char* argv[]){
  
 	args.add("help", "prints this help");
@@ -219,6 +232,7 @@ void process_arguments(int argc, char* argv[]){
 	args.add("zaxis", "render the z-axis as a green line");
 	args.add("pdf", "outputs the PDF if an OBJ files is given");
 	args.add("interp", "interpolates between two specified sets of coefficients", "", "[c0 c1 c2 c3 ...]");
+	args.add("center", "the center of the model given with --obj", "[x y z]");
  
 	//process the command line arguments
 	args.parse(argc, argv);
@@ -315,12 +329,29 @@ void process_arguments(int argc, char* argv[]){
 	}
 	else if(args["obj"].is_set()){
  
-		std::string filename = args["obj"].as_string(0);
-		unsigned int l = args["obj"].as_int(1);
-		int p = args["obj"].as_int(2);
-		std::cout << p << std::endl;
-		std::vector<stim::vec3<float> > sphere = sample_sphere(p);
-		p = p+3;
+		std::string filename = args["obj"].as_string(0);	///Read Filename
+		unsigned int l = args["obj"].as_int(1);			///l value
+		int p = args["obj"].as_int(2);				///number of samples
+		stim::obj<double> object(filename);			///Open the file
+		stim::vec3<double> c;					///read the center
+		if(args["center"].is_set())
+			stim::vec3<double> c(args["center"].as_float(0), args["center"].as_float(1), args["center"].as_float(2));
+		else
+			c = stim::vec3<double>(0,0,0);
+		
+		unsigned int nV = object.numV();
+		std::vector< stim::vec3<double> > points;			///redo the points such that they are in a stim::vec3 array, not stim::vec array
+//		points.resize(nV);
+		
+		for(int i = 0; i < nV; i++)
+		{
+			stim::vec<double> temp = object.getV(i);
+			points.push_back(stim::vec3<double>(temp[0], temp[1], temp[2]));
+		}
+		S.pdf(points, l, l, c, p);
+		
+/*
+		std::vector<stim::vec3<double> > sphere = stim::Random<double>::sample_sphere(p, 1.0, stim::TAU);
  
 		//create an obj object
 		stim::obj<double> object(filename);
@@ -334,8 +365,8 @@ void process_arguments(int argc, char* argv[]){
  
 		//for each vertex in the model, create an MC sample
 		std::vector< stim::vec<double> > spherical;
-		stim::vec<float> sample;
-		stim::vec<float> centered;
+		stim::vec<double> sample;
+		stim::vec<double> centered;
 		for(unsigned int i = 0; i < nV; i++){
  
 			sample = object.getV(i);			//get a vertex in cartesian coordinates
@@ -346,7 +377,7 @@ void process_arguments(int argc, char* argv[]){
 		//generate the spherical PDF
 		stim::spharmonics<double> P;
 		P.pdf(spherical, l, l);
-		std::vector<float> weights;		///array of weights
+		std::vector<double> weights;		///array of weights
 		if(args["pdf"].is_set())
 		{
 //			S.pdf(spherical, l, l);
@@ -355,7 +386,7 @@ void process_arguments(int argc, char* argv[]){
 				float val = 0;		///value starts with 0
 				for(int j = 0; j < nV; j++)		///for each point on surface
 				{
-					stim::vec3<float> star(object.getV(j)[0] - c[0],
+					stim::vec3<double> star(object.getV(j)[0] - c[0],
 						object.getV(j)[1] - c[1], 
 						object.getV(j)[2] - c[2]);		///center each point on the model 
 //					val += abs(star.dot(sphere[i])); 		///sum the dot product of the centered point and the sphere.
@@ -368,20 +399,7 @@ void process_arguments(int argc, char* argv[]){
 			S.mcBegin(l,l);
 			for(int i = 0; i < p; i++)
 			{
-				if(sphere[i] == stim::vec3<float>(0., 0., 1.))
-				{
-					std::cout << i  << sphere[i] << " " << weights[i] << std::endl;
-				}
-				if(sphere[i] == stim::vec3<float>(0., 1., 0.))
-				{
-					std::cout << i << sphere[i] << " " << weights[i] << std::endl;
-				}
-				if(sphere[i] == stim::vec3<float>(0., -1., 0.))
-				{
-					std::cout << i <<  sphere[i] << " " << weights[i] << std::endl;
-				}
-					//std::cout << i <<  sphere[i] << " " << weights[i] << std::endl;
-				stim::vec3<float> sph = sphere[i].cart2sph();
+				stim::vec3<double> sph = sphere[i].cart2sph();
 				S.mcSample(sph[1], sph[2], weights[i]);
 			}
 			S.mcEnd();
@@ -400,6 +418,7 @@ void process_arguments(int argc, char* argv[]){
 			}
 			S.mcEnd();
 		}
+*/
 	}
  
 	//if the user specifies an SH basis function