qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

nuke QF/texture.h moving it's contents into QF/image.h (yay, finally, a

Browse source 
real home for tex_t:)
This commit is contained in:
Bill Currie 2003-09-04 18:59:39 +00:00
parent 39ed540979
commit 2b5a3753ca
23 changed files with 34 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/Makefile.am
View file

@ -8,4 +8,4 @@ include_HEADERS = bspfile.h cbuf.h cdaudio.h checksum.h clip_hull.h cmd.h \
pakfile.h pcx.h png.h plugin.h pr_comp.h pr_debug.h pr_obj.h progs.h \
qargs.h qdefs.h qendian.h qfplist.h qtypes.h quakefs.h quakeio.h render.h \
riff.h screen.h sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h \
texture.h tga.h uint32.h va.h ver_check.h vid.h view.h wad.h zone.h
tga.h uint32.h va.h ver_check.h vid.h view.h wad.h zone.h

18
include/QF/image.h
View file

@ -34,6 +34,22 @@
#include "QF/quakeio.h"
struct tex_s *LoadImage (const char *imageFile);
// could not use texture_t as that is used for models.
typedef struct tex_s {
int width;
int height;
int format;
unsigned char *palette; // 0 = 32 bit, otherwise 8
unsigned char data[4]; // variable length
} tex_t;
#define tex_palette 0
#define tex_l GL_LUMINANCE
#define tex_a GL_ALPHA
#define tex_la 2
#define tex_rgb 3
#define tex_rgba 4
tex_t *LoadImage (const char *imageFile);
#endif//__QF_image_h

51
include/QF/texture.h
View file

@ -1,51 +0,0 @@
/*
texture.h
texture definition
Copyright (C) 2000 Bill Currie
Author: Bill Currie
Date: 2000-01-18
This program 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,
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.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#ifndef __texture_h
#define __texture_h
// could not use texture_t as that is used for models.
typedef struct tex_s {
int width;
int height;
int format;
unsigned char *palette; // 0 = 32 bit, otherwise 8
unsigned char data[4]; // variable length
} tex_t;
#define tex_palette 0
#define tex_l GL_LUMINANCE
#define tex_a GL_ALPHA
#define tex_la 2
#define tex_rgb 3
#define tex_rgba 4
#endif // __texture_h

1
libs/image/image.c
View file

@ -43,7 +43,6 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/pcx.h"
#include "QF/png.h"
#include "QF/quakefs.h"
#include "QF/texture.h"
#include "QF/tga.h"
tex_t *

2
libs/image/pcx.c
View file

@ -38,12 +38,12 @@ static __attribute__ ((unused)) const char rcsid[] =
# include <strings.h>
#endif
#include "QF/image.h"
#include "QF/pcx.h"
#include "QF/qendian.h"
#include "QF/qtypes.h"
#include "QF/quakefs.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/zone.h"
#include "compat.h"

6
libs/image/png.c
View file

@ -38,17 +38,17 @@ static __attribute__ ((unused)) const char rcsid[] =
# include <strings.h>
#endif
#include "png.h"
#include <png.h>
#include "QF/image.h"
#include "QF/png.h"
#include "QF/qendian.h"
#include "QF/qtypes.h"
#include "QF/quakefs.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/zone.h"
#include "compat.h"
#include "QF/png.h"
typedef unsigned char uch;
typedef unsigned short ush;

2
libs/image/tga.c
View file

@ -40,10 +40,10 @@ static __attribute__ ((unused)) const char rcsid[] =
#include <stdlib.h>
#include "QF/image.h"
#include "QF/qendian.h"
#include "QF/quakefs.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/tga.h"
#include "QF/zone.h"
#include "QF/GL/defines.h"

1
libs/models/alias/gl_model_alias.c
View file

@ -47,7 +47,6 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/quakefs.h"
#include "QF/skin.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/va.h"
#include "QF/vid.h"
#include "QF/GL/qf_textures.h"

1
libs/models/brush/gl_model_brush.c
View file

@ -48,7 +48,6 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/qendian.h"
#include "QF/quakefs.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/va.h"
#include "QF/vid.h"
#include "QF/GL/qf_textures.h"

1
libs/models/sprite/gl_model_sprite.c
View file

@ -42,7 +42,6 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/image.h"
#include "QF/model.h"
#include "QF/quakefs.h"
#include "QF/texture.h"
#include "QF/va.h"
#include "QF/GL/qf_textures.h"

1
libs/video/renderer/gl/gl_draw.c
View file

@ -50,7 +50,6 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/render.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/va.h"
#include "QF/vid.h"
#include "QF/GL/defines.h"

2
libs/video/renderer/gl/gl_screen.c
View file

@ -44,11 +44,11 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/dstring.h"
#include "QF/image.h"
#include "QF/quakefs.h"
#include "QF/render.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/tga.h"
#include "QF/va.h"
#include "QF/GL/defines.h"

2
libs/video/renderer/gl/gl_skin.c
View file

@ -40,9 +40,9 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/image.h"
#include "QF/render.h"
#include "QF/skin.h"
#include "QF/texture.h"
#include "QF/GL/defines.h"
#include "QF/GL/funcs.h"
#include "QF/GL/qf_textures.h"

1
libs/video/renderer/gl/gl_sky.c
View file

@ -43,7 +43,6 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/image.h"
#include "QF/quakefs.h"
#include "QF/render.h"
#include "QF/texture.h"
#include "QF/va.h"
#include "QF/vid.h"
#include "QF/GL/defines.h"

2
libs/video/renderer/r_screen.c
View file

@ -42,11 +42,11 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/image.h"
#include "QF/pcx.h"
#include "QF/render.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "compat.h"
#include "r_cvar.h"

2
libs/video/renderer/sw/screen.c
View file

@ -44,12 +44,12 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/dstring.h"
#include "QF/image.h"
#include "QF/pcx.h"
#include "QF/quakefs.h"
#include "QF/render.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/va.h"
#include "compat.h"

2
libs/video/renderer/sw/sw_ralias.c
View file

@ -32,10 +32,10 @@ static __attribute__ ((unused)) const char rcsid[] =
"$Id$";
#include "QF/console.h"
#include "QF/image.h"
#include "QF/render.h"
#include "QF/skin.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "d_ifacea.h"
#include "r_local.h"

2
libs/video/renderer/sw32/screen.c
View file

@ -44,12 +44,12 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/dstring.h"
#include "QF/image.h"
#include "QF/pcx.h"
#include "QF/quakefs.h"
#include "QF/render.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/va.h"
#include "compat.h"

2
libs/video/renderer/sw32/sw32_ralias.c
View file

@ -32,10 +32,10 @@ static __attribute__ ((unused)) const char rcsid[] =
"$Id$";
#include "QF/console.h"
#include "QF/image.h"
#include "QF/render.h"
#include "QF/skin.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "d_ifacea.h"
#include "r_local.h"

2
nq/source/cl_screen.c
View file

@ -43,9 +43,9 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/image.h"
#include "QF/pcx.h"
#include "QF/screen.h"
#include "QF/texture.h"
#include "client.h"
#include "r_cvar.h"

2
nq/source/skin.c
View file

@ -41,11 +41,11 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/hash.h"
#include "QF/image.h"
#include "QF/pcx.h"
#include "QF/quakefs.h"
#include "QF/skin.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "client.h"
#include "compat.h"

2
qw/source/cl_screen.c
View file

@ -43,10 +43,10 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/image.h"
#include "QF/msg.h"
#include "QF/pcx.h"
#include "QF/screen.h"
#include "QF/texture.h"
#include "QF/va.h"
#include "cl_parse.h"

2
qw/source/skin.c
View file

@ -41,11 +41,11 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/hash.h"
#include "QF/image.h"
#include "QF/pcx.h"
#include "QF/quakefs.h"
#include "QF/skin.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "client.h"
#include "compat.h"