Changeset 5293 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Oct 7, 2005, 12:49:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: most remaining memory leaks are related to SDL_Video-buffer-stuff
remaining Errors are within the SDL-lib… or at least i think so
→ find the solution

File:

• trunk/src/lib/graphics/importer/texture.cc (modified) (4 diffs)

trunk/src/lib/graphics/importer/texture.cc

@@ -60 +60 @@
       PRINTF(4)("Loading texture to OpenGL-Environment.\n");
 
-      GLuint texture;
       int w, h;
       SDL_Surface *image;
@@ -110 +109 @@
 
       /* Create an OpenGL texture for the image */
-      glGenTextures(1, &texture);
-      glBindTexture(GL_TEXTURE_2D, texture);
+      glGenTextures(1, &this->texture);
+      glBindTexture(GL_TEXTURE_2D, this->texture);
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -134 +133 @@
       SDL_FreeSurface(image); /* No longer needed */
       glBindTexture(GL_TEXTURE_2D, 0);
-      return texture;
     }
 }
@@ -163 +161 @@
           PRINTF(3)("loading Image %s\n", imageName);
           if (tmpSurf)
-            this->texture = loadTexToGL(tmpSurf);
+            loadTexToGL(tmpSurf);