Changeset 3089 in orxonox.OLD

Timestamp:

Dec 4, 2004, 11:09:25 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/images: modularity improvement, loadTexToGL function, so that not each reader must implement it itself. (far from perfect)

Location:

orxonox/branches/images/importer

Files:

• material.cc (modified) (3 diffs)
• material.h (modified) (2 diffs)

orxonox/branches/images/importer/material.cc

@@ -394 +394 @@
   if (map = SDL_LoadBMP(bmpName))
     {
-
-      glGenTextures( 1, texture );
-      /* Typical Texture Generation Using Data From The Bitmap */
-      glBindTexture( GL_TEXTURE_2D, *texture );
-      
-      /* Generate The Texture */
-      glTexImage2D( GL_TEXTURE_2D, 0, 3, map->w,
-                    map->h, 0, GL_BGR,
-                    GL_UNSIGNED_BYTE, map->pixels );
-      
-      /* Linear Filtering */
-      glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );                    
-      glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+      loadTexToGL (map->w, map->h, map->pixels, texture);
       if ( map )
         SDL_FreeSurface( map );
@@ -455 +443 @@
   
 
-  if(pImage == NULL)                                                                    // If we can't load the file, quit!
+  if(pImage == NULL)
     exit(0);
-
-  // Generate a texture with the associative texture ID stored in the array
-  glGenTextures(1, texture);
-  
-  // Bind the texture to the texture arrays index and init the texture
-  glBindTexture(GL_TEXTURE_2D, *texture);
-  
-  // Build Mipmaps (builds different versions of the picture for distances - looks better)
-  gluBuild2DMipmaps(GL_TEXTURE_2D, 3, pImage->sizeX, pImage->sizeY, GL_RGB, GL_UNSIGNED_BYTE, pImage->data);
-  
-  // Lastly, we need to tell OpenGL the quality of our texture map.  GL_LINEAR_MIPMAP_LINEAR
-  // is the smoothest.  GL_LINEAR_MIPMAP_NEAREST is faster than GL_LINEAR_MIPMAP_LINEAR, 
-  // but looks blochy and pixilated.  Good for slower computers though. 
-  
-  glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
-  glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR); 
-  
-
-  // Now we need to free the image data that we loaded since OpenGL stored it as a texture
-  
-  if (pImage)                                                                           // If we loaded the image
-    {
-      if (pImage->data)                                                 // If there is texture data
+  
+  loadTexToGL (pImage->sizeX, pImage->sizeY, pImage->data, texture);
+  if (pImage)
+    {
+      if (pImage->data)
         {
-          free(pImage->data);                                           // Free the texture data, we don't need it anymore
+          free(pImage->data);
         }
       
-      free(pImage);                                                             // Free the image structure
+      free(pImage);
     }
   return true;
@@ -528 +498 @@
 }
 
+bool Material::loadTexToGL (int hight, int width, void* rawImage, GLuint* texture)
+{
+  glGenTextures(1, texture);
+  glBindTexture(GL_TEXTURE_2D, *texture);
+  /* not Working, and not needed. 
+  glTexImage2D( GL_TEXTURE_2D, 0, 3, width,
+                height, 0, GL_BGR,
+                GL_UNSIGNED_BYTE, map->pixels );
+  */ 
+  gluBuild2DMipmaps(GL_TEXTURE_2D, 3, width, hight, GL_RGB, GL_UNSIGNED_BYTE, rawImage);
+  
+  glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR); 
+  
+
+}

orxonox/branches/images/importer/material.h

@@ -71 +71 @@
     int sizeX;
     int sizeY;
-    unsigned char *data;
+    GLubyte *data;
   };
 
@@ -91 +91 @@
   bool loadJPG (char* jpgName, GLuint* texture);
   void decodeJPG(jpeg_decompress_struct* cinfo, tImageJPG *pImageData);
+
+  bool loadTexToGL (int hight, int width, void* rawImage, GLuint* texture);
 };
 #endif