Changeset 6165 in orxonox.OLD for branches/christmas_branche/src

Timestamp:

Dec 19, 2005, 7:29:26 PM (19 years ago)

Author:

patrick

Message:

branches: added a branche christmas for some christmas tests

Location:

branches/christmas_branche

Files:

• . (copied) (copied from trunk)
• src/lib/graphics/importer/texture.cc (modified) (2 diffs)

branches/christmas_branche/src/lib/graphics/importer/texture.cc

@@ -262 +262 @@
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
   /* control the mipmap levels */
-  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MIN_LOD, -100);
-  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MAX_LOD, 0);
+//   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);
 
@@ -290 +292 @@
                                );
   if(unlikely(errorCode != 0))
-    PRINTF(1)("Error while loading texture, gluBuild2DMipmaps returned %i\n", errorCode);
-
-// #define max(a,b) (a>b)?a:b
-//   mipmapLevel = (int)(log2f(max(surface->w, surface->h)));
-// #undef max
-//   PRINTF(5)("Built the texture mipmpaps, got: %i levels of detail\n", mipmapLevel);
-
-  /* now actualy load the mipmaps into the graphics memory */
-//   glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 1, GL_TEXTURE_WIDTH, &mipmapWidth);
-//   glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 1, GL_TEXTURE_WIDTH, &mipmapHight);
-//   PRINTF(5)(" Mipmap at level %i has a %ix%i resolution\n", 1, mipmapWidth, mipmapHight);
-//   glTexImage2D(GL_PROXY_TEXTURE_2D,
-//                1,
-//                GL_RGBA,
-//                mipmapWidth, mipmapHight,
-//                0,
-//                GL_RGBA,
-//                GL_UNSIGNED_BYTE,
-//                NULL
-//                );
+    PRINTF(1)("Error while loading texture (mipmap generation), gluBuild2DMipmaps returned %i\n", errorCode);
 
   glBindTexture(GL_TEXTURE_2D, 0);