Changeset 6333 in orxonox.OLD

Timestamp:

Dec 29, 2005, 6:12:24 PM (18 years ago)

Author:

hdavid

Message:

branches\avi_play: fixed a bug, still memory leak somewhere in MediaContainer

Location:

branches/avi_play/src

Files:

• lib/graphics/importer/media_container.cc (modified) (2 diffs)
• subprojects/importer/multitex.cc (modified) (1 diff)

branches/avi_play/src/lib/graphics/importer/media_container.cc

@@ -190 +190 @@
                       GL_UNSIGNED_BYTE,
                       surface->pixels);
-        }
-        else
-          // update the texture
-          glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, surface->w, surface->h, GL_RGB, GL_UNSIGNED_BYTE, surface->pixels);
-        // build the MipMaps
-        gluBuild2DMipmaps(GL_TEXTURE_2D,
+          // build the MipMaps
+          gluBuild2DMipmaps(GL_TEXTURE_2D,
                           GL_RGB,
                           surface->w,
@@ -202 +198 @@
                           GL_UNSIGNED_BYTE,
                           surface->pixels);
-        glBindTexture(GL_TEXTURE_2D, 0);
+          glBindTexture(GL_TEXTURE_2D, 0);
+        }
+        else
+        {
+          /* Create an OpenGL texture from the surface */
+          glGenTextures(1, &texture);
+          glBindTexture(GL_TEXTURE_2D, texture);
+          glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+          glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+          // update the texture
+          glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, surface->w, surface->h, GL_RGB, GL_UNSIGNED_BYTE, surface->pixels);
+
+          // build the MipMaps
+          gluBuild2DMipmaps(GL_TEXTURE_2D,
+                          GL_RGB,
+                          surface->w,
+                          surface->h,
+                          GL_RGB,
+                          GL_UNSIGNED_BYTE,
+                          surface->pixels);
+          glBindTexture(GL_TEXTURE_2D, 0);
+        }
 
         return texture;

branches/avi_play/src/subprojects/importer/multitex.cc

@@ -62 +62 @@
 
   // get each fram individually
-  while(seq->addFrame(movie->getNextFrame()) != NULL);
+  //while(seq->addFrame(movie->getNextFrame()) != NULL);
   // get a list of frames
-  //movie->gotoFrame(start_frame);
-  //seq->addFrameList(movie->getFrameList());
+  movie->gotoFrame(start_frame);
+  seq->addFrameList(movie->getFrameList());
 
   testMat->setDiffuseMap("maps/radialTransparency.png");