Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3091 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Dec 5, 2004, 12:15:02 AM (20 years ago)
Author:
bensch
Message:

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

Location:
orxonox/branches/images/importer
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/images/importer/material.cc

    r3090 r3091  
    480480      pImage->data[i+2] = temp;
    481481    }
    482   loadTexToGL (pImage->sizeX, pImage->sizeY, pImage->data, texture);
     482  loadTexToGL (pImage, texture);
    483483 
    484484  return true;
     
    538538    exit(0);
    539539 
    540   loadTexToGL (pImage->sizeX, pImage->sizeY, pImage->data, texture);
     540  loadTexToGL (pImage, texture);
    541541  if (pImage)
    542542    {
     
    590590}
    591591
    592 bool Material::loadTexToGL (int hight, int width, void* rawImage, GLuint* texture)
     592bool Material::loadTexToGL (Image* pImage, GLuint* texture)
    593593{
    594594  glGenTextures(1, texture);
     
    599599                GL_UNSIGNED_BYTE, map->pixels );
    600600  */
    601   gluBuild2DMipmaps(GL_TEXTURE_2D, 3, width, hight, GL_RGB, GL_UNSIGNED_BYTE, rawImage);
     601  gluBuild2DMipmaps(GL_TEXTURE_2D, 3, pImage->sizeX, pImage->sizeY, GL_RGB, GL_UNSIGNED_BYTE, pImage->data);
    602602 
    603603  glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
  • orxonox/branches/images/importer/material.h

    r3090 r3091  
    9292  void decodeJPG(jpeg_decompress_struct* cinfo, Image *pImageData);
    9393
    94   bool loadTexToGL (int hight, int width, void* rawImage, GLuint* texture);
     94  bool loadTexToGL (Image* pImage, GLuint* texture);
    9595};
    9696#endif
Note: See TracChangeset for help on using the changeset viewer.