Changeset 6127 in orxonox.OLD for branches/avi_play/src/subprojects/importer

Timestamp:

Dec 15, 2005, 11:54:48 PM (19 years ago)

Author:

hdavid

Message:

branches/avi_play: MediaContainer::getFPS() works

Location:

branches/avi_play/src/subprojects/importer

Files:

• importer.cc (modified) (1 diff)
• multitex.cc (modified) (3 diffs)

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

@@ -60 +60 @@
 void Framework::moduleTick(float dt)
 {
-  while(movie->getNextFrame() != NULL)
-    movie->saveCurrentFrame();  
+  //while(movie->getNextFrame() != NULL);
+  //  movie->saveCurrentFrame();        
 }
 

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

@@ -37 +37 @@
 MediaContainer* movie;
 
-int counter = 0;
+float counter = 0;
 
 
 void Framework::moduleInit(int argc, char** argv)
 {
-  movie = new MediaContainer("/home/lieni/Desktop/Face2.avi");
+  movie = new MediaContainer("/home/david/Desktop/Face2.avi");
 
   // print information about the media file
@@ -52 +52 @@
 
   seq = new TextureSequence();
-  //for (int i = 1; i < argc; i++)
-  //{
-  //  seq->addFrame(argv[i]);
-  //  printf("%s\n", argv[i]);
-  //}
+  for (int i = 1; i < argc; i++)
+  {
+    seq->addFrame(argv[i]);
+    printf("%s\n", argv[i]);
+  }
 
   // add one frame from the movie
-  //seq->addFrame(movie->getNextFrame());
+  seq->addFrame(movie->getNextFrame());
   GLuint tex;
-  while((tex = movie->getNextFrame()) != NULL)
-    seq->addFrame(tex);
+  //while((tex = movie->getNextFrame()) != NULL)
+  //  seq->addFrame(tex);
 
   test = new Texture(argv[1]);
@@ -102 +102 @@
 void Framework::moduleTick(float dt)
 {
-  counter++;
+  counter += dt;
 
-  seq->gotoFrame(counter);
+  seq->gotoFrame((unsigned int)counter);
 
-  if (counter > seq->getFrameCount())
+  if ((unsigned int)counter > seq->getFrameCount())
     counter = 0;