Changeset 3091 in orxonox.OLD

Timestamp:

Dec 5, 2004, 12:15:02 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/images: passing struct instead of all its values by themselves.

Location:

orxonox/branches/images/importer

Files:

• material.cc (modified) (4 diffs)
• material.h (modified) (1 diff)

orxonox/branches/images/importer/material.cc

@@ -480 +480 @@
       pImage->data[i+2] = temp;
     }
-  loadTexToGL (pImage->sizeX, pImage->sizeY, pImage->data, texture);
+  loadTexToGL (pImage, texture);
   
   return true;
@@ -538 +538 @@
     exit(0);
   
-  loadTexToGL (pImage->sizeX, pImage->sizeY, pImage->data, texture);
+  loadTexToGL (pImage, texture);
   if (pImage)
     {
@@ -590 +590 @@
 }
 
-bool Material::loadTexToGL (int hight, int width, void* rawImage, GLuint* texture)
+bool Material::loadTexToGL (Image* pImage, GLuint* texture)
 {
   glGenTextures(1, texture);
@@ -599 +599 @@
                 GL_UNSIGNED_BYTE, map->pixels );
   */ 
-  gluBuild2DMipmaps(GL_TEXTURE_2D, 3, width, hight, GL_RGB, GL_UNSIGNED_BYTE, rawImage);
+  gluBuild2DMipmaps(GL_TEXTURE_2D, 3, pImage->sizeX, pImage->sizeY, GL_RGB, GL_UNSIGNED_BYTE, pImage->data);
   
   glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);

orxonox/branches/images/importer/material.h

@@ -92 +92 @@
   void decodeJPG(jpeg_decompress_struct* cinfo, Image *pImageData);
 
-  bool loadTexToGL (int hight, int width, void* rawImage, GLuint* texture);
+  bool loadTexToGL (Image* pImage, GLuint* texture);
 };
 #endif