Changeset 6731 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Jan 25, 2006, 6:46:06 PM (19 years ago)

Author:

bensch

Message:

merged avi_play back to the trunk. command ​https://svn.orxonox.net/orxonox/branches/avi_play . -r6602:HEAD

File:

• trunk/src/story_entities/movie_loader.cc (modified) (6 diffs)

trunk/src/story_entities/movie_loader.cc

@@ -20 +20 @@
 #include "graphics_engine.h"
 #include "load_param.h"
-#include "resource_manager.h"
+#include "state.h"
 
 
@@ -35 +35 @@
 }
 
-MovieLoader::~MovieLoader()
+MovieLoader::~MovieLoader() 
 {
-  PRINTF(4)("Deleted MoviePlayer\n");
+  delete this->movie_player;
 }
 
@@ -52 +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();
 }
@@ -97 +83 @@
   // first timestamp for t = 0
   this->lastFrame = SDL_GetTicks ();
-  this->movie_player->start(0);
 
   while( this->isRunning)
   {
-
     this->tick();
     this->draw();
-
   }
 }
@@ -121 +104 @@
 
   glBegin(GL_QUADS);
-    glTexCoord2f(1.0f, 0.0f); glVertex2f( 0, 0);
-    glTexCoord2f(1.0f, 1.0f); glVertex2f( 0, 100);
-    glTexCoord2f(0.0f, 1.0f); glVertex2f( 100, 100);
-    glTexCoord2f(0.0f, 0.0f); glVertex2f( 100, 0);
+    glTexCoord2f(0.0f, 0.0f); glVertex2f( 0, 0);
+    glTexCoord2f(0.0f, 1.0f); glVertex2f( 0, State::getResY());
+    glTexCoord2f(1.0f, 1.0f); glVertex2f( State::getResX(), State::getResY());
+    glTexCoord2f(1.0f, 0.0f); glVertex2f( State::getResX(), 0);
   glEnd();
 
@@ -139 +122 @@
 
   // calculate time difference in milliseconds (Uint32)
-  this->dt = currentFrame - this->lastFrame;
+  this->dt = currentFrame - this->lastFrame; 
   // calculate time difference in seconds (float)
   this->dts = (float)this->dt / 1000.0f;