Changeset 5861 in orxonox.OLD for trunk/src/lib/graphics
- Timestamp:
- Dec 1, 2005, 8:41:26 PM (19 years ago)
- Location:
- trunk/src/lib/graphics/importer
- Files:
-
- 1 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/graphics/importer/Makefile.am
r5858 r5861 10 10 material.cc \ 11 11 texture.cc \ 12 multi_frame_texture.cc12 texture_sequence.cc 13 13 14 14 … … 21 21 material.h \ 22 22 texture.h \ 23 multi_frame_texture.h \23 texture_sequence.h \ 24 24 anorms.h \ 25 25 anormtab.h -
trunk/src/lib/graphics/importer/texture_sequence.cc
r5860 r5861 16 16 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER 17 17 18 #include " multi_frame_texture.h"18 #include "texture_sequence.h" 19 19 20 20 #include "debug.h" … … 32 32 * Constructor for a Texture 33 33 */ 34 MultiFrameTexture::MultiFrameTexture(unsigned int count, ...)34 TextureSequence::TextureSequence(unsigned int count, ...) 35 35 { 36 this->setClassID(CL_ MULTI_FRAME_TEXTURE, "MultiFrameTexture");36 this->setClassID(CL_TEXTURE_SEQUENCE, "TextureSequence"); 37 37 38 38 va_list textureNameList; … … 43 43 44 44 /** 45 * Destructor of a MultiFrameTexture45 * Destructor of a TextureSequence 46 46 47 47 Frees Data, and deletes the textures from GL 48 48 */ 49 MultiFrameTexture::~MultiFrameTexture()49 TextureSequence::~TextureSequence() 50 50 { 51 51 } … … 55 55 * rebuilds all the textures from the Images stored in this FrameSequence 56 56 */ 57 bool MultiFrameTexture::rebuild()57 bool TextureSequence::rebuild() 58 58 { 59 // if (this->texture != 0 && glIs MultiFrameTexture(this->texture))59 // if (this->texture != 0 && glIsTextureSequence(this->texture)) 60 60 // { 61 // glDelete MultiFrameTextures(1,&this->texture);61 // glDeleteTextureSequences(1,&this->texture); 62 62 // this->texture = 0; 63 63 // } … … 65 65 // if (this->image != NULL) 66 66 // { 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()); 68 68 // this->texture = loadTexToGL(this->image); 69 69 // } … … 73 73 74 74 75 bool MultiFrameTexture::loadImageSeries(unsigned int count, ...)75 bool TextureSequence::loadImageSeries(unsigned int count, ...) 76 76 { 77 77 va_list textureNameList; … … 81 81 } 82 82 83 bool MultiFrameTexture::loadImageSeries(unsigned int count, va_list textures)83 bool TextureSequence::loadImageSeries(unsigned int count, va_list textures) 84 84 { 85 85 … … 88 88 89 89 90 bool MultiFrameTexture::addFrame(const char* imageName)90 bool TextureSequence::addFrame(const char* imageName) 91 91 { 92 92 … … 95 95 96 96 97 bool MultiFrameTexture::addFrame(SDL_Surface* surface)97 bool TextureSequence::addFrame(SDL_Surface* surface) 98 98 { 99 99 -
trunk/src/lib/graphics/importer/texture_sequence.h
r5860 r5861 4 4 */ 5 5 6 #ifndef _ MULTI_FRAME_TEXTURE_H7 #define _ MULTI_FRAME_TEXTURE_H6 #ifndef _TEXTURE_SEQUENCE_H 7 #define _TEXTURE_SEQUENCE_H 8 8 9 9 #include "texture.h" … … 18 18 19 19 //! A Class, that reads in Textures from different fileformats. 20 class MultiFrameTexture : public Texture20 class TextureSequence : public Texture 21 21 { 22 22 public: 23 MultiFrameTexture(unsigned int count = 0, ...);23 TextureSequence(unsigned int count = 0, ...); 24 24 // Texture(TEXTURE_TYPE type, int resolution); 25 ~ MultiFrameTexture();25 ~TextureSequence(); 26 26 27 27 bool loadImageSeries(unsigned int count, ...); … … 42 42 }; 43 43 44 #endif /* _ MULTI_FRAME_TEXTURE_H */44 #endif /* _TEXTURE_SEQUENCE_H */
Note: See TracChangeset
for help on using the changeset viewer.