maj/OpenArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed Moved LoadTGA into the BitmapImage class

Browse Source 
~G2k
This commit is contained in:
Tom Hicks
2006-07-01 23:49:06 -04:00
parent 2956132146
commit 292f481abc
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tga.cpp
View File

@@ -64,7 +64,7 @@ namespace OpenArena{
TargaImage(1,1); TargaImage(1,1);
} }
TextureImage* LoadTGA(const char * filename) TextureImage* TargaImage::LoadTGA(const char * filename)
{ {
TargaImage::TGAHeader tgaheader; TargaImage::TGAHeader tgaheader;
TextureImage* image; TextureImage* image;
@@ -109,7 +109,7 @@ namespace OpenArena{
return image; return image;
} }
TextureImage* LoadUncompressedTGA(FILE * fTGA) TextureImage* TargaImage::LoadUncompressedTGA(FILE * fTGA)
{ {
TargaImage::TGA tga; TargaImage::TGA tga;
TextureImage* image = new TextureImage; TextureImage* image = new TextureImage;
@@ -195,7 +195,7 @@ namespace OpenArena{
return image; return image;
} }
TextureImage* LoadCompressedTGA(FILE * fTGA) TextureImage* TargaImage::LoadCompressedTGA(FILE * fTGA)
{ {
TextureImage* image = new TextureImage; TextureImage* image = new TextureImage;
TargaImage::TGA tga; TargaImage::TGA tga;

7
src/tga.h
View File

@@ -22,6 +22,8 @@ namespace OpenArena{
private: private:
TargaImage(); TargaImage();
TargaImage(uint32 width, uint32 height, uint32 bpp = 24, Image::Type type = Image::Type_RGB); TargaImage(uint32 width, uint32 height, uint32 bpp = 24, Image::Type type = Image::Type_RGB);
static TextureImage* LoadUncompressedTGA(FILE *); // Load an Uncompressed file
static TextureImage* LoadCompressedTGA(FILE *); // Load a Compressed file
uint32 _width; uint32 _width;
uint32 _height; uint32 _height;
uint32 _bpp; uint32 _bpp;
@@ -52,13 +54,12 @@ namespace OpenArena{
virtual Image::Type GetType() const; virtual Image::Type GetType() const;
virtual ~TargaImage(void); virtual ~TargaImage(void);
static TargaImage* CreateFromFile(const char* filename); static TargaImage* CreateFromFile(const char* filename);
static TextureImage* LoadTGA(const char *filename);
}; };
TextureImage* LoadTGA(const char *filename);
const GLubyte uTGAcompare[12] = {0,0,2, 0,0,0,0,0,0,0,0,0}; // Uncompressed TGA Header const GLubyte uTGAcompare[12] = {0,0,2, 0,0,0,0,0,0,0,0,0}; // Uncompressed TGA Header
const GLubyte cTGAcompare[12] = {0,0,10,0,0,0,0,0,0,0,0,0}; // Compressed TGA Header const GLubyte cTGAcompare[12] = {0,0,10,0,0,0,0,0,0,0,0,0}; // Compressed TGA Header
TextureImage* LoadUncompressedTGA(FILE *); // Load an Uncompressed file
TextureImage* LoadCompressedTGA(FILE *); // Load a Compressed file
}; };
#endif #endif