Changeset 6731 in orxonox.OLD for trunk/src/world_entities/movie_entity.cc

Timestamp:

Jan 25, 2006, 6:46:06 PM (18 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/world_entities/movie_entity.cc (modified) (5 diffs)

trunk/src/world_entities/movie_entity.cc

@@ -37 +37 @@
   height = 20;
   width = 20;
+  mediaLoaded = false;
 
   this->toList(OM_COMMON);
@@ -63 +64 @@
   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);
 }
@@ -69 +70 @@
 void MovieEntity::loadMovie(const char* filename)
 {
-  media_container->loadMedia(filename);
+  if(media_container->loadMedia(filename))
+    mediaLoaded = true;
+  else
+    mediaLoaded = false;
 }
 
@@ -97 +101 @@
 void MovieEntity::tick(float time)
 {
+  if(!mediaLoaded)
+    return;
+
   timer += time;
 
@@ -122 +129 @@
 void MovieEntity::draw() const
 {
+  if(!mediaLoaded)
+    false;
 
   glPushMatrix();