Changeset 3097 in orxonox.OLD for orxonox/branches/images/importer

Timestamp:

Dec 5, 2004, 3:07:19 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/images: doxygen-tags, comments, etc.

File:

• orxonox/branches/images/importer/material.cc (modified) (7 diffs)

orxonox/branches/images/importer/material.cc

@@ -525 +525 @@
 }
 
+/**
+   \brief reads in a jpg-file
+   \param jpgName the Name of the Image to load
+   \param texture a reference to the Texture to write the image to
+*/
 bool Material::loadJPG (char* jpgName, GLuint* texture)
 {
@@ -614 +619 @@
 }
 
+/**
+   \brief reads in a tga-file
+   \param tgaName the Name of the Image to load
+   \param texture a reference to the Texture to write the image to
+*/
 bool Material::loadTGA(const char * tgaName, GLuint* texture)
 {
   typedef struct
   {
-    GLubyte Header[12];                                                                 /* TGA File Header */
+    GLubyte Header[12];
   } TGAHeader;
- TGAHeader tgaHeader;                   
-
-  GLubyte uTGAcompare[12] = {0,0,2, 0,0,0,0,0,0,0,0,0}; /* Uncompressed TGA Header */
-  GLubyte cTGAcompare[12] = {0,0,10,0,0,0,0,0,0,0,0,0}; /* Compressed TGA Header */
+  TGAHeader tgaHeader;                  
+  
+  GLubyte uTGAcompare[12] = {0,0,2, 0,0,0,0,0,0,0,0,0}; // Uncompressed TGA Header 
+  GLubyte cTGAcompare[12] = {0,0,10,0,0,0,0,0,0,0,0,0}; // Compressed TGA Header 
   FILE * fTGA;
   fTGA = fopen(tgaName, "rb");
@@ -665 +675 @@
 }
 
+/**
+   \brief reads in an uncompressed tga-file
+   \param filename the Name of the Image to load
+   \param fTGA a Pointer to a File, that should be read
+   \param texture a reference to the Texture to write the image to
+*/
 bool Material::loadUncompressedTGA(const char * filename, FILE * fTGA, GLuint* texture)
 {
@@ -723 +739 @@
     }
   
-  /* Byte Swapping Optimized By Steve Thomas */
   for(cswap = 0; cswap < (int)imageSize; cswap += bytesPerPixel)
     {
@@ -735 +750 @@
 }
 
+/**
+   \brief reads in a compressed tga-file
+   \param filename the Name of the Image to load
+   \param fTGA a Pointer to a File, that should be read
+   \param texture a reference to the Texture to write the image to
+*/
 bool Material::loadCompressedTGA(const char * filename, FILE * fTGA, GLuint* texture)
 {
@@ -873 +894 @@
           for(counter = 0; counter < chunkheader; counter++) //copy the color into the image data as many times as dictated
             {                                                   
-              // switch R and B bytes areound while copying                                                                                             /* by the header */
+              // switch R and B bytes areound while copying
               pImage->data[currentbyte    ] = colorbuffer[2];
               pImage->data[currentbyte + 1] = colorbuffer[1];
@@ -905 +926 @@
     }
   
-  while(currentpixel < pixelcount);     /* Loop while there are still pixels left */
+  while(currentpixel < pixelcount);     // Loop while there are still pixels left
+
   loadTexToGL (pImage, texture);