Changeset 6350 in orxonox.OLD

Timestamp:

Dec 30, 2005, 1:36:40 PM (18 years ago)

Author:

hdavid

Message:

branches\avi_play

Location:

branches/avi_play/src

Files:

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

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

@@ -142 +142 @@
 void MediaContainer::loadFrames()
 {
+  // empty texture list
+  this->clearLists();
+
   // go to the begin of the video
   av_seek_frame(format_context, video_stream, 0, AVSEEK_FLAG_BACKWARD);
@@ -152 +155 @@
 GLuint MediaContainer::getNextFrame()
 {
+  //if (glIsTexture(texture))
+  //  glDeleteTextures(1, &texture);
+
   // get next frame
   if(av_read_frame(format_context, &packet) >= 0)

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

@@ -47 +47 @@
 TextureSequence::~TextureSequence()
 {
+  this->clearLists();
+}
+
+void TextureSequence::clearLists()
+{
   // delete all images
   while(!this->images.empty())
@@ -54 +59 @@
   }
 
-  this->setTexture(0);
   // delete all textures.
   while(!this->textures.empty())
@@ -63 +67 @@
   }
 }
-
 
 /**

branches/avi_play/src/lib/graphics/importer/texture_sequence.h

@@ -31 +31 @@
     bool addFrame(GLuint texture);
 
+    void clearLists();
+
     virtual bool rebuild();
 

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

@@ -74 +74 @@
           obj = new PrimitiveModel(PRIM_PLANE, 10.0);
           break;
+        case SDLK_5:
+          media_container->loadFrames();
+          counter = 0;
+          timer = 0;
+          PRINTF(0)("total_frames: %i\n", media_container->getFrameCount());
+          SDL_Delay(1000);
+          break;
         // increase fps
         case SDLK_9:
@@ -101 +108 @@
       timer = 0;
       counter = 0;
+      PRINTF(0)("BEGIN\n");
     }
   }