Changeset 6290 in orxonox.OLD for branches/avi_play/src/subprojects

Timestamp:

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

Author:

hdavid

Message:

branches\avi_play: work on the movie_player

Location:

branches/avi_play/src/subprojects/importer

Files:

• movie_player_test.cc (modified) (3 diffs)
• multitex.cc (modified) (3 diffs)

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();