Changeset 3536 in orxonox.OLD for orxonox/trunk

Timestamp:

Mar 13, 2005, 11:57:19 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: GL_TEXTURE_2D-patch: now only enabled and disabled through Material

Location:

orxonox/trunk/src

Files:

• glmenu/glmenu_imagescreen.cc (modified) (2 diffs)
• lib/graphics/importer/material.cc (modified) (1 diff)
• world_entities/skysphere.cc (modified) (2 diffs)

orxonox/trunk/src/glmenu/glmenu_imagescreen.cc

@@ -171 +171 @@
   glDisable(GL_LIGHTING);
 
-  backMat->select();
   glBegin(GL_QUADS);
   glColor3f(0.96, 0.84, 0.34);
@@ -210 +209 @@
   glEnd();
 
-  glEnable(GL_TEXTURE_2D);
+  backMat->select();
   glBegin(GL_QUADS);
   glTexCoord2i(0, 0); glVertex2i(offsetX, offsetY);

orxonox/trunk/src/lib/graphics/importer/material.cc

@@ -153 +153 @@
 
   if (this->diffuseTextureSet)
-    glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
+    {
+      glEnable(GL_TEXTURE_2D);
+      glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
+    }
   else
-    glBindTexture(GL_TEXTURE_2D, 0);
-  
+    {
+      glDisable(GL_TEXTURE_2D);
+      glBindTexture(GL_TEXTURE_2D, 0);
+    }
 }
 

orxonox/trunk/src/world_entities/skysphere.cc

@@ -105 +105 @@
 void Skysphere::draw()
 {
-  glEnable(GL_TEXTURE_2D);
   glPushMatrix();
   glMatrixMode(GL_MODELVIEW);
@@ -119 +118 @@
   gluSphere(sphereObj, sphereRadius, 20, 20);
   glPopMatrix();
-  glDisable(GL_TEXTURE_2D);
 }