Changeset 6136 in orxonox.OLD for branches/network/src/lib/graphics/importer/texture.cc

Timestamp:

Dec 16, 2005, 6:06:32 PM (18 years ago)

Author:

patrick

Message:

network: further work on the texture class. mipmap loading on the right wa

File:

• branches/network/src/lib/graphics/importer/texture.cc (modified) (6 diffs)

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

@@ -19 +19 @@
 
 #include "debug.h"
+#include "compiler.h"
+#include <math.h>
 
 // INCLUDING SDL_Image
@@ -178 +180 @@
  * @returns a !!new!! Surface, that is loadable by openGL.
  */
-SDL_Surface* Texture::prepareSurface(SDL_Surface* surface, bool& hasAlpha)
+SDL_Surface* Texture::prepareSurface(SDL_Surface* surface, bool& hasAlpha) const
 {
   PRINTF(4)("Loading texture to OpenGL-Environment.\n");
@@ -238 +240 @@
  * @returns The ID of the texture.
  */
-GLuint Texture::loadTexToGL (const SDL_Surface* surface)
+GLuint Texture::loadTexToGL (const SDL_Surface* surface) const
 {
 //   if (this->texture != 0 && glIsTexture(this->texture))
@@ -244 +246 @@
 //   this->texture = 0;
 
-  GLuint texture;
+  int      errorCode = 0;           //!< the error code for the texture loading functions
+  GLuint   texture;                 //!< the OpenGL texture handle
+  int      mipmapLevel = 0;         //!< the maximum mipmap level for this texture
+  int      mipmapWidth = 0;         //!< the width of the mipmap
+  int      mipmapHight = 0;         //!< the height of the mipmap
+
 
   if (surface == NULL)
@@ -260 +267 @@
   glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_PRIORITY, this->priority);
 
-  // build the Texture
+  /* build the Texture  OpenGL V >= 1.1 */
   glTexImage2D(GL_TEXTURE_2D,
                0,
@@ -271 +278 @@
 
   // build the MipMaps automaticaly
-  gluBuild2DMipmaps(GL_TEXTURE_2D,
-                    GL_RGBA,
-                    surface->w,
-                    surface->h,
-                    GL_RGBA,
-                    GL_UNSIGNED_BYTE,
-                    surface->pixels);
+  errorCode = gluBuild2DMipmaps(GL_TEXTURE_2D,
+                                GL_RGBA,
+                                surface->w,
+                                surface->h,
+                                GL_RGBA,
+                                GL_UNSIGNED_BYTE,
+                                surface->pixels
+                               );
+  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, mipmapHeight);
+  glTexImage2D(GL_PROXY_TEXTURE_2D,
+               1,
+               GL_RGBA,
+               mipmapWidth, mipmapHeight,
+               0,
+               GL_RGBA,
+               GL_UNSIGNED_BYTE,
+               NULL
+               );
+
   glBindTexture(GL_TEXTURE_2D, 0);
   return texture;