Changeset 5861 in orxonox.OLD

Timestamp:

Dec 1, 2005, 8:41:26 PM (18 years ago)

Author:

bensch

Message:

trunk: renaming to TextureSequence

Location:

trunk/src/lib/graphics/importer

Files:

• Makefile.am (modified) (2 diffs)
• texture_sequence.cc (moved) (moved from trunk/src/lib/graphics/importer/multi_frame_texture.cc) (9 diffs)
• texture_sequence.h (moved) (moved from trunk/src/lib/graphics/importer/multi_frame_texture.h) (3 diffs)

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

@@ -10 +10 @@
                            material.cc \
                            texture.cc \
-                           multi_frame_texture.cc
+                           texture_sequence.cc
 
 
@@ -21 +21 @@
                  material.h \
                  texture.h \
-                 multi_frame_texture.h \
+                 texture_sequence.h \
                  anorms.h \
                  anormtab.h

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

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
-#include "multi_frame_texture.h"
+#include "texture_sequence.h"
 
 #include "debug.h"
@@ -32 +32 @@
  *  Constructor for a Texture
 */
-MultiFrameTexture::MultiFrameTexture(unsigned int count, ...)
+TextureSequence::TextureSequence(unsigned int count, ...)
 {
-  this->setClassID(CL_MULTI_FRAME_TEXTURE, "MultiFrameTexture");
+  this->setClassID(CL_TEXTURE_SEQUENCE, "TextureSequence");
 
   va_list textureNameList;
@@ -43 +43 @@
 
 /**
- *  Destructor of a MultiFrameTexture
+ *  Destructor of a TextureSequence
 
    Frees Data, and deletes the textures from GL
 */
-MultiFrameTexture::~MultiFrameTexture()
+TextureSequence::~TextureSequence()
 {
 }
@@ -55 +55 @@
  * rebuilds all the textures from the Images stored in this FrameSequence
  */
-bool MultiFrameTexture::rebuild()
+bool TextureSequence::rebuild()
 {
-//   if (this->texture != 0 && glIsMultiFrameTexture(this->texture))
+//   if (this->texture != 0 && glIsTextureSequence(this->texture))
 //     {
-//       glDeleteMultiFrameTextures(1,&this->texture);
+//       glDeleteTextureSequences(1,&this->texture);
 //       this->texture = 0;
 //     }
@@ -65 +65 @@
 //   if (this->image != NULL)
 //     {
-//       PRINTF(3)("Reloading MultiFrameTexture of %s '%s'\n", this->getClassName(), this->getName());
+//       PRINTF(3)("Reloading TextureSequence of %s '%s'\n", this->getClassName(), this->getName());
 //       this->texture = loadTexToGL(this->image);
 //     }
@@ -73 +73 @@
 
 
-bool MultiFrameTexture::loadImageSeries(unsigned int count, ...)
+bool TextureSequence::loadImageSeries(unsigned int count, ...)
 {
   va_list textureNameList;
@@ -81 +81 @@
 }
 
-bool MultiFrameTexture::loadImageSeries(unsigned int count, va_list textures)
+bool TextureSequence::loadImageSeries(unsigned int count, va_list textures)
 {
 
@@ -88 +88 @@
 
 
-bool MultiFrameTexture::addFrame(const char* imageName)
+bool TextureSequence::addFrame(const char* imageName)
 {
 
@@ -95 +95 @@
 
 
-bool MultiFrameTexture::addFrame(SDL_Surface* surface)
+bool TextureSequence::addFrame(SDL_Surface* surface)
 {
 

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

@@ -4 +4 @@
  */
 
-#ifndef _MULTI_FRAME_TEXTURE_H
-#define _MULTI_FRAME_TEXTURE_H
+#ifndef _TEXTURE_SEQUENCE_H
+#define _TEXTURE_SEQUENCE_H
 
 #include "texture.h"
@@ -18 +18 @@
 
 //! A Class, that reads in Textures from different fileformats.
-class MultiFrameTexture : public Texture
+class TextureSequence : public Texture
 {
   public:
-    MultiFrameTexture(unsigned int count = 0, ...);
+    TextureSequence(unsigned int count = 0, ...);
   //  Texture(TEXTURE_TYPE type, int resolution);
-    ~MultiFrameTexture();
+    ~TextureSequence();
 
     bool loadImageSeries(unsigned int count, ...);
@@ -42 +42 @@
 };
 
-#endif /* _MULTI_FRAME_TEXTURE_H */
+#endif /* _TEXTURE_SEQUENCE_H */