Changeset 10643 in orxonox.OLD for trunk/src/lib

Timestamp:

Apr 29, 2007, 6:51:28 PM (18 years ago)

Author:

bknecht

Message:

improvements by landauf on bsp, rotor and wireframe (does build, should work)

Location:

trunk/src/lib/graphics

Files:

• graphics_engine.cc (modified) (1 diff)
• importer/bsp/bsp_manager.cc (modified) (5 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -480 +480 @@
 void GraphicsEngine::wireframe()
 {
-  glPolygonMode(GL_FRONT, GL_LINE);
+  State::showWireframe(!State::showWireframe());
+  /*
+   if (State::showWireframe()){}
+       glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+   else
+       glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+  */
 }
 

trunk/src/lib/graphics/importer/bsp/bsp_manager.cc

@@ -504 +504 @@
     //  glDisable(GL_BLEND);
   }
+  
+  if (State::showWireframe())
+  {
+    glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+    glBindTexture(GL_TEXTURE_2D, this->bspFile->whiteLightMap );
+    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
+  }
 
   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-  // glColor4f(3.0,3.0,3.0,1.0);
   glEnableClientState(GL_VERTEX_ARRAY );
   glEnableClientState(GL_TEXTURE_COORD_ARRAY );
@@ -536 +542 @@
   glDisableClientState(GL_NORMAL_ARRAY );
   // glDisableClientState(GL_COLOR_ARRAY);
-
+  
+  if (State::showWireframe())
+  {
+    glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+  }
 }
 
@@ -592 +603 @@
   if (Face->effect != -1) return;
 
-
   if(Face->lm_index < 0) {
     glActiveTextureARB(GL_TEXTURE1_ARB);
@@ -602 +612 @@
     glEnable(GL_TEXTURE_2D);
   }
-  //glColor4f(3.0,3.0,3.0,1.0);
+ 
+  if (State::showWireframe())
+  {
+    glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+    glBindTexture(GL_TEXTURE_2D, this->bspFile->whiteLightMap );
+    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
+  }
+
 
   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -646 +663 @@
   glDisableClientState(GL_VERTEX_ARRAY );
   glDisableClientState(GL_TEXTURE_COORD_ARRAY );
-
-
+  
+  if (State::showWireframe())
+  {
+    glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+  }
 }