Changeset 6704 in orxonox.OLD for branches/avi_play/src/world_entities

Timestamp:

Jan 25, 2006, 3:18:45 PM (19 years ago)

Author:

hdavid

Message:

branches/avi_play: MediaContainer is dummy-safe

Location:

branches/avi_play/src/world_entities

Files:

• movie_entity.cc (modified) (5 diffs)
• movie_entity.h (modified) (1 diff)

branches/avi_play/src/world_entities/movie_entity.cc

@@ -40 +40 @@
   height = 20;
   width = 20;
+  mediaLoaded = false;
 
   this->toList(OM_COMMON);
@@ -64 +65 @@
   LoadParam(root, "name", this, MovieEntity, loadMovie);
   LoadParam(root, "axis", this, MovieEntity, setAxis);
-  LoadParam(root, "rotation", this, MovieEntity, setRotation);
+  //LoadParam(root, "rotation", this, MovieEntity, setRotation);
   LoadParam(root, "size", this, MovieEntity, setSize);
 }
@@ -70 +71 @@
 void MovieEntity::loadMovie(const char* filename)
 {
-  media_container->loadMedia(filename);
+  if(media_container->loadMedia(filename))
+    mediaLoaded = true;
+  else
+    mediaLoaded = false;
 }
 
@@ -98 +102 @@
 void MovieEntity::tick(float time)
 {
+  if(!mediaLoaded)
+    return;
+
   timer += time;
 
@@ -123 +130 @@
 void MovieEntity::draw() const
 {
+  if(!mediaLoaded)
+    false;
 
   glPushMatrix();

branches/avi_play/src/world_entities/movie_entity.h

@@ -26 +26 @@
     float width;
 
+    bool mediaLoaded;
+
   public:
     MovieEntity (const TiXmlElement* root = NULL);