Changeset 6532 in orxonox.OLD for trunk/src/lib/graphics/importer

Timestamp:

Jan 18, 2006, 1:20:02 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/movie_play to the trunk. no conflicts, but a minor virtual function BUG

Location:

trunk/src/lib/graphics/importer

Files:

• Makefile.am (modified) (2 diffs)
• media_container.cc (copied) (copied from branches/avi_play/src/lib/graphics/importer/media_container.cc)
• media_container.h (copied) (copied from branches/avi_play/src/lib/graphics/importer/media_container.h)
• movie_player.cc (copied) (copied from branches/avi_play/src/lib/graphics/importer/movie_player.cc)
• movie_player.h (copied) (copied from branches/avi_play/src/lib/graphics/importer/movie_player.h)
• texture.cc (modified) (1 diff)
• texture_sequence.cc (modified) (5 diffs)
• texture_sequence.h (modified) (2 diffs)

trunk/src/lib/graphics/importer/Makefile.am

@@ -14 +14 @@
                            texture.cc \
                            texture_sequence.cc \
-                           height_map.cc
+                           height_map.cc \
+                           media_container.cc \
+                           movie_player.cc
 
 libtc_a_SOURCES  = tc.cc
@@ -32 +34 @@
                  height_map.h \
                  anorms.h \
-                 anormtab.h
+                 anormtab.h \
+                 media_container.h \
+                 movie_player.h

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

@@ -199 +199 @@
                                0xFF000000
 #else
-                                   0xFF000000,
+                               0xFF000000,
                                0x00FF0000,
                                0x0000FF00,

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

@@ -47 +47 @@
 TextureSequence::~TextureSequence()
 {
+  this->clearLists();
+}
+
+void TextureSequence::clearLists()
+{
   // delete all images
   while(!this->images.empty())
@@ -54 +59 @@
   }
 
-  this->setTexture(0);
   // delete all textures.
   while(!this->textures.empty())
@@ -63 +67 @@
   }
 }
-
 
 /**
@@ -149 +152 @@
   }
   this->setAlpha(hasAlpha);
+
   return true;
 }
 
+/**
+ * @brief adds a new Frame at the end of the Sequence.
+ * @param texture the texture to add at the end of the Sequence.
+ */
+bool TextureSequence::addFrame(GLuint texture)
+{
+  if (texture == 0)
+    return false;
+  this->textures.push_back(texture);
 
+  return true;
+}
 
 /**
@@ -158 +173 @@
  * @param frameNumber the n-th frame
  */
-void TextureSequence::gotoFrame(unsigned int frameNumber)
+/*void TextureSequence::gotoFrame(unsigned int frameNumber)
 {
   if (this->textures.size() > frameNumber)
     this->setTexture(this->textures[frameNumber]);
 }
+*/

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

@@ -29 +29 @@
     bool addFrame(const char* image);
     bool addFrame(SDL_Surface* surface);
+    bool addFrame(GLuint texture);
+
+    void clearLists();
 
     virtual bool rebuild();
@@ -35 +38 @@
     inline unsigned int getFrameCount() const { return this->textures.size(); };
 
-    void gotoFrame(unsigned int frameNumber);
+    //void gotoFrame(unsigned int frameNumber);
     /** @returns The textureID of the Frame @param frameNumber the n-th frame this texture-series.  */
     inline GLuint getFrameTexture(unsigned int frameNumber) const { return (this->textures.size()>frameNumber)?this->textures[frameNumber]:0; };