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

Timestamp:

Jan 21, 2006, 1:18:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network-branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6500:HEAD
minor conflicts in texture and one Makefile resolved to the trunk

also made a small patch to texture, so it Modulates with GL_REPEAT

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

@@ -274 +274 @@
     this->hwExtensions = new SubString((char*)glGetString(GL_EXTENSIONS), " \n\t,");
 
-  PRINT(4)("Running on : %s %s %s\n", vendor, renderer, version);
+  PRINT(4)("Running on : vendor: %s,  renderer: %s,  version:%s\n", vendor, renderer, version);
   PRINT(4)("Extensions:\n");
   if (this->hwExtensions != NULL)

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

@@ -260 +260 @@
   glBindTexture(target, texture);
 
-  glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+  glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);
+  glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_REPEAT);
+
+  glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR/*_MIPMAP_LINEAR*/);
   glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
-
-  glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);
-  glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_REPEAT);
+  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_PRIORITY, this->priority);
+
 
   /* control the mipmap levels */
-//   glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MIN_LOD, 5);f
-//   glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MAX_LOD, 0);
-  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_PRIORITY, this->priority);
+  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MIN_LOD, 5);
+  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MAX_LOD, 0);
 
   /* build the Texture  OpenGL V >= 1.1 */
@@ -295 +296 @@
     PRINTF(1)("Error while loading texture (mipmap generation), gluBuild2DMipmaps returned %i\n", errorCode);
 
+  // Deselect newly built texture, as we do not want to display with this texture.
   if (target == GL_TEXTURE_2D)
     glBindTexture(target, 0);
+
   return texture;
 }