Changeset 6325 in orxonox.OLD

Timestamp:

Dec 28, 2005, 12:20:38 AM (18 years ago)

Author:

hdavid

Message:

branches\avi_play: the frames are created faster with glTexSubImage2D, implemented custom speed setting

Location:

branches/avi_play/src

Files:

• lib/graphics/importer/media_container.cc (modified) (1 diff)
• lib/graphics/importer/movie_player.cc (modified) (3 diffs)
• subprojects/importer/movie_player_test.cc (modified) (1 diff)

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

@@ -174 +174 @@
                                             );
 
-        // NOTE: use glTexSubImage2D, it's faster!! //
-        /* 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);
-        // build the Texture
-        glTexImage2D(GL_TEXTURE_2D,
-                    0,
-                    GL_RGB,
-                    surface->w, surface->h,
-                    0,
-                    GL_RGB,
-                    GL_UNSIGNED_BYTE,
-                    surface->pixels);
+        if(frame_num == 1)
+        {
+          /* 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);
+          // create the texture
+          glTexImage2D(GL_TEXTURE_2D,
+                      0,
+                      GL_RGB,
+                      surface->w, surface->h,
+                      0,
+                      GL_RGB,
+                      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,

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

@@ -58 +58 @@
   status = STOP;
   timer = 0;
+  speed = 1;
 
   material = new Material;
@@ -124 +125 @@
     current_frame = media_container->getFrameNumber();
     timer += dt;
-    actuel_frame = timer * fps;
+    actuel_frame = timer * fps * speed;
 
     if(actuel_frame != current_frame)
@@ -151 +152 @@
 void MoviePlayer::setSpeed(float speed)
 {
-  this->speed = speed;
+  if(speed > 0)
+    this->speed = speed;
 }
 

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

@@ -49 +49 @@
           movie_player->stop();
           break;
+        case SDLK_9:
+          movie_player->setSpeed(movie_player->getSpeed() - 0.5);
+          PRINTF(0)("speed: %f\n", movie_player->getSpeed());
+          break;
+        case SDLK_0:
+          movie_player->setSpeed(movie_player->getSpeed() + 0.5);
+          PRINTF(0)("speed: %f\n", movie_player->getSpeed());
+          break;
       }
   }