Changeset 1997 for GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

Timestamp:

01/18/07 21:09:55 (17 years ago)

Author:

bittner

Message:

sil mutation

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

@@ -115 +115 @@
   
   glBegin(GL_TRIANGLES);
+  Vector3 normal = t.GetNormal();
+  glNormal3f(normal.x, normal.y, normal.z);
   glVertex3f(t.mVertices[0].x, t.mVertices[0].y, t.mVertices[0].z);
   glVertex3f(t.mVertices[1].x, t.mVertices[1].y, t.mVertices[1].z);
@@ -315 +317 @@
   glEnable(GL_CULL_FACE);
   glShadeModel(GL_FLAT);
+  glDepthFunc( GL_LESS );
   glEnable(GL_DEPTH_TEST);
   glEnable(GL_CULL_FACE);
   
   InitExtensions();
-  
-#if 0
-  GLfloat mat_ambient[]   = {  0.5, 0.5, 0.5, 1.0  };
-  /*  mat_specular and mat_shininess are NOT default values     */
-  GLfloat mat_diffuse[]   = {  1.0, 1.0, 1.0, 1.0  };
-  GLfloat mat_specular[]  = {  0.3, 0.3, 0.3, 1.0  };
-  GLfloat mat_shininess[] = {  1.0  };
-  
-  GLfloat light_ambient[]  = {  0.2, 0.2, 0.2, 1.0  };
-  GLfloat light_diffuse[]  = {  0.4, 0.4, 0.4, 1.0  };
-  GLfloat light_specular[] = {  0.3, 0.3, 0.3, 1.0  };
-  
-  GLfloat lmodel_ambient[] = {  0.3, 0.3, 0.3, 1.0  };
-  
-  
-  // default Material
-  glMaterialfv(GL_FRONT, GL_AMBIENT, mat_ambient);
-  glMaterialfv(GL_FRONT, GL_DIFFUSE, mat_diffuse);
-  glMaterialfv(GL_FRONT, GL_SPECULAR, mat_specular);
-  glMaterialfv(GL_FRONT, GL_SHININESS, mat_shininess);
-
-  // a light
-  glLightfv(GL_LIGHT0, GL_AMBIENT, light_ambient);
-  glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
-  glLightfv(GL_LIGHT0, GL_SPECULAR, light_specular);
-  
-  glLightfv(GL_LIGHT1, GL_AMBIENT, light_ambient);
-  glLightfv(GL_LIGHT1, GL_DIFFUSE, light_diffuse);
-  glLightfv(GL_LIGHT1, GL_SPECULAR, light_specular);
-  
-  glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lmodel_ambient);
-  
-  glEnable(GL_LIGHTING);
-  glEnable(GL_LIGHT0);
-  glEnable(GL_LIGHT1);
-  
-  
-  // set position of the light
-  GLfloat infinite_light[] = {  1.0, 0.8, 1.0, 0.0  };
-  glLightfv (GL_LIGHT0, GL_POSITION, infinite_light);
-  
-  // set position of the light2
-  GLfloat infinite_light2[] = {  -0.3, 1.5, 1.0, 0.0  };
-  glLightfv (GL_LIGHT1, GL_POSITION, infinite_light2);
-  
-  glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
-  //   glColorMaterial( GL_FRONT_AND_BACK, GL_SPECULAR);
-  glEnable(GL_COLOR_MATERIAL);
-  
-  glShadeModel( GL_FLAT );
-  
-  glDepthFunc( GL_LESS );
-  glEnable( GL_DEPTH_TEST );
-#endif
 
   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );