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

Timestamp:

Dec 1, 2005, 11:00:49 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: sequence test

Location:

trunk/src/lib/graphics/importer

Files:

• texture_sequence.cc (modified) (9 diffs)
• texture_sequence.h (modified) (1 diff)

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

@@ -29 +29 @@
 /**
  *  Constructor for a Texture
-*/
+ */
 TextureSequence::TextureSequence(unsigned int count, ...)
 {
@@ -41 +41 @@
 
 /**
- *  Destructor of a TextureSequence
-
-   Frees Data, and deletes the textures from GL
-*/
+ * Destructor of a TextureSequence
+ *
+ * Frees Data, and deletes the textures from GL
+ */
 TextureSequence::~TextureSequence()
 {
@@ -54 +54 @@
   }
 
+  this->setTexture(0);
   // delete all textures.
   while(!this->textures.empty())
@@ -65 +66 @@
 
 /**
- * rebuilds all the textures from the Images stored in this FrameSequence
+ * @brief rebuilds all the textures from the Images stored in this FrameSequence
  */
 bool TextureSequence::rebuild()
@@ -85 +86 @@
 
 /**
- * loads an image Series
+ * @brief loads an image Sequence
  * @param count how many images to load to the TextureSequence
  * @param ... the names of the Images to load
@@ -99 +100 @@
 
 /**
- * loads an image Series
+ * @brief loads an image Sequence
  * @param count how many images to load to the TextureSequence
  * @param textures the names of the Images to load
@@ -115 +116 @@
 }
 
-
+/**
+ * @brief adds a new Frame to this Sequence (at the end)
+ * @param imageName the Name of the Image to add
+ * @returns true on success
+ */
 bool TextureSequence::addFrame(const char* imageName)
 {
@@ -129 +134 @@
 
 /**
- * adds a new Frame at the end of the Sequence.
+ * @brief adds a new Frame at the end of the Sequence.
  * @param surface the Surface to add at the end of the Sequence.
  */
@@ -144 +149 @@
   }
   this->setAlpha(hasAlpha);
+  return true;
 }
+
+
+
+/**
+ * moves to the n'th texture which can then be retrieved via the Texture function: this->getTexture()
+ * @param frameNumber the n-th frame
+ */
+void TextureSequence::gotoFrame(unsigned int frameNumber)
+{
+  if (this->textures.size() > frameNumber)
+    this->setTexture(this->textures[frameNumber]);
+}

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

@@ -32 +32 @@
     virtual bool rebuild();
 
+    /** @returns the count of frames in this sequence */
+    inline unsigned int getFrameCount() const { return this->textures.size(); };
+
+    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[frameNumber]; };
+    inline GLuint getFrameTexture(unsigned int frameNumber) const { return (this->textures.size()>frameNumber)?this->textures[frameNumber]:0; };
     /** @returns The SDL_Surface of the image at Frame @param frameNumber the n-th frame of this image-seriers */
-    const SDL_Surface* const getFrameImage(unsigned int frameNumber) const { return this->images[frameNumber]; };
+    const SDL_Surface* const getFrameImage(unsigned int frameNumber) const { return (this->images.size()>frameNumber)?this->images[frameNumber]:NULL; };
 
   private: