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

*** empty log message ***

Browse Source
This commit is contained in:
Tom Hicks
2006-07-03 05:12:06 -04:00
parent f2ac04d3b5
commit c5264c1887
15 changed files with 692 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mygl.cpp
View File

@@ -1,18 +1,17 @@
#include "mygl.h"
namespace OpenArena
{
void FreeGLTexture(GLuint& texture)
void FreeGLTexture(GLuint texture)
{
glDeleteTextures(1, &texture);
}
bool LoadGLTexture(string fn, GLuint& texture, GLuint mag, GLuint min)
bool LoadGLTexture(string fn, GLuint texture, GLuint mag, GLuint min)
{
if(Right(tolower(fn), 4) == ".bmp")
{
TextureImage* texImage = NULL;
if(texImage = BitmapImage::LoadBMP(fn.c_str()))
if(texImage = LoadBMP(fn.c_str()))
{
glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture);
@@ -36,7 +35,7 @@ namespace OpenArena
else if(Right(tolower(fn), 4) == ".tga")
{
TextureImage* texImage = NULL;
if(texImage = TargaImage::LoadTGA(fn.c_str()))
if(texImage = LoadTGA(fn.c_str()))
{
glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture);
@@ -64,4 +63,4 @@ namespace OpenArena
}
};
OpenArena::Window* g_Screen = NULL;
OpenArena::Window g_Screen;