Changeset 5293 in orxonox.OLD for trunk

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

Location:

trunk/src

Files:

• lib/graphics/importer/texture.cc (modified) (4 diffs)
• lib/sound/sound_engine.cc (modified) (5 diffs)
• orxonox.cc (modified) (1 diff)

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);
 
 

trunk/src/lib/sound/sound_engine.cc

@@ -205 +205 @@
 /**
  *  standard deconstructor
-
-*/
+ */
 SoundEngine::~SoundEngine ()
 {
-  SoundEngine::singletonRef = NULL;
-
   // deleting all the SoundSources
   if(this->sourceList != NULL)
@@ -236 +233 @@
     delete bufferIterator;
   }
+
   // removing openAL from AudioResource
   alutExit();
+
+  SoundEngine::singletonRef = NULL;
 }
 
@@ -307 +307 @@
 
 /**
- *  adds a SoundSource to the sourceList of the SoundEngine
+ * adds a SoundSource to the sourceList of the SoundEngine
  * @param source The source to add to the sourceList
 */
@@ -392 +392 @@
 
 /**
- *  SourceEngine::flushAllBuffers
-*/
+ * flushes all the Buffers
+ * deletes them from the BufferList, and also removes them via the ResourceManager.
+ */
 void SoundEngine::flushAllBuffers()
 {
@@ -410 +411 @@
 
 /**
-  *  SourceEngine::flushAllBuffers
+ * deletes all the Sources.
  */
 void SoundEngine::flushAllSources()

trunk/src/orxonox.cc

@@ -432 +432 @@
   delete orx;
   ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
-
-}
+}