Changeset 6290 in orxonox.OLD

Timestamp:

Dec 26, 2005, 12:59:35 AM (18 years ago)

Author:

hdavid

Message:

branches\avi_play: work on the movie_player

Location:

branches/avi_play/src

Files:

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

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

@@ -34 +34 @@
 MediaContainer::MediaContainer(const char* filename)
 {
-  /* set the class id for the base object */
-  this->setClassID(CL_MEDIA_CONTAINER, "MediaContainer");
-
-  /* register all formats and codecs */
-  av_register_all();
-
-  fps = 0;
+  this->init();
 
   if (filename != NULL)
@@ -48 +42 @@
 MediaContainer::MediaContainer()
 {
-  /* set the class id for the base object */
-  this->setClassID(CL_MEDIA_CONTAINER, "MediaContainer");
-
-  /* register all formats and codecs */
-  av_register_all();
-
-  fps = 0;
+  this->init();
 }
 
@@ -83 +71 @@
   av_close_input_file(format_context);
 
+}
+
+void MediaContainer::init()
+{
+  /* set the class id for the base object */
+  this->setClassID(CL_MEDIA_CONTAINER, "MediaContainer");
+
+  /* register all formats and codecs */
+  av_register_all();
+
+  fps = 0;
 }
 

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

@@ -53 +53 @@
   ~MediaContainer();
 
+  void init();
   SDL_Surface* getFrame(int frame_number);
   SDL_Surface* getNextFrame();

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

@@ -35 +35 @@
 {
   media_container = new MediaContainer(filename);
+
+  this->init();
 }
 
@@ -40 +42 @@
 {
   media_container = new MediaContainer();
+
+  this->init();
 }
 
@@ -47 +51 @@
 MoviePlayer::~MoviePlayer()
 {
+  delete media_container;
+}
 
+void MoviePlayer::init()
+{
+  status = STOP;
+
+  tex = new Texture();
+  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);
 }
 
@@ -62 +83 @@
 void MoviePlayer::start(unsigned int start_frame)
 {
-
+  status = PLAY;
 }
 
 void MoviePlayer::resume()
 {
-
+  status = PLAY;
 }
 
 void MoviePlayer::pause()
 {
-
+  status = PAUSE;
 }
 
 void MoviePlayer::stop()
 {
-
+  status = STOP;
 }
 
 void MoviePlayer::tick(float time)
 {
+  surface = media_container->getNextFrame();
 
+  if(surface == NULL)
+    texture = NULL;
+  else
+  {
+    bool hasAlpha;
+    SDL_Surface* newSurf = tex->prepareSurface(surface, hasAlpha);
+    if (newSurf != NULL)
+      texture = Texture::loadTexToGL(newSurf);
+    else
+      texture = NULL;
+  }
 }
 
 const void MoviePlayer::draw()
 {
+  material->select();
+  glBindTexture(GL_TEXTURE_2D, texture);
+  model->draw();
 
+  LightManager::getInstance()->draw();
 }
 
@@ -97 +134 @@
 float MoviePlayer::getSpeed()
 {
-
+  return speed;
 }
 
 const MP_STATUS MoviePlayer::getStatus()
 {
-
+  return status;
 }

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

@@ -10 +10 @@
 #include "glincl.h"
 #include "sdlincl.h"
+
 #include "media_container.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 */
@@ -19 +24 @@
 
 class MediaContainer;
+class Model;
+class Material;
+class Texture;
 
 /* The state of the MoviePlayer */
@@ -27 +35 @@
 };
 
-
-
 class MoviePlayer : public BaseObject
 {
@@ -34 +40 @@
 private:
 
-  MediaContainer* media_container;      
+  MediaContainer* media_container;
+  Model* model;
+  Material* material;
+  Texture* tex;
+
+  SDL_Surface* surface;
+  GLuint texture;
+
+  MP_STATUS status;     
+  float speed;  
 
 public:
@@ -42 +57 @@
   ~MoviePlayer();
 
+  void init();
   void loadMovie(const char* filename);
 

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

@@ -196 +196 @@
                                0xFF000000
 #else
-                                   0xFF000000,
+                               0xFF000000,
                                0x00FF0000,
                                0x0000FF00,

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

@@ -16 +16 @@
 */
 
-#include "framework.h"
-
-#include "light.h"
-
-#include "texture_sequence.h"
-#include "material.h"
-
-#include "objModel.h"
-
-#include "primitive_model.h"
 #include <stdlib.h>
 
-#include "resource_manager.h"
-#include "movie_player.h";
+#include "framework.h"
+#include "movie_player.h"
 
 MoviePlayer* movie_player;
@@ -38 +28 @@
 
   movie_player->printInformation();
-
 }
 
@@ -48 +37 @@
 void Framework::moduleTick(float dt)
 {
-
+  movie_player->tick(dt);
 }
 
 void Framework::moduleDraw(void) const
 {
-
+  movie_player->draw();
 }
 

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

@@ -26 +26 @@
 #include <stdlib.h>
 
-#include "resource_manager.h"
 #include "media_container.h"
 
 Model* obj;
 TextureSequence* seq;
-Texture* test;
 Material* testMat;
 MediaContainer* movie;
@@ -59 +57 @@
   movie->printMediaInformation();
 
-  ResourceManager::getInstance()->addImageDir("./");
-
   testMat = new Material;
 
@@ -71 +67 @@
   seq->addFrameList(movie->getFrameList());
 
-  test = new Texture();
   testMat->setDiffuseMap("maps/radialTransparency.png");
 
-  ResourceManager::getInstance()->addImageDir("");
-
-
   obj = new PrimitiveModel(PRIM_PLANE, 10.0);
-
-  ResourceManager::getInstance()->debug();
 
   LightManager* lightMan = LightManager::getInstance();