Changeset 8324 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Jun 12, 2006, 12:40:57 AM (19 years ago)

Author:

bensch

Message:

trunk: Texture-Sequence is initialized smoothly now in the GLGuiCursor

Location:

trunk/src/lib/graphics/importer

Files:

• texture_sequence.cc (modified) (2 diffs)
• texture_sequence.h (modified) (2 diffs)

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

@@ -128 +128 @@
 /**
  * @brief Loads an Image-Series into the TextureSequence.
- * @param imagePrefix The Prefix of the Image
+ * @param imageNameSubstitue The Prefix of the Image
  * @param from From which image
  * @param to To which image
@@ -137 +137 @@
  * @note important is, that the count of ###'s is correct.
  */
-bool TextureSequence::loadImageSeries(const std::string& imagePrefix, unsigned int from, unsigned int to)
+bool TextureSequence::loadImageSeries(const std::string& imageNameSubstitue, unsigned int from, unsigned int to)
 {
   unsigned int index = 0;
   unsigned int frameSize = 0;
   // search for the special character # in the LoadParam
-  if ((index = imagePrefix.find("_#")) != std::string::npos)
-  {
-    std::string _imagePrefix = imagePrefix;
+  if ((index = imageNameSubstitue.find("_#")) != std::string::npos)
+  {
+    std::string _imageNameSubstitue = imageNameSubstitue;
     index++; // start at #
-    while(imagePrefix[index+frameSize] == '#')
+    while(imageNameSubstitue[index+frameSize] == '#')
     {
-      _imagePrefix[index+frameSize] = '0';
+      _imageNameSubstitue[index+frameSize] = '0';
       frameSize++;
     }
 
-    PRINTF(4)("Found %d '#'s in %s... searching for LOD's\n", frameSize, imagePrefix.c_str());
+    PRINTF(4)("Found %d '#'s in %s... searching for LOD's\n", frameSize, imageNameSubstitue.c_str());
     char tmpString[32];
     for (unsigned int i = from; i < to; i++)
     {
       sprintf(tmpString, "%d", i);
-      _imagePrefix.replace(index+frameSize -strlen(tmpString), strlen(tmpString), tmpString);
-      this->addFrame(_imagePrefix);
+      _imageNameSubstitue.replace(index+frameSize -strlen(tmpString), strlen(tmpString), tmpString);
+      this->addFrame(_imageNameSubstitue);
     }
     return true;

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

@@ -23 +23 @@
     bool loadImageSeries(unsigned int count, ...);
     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 loadImageSeries(const std::string& imageNameSubstitue, unsigned int from, unsigned int to);
     bool addFrame(const std::string& image);
     bool addFrame(SDL_Surface* surface);
@@ -34 +34 @@
     /** @returns the count of frames in this sequence */
     inline unsigned int getFrameCount() const { return this->textures.size(); };
+    /** @returns true if no Textures are stored inside of this TextureSequence */
+    inline bool empty() const { return textures.empty(); };
 
     //void gotoFrame(unsigned int frameNumber);