Changeset 6600 in orxonox.OLD for trunk/src/world_entities

Timestamp:

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

Author:

bensch

Message:

TRUNK: merged the avi_play branche again

Location:

trunk/src/world_entities

Files:

• movie_entity.cc (modified) (4 diffs)
• movie_entity.h (modified) (2 diffs)

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;