Merge branch 'JACK' into 'master'

Jack See merge request !10

Merge branch 'JACK' into 'master'
Jack See merge request !10
David Mayerich
2 parents 86a4e373 c62540c7
Showing 1 changed file with 144 additions and 28 deletions Show diff stats
main.cu
@@ -67,16 +67,18 @@ std::vector&lt;float&gt; colormap;
 // special key indicator
 int mods;
-// create display lists
-GLuint dlist1;
-GLuint dlist2;
-
 //OpenGL objects
 GLuint cmap_tex = 0;				//texture name for the color map
 float delta;
 float sigma = 3;					//default sigma
 float radius = 3;					//equals to radius
+int adjoint_fac = 0;
+int light_fac = 0;
+
+//light position
+stim::vec3<float> l1(0.0, 0.0, 0.0);
+stim::vec3<float> l2(0.0, 0.0, 0.0);
 //sets an OpenGL viewport taking up the entire window
 void glut_render_single_projection(){
@@ -128,6 +130,50 @@ void glut_render_modelview(){
 //draws the network(s)
 void glut_render(void) {
+	// light
+	stim::vec3<float> eye = cam.getPosition();		//get the camera position (eye point)
+	if (l1[0] + l1[1] + l1[2] + l2[0] + l2[1] + l2[2] == 0) {
+		stim::vec3<float> s = bb.size();
+		
+		l1[0] = eye[0] + s[0] / 2;
+		l1[1] = eye[1] + s[1] / 2;
+		l1[2] = eye[2] + s[2] / 2;
+		l2[0] = eye[0] - s[0] / 2;
+		l2[1] = eye[1] - s[1] / 2;
+		l2[2] = eye[2] - s[2] / 2;
+	}
+	
+	GLfloat global_ambient[] = { 0.3, 0.3, 0.3, 1.0 };
+	GLfloat ambient[] = { 0.0, 0.0, 0.0, 1.0 };
+	GLfloat diffuse1[] = { 0.6, 0.6, 0.6, 1.0 };
+	GLfloat diffuse2[] = { 0.4, 0.4, 0.4, 1.0 };
+	GLfloat specular[] = { 0.6, 0.6, 0.6, 1.0 };
+	GLfloat position1[] = { l1[0], l1[1], 50, 0.0 };		// upper right light source
+	GLfloat position2[] = { l2[0], l2[1], 0, 0.0 };			// lower left light source
+	GLfloat position[] = { eye[0], eye[1], 50, 1.0 };
+
+	glClearColor(0.0, 0.0, 0.0, 1.0);
+	glShadeModel(GL_SMOOTH);
+
+	glLightModelfv(GL_LIGHT_MODEL_AMBIENT, global_ambient);
+
+	glLightfv(GL_LIGHT0, GL_AMBIENT, ambient);
+	glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse1);
+	glLightfv(GL_LIGHT0, GL_SPECULAR, specular);
+	glLightfv(GL_LIGHT0, GL_POSITION, position1);
+
+	glLightfv(GL_LIGHT1, GL_AMBIENT, ambient);
+	glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse2);
+	glLightfv(GL_LIGHT1, GL_SPECULAR, specular);
+	glLightfv(GL_LIGHT1, GL_POSITION, position2);
+
+	glLightfv(GL_LIGHT2, GL_AMBIENT, ambient);
+	glLightfv(GL_LIGHT2, GL_DIFFUSE, diffuse1);
+	glLightfv(GL_LIGHT2, GL_SPECULAR, specular);
+	glLightfv(GL_LIGHT2, GL_POSITION, position);
+	
+	glEnable(GL_COLOR_MATERIAL);
+
 	//no mapping, just comparing
 	if (ind == 0) {	
 		if (num_nets == 1) {										//if a single network is loaded
@@ -136,23 +182,41 @@ void glut_render(void) {
 			glut_render_modelview();								//set up the modelview matrix with camera details
 			glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);		//clear the screen
 			GT.glCenterline0();										//render the GT network (the only one loaded)
+			glDisable(GL_DEPTH_TEST);
 		}
 		if (num_nets == 2) {										//if two networks are loaded	
+			glEnable(GL_TEXTURE_1D);										//enable texture mapping
+			if (light_fac == 0)
+				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	//texture map will be used as the network color
+			else
+				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+			glBindTexture(GL_TEXTURE_1D, cmap_tex);							//bind the Brewer texture map
+			
 			glEnable(GL_DEPTH_TEST);								//enable depth
 			glut_render_left_projection();							//set up a projection for the left half of the window
 			glut_render_modelview();								//set up the modelview matrix using camera details
 			glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);		//clear the screen
-			glEnable(GL_TEXTURE_1D);										//enable texture mapping
-			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);		//texture map will be used as the network color
-			glBindTexture(GL_TEXTURE_1D, cmap_tex);							//bind the Brewer texture map
-
 			GT.glCylinder(sigma, radius);							//render the GT network
+			if (adjoint_fac == 1) {
+				glDisable(GL_TEXTURE_1D);							//disable texture in order to render in other color
+				glEnable(GL_BLEND);									//enable color blend
+				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	//set blend function
+				glDisable(GL_DEPTH_TEST);							//should disable depth to render transparancy
+				glColor4f(0.0f, 0.3f, 0.0f, 0.2f);
+				T.glAdjointCylinder(sigma, radius);
+				glDisable(GL_BLEND);
+				glEnable(GL_DEPTH_TEST);
+				glEnable(GL_TEXTURE_1D);
+				glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+			}
 			glut_render_right_projection();							//set up a projection for the right half of the window
 			glut_render_modelview();								//set up the modelview matrix using camera details
+
 			T.glCylinder(sigma, radius);							//render the T network
+
 			sigma = radius;											// set sigma equal to radius
 		}
 	}
@@ -165,20 +229,37 @@ void glut_render(void) {
 		}
 		if (num_nets == 2) {											//if two networks are loaded
 			if (compareMode) {
+				glEnable(GL_TEXTURE_1D);										//enable texture mapping
+				if (light_fac == 0)
+					glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	//texture map will be used as the network color
+				else
+					glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);//map light to texture
+				glBindTexture(GL_TEXTURE_1D, cmap_tex);							//bind the Brewer texture map
+				
 				glEnable(GL_DEPTH_TEST);								//enable depth
 				glut_render_left_projection();							//set up a projection for the left half of the window
 				glut_render_modelview();								//set up the modelview matrix using camera details
 				glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);		//clear the screen
-				glEnable(GL_TEXTURE_1D);										//enable texture mapping
-				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);		//texture map will be used as the network color
-				glBindTexture(GL_TEXTURE_1D, cmap_tex);							//bind the Brewer texture map
-
 				_GT.glCylinder(sigma, radius);							//render the GT network
+				if (adjoint_fac == 1) {
+					glDisable(GL_TEXTURE_1D);							//temporarily disable texture
+					glEnable(GL_BLEND);									//enable color blend
+					glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	//set blend function
+					glDisable(GL_DEPTH_TEST);							//should disable depth
+					glColor4f(0.0f, 0.3f, 0.0f, 0.2f);
+					_T.glAdjointCylinder(sigma, radius);
+					glDisable(GL_BLEND);
+					glEnable(GL_DEPTH_TEST);
+					glEnable(GL_TEXTURE_1D);							//re-enable texture
+					glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+				}
 				glut_render_right_projection();							//set up a projection for the right half of the window
 				glut_render_modelview();								//set up the modelview matrix using camera details
+
 				_T.glCylinder(sigma, radius);							//render the T network
+
 				sigma = radius;											//set sigma equal to radius
 			}
 			else {
@@ -186,18 +267,20 @@ void glut_render(void) {
 				glut_render_left_projection();							//set up a projection for the left half of the window
 				glut_render_modelview();								//set up the modelview matrix using camera details
 				glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);		//clear the screen
-
-																		//_GT.glRandColorCenterlineGT(dlist1, _gt_t, colormap);
-				_GT.glRandColorCylinder1(dlist1, _gt_t, colormap, sigma, radius);
+						
+				_GT.glRandColorCylinder(0, _gt_t, colormap, sigma, radius);
 				glut_render_right_projection();							//set up a projection for the right half of the window
 				glut_render_modelview();								//set up the modelview matrix using camera details
-																		//_T.glRandColorCenterlineT(dlist2, _t_gt, colormap);
-				_T.glRandColorCylinder2(dlist2, _t_gt, colormap, sigma, radius);
+																		
+				_T.glRandColorCylinder(1, _t_gt, colormap, sigma, radius);
+
 				sigma = radius;											//set sigma equal to radius
 			}
 		}
 	}
+	glDisable(GL_DEPTH_TEST);
+	glDisable(GL_TEXTURE_1D);
 	if (num_nets == 2) {											// works only with two networks
 		std::ostringstream ss;
@@ -206,27 +289,34 @@ void glut_render(void) {
 		else
 			ss << "Compare Mode";									// default mode is compare mode
-		glDisable(GL_TEXTURE_1D);
-		glMatrixMode(GL_PROJECTION);										// set up the 2d viewport for mode text printing
+		if (light_fac == 1)
+			glDisable(GL_LIGHTING);
+		glMatrixMode(GL_PROJECTION);								// set up the 2d viewport for mode text printing
 		glPushMatrix();
 		glLoadIdentity();
-		int X = glutGet(GLUT_WINDOW_WIDTH);									// get the current window width
-		int Y = glutGet(GLUT_WINDOW_HEIGHT);								// get the current window height
-		glViewport(0, 0, X / 2, Y);											// locate to left bottom corner
-		gluOrtho2D(0, X, 0, Y);												// define othogonal aspect
-		glColor3f(0.0, 1.0, 0.0);											// using green to show mode
+		int X = glutGet(GLUT_WINDOW_WIDTH);							// get the current window width
+		int Y = glutGet(GLUT_WINDOW_HEIGHT);						// get the current window height
+		glViewport(0, 0, X / 2, Y);									// locate to left bottom corner
+		gluOrtho2D(0, X, 0, Y);										// define othogonal aspect
+		glColor3f(0.8, 0.0, 0.0);									// using red to show mode
 		glMatrixMode(GL_MODELVIEW);
 		glPushMatrix();
 		glLoadIdentity();
-		glRasterPos2f(0, 5);												//print text in the left bottom corner
+		glRasterPos2f(0, 5);										//print text in the left bottom corner
 		glutBitmapString(GLUT_BITMAP_TIMES_ROMAN_24, (const unsigned char*)(ss.str().c_str()));
 		glPopMatrix();
 		glMatrixMode(GL_PROJECTION);
 		glPopMatrix();
+		glColor3f(1.0, 1.0, 1.0);									//clear red color
+		if (light_fac == 1)
+			glEnable(GL_LIGHTING);
 	}
+
+	glDisable(GL_COLOR_MATERIAL);
+
 	glutSwapBuffers();
 }
@@ -331,12 +421,12 @@ void glut_keyboard(unsigned char key, int x, int y){
 	switch (key) {
 		// change render mode
-		case 'm':											// if keyboard 'm' is pressed, then change render mode
-			if (compareMode && !mappingMode && ind) {		// if current mode is comparing mode
+		case 'm':															// if keyboard 'm' is pressed, then change render mode
+			if (compareMode && !mappingMode && ind && !adjoint_fac) {		// if current mode is comparing mode
 				compareMode = false;
 				mappingMode = true;
 			}
-			else if (!compareMode && mappingMode && ind) {	// if current mode is mapping mode
+			else if (!compareMode && mappingMode && ind && !adjoint_fac) {	// if current mode is mapping mode
 				compareMode = true;
 				mappingMode = false;
 			}
@@ -363,6 +453,32 @@ void glut_keyboard(unsigned char key, int x, int y){
 				radius = 0.2;
 			break;
+		// turn on/off the light
+		case 'l':						// if keyboard 'l' is pressed, then change the light
+			if (!light_fac && !adjoint_fac) {
+				light_fac = 1;
+				glEnable(GL_LIGHTING);
+				glEnable(GL_LIGHT0);
+				glEnable(GL_LIGHT1);
+				glEnable(GL_LIGHT2);
+			}
+			else if (light_fac && !adjoint_fac) {
+				light_fac = 0;
+				glDisable(GL_LIGHTING);
+				glDisable(GL_LIGHT0);
+				glDisable(GL_LIGHT1);
+				glDisable(GL_LIGHT2);
+			}
+			break;
+
+		// render a transparant T very close to GT in compare mode
+		case 32:						// if keyboard 'SPACE' is pressed, then change the adjoint_fac
+			if (!adjoint_fac && compareMode && !light_fac)
+				adjoint_fac = 1;
+			else if(adjoint_fac && compareMode && !light_fac)
+				adjoint_fac = 0;
+			break;
+
 		// close window and exit application
 		case 27:						// if keyboard 'ESC' is pressed, then exit
 			exit(0);