Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5861 in orxonox.OLD for trunk


Ignore:
Timestamp:
Dec 1, 2005, 8:41:26 PM (19 years ago)
Author:
bensch
Message:

trunk: renaming to TextureSequence

Location:
trunk/src/lib/graphics/importer
Files:
1 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/graphics/importer/Makefile.am

    r5858 r5861  
    1010                           material.cc \
    1111                           texture.cc \
    12                            multi_frame_texture.cc
     12                           texture_sequence.cc
    1313
    1414
     
    2121                 material.h \
    2222                 texture.h \
    23                  multi_frame_texture.h \
     23                 texture_sequence.h \
    2424                 anorms.h \
    2525                 anormtab.h
  • trunk/src/lib/graphics/importer/texture_sequence.cc

    r5860 r5861  
    1616#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
    1717
    18 #include "multi_frame_texture.h"
     18#include "texture_sequence.h"
    1919
    2020#include "debug.h"
     
    3232 *  Constructor for a Texture
    3333*/
    34 MultiFrameTexture::MultiFrameTexture(unsigned int count, ...)
     34TextureSequence::TextureSequence(unsigned int count, ...)
    3535{
    36   this->setClassID(CL_MULTI_FRAME_TEXTURE, "MultiFrameTexture");
     36  this->setClassID(CL_TEXTURE_SEQUENCE, "TextureSequence");
    3737
    3838  va_list textureNameList;
     
    4343
    4444/**
    45  *  Destructor of a MultiFrameTexture
     45 *  Destructor of a TextureSequence
    4646
    4747   Frees Data, and deletes the textures from GL
    4848*/
    49 MultiFrameTexture::~MultiFrameTexture()
     49TextureSequence::~TextureSequence()
    5050{
    5151}
     
    5555 * rebuilds all the textures from the Images stored in this FrameSequence
    5656 */
    57 bool MultiFrameTexture::rebuild()
     57bool TextureSequence::rebuild()
    5858{
    59 //   if (this->texture != 0 && glIsMultiFrameTexture(this->texture))
     59//   if (this->texture != 0 && glIsTextureSequence(this->texture))
    6060//     {
    61 //       glDeleteMultiFrameTextures(1,&this->texture);
     61//       glDeleteTextureSequences(1,&this->texture);
    6262//       this->texture = 0;
    6363//     }
     
    6565//   if (this->image != NULL)
    6666//     {
    67 //       PRINTF(3)("Reloading MultiFrameTexture of %s '%s'\n", this->getClassName(), this->getName());
     67//       PRINTF(3)("Reloading TextureSequence of %s '%s'\n", this->getClassName(), this->getName());
    6868//       this->texture = loadTexToGL(this->image);
    6969//     }
     
    7373
    7474
    75 bool MultiFrameTexture::loadImageSeries(unsigned int count, ...)
     75bool TextureSequence::loadImageSeries(unsigned int count, ...)
    7676{
    7777  va_list textureNameList;
     
    8181}
    8282
    83 bool MultiFrameTexture::loadImageSeries(unsigned int count, va_list textures)
     83bool TextureSequence::loadImageSeries(unsigned int count, va_list textures)
    8484{
    8585
     
    8888
    8989
    90 bool MultiFrameTexture::addFrame(const char* imageName)
     90bool TextureSequence::addFrame(const char* imageName)
    9191{
    9292
     
    9595
    9696
    97 bool MultiFrameTexture::addFrame(SDL_Surface* surface)
     97bool TextureSequence::addFrame(SDL_Surface* surface)
    9898{
    9999
  • trunk/src/lib/graphics/importer/texture_sequence.h

    r5860 r5861  
    44 */
    55
    6 #ifndef _MULTI_FRAME_TEXTURE_H
    7 #define _MULTI_FRAME_TEXTURE_H
     6#ifndef _TEXTURE_SEQUENCE_H
     7#define _TEXTURE_SEQUENCE_H
    88
    99#include "texture.h"
     
    1818
    1919//! A Class, that reads in Textures from different fileformats.
    20 class MultiFrameTexture : public Texture
     20class TextureSequence : public Texture
    2121{
    2222  public:
    23     MultiFrameTexture(unsigned int count = 0, ...);
     23    TextureSequence(unsigned int count = 0, ...);
    2424  //  Texture(TEXTURE_TYPE type, int resolution);
    25     ~MultiFrameTexture();
     25    ~TextureSequence();
    2626
    2727    bool loadImageSeries(unsigned int count, ...);
     
    4242};
    4343
    44 #endif /* _MULTI_FRAME_TEXTURE_H */
     44#endif /* _TEXTURE_SEQUENCE_H */
Note: See TracChangeset for help on using the changeset viewer.