Changeset 8310 in orxonox.OLD

Timestamp:

Jun 11, 2006, 12:33:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: impooved TextureSequence

Location:

trunk/src

Files:

• lib/graphics/importer/texture_sequence.cc (modified) (3 diffs)
• lib/graphics/importer/texture_sequence.h (modified) (1 diff)
• world_entities/movie_entity.cc (modified) (2 diffs)

trunk/src/lib/graphics/importer/texture_sequence.cc

@@ -29 +29 @@
 
 /**
- *  Constructor for a Texture
+ * @brief Constructor for a Texture
  */
 TextureSequence::TextureSequence(unsigned int count, ...)
@@ -38 +38 @@
   va_start(textureNameList, count);
 
+  for (unsigned int i = 0; i < count; i++)
+  {
+    this->addFrame(va_arg(textureNameList, char*));
+  }
+  va_end(textureNameList);
+
   this->loadImageSeries(count, textureNameList);
 }
 
-
-/**
- * Destructor of a TextureSequence
+/**
+ * @brief Creates an ImageSeries out of TextureNames.
+ * @param textureNames The Names of the Textures
+ * @param prependFolder Optional you can prepend a Folder of Textures.
+ */
+TextureSequence::TextureSequence(const std::vector<std::string>& textureNames, const std::string& prependFolder)
+{
+  this->setClassID(CL_TEXTURE_SEQUENCE, "TextureSequence");
+  this->loadImageSeries(textureNames, prependFolder);
+}
+
+
+/**
+ * @brief Destructor of a TextureSequence
  *
  * Frees Data, and deletes the textures from GL
@@ -87 +104 @@
       retVal = false;
   }
+  va_end(textureNameList);
+  return retVal;
+}
+
+/**
+ * @brief Load an TextureSeries from TextureNames
+ * @param textureNames The Names of the Textures.
+ * @param prependFolder (optional) the Folder to prepend
+ * @return true on success.
+ */
+bool TextureSequence::loadImageSeries(const std::vector<std::string>& textureNames, const std::string& prependFolder)
+{
+  bool retVal = true;
+  for (unsigned int i = 0; i < textureNames.size(); i++)
+  {
+    if( !this->addFrame(prependFolder + textureNames[i]))
+      retVal = false;
+  }
+
   return retVal;
 }

trunk/src/lib/graphics/importer/texture_sequence.h

@@ -17 +17 @@
   public:
     TextureSequence(unsigned int count = 0, ...);
-    TextureSequence(const std::vector<std::string>*& textureNames);
+    TextureSequence(const std::vector<std::string>& textureNames, const std::string& prependFolder = "");
     //  Texture(TEXTURE_TYPE type, int resolution);
     virtual ~TextureSequence();
 
     bool loadImageSeries(unsigned int count, ...);
-    bool loadImageSeries(unsigned int count, std::vector<std::string>& textureNames);
+    bool loadImageSeries(const std::vector<std::string>& textureNames, const std::string& prependFolder = "");
     bool loadImageSeries(const std::string& imagePrefix, unsigned int from, unsigned int to);
     bool addFrame(const std::string& image);

trunk/src/world_entities/movie_entity.cc

@@ -120 +120 @@
     counter = (int)(fps * timer);
 
-    if ((int)counter >= media_container->getFrameCount())
+    if ((unsigned int)counter >= media_container->getFrameCount())
     {
       timer = 0;
@@ -138 +138 @@
 void MovieEntity::draw() const
 {
-  if(!mediaLoaded)
-    false;
+//   if(!mediaLoaded)
+//     false;
 
   glPushAttrib(GL_ENABLE_BIT);