Changeset 3347 in orxonox.OLD for orxonox/branches/parenting/src

Timestamp:

Jan 5, 2005, 11:53:36 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/parenting: importer: bpp-patch

Location:

orxonox/branches/parenting/src/importer

Files:

• texture.cc (modified) (2 diffs)
• texture.h (modified) (1 diff)

orxonox/branches/parenting/src/importer/texture.cc

@@ -202 +202 @@
                 GL_UNSIGNED_BYTE, map->pixels );
   */ 
-  gluBuild2DMipmaps(GL_TEXTURE_2D, 3, pImage->width, pImage->height, GL_RGB, GL_UNSIGNED_BYTE, pImage->data);
+  gluBuild2DMipmaps(GL_TEXTURE_2D, 3, pImage->width, pImage->height, pImage->format, GL_UNSIGNED_BYTE, pImage->data);
   
   glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
@@ -224 +224 @@
       pImage->width  = map->w;
       pImage->data   = (GLubyte*)map->pixels;
-      pImage->bpp    = 3;//map->BytesPerPixel;
+      pImage->bpp    = map->format->BytesPerPixel;
+      if (pImage->bpp == 3)
+        pImage->format = GL_RGB;
+      else if (pImage->bpp == 4)
+        pImage->format = GL_RGBA;
+          
+      PRINTF(0)("Bits Per Pixel: %d\n", pImage->bpp);
       if( !IMG_isPNG(SDL_RWFromFile(imgNameWithPath, "rb")) && !IMG_isJPG(SDL_RWFromFile(imgNameWithPath, "rb")))
         for (int i=0;i<map->h * map->w *3;i+=3)

orxonox/branches/parenting/src/importer/texture.h

@@ -61 +61 @@
     GLuint height;  //!< The height of the Image.
     GLuint bpp;     //!< BytesPerPixel
+    GLenum format;  //!< The Format of the PixelData
     GLuint type;    //!< Type of the Image.
     GLubyte *data;  //!< The Image Data comes here! DANGER: uncompressed data.