Changeset 6600 in orxonox.OLD

Timestamp:

Jan 18, 2006, 5:25:48 PM (18 years ago)

Author:

bensch

Message:

TRUNK: merged the avi_play branche again

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/graphics/importer/movie_player.cc (modified) (13 diffs)
• lib/graphics/importer/movie_player.h (modified) (6 diffs)
• story_entities/Makefile.am (modified) (2 diffs)
• story_entities/movie_loader.cc (copied) (copied from branches/avi_play/src/story_entities/movie_loader.cc)
• story_entities/movie_loader.h (copied) (copied from branches/avi_play/src/story_entities/movie_loader.h)
• world_entities/movie_entity.cc (modified) (4 diffs)
• world_entities/movie_entity.h (modified) (2 diffs)

trunk/src/defs/class_id.h

@@ -154 +154 @@
   CL_MULTI_PLAYER_WORLD         =    0x00000107,
   CL_MULTI_PLAYER_WORLD_DATA    =    0x00000108,
+  CL_MOVIE_LOADER               =    0x00000109,
 
   // WorldEntities (range from 0x00000200 to 0x000004ff)

trunk/src/lib/graphics/importer/movie_player.cc

@@ -49 +49 @@
 MoviePlayer::~MoviePlayer()
 {
-  delete material;
-  delete model;
+  //delete material;
+  //delete model;
 
   if (glIsTexture(texture))
@@ -81 +81 @@
   loading = false;
 
-  material = new Material;
+  /*material = new Material;
   material->setDiffuseMap("maps/radialTransparency.png");
 
@@ -90 +90 @@
   (new Light())->setAbsCoor(5.0, 10.0, 40.0);
   (new Light())->setAbsCoor(-10, -20, -100);
+  */
 }
 
@@ -195 +196 @@
       // Free the packet that was allocated by av_read_frame
       av_free_packet(&packet);
-      
+
       // Did we get a video frame?
       if(frame_finished)
@@ -248 +249 @@
 void MoviePlayer::skipFrame(int frames)
 {
-  
+
   while(frames != 0)
   {
@@ -259 +260 @@
       avcodec_decode_video(codec_context, frame, &frame_finished,
                             packet.data, packet.size);
-        
+
       // Did we get a video frame?
       if(frame_finished)
@@ -269 +270 @@
     av_free_packet(&packet);
   }
-  
+
   this->getNextFrame();
 
@@ -307 +308 @@
       return false;
     }
-    
+
     // go from the keyframe to the exact position
     codec_context->hurry_up = 1;
@@ -327 +328 @@
     } while(1);
     codec_context->hurry_up = 0;
-  
+
     this->frame_number = frames;
   }
-  
+
   return true;
 }
@@ -343 +344 @@
     status = PLAY;
     timer = 0;
-  
+
     this->gotoFrame(start_frame);
-  
+
     PRINTF(0)("start\n");
   }
@@ -380 +381 @@
   {
     timer += dt;
-    actual_frame = timer * fps + start_frame;
+    actual_frame = (int)(timer * fps + start_frame);
     if(actual_frame != frame_number)
     {
@@ -387 +388 @@
       else
         this->skipFrame(actual_frame - frame_number - 1);
-    }   
+    }
     //PRINTF(0)("frame_number: %i\n", frame_number);
   }
 }
 
-const void MoviePlayer::draw()
+/*const void MoviePlayer::draw()
 {
   material->select();
@@ -399 +400 @@
 
   LightManager::getInstance()->draw();
+}*/
+
+GLuint MoviePlayer::getTexture()
+{
+  return this->texture;
 }
 

trunk/src/lib/graphics/importer/movie_player.h

@@ -18 +18 @@
 #include "glincl.h"
 
-#include "light.h"
+//#include "light.h"
 #include "texture.h"
-#include "material.h"
-#include "primitive_model.h"
+//#include "material.h"
+//#include "primitive_model.h"
 
 // include base_object.h since all classes are derived from this one
@@ -29 +29 @@
 typedef enum MP_STATUS {
   PLAY,
-        PAUSE,
-        STOP
+        PAUSE,
+        STOP
 };
 
@@ -38 +38 @@
 private:
 
-  Model* model;
-  Material* material;
+  //Model* model;
+  //Material* material;
 
   AVFormatContext* format_context;
@@ -54 +54 @@
   int video_stream;
 
-  MP_STATUS status;     
+  MP_STATUS status;
   float timer;
   int start_frame;
@@ -61 +61 @@
   float fps;
   int duration;
-  bool loading;  
+  bool loading;
 
 public:
@@ -71 +71 @@
   bool loadMovie(const char* filename);
 
-        void start(float start_time);
-        void resume();
-        void pause();
-        void stop();
+        void start(float start_time);
+        void resume();
+        void pause();
+        void stop();
 
-        void tick(float dt);
-        const void draw();
+        void tick(float dt);
+        //const void draw();
+        GLuint getTexture();
 
-        void setFPS(float fps);
-        float getFPS();
-        const MP_STATUS getStatus();
+        void setFPS(float fps);
+        float getFPS();
+        const MP_STATUS getStatus();
   void printInformation();
 
 private:
-  
+
   void init();
   void getNextFrame();

trunk/src/story_entities/Makefile.am

@@ -11 +11 @@
                 story_entities/single_player_world_data.cc \
                 story_entities/multi_player_world.cc \
-                story_entities/multi_player_world_data.cc
+                story_entities/multi_player_world_data.cc \
+                story_entities/movie_loader.cc
 
 StoryEntities_HEADERS_ = \
@@ -23 +24 @@
                 story_entities/single_player_world_data.h \
                 story_entities/multi_player_world.h \
-                story_entities/multi_player_world_data.h
+                story_entities/multi_player_world_data.h \
+                story_entities/movie_loader.h

trunk/src/world_entities/movie_entity.cc

@@ -19 +19 @@
 #include "load_param.h"
 #include "factory.h"
-#include "material.h"
 
 #include "network_game_manager.h"
@@ -36 +35 @@
 
   media_container = new MediaContainer();
-
-  this->material = new Material;
-  this->material->setDiffuseMap("maps/radialTransparency.png");
 
   axis = 0;
@@ -59 +55 @@
 MovieEntity::~MovieEntity ()
 {
-  delete this->material;
   delete this->media_container;
 }
@@ -139 +134 @@
   glDisable(GL_LIGHTING);
 
-  this->material->select();
+  glEnable(GL_TEXTURE_2D);
   glBindTexture(GL_TEXTURE_2D, media_container->getFrameTexture(counter));
+
+  glColor3f(1.0, 1.0, 1.0);
 
   glBegin(GL_QUADS);

trunk/src/world_entities/movie_entity.h

@@ -11 +11 @@
 
 class MediaContainer;
-class Material;
 
 class MovieEntity : public WorldEntity
@@ -17 +16 @@
   private:
     MediaContainer* media_container;
-    Material* material;
 
     int counter;