Changeset 6523 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Jan 18, 2006, 2:54:04 AM (19 years ago)

Author:

bensch

Message:

trunk: water fake render

Location:

trunk/src/lib/graphics

Files:

• graphics_engine.cc (modified) (1 diff)
• importer/texture.cc (modified) (2 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -474 +474 @@
 void GraphicsEngine::wireframe()
 {
-  glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+  glPolygonMode(GL_FRONT, GL_LINE);
 }
 

trunk/src/lib/graphics/importer/texture.cc

@@ -276 +276 @@
                0,
                GL_RGBA,
-               surface->w, surface->h,
+               surface->w,
+               surface->h,
                0,
                GL_RGBA,
@@ -294 +295 @@
     PRINTF(1)("Error while loading texture (mipmap generation), gluBuild2DMipmaps returned %i\n", errorCode);
 
-  glBindTexture(target, 0);
+  if (target == GL_TEXTURE_2D)
+    glBindTexture(target, 0);
   return texture;
 }