Changeset 6731 in orxonox.OLD for trunk/src/world_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

Location:

trunk/src/world_entities

Files:

• Makefile.am (modified) (2 diffs)
• movie_entity.cc (modified) (5 diffs)
• movie_entity.h (modified) (1 diff)
• recorder.cc (copied) (copied from branches/avi_play/src/world_entities/recorder.cc)
• recorder.h (copied) (copied from branches/avi_play/src/world_entities/recorder.h)

trunk/src/world_entities/Makefile.am

@@ -21 +21 @@
                   world_entities/satellite.cc \
                   world_entities/movie_entity.cc \
+                  world_entities/recorder.cc \
                   world_entities/character_attributes.cc \
                   world_entities/test_entity.cc \
@@ -74 +75 @@
                  world_entities/satellite.h \
                  world_entities/movie_entity.h \
+                 world_entities/recorder.h \
                  world_entities/character_attributes.h \
                  world_entities/test_entity.h \

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

trunk/src/world_entities/movie_entity.h

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