speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests Projects Releases 1 Packages Wiki Activity Actions 5

Code reuse.

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@1885 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: b5b0140862b074e684ea32ec21fd546a8bfe2ccb
Former-commit-id: b001e1b88be4dff45b304c9eed2b69551fbaea6c
This commit is contained in:
kmetykog 2009-11-30 10:43:53 +00:00
parent 01f38ea229
commit ea3c1ee994
1 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/libs/tgfclient/img.cpp
View file

@ -4,7 +4,7 @@
created : Tue Aug 17 20:13:08 CEST 1999
copyright : (C) 1999 by Eric Espie
email : torcs@free.fr
version : $Id: img.cpp,v 1.5 2006/10/29 15:55:33 berniw Exp $
version : $Id$
***************************************************************************/
/***************************************************************************
@ -20,7 +20,7 @@
Images manipulation tools.
Load and store png images with easy interface.
@author <a href=mailto:torcs@free.fr>Eric Espie</a>
@version $Id: img.cpp,v 1.5 2006/10/29 15:55:33 berniw Exp $
@version $Id$
@ingroup img
*/
@ -292,36 +292,12 @@ GfImgFreeTex(GLuint tex)
GLuint
GfImgReadTex(const char *filename)
{
void *handle;
float screen_gamma;
GLbyte *tex;
int w, h;
GLuint retTex;
sprintf(buf, "%s%s", GetLocalDir(), GFSCR_CONF_FILE);
handle = GfParmReadFile(buf, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
screen_gamma = (float)GfParmGetNum(handle, GFSCR_SECT_PROP, GFSCR_ATT_GAMMA, (char*)NULL, 2.0);
tex = (GLbyte*)GfImgReadPng(filename, &w, &h, screen_gamma);
if (!tex) {
GfParmReleaseHandle(handle);
return 0;
}
glGenTextures(1, &retTex);
glBindTexture(GL_TEXTURE_2D, retTex);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, (GLvoid *)(tex));
free(tex);
GfParmReleaseHandle(handle);
return retTex;
return GfImgReadTex(filename, w, h);
}
GLuint
GfImgReadTex(const char *filename, int &width,int &height)
GfImgReadTex(const char *filename, int &width, int &height)
{
void *handle;
float screen_gamma;