Changeset 6611 in orxonox.OLD

Timestamp:

Jan 19, 2006, 12:35:05 AM (18 years ago)

Author:

hdavid

Message:

some cleanup and fixes

Location:

branches/avi_play/src

Files:

• lib/graphics/importer/movie_player.cc (modified) (7 diffs)
• lib/graphics/importer/movie_player.h (modified) (5 diffs)
• story_entities/movie_loader.cc (modified) (4 diffs)

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

@@ -62 +62 @@
   av_free(frame);
 
-  avcodec_default_free_buffers(codec_context);
-
   // Close the codec
   avcodec_close(codec_context);
@@ -80 +78 @@
   frame_number = 0;
   loading = false;
-
-  /*material = new Material;
-  material->setDiffuseMap("maps/radialTransparency.png");
-
-  model = new PrimitiveModel(PRIM_PLANE, 10.0);
-
-  LightManager* lightMan = LightManager::getInstance();
-  lightMan->setAmbientColor(.1,.1,.1);
-  (new Light())->setAbsCoor(5.0, 10.0, 40.0);
-  (new Light())->setAbsCoor(-10, -20, -100);
-  */
 }
 
@@ -344 +331 @@
     status = PLAY;
     timer = 0;
-
-    this->gotoFrame(start_frame);
-
-    PRINTF(0)("start\n");
   }
 }
@@ -354 +337 @@
 {
   if(status == PAUSE)
-  {
     status = PLAY;
-    PRINTF(0)("resume\n");
-  }
 }
 
@@ -363 +343 @@
 {
   if(status == PLAY)
-  {
     status = PAUSE;
-    PRINTF(0)("pause\n");
-  }
 }
 
@@ -372 +349 @@
 {
   status = STOP;
-
-  PRINTF(0)("stop\n");
 }
 
@@ -389 +364 @@
         this->skipFrame(actual_frame - frame_number - 1);
     }
-    //PRINTF(0)("frame_number: %i\n", frame_number);
-  }
-}
-
-/*const void MoviePlayer::draw()
-{
-  material->select();
-  glBindTexture(GL_TEXTURE_2D, texture);
-  model->draw();
-
-  LightManager::getInstance()->draw();
-}*/
+  }
+}
 
 GLuint MoviePlayer::getTexture()

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

@@ -17 +17 @@
 
 #include "glincl.h"
-
-//#include "light.h"
 #include "texture.h"
-//#include "material.h"
-//#include "primitive_model.h"
 
 // include base_object.h since all classes are derived from this one
@@ -29 +25 @@
 typedef enum MP_STATUS {
   PLAY,
-        PAUSE,
-        STOP
+  PAUSE,
+  STOP
 };
 
@@ -37 +33 @@
 
 private:
-
-  //Model* model;
-  //Material* material;
 
   AVFormatContext* format_context;
@@ -71 +64 @@
   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();
-        GLuint getTexture();
+  void tick(float dt);
+  GLuint getTexture();
 
-        void setFPS(float fps);
-        float getFPS();
-        const MP_STATUS getStatus();
+  void setFPS(float fps);
+  float getFPS();
+  const MP_STATUS getStatus();
   void printInformation();
 
@@ -94 +86 @@
 };
 
-
-
 #endif // _MOVIE_PLAYER

branches/avi_play/src/story_entities/movie_loader.cc

@@ -20 +20 @@
 #include "graphics_engine.h"
 #include "load_param.h"
-#include "resource_manager.h"
 #include "state.h"
 
@@ -36 +35 @@
 }
 
-MovieLoader::~MovieLoader()
+MovieLoader::~MovieLoader() 
 {
-  PRINTF(4)("Deleted MoviePlayer\n");
+  delete this->movie_player;
 }
 
@@ -53 +52 @@
 {
   movie_player->loadMovie(filename);
-
-  PRINTF(0)("\nloaded Movie %s\n\n", filename);
 }
 
 
-ErrorMessage MovieLoader::init()
-{
-
-}
+ErrorMessage MovieLoader::init() {}
 
 
-ErrorMessage MovieLoader::loadData()
-{
-
-}
+ErrorMessage MovieLoader::loadData() {}
 
 
-ErrorMessage MovieLoader::unloadData()
-{
-
-}
+ErrorMessage MovieLoader::unloadData() {}
 
 bool MovieLoader::start()
 {
-  PRINTF(0)("\nMovieLoader INFO:\n");
-  movie_player->printInformation();
-  PRINTF(0)("\n");
-
+  this->movie_player->start(0);
+  
   this->isRunning = true;
-
   this->run();
 }
@@ -98 +83 @@
   // first timestamp for t = 0
   this->lastFrame = SDL_GetTicks ();
-  this->movie_player->start(0);
 
   while( this->isRunning)
   {
-
     this->tick();
     this->draw();
-
   }
 }