Changeset 7010 in orxonox.OLD

Timestamp:

Feb 3, 2006, 12:40:23 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged avi_play back here

Location:

trunk/src

Files:

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

trunk/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);
 }
 

trunk/src/story_entities/movie_loader.h

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

trunk/src/story_entities/story_entity.cc

@@ -77 +77 @@
   .describe("Sets the ID of the next StoryEntity");
 
+  LoadParam(root, "menu-entry", this, StoryEntity, addToGameMenu)
+      .describe("If this entry is 1, the world is contained in the SimpleGameMenu");
+
+
+  LoadParam(root, "description", this, StoryEntity, setDescription)
+      .describe("Sets the description of this StoryEntity");
+
+  LoadParam(root, "menu-item-image", this, StoryEntity, setMenuItemImage)
+      .describe("If this entry is 1, the world is contained in the SimpleGameMenu");
+
+  LoadParam(root, "screenshoot", this, StoryEntity, setMenuScreenshoot)
+      .describe("If this entry is 1, the world is contained in the SimpleGameMenu");
+
   PRINTF(4)("Loaded StoryEntity specific stuff\n");
 }
@@ -152 +165 @@
     .describe("Sets the description of this StoryEntity");
 
-    LoadParam(root, "menu-entry", this, StoryEntity, addToGameMenu)
-    .describe("If this entry is 1, the world is contained in the SimpleGameMenu");
-
     LoadParam(root, "menu-item-image", this, StoryEntity, setMenuItemImage)
     .describe("If this entry is 1, the world is contained in the SimpleGameMenu");

trunk/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);

trunk/src/world_entities/movie_entity.h

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

trunk/src/world_entities/playable.cc

@@ -305 +305 @@
 {
   SYNCHELP_READ_BEGIN();
-  
+
   byte b;
   SYNCHELP_READ_BYTE( b, NWT_PL_B );
-  
+
   byte flags;
-  
+
   if ( b == DATA_FLAGS )
   {
@@ -316 +316 @@
 
     bFire = (flags & FLAGS_bFire) != 0;
-    
+
     return SYNCHELP_READ_N;
   }
-  
+
   if ( b == DATA_SCORE )
   {
@@ -325 +325 @@
     SYNCHELP_READ_BYTE( newScore, NWT_PL_SCORE );
     setScore( newScore );
-    
+
     return SYNCHELP_READ_N;
   }
@@ -335 +335 @@
 {
   SYNCHELP_WRITE_BEGIN();
-  
+
   if ( score != oldScore && isServer() )
   {
@@ -341 +341 @@
     SYNCHELP_WRITE_INT( score, NWT_PL_SCORE );
     oldScore = score;
-    
+
     return SYNCHELP_WRITE_N;
   }
-  
+
   byte flags = 0;