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

Added class TargaImage

Browse Source 
~G2k
This commit is contained in:
Tom Hicks
2006-07-01 23:09:54 -04:00
parent 1dd65057a8
commit 966442e566
2 changed files with 563 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
src/tga.cpp
View File

@@ -1,13 +1,72 @@
#include "tga.h" #include "tga.h"
#ifdef WIN32 #ifdef WIN32
#pragma warning(disable:4996) #pragma warning(disable:4996)
#endif #endif
namespace OpenArena{ namespace OpenArena{
TextureImage* LoadTGA(const char * filename)
{ uint8 * TargaImage::GetImageData() const
TGAHeader tgaheader; {
return _data;
}
uint32 TargaImage::GetBitsPerPixel() const
{
return _bpp;
}
uint32 TargaImage::GetBytesPerPixel() const
{
return _bpp >> 8;
}
uint32 TargaImage::GetWidth() const
{
return _width;
}
uint32 TargaImage::GetHeight() const
{
return _height;
}
Image::Type TargaImage::GetType() const
{
return _type;
}
TargaImage::~TargaImage(void)
{
delete [] _data;
}
TargaImage* TargaImage::CreateFromFile(const char* filename)
{
TextureImage* texImage = LoadTGA(filename);
TargaImage* image = new TargaImage(texImage->sizeX, texImage->sizeY, texImage->bpp);
image->_data = texImage->data;
image->_type = (Image::Type)texImage->type;
return image;
}
TargaImage::TargaImage(uint32 width, uint32 height, uint32 bpp, Image::Type type)
{
_width = width;
_height = height;
_bpp = bpp;
_type = type;
_data = new uint8[_width*_height* (_bpp >> 8)];
}
TargaImage::TargaImage()
{
TargaImage(1,1);
}
TextureImage* LoadTGA(const char * filename)
{
TargaImage::TGAHeader tgaheader;
TextureImage* image; TextureImage* image;
std::string errmsg; std::string errmsg;
FILE* file = fopen(filename, "rb"); FILE* file = fopen(filename, "rb");
@@ -17,18 +76,18 @@ TextureImage* LoadTGA(const char * filename)
errmsg = "Could not open texture file "; errmsg = "Could not open texture file ";
errmsg = errmsg + filename; errmsg = errmsg + filename;
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, errmsg.c_str(), "ERROR", MB_OK); MessageBox(NULL, errmsg.c_str(), "ERROR", MB_OK);
#endif #endif
return NULL; return NULL;
} }
if(fread(&tgaheader, sizeof(TGAHeader), 1, file) == 0) if(fread(&tgaheader, sizeof(TargaImage::TGAHeader), 1, file) == 0)
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Could not read file header", "ERROR", MB_OK); MessageBox(NULL, "Could not read file header", "ERROR", MB_OK);
#endif #endif
if(file != NULL) if(file != NULL)
fclose(file); fclose(file);
return NULL; return NULL;
@@ -41,26 +100,26 @@ TextureImage* LoadTGA(const char * filename)
else else
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "TGA file must be type 2 or type 10 ", "Invalid Image", MB_OK); MessageBox(NULL, "TGA file must be type 2 or type 10 ", "Invalid Image", MB_OK);
#endif #endif
fclose(file); fclose(file);
return NULL; return NULL;
} }
return image; return image;
} }
TextureImage* LoadUncompressedTGA(FILE * fTGA) TextureImage* LoadUncompressedTGA(FILE * fTGA)
{ {
TGA tga; TargaImage::TGA tga;
TextureImage* image = new TextureImage; TextureImage* image = new TextureImage;
if(fread(tga.header, sizeof(tga.header), 1, fTGA) == 0) if(fread(tga.header, sizeof(tga.header), 1, fTGA) == 0)
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Could not read info header", "ERROR", MB_OK); MessageBox(NULL, "Could not read info header", "ERROR", MB_OK);
#endif #endif
if(fTGA != NULL) if(fTGA != NULL)
{ {
fclose(fTGA); fclose(fTGA);
@@ -78,9 +137,9 @@ TextureImage* LoadUncompressedTGA(FILE * fTGA)
if((image->sizeX <= 0) || (image->sizeY <= 0) || ((image->bpp != 24) && (image->bpp !=32))) if((image->sizeX <= 0) || (image->sizeY <= 0) || ((image->bpp != 24) && (image->bpp !=32)))
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Invalid texture information", "ERROR", MB_OK); MessageBox(NULL, "Invalid texture information", "ERROR", MB_OK);
#endif #endif
if(fTGA != NULL) if(fTGA != NULL)
{ {
fclose(fTGA); fclose(fTGA);
@@ -104,9 +163,9 @@ TextureImage* LoadUncompressedTGA(FILE * fTGA)
if(image->data == NULL) if(image->data == NULL)
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Could not allocate memory for image", "ERROR", MB_OK); MessageBox(NULL, "Could not allocate memory for image", "ERROR", MB_OK);
#endif #endif
fclose(fTGA); fclose(fTGA);
return NULL; return NULL;
} }
@@ -114,9 +173,9 @@ TextureImage* LoadUncompressedTGA(FILE * fTGA)
if(fread(image->data, 1, tga.imageSize, fTGA) != tga.imageSize) if(fread(image->data, 1, tga.imageSize, fTGA) != tga.imageSize)
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Could not read image data", "ERROR", MB_OK); MessageBox(NULL, "Could not read image data", "ERROR", MB_OK);
#endif #endif
if(image->data != NULL) if(image->data != NULL)
{ {
free(image->data); free(image->data);
@@ -134,19 +193,19 @@ TextureImage* LoadUncompressedTGA(FILE * fTGA)
fclose(fTGA); fclose(fTGA);
return image; return image;
} }
TextureImage* LoadCompressedTGA(FILE * fTGA) TextureImage* LoadCompressedTGA(FILE * fTGA)
{ {
TextureImage* image = new TextureImage; TextureImage* image = new TextureImage;
TGA tga; TargaImage::TGA tga;
if(fread(tga.header, sizeof(tga.header), 1, fTGA) == 0) if(fread(tga.header, sizeof(tga.header), 1, fTGA) == 0)
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Could not read info header", "ERROR", MB_OK); MessageBox(NULL, "Could not read info header", "ERROR", MB_OK);
#endif #endif
if(fTGA != NULL) if(fTGA != NULL)
{ {
fclose(fTGA); fclose(fTGA);
@@ -164,9 +223,9 @@ TextureImage* LoadCompressedTGA(FILE * fTGA)
if((image->sizeX <= 0) || (image->sizeY <= 0) || ((image->bpp != 24) && (image->bpp !=32))) if((image->sizeX <= 0) || (image->sizeY <= 0) || ((image->bpp != 24) && (image->bpp !=32)))
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Invalid texture information", "ERROR", MB_OK); MessageBox(NULL, "Invalid texture information", "ERROR", MB_OK);
#endif #endif
if(fTGA != NULL) if(fTGA != NULL)
{ {
fclose(fTGA); fclose(fTGA);
@@ -181,9 +240,9 @@ TextureImage* LoadCompressedTGA(FILE * fTGA)
if(image->data == NULL) if(image->data == NULL)
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Could not allocate memory for image", "ERROR", MB_OK); MessageBox(NULL, "Could not allocate memory for image", "ERROR", MB_OK);
#endif #endif
fclose(fTGA); fclose(fTGA);
return NULL; return NULL;
} }
@@ -200,9 +259,9 @@ TextureImage* LoadCompressedTGA(FILE * fTGA)
if(fread(&chunkheader, sizeof(GLubyte), 1, fTGA) == 0) if(fread(&chunkheader, sizeof(GLubyte), 1, fTGA) == 0)
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Could not read RLE header", "ERROR", MB_OK); MessageBox(NULL, "Could not read RLE header", "ERROR", MB_OK);
#endif #endif
if(fTGA != NULL) if(fTGA != NULL)
{ {
fclose(fTGA); fclose(fTGA);
@@ -222,9 +281,9 @@ TextureImage* LoadCompressedTGA(FILE * fTGA)
if(fread(colorbuffer, 1, tga.bytesPerPixel, fTGA) != tga.bytesPerPixel) if(fread(colorbuffer, 1, tga.bytesPerPixel, fTGA) != tga.bytesPerPixel)
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Could not read image data", "ERROR", MB_OK); MessageBox(NULL, "Could not read image data", "ERROR", MB_OK);
#endif #endif
if(fTGA != NULL) if(fTGA != NULL)
{ {
@@ -259,9 +318,9 @@ TextureImage* LoadCompressedTGA(FILE * fTGA)
if(currentpixel > pixelcount) if(currentpixel > pixelcount)
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Too many pixels read", "ERROR", NULL); MessageBox(NULL, "Too many pixels read", "ERROR", NULL);
#endif #endif
if(fTGA != NULL) if(fTGA != NULL)
{ {
@@ -288,9 +347,9 @@ TextureImage* LoadCompressedTGA(FILE * fTGA)
if(fread(colorbuffer, 1, tga.bytesPerPixel, fTGA) != tga.bytesPerPixel) if(fread(colorbuffer, 1, tga.bytesPerPixel, fTGA) != tga.bytesPerPixel)
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Could not read from file", "ERROR", MB_OK); MessageBox(NULL, "Could not read from file", "ERROR", MB_OK);
#endif #endif
if(fTGA != NULL) if(fTGA != NULL)
{ {
@@ -327,9 +386,9 @@ TextureImage* LoadCompressedTGA(FILE * fTGA)
if(currentpixel > pixelcount) if(currentpixel > pixelcount)
{ {
//This needs to be abstracted somehow //This needs to be abstracted somehow
#ifdef WIN32 #ifdef WIN32
MessageBox(NULL, "Too many pixels read", "ERROR", NULL); MessageBox(NULL, "Too many pixels read", "ERROR", NULL);
#endif #endif
if(fTGA != NULL) if(fTGA != NULL)
{ {
@@ -355,12 +414,12 @@ TextureImage* LoadCompressedTGA(FILE * fTGA)
while(currentpixel < pixelcount); while(currentpixel < pixelcount);
fclose(fTGA); fclose(fTGA);
return image; return image;
} }
/* /*
TextureImage* LoadTGA(const char * filename) TextureImage* LoadTGA(const char * filename)
{ {
TGAHeader tgaheader; TGAHeader tgaheader;
TextureImage* image; TextureImage* image;
std::string errmsg; std::string errmsg;
@@ -393,10 +452,10 @@ TextureImage* LoadTGA(const char * filename)
return NULL; return NULL;
} }
return image; return image;
} }
TextureImage* LoadUncompressedTGA(FILE * fTGA) TextureImage* LoadUncompressedTGA(FILE * fTGA)
{ {
TGA tga; TGA tga;
TextureImage* image = new TextureImage; TextureImage* image = new TextureImage;
@@ -467,10 +526,10 @@ TextureImage* LoadUncompressedTGA(FILE * fTGA)
fclose(fTGA); fclose(fTGA);
return image; return image;
} }
TextureImage* LoadCompressedTGA(FILE * fTGA) TextureImage* LoadCompressedTGA(FILE * fTGA)
{ {
TextureImage* image = new TextureImage; TextureImage* image = new TextureImage;
TGA tga; TGA tga;
@@ -664,6 +723,6 @@ TextureImage* LoadCompressedTGA(FILE * fTGA)
while(currentpixel < pixelcount); while(currentpixel < pixelcount);
fclose(fTGA); fclose(fTGA);
return image; return image;
} }
*/ */
}; };

21
src/tga.h
View File

@@ -15,8 +15,19 @@
#include <cstdio> #include <cstdio>
#include <string> #include <string>
#include "texture.h" #include "texture.h"
#include "Image.h"
namespace OpenArena{ namespace OpenArena{
class TargaImage: public Image{
private:
TargaImage();
TargaImage(uint32 width, uint32 height, uint32 bpp = 24, Image::Type type = Image::Type_RGB);
uint32 _width;
uint32 _height;
uint32 _bpp;
Image::Type _type;
uint8 * _data;
public:
struct TGAHeader struct TGAHeader
{ {
GLubyte Header[12]; // File Header To Determine File Type GLubyte Header[12]; // File Header To Determine File Type
@@ -33,6 +44,16 @@ namespace OpenArena{
GLuint Bpp; // Number Of BITS Per Pixel (24 Or 32) GLuint Bpp; // Number Of BITS Per Pixel (24 Or 32)
}; };
virtual uint8 * GetImageData() const;
virtual uint32 GetBitsPerPixel() const;
virtual uint32 GetBytesPerPixel() const;
virtual uint32 GetWidth() const;
virtual uint32 GetHeight() const;
virtual Image::Type GetType() const;
virtual ~TargaImage(void);
static TargaImage* CreateFromFile(const char* filename);
};
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