X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTGALoader.h;h=d8f333635a9cd380749a8284c22243f5cdca4212;hb=34ce0cdd42f673a04aa29ae148d2206420dfd813;hp=b27cb182aa4601fea6b0e6e56d6991985f0a1183;hpb=b1f01eb2b335d313af30594d671a90f7d9cfed08;p=lugaru.git
diff --git a/Source/TGALoader.h b/Source/TGALoader.h
index b27cb18..d8f3336 100644
--- a/Source/TGALoader.h
+++ b/Source/TGALoader.h
@@ -3,24 +3,22 @@ Copyright (C) 2003, 2010 - Wolfire Games
This file is part of Lugaru.
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
-This program is distributed in the hope that it will be useful,
+Lugaru is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+along with Lugaru. If not, see .
*/
-#ifndef _TGA_LOADER_H_
-#define _TGA_LOADER_H_
+#ifndef _TGA_LOADER_H_
+#define _TGA_LOADER_H_
#ifdef _MSC_VER
#pragma once
@@ -39,26 +37,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "GL/gl.h"
#else
#include "gamegl.h"
-// #include "MoreFilesX.h"
#endif
-//#include
-//#include
-
/**> DATA STRUCTURES <**/
-typedef struct TGAImageRec
-{
- GLubyte *data; // Image Data (Up To 32 Bits)
- GLuint bpp; // Image Color Depth In Bits Per Pixel.
- GLuint sizeX;
- GLuint sizeY;
-} TGAImageRec;
-
-bool upload_image(const unsigned char* filePath, bool hasalpha);
-
-/**> FUNCTION PROTOTYPES <**/
-TGAImageRec* LoadTGA( char *filename );
-
+typedef struct ImageRec {
+ GLubyte *data; // Image Data (Up To 32 Bits)
+ GLuint bpp; // Image Color Depth In Bits Per Pixel.
+ GLuint sizeX;
+ GLuint sizeY;
+} ImageRec;
+
+bool upload_image(const char* filePath);
#endif