Changeset 6971 in orxonox.OLD for branches

Timestamp:

Feb 2, 2006, 12:20:15 AM (19 years ago)

Author:

hdavid

Message:

branches/avi_play: custom fps can be set for the MovieEntity and MovieLoader via oxw-file

Location:

branches/avi_play/src

Files:

• story_entities/movie_loader.cc (modified) (1 diff)
• story_entities/movie_loader.h (modified) (1 diff)
• world_entities/movie_entity.cc (modified) (5 diffs)
• world_entities/movie_entity.h (modified) (1 diff)

branches/avi_play/src/story_entities/movie_loader.cc

@@ -47 +47 @@
 
   LoadParam(root, "name", this, MovieLoader, loadMovie);
+  LoadParam(root, "fps", this, MovieLoader, setFPS);
+}
+
+void MovieLoader::setFPS(float fps)
+{
+  this->movie_player->setFPS(fps);
 }
 

branches/avi_play/src/story_entities/movie_loader.h

@@ -41 +41 @@
   private:
     void loadMovie(const char* filename);
+    void setFPS(float fps);
     void tick();
     void draw() const;

branches/avi_play/src/world_entities/movie_entity.cc

@@ -46 +46 @@
   counter = 0;
   timer = 0;
-  fps = media_container->getFPS();
 }
 
@@ -66 +65 @@
   //LoadParam(root, "rotation", this, MovieEntity, setRotation);
   LoadParam(root, "size", this, MovieEntity, setSize);
+  LoadParam(root, "fps", this, MovieEntity, setFPS);
+}
+
+void MovieEntity::setFPS(float fps)
+{
+  this->fps = fps;
+PRINTF(0)("fps: %f\n", fps);
 }
 
@@ -71 +77 @@
 {
   if(media_container->loadMedia(filename))
+  {
     mediaLoaded = true;
+    fps = media_container->getFPS();
+  }
   else
     mediaLoaded = false;
@@ -78 +87 @@
 void MovieEntity::setAxis(float axis)
 {
+PRINTF(0)("fps: %f\n", fps);
   this->axis = axis;
 }
@@ -141 +151 @@
   glPushAttrib(GL_ENABLE_BIT);
   glDisable(GL_LIGHTING);
+  glDisable(GL_BLEND);
 
   glEnable(GL_TEXTURE_2D);

branches/avi_play/src/world_entities/movie_entity.h

@@ -41 +41 @@
     void setRotation(float rotation);
     void setSize(float width, float height);
+    void setFPS(float fps);
 
 };