qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-22 03:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

GL fixes, partial Q{open,close,read,write,getc} -> f*

Browse source
This commit is contained in:
Jeff Teunissen 2000-05-23 17:05:34 +00:00
parent db453a4b15
commit fd11d81788
11 changed files with 98 additions and 497 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
source/gl_draw.c
View file

@ -27,8 +27,9 @@
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
# include "config.h"
#endif
#include <string.h>
#include <stdio.h>
@ -59,8 +60,6 @@ extern unsigned char d_15to8table[65536];
CVAR_FIXME */
extern cvar_t *crosshair, *cl_crossx, *cl_crossy, *crosshaircolor;
/* cvar_t gl_nobind = {"gl_nobind", "0"};
CVAR_FIXME */
cvar_t *gl_nobind;
/* cvar_t gl_max_size = {"gl_max_size", "1024"};
CVAR_FIXME */
@ -126,8 +125,6 @@ int numgltextures;
void GL_Bind (int texnum)
{
/* if (gl_nobind.value)
CVAR_FIXME */
if (gl_nobind->value)
texnum = char_texture;
if (currenttexture == texnum)
@ -387,7 +384,7 @@ void Draw_TextureMode_f (void)
for (i=0 ; i< 6 ; i++)
{
if (!strcasecmp (modes[i].name, Cmd_Argv(1) ) )
if (!stricmp (modes[i].name, Cmd_Argv(1) ) )
break;
}
if (i == 6)
@ -434,10 +431,7 @@ void Draw_Init (void)
CVAR_FIXME */
gl_picmip = Cvar_Get("gl_picmip", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&cl_verstring);
CVAR_FIXME */
/* Oddone: Why did you remove this? */
cl_verstring = Cvar_Get("cl_verstring", PROGRAM " " VERSION, CVAR_NONE, "None");
cl_verstring = Cvar_Get("cl_verstring", PROGRAM " " VERSION, CVAR_NONE, "Client version string");
// 3dfx can only handle 256 wide textures
if (!strncasecmp ((char *)gl_renderer, "3dfx",4) ||
@ -612,19 +606,11 @@ void Draw_Crosshair(void)
extern vrect_t scr_vrect;
unsigned char *pColor;
/* if (crosshair.value == 2) {
CVAR_FIXME */
if (crosshair->value == 2) {
/* x = scr_vrect.x + scr_vrect.width/2 - 3 + cl_crossx.value;
CVAR_FIXME */
x = scr_vrect.x + scr_vrect.width/2 - 3 + cl_crossx->value;
/* y = scr_vrect.y + scr_vrect.height/2 - 3 + cl_crossy.value;
CVAR_FIXME */
y = scr_vrect.y + scr_vrect.height/2 - 3 + cl_crossy->value;
glTexEnvf ( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
/* pColor = (unsigned char *) &d_8to24table[(byte) crosshaircolor.value];
CVAR_FIXME */
pColor = (unsigned char *) &d_8to24table[(byte) crosshaircolor->value];
glColor4ubv ( pColor );
GL_Bind (cs_texture);
@ -641,16 +627,9 @@ void Draw_Crosshair(void)
glEnd ();
glTexEnvf ( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
/* } else if (crosshair.value)
CVAR_FIXME */
} else if (crosshair->value)
/* Draw_Character (scr_vrect.x + scr_vrect.width/2-4 + cl_crossx.value,
CVAR_FIXME */
Draw_Character (scr_vrect.x + scr_vrect.width/2-4 + cl_crossx->value,
/* scr_vrect.y + scr_vrect.height/2-4 + cl_crossy.value,
CVAR_FIXME */
scr_vrect.y + scr_vrect.height/2-4 + cl_crossy->value,
'+');
scr_vrect.y + scr_vrect.height/2-4 + cl_crossy->value, '+');
}
@ -707,9 +686,9 @@ void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha)
gl = (glpic_t *)pic->data;
glDisable(GL_ALPHA_TEST);
glEnable (GL_BLEND);
// glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glCullFace(GL_FRONT);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
// glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); // FIXME deek: these cause problems with text. Looking for the real problem
glColor4f (1,1,1,alpha);
GL_Bind (gl->texnum);
glBegin (GL_QUADS);
@ -723,7 +702,7 @@ void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha)
glVertex2f (x, y+pic->height);
glEnd ();
glColor4f (1,1,1,1);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
// glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); // FIXME
glEnable(GL_ALPHA_TEST);
glDisable (GL_BLEND);
}
@ -1144,25 +1123,11 @@ static unsigned scaled[1024*512]; // [512*256];
for (scaled_height = 1 ; scaled_height < height ; scaled_height<<=1)
;
/* scaled_width >>= (int)gl_picmip.value;
CVAR_FIXME */
scaled_width >>= (int)gl_picmip->value;
/* scaled_height >>= (int)gl_picmip.value;
CVAR_FIXME */
scaled_height >>= (int)gl_picmip->value;
/* if (scaled_width > gl_max_size.value)
CVAR_FIXME */
if (scaled_width > gl_max_size->value)
/* scaled_width = gl_max_size.value;
CVAR_FIXME */
scaled_width = gl_max_size->value;
/* if (scaled_height > gl_max_size.value)
CVAR_FIXME */
if (scaled_height > gl_max_size->value)
/* scaled_height = gl_max_size.value;
CVAR_FIXME */
scaled_height = gl_max_size->value;
scaled_width = min(scaled_width, gl_max_size->value);
scaled_height = min(scaled_height, gl_max_size->value);
if (scaled_width * scaled_height > sizeof(scaled)/4)
Sys_Error ("GL_LoadTexture: too big");
@ -1258,25 +1223,11 @@ void GL_Upload8_EXT (byte *data, int width, int height, qboolean mipmap, qboole
for (scaled_height = 1 ; scaled_height < height ; scaled_height<<=1)
;
/* scaled_width >>= (int)gl_picmip.value;
CVAR_FIXME */
scaled_width >>= (int)gl_picmip->value;
/* scaled_height >>= (int)gl_picmip.value;
CVAR_FIXME */
scaled_height >>= (int)gl_picmip->value;
/* if (scaled_width > gl_max_size.value)
CVAR_FIXME */
if (scaled_width > gl_max_size->value)
/* scaled_width = gl_max_size.value;
CVAR_FIXME */
scaled_width = gl_max_size->value;
/* if (scaled_height > gl_max_size.value)
CVAR_FIXME */
if (scaled_height > gl_max_size->value)
/* scaled_height = gl_max_size.value;
CVAR_FIXME */
scaled_height = gl_max_size->value;
scaled_width = min(scaled_width, gl_max_size->value);
scaled_height = min(scaled_height, gl_max_size->value);
if (scaled_width * scaled_height > sizeof(scaled))
Sys_Error ("GL_LoadTexture: too big");

24
source/gl_mesh.c
View file

@ -335,11 +335,11 @@ void GL_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr)
COM_FOpenFile (cache, &f);
if (f)
{
Qread (f, &numcommands, 4);
Qread (f, &numorder, 4);
Qread (f, &commands, numcommands * sizeof(commands[0]));
Qread (f, &vertexorder, numorder * sizeof(vertexorder[0]));
Qclose (f);
fread (&numcommands, 4, 1, f);
fread (&numorder, 4, 1, f);
fread (&commands, numcommands * sizeof(commands[0]), 1, f);
fread (&vertexorder, numorder * sizeof(vertexorder[0]), 1, f);
fclose (f);
}
else
{
@ -354,22 +354,22 @@ void GL_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr)
// save out the cached version
//
snprintf (fullpath, sizeof(fullpath), "%s/%s", com_gamedir, cache);
f = Qopen (fullpath, "wb");
f = fopen (fullpath, "wb");
if (!f) {
char gldir[MAX_OSPATH];
snprintf (gldir, sizeof(gldir), "%s/glquake", com_gamedir);
Sys_mkdir (gldir);
f = Qopen (fullpath, "wb");
f = fopen (fullpath, "wb");
}
if (f)
{
Qwrite (f, &numcommands, 4);
Qwrite (f, &numorder, 4);
Qwrite (f, &commands, numcommands * sizeof(commands[0]));
Qwrite (f, &vertexorder, numorder * sizeof(vertexorder[0]));
Qclose (f);
fwrite (&numcommands, 4, 1, f);
fwrite (&numorder, 4, 1, f);
fwrite (&commands, numcommands * sizeof(commands[0]), 1, f);
fwrite (&vertexorder, numorder * sizeof(vertexorder[0]), 1, f);
fclose (f);
}
}

2
source/gl_ngraph.c
View file

@ -27,7 +27,7 @@
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
# include "config.h"
#endif
#include <string.h>
#include <stdio.h>

7
source/gl_part.c
View file

@ -126,7 +126,6 @@ void R_ReadPointFile_f (void)
int c;
particle_t *p;
char name[MAX_OSPATH];
char buf[256];
// FIXME sprintf (name,"maps/%s.pts", sv.name);
@ -141,9 +140,7 @@ void R_ReadPointFile_f (void)
c = 0;
for ( ;; )
{
if (!Qgets(f,buf,sizeof(buf)))
break;
r = sscanf (buf,"%f %f %f\n", &org[0], &org[1], &org[2]);
r = fscanf (f,"%f %f %f\n", &org[0], &org[1], &org[2]);
if (r != 3)
break;
c++;
@ -165,7 +162,7 @@ void R_ReadPointFile_f (void)
VectorCopy (org, p->org);
}
Qclose (f);
fclose (f);
Con_Printf ("%i points read\n", c);
}

3
source/gl_refrag.c
View file

@ -27,8 +27,9 @@
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
# include "config.h"
#endif
#include "sys.h"
#include "qargs.h"
#include "bothdefs.h" // needed by: common.h, net.h, client.h

7
source/gl_rlight.c
View file

@ -27,8 +27,9 @@
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
# include "config.h"
#endif
#include <math.h>
#include <string.h>
#include <stdio.h>
@ -175,8 +176,6 @@ void R_RenderDlights (void)
int i;
dlight_t *l;
/* if (!gl_flashblend.value)
CVAR_FIXME */
if (!gl_flashblend->value)
return;
@ -268,8 +267,6 @@ void R_PushDlights (void)
int i;
dlight_t *l;
/* if (gl_flashblend.value)
CVAR_FIXME */
if (gl_flashblend->value)
return;

130
source/gl_rmain.c
View file

@ -27,35 +27,21 @@
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
# include "config.h"
#endif
#include <math.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include "bothdefs.h" // needed by: common.h, net.h, client.h
#include "bspfile.h" // needed by: glquake.h
#include "vid.h"
#include "sys.h"
#include "zone.h" // needed by: client.h, gl_model.h
#include "mathlib.h" // needed by: protocol.h, render.h, client.h,
// modelgen.h, glmodel.h
#include "wad.h"
#include "draw.h"
#include "cvar.h"
#include "net.h" // needed by: client.h
#include "protocol.h" // needed by: client.h
#include "sound.h"
#include "cmd.h"
#include "sbar.h"
#include "render.h" // needed by: client.h, gl_model.h, glquake.h
#include "client.h" // need cls in this file
#include "model.h" // needed by: glquake.h
#include "bothdefs.h"
#include "commdef.h"
#include "console.h"
#include "glquake.h"
#include "model.h"
#include "render.h"
#include "sys.h"
entity_t r_worldentity;
@ -107,87 +93,35 @@ int d_lightstylevalue[256]; // 8.8 fraction of base light value
void R_MarkLeaves (void);
/* cvar_t r_norefresh = {"r_norefresh","0"};
CVAR_FIXME */
cvar_t *r_norefresh;
/* cvar_t r_drawentities = {"r_drawentities","1"};
CVAR_FIXME */
cvar_t *r_drawentities;
/* cvar_t r_drawviewmodel = {"r_drawviewmodel","1"};
CVAR_FIXME */
cvar_t *r_drawviewmodel;
/* cvar_t r_speeds = {"r_speeds","0"};
CVAR_FIXME */
cvar_t *r_speeds;
/* cvar_t r_fullbright = {"r_fullbright","0"};
CVAR_FIXME */
cvar_t *r_fullbright;
/* cvar_t r_lightmap = {"r_lightmap","0"};
CVAR_FIXME */
cvar_t *r_lightmap;
/* cvar_t r_shadows = {"r_shadows","0"};
CVAR_FIXME */
cvar_t *r_shadows;
/* cvar_t r_mirroralpha = {"r_mirroralpha","1"};
CVAR_FIXME */
cvar_t *r_mirroralpha;
/* cvar_t r_wateralpha = {"r_wateralpha","1"};
CVAR_FIXME */
cvar_t *r_wateralpha;
/* cvar_t r_dynamic = {"r_dynamic","1"};
CVAR_FIXME */
cvar_t *r_dynamic;
/* cvar_t r_novis = {"r_novis","0"};
CVAR_FIXME */
cvar_t *r_novis;
/* cvar_t r_netgraph = {"r_netgraph","0"};
CVAR_FIXME */
cvar_t *r_netgraph;
/* cvar_t gl_clear = {"gl_clear","0"};
CVAR_FIXME */
cvar_t *gl_clear;
/* cvar_t gl_cull = {"gl_cull","1"};
CVAR_FIXME */
cvar_t *gl_cull;
/* cvar_t gl_texsort = {"gl_texsort","1"};
CVAR_FIXME */
cvar_t *gl_texsort;
/* cvar_t gl_smoothmodels = {"gl_smoothmodels","1"};
CVAR_FIXME */
cvar_t *gl_smoothmodels;
/* cvar_t gl_affinemodels = {"gl_affinemodels","0"};
CVAR_FIXME */
cvar_t *gl_affinemodels;
/* cvar_t gl_polyblend = {"gl_polyblend","1"};
CVAR_FIXME */
cvar_t *gl_polyblend;
/* cvar_t gl_flashblend = {"gl_flashblend","1"};
CVAR_FIXME */
cvar_t *gl_flashblend;
/* cvar_t gl_playermip = {"gl_playermip","0"};
CVAR_FIXME */
cvar_t *gl_playermip;
/* cvar_t gl_nocolors = {"gl_nocolors","0"};
CVAR_FIXME */
cvar_t *gl_nocolors;
/* cvar_t gl_keeptjunctions = {"gl_keeptjunctions","1"};
CVAR_FIXME */
cvar_t *gl_keeptjunctions;
/* cvar_t gl_reporttjunctions = {"gl_reporttjunctions","0"};
CVAR_FIXME */
cvar_t *gl_reporttjunctions;
/* cvar_t gl_finish = {"gl_finish","0"};
CVAR_FIXME */
cvar_t *gl_finish;
cvar_t *r_skyname;
/* extern cvar_t gl_ztrick;
CVAR_FIXME */
extern cvar_t *gl_ztrick;
/* extern cvar_t scr_fov;
CVAR_FIXME */
extern cvar_t *scr_fov;
/*
=================
@ -630,8 +564,6 @@ void R_DrawAliasModel (entity_t *e)
// we can't dynamically colormap textures, so they are cached
// seperately for the players. Heads are just uncolored.
/* if (currententity->scoreboard && !gl_nocolors.value)
CVAR_FIXME */
if (currententity->scoreboard && !gl_nocolors->value)
{
i = currententity->scoreboard - cl.players;
@ -643,14 +575,10 @@ void R_DrawAliasModel (entity_t *e)
GL_Bind(playertextures + i);
}
/* if (gl_smoothmodels.value)
CVAR_FIXME */
if (gl_smoothmodels->value)
glShadeModel (GL_SMOOTH);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
/* if (gl_affinemodels.value)
CVAR_FIXME */
if (gl_affinemodels->value)
glHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
@ -659,15 +587,11 @@ void R_DrawAliasModel (entity_t *e)
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
glShadeModel (GL_FLAT);
/* if (gl_affinemodels.value)
CVAR_FIXME */
if (gl_affinemodels->value)
glHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
glPopMatrix ();
/* if (r_shadows.value)
CVAR_FIXME */
if (r_shadows->value)
{
glPushMatrix ();
@ -695,8 +619,6 @@ void R_DrawEntitiesOnList (void)
{
int i;
/* if (!r_drawentities.value)
CVAR_FIXME */
if (!r_drawentities->value)
return;
@ -751,16 +673,12 @@ void R_DrawViewModel (void)
dlight_t *dl;
int ambientlight, shadelight;
/* if (!r_drawviewmodel.value || !Cam_DrawViewModel())
CVAR_FIXME */
if (!r_drawviewmodel->value || !Cam_DrawViewModel())
return;
if (envmap)
return;
/* if (!r_drawentities.value)
CVAR_FIXME */
if (!r_drawentities->value)
return;
@ -815,8 +733,6 @@ R_PolyBlend
*/
void R_PolyBlend (void)
{
/* if (!gl_polyblend.value)
CVAR_FIXME */
if (!gl_polyblend->value)
return;
if (!v_blend[3])
@ -913,16 +829,10 @@ R_SetupFrame
void R_SetupFrame (void)
{
// don't allow cheats in multiplayer
/* r_fullbright.value = 0;
CVAR_FIXME */
r_fullbright->value = 0;
/* r_lightmap.value = 0;
CVAR_FIXME */
r_lightmap->value = 0;
if (!atoi(Info_ValueForKey(cl.serverinfo, "watervis")))
/* r_wateralpha.value = 1;
CVAR_FIXME */
r_wateralpha->value = 1;
Cvar_SetValue(r_wateralpha, 1);
R_AnimateLight ();
@ -1006,11 +916,7 @@ void R_SetupGL (void)
glViewport (glx + x, gly + y2, w, h);
screenaspect = (float)r_refdef.vrect.width/r_refdef.vrect.height;
// yfov = 2*atan((float)r_refdef.vrect.height/r_refdef.vrect.width)*180/M_PI;
/* // yfov = (2.0 * tan (scr_fov.value/360*M_PI)) / screenaspect;
CVAR_FIXME */
// yfov = (2.0 * tan (scr_fov->value/360*M_PI)) / screenaspect;
/* // yfov = 2*atan((float)r_refdef.vrect.height/r_refdef.vrect.width)*(scr_fov.value*2)/M_PI;
CVAR_FIXME */
// yfov = 2*atan((float)r_refdef.vrect.height/r_refdef.vrect.width)*(scr_fov->value*2)/M_PI;
// MYgluPerspective (yfov, screenaspect, 4, 4096);
MYgluPerspective (r_refdef.fov_y, screenaspect, 4, 4096);
@ -1041,8 +947,6 @@ void R_SetupGL (void)
//
// set drawing parms
//
/* if (gl_cull.value)
CVAR_FIXME */
if (gl_cull->value)
glEnable(GL_CULL_FACE);
else
@ -1096,12 +1000,8 @@ R_Clear
*/
void R_Clear (void)
{
/* if (r_mirroralpha.value != 1.0)
CVAR_FIXME */
if (r_mirroralpha->value != 1.0)
{
/* if (gl_clear.value)
CVAR_FIXME */
if (gl_clear->value)
glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
else
@ -1110,14 +1010,10 @@ void R_Clear (void)
gldepthmax = 0.5;
glDepthFunc (GL_LEQUAL);
}
/* else if (gl_ztrick.value)
CVAR_FIXME */
else if (gl_ztrick->value)
{
static int trickframe;
/* if (gl_clear.value)
CVAR_FIXME */
if (gl_clear->value)
glClear (GL_COLOR_BUFFER_BIT);
@ -1137,8 +1033,6 @@ void R_Clear (void)
}
else
{
/* if (gl_clear.value)
CVAR_FIXME */
if (gl_clear->value)
glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
else
@ -1234,16 +1128,12 @@ void R_RenderView (void)
{
double time1 = 0, time2;
/* if (r_norefresh.value)
CVAR_FIXME */
if (r_norefresh->value)
return;
if (!r_worldentity.model || !cl.worldmodel)
Sys_Error ("R_RenderView: NULL worldmodel");
/* if (r_speeds.value)
CVAR_FIXME */
if (r_speeds->value)
{
glFinish ();
@ -1254,8 +1144,6 @@ void R_RenderView (void)
mirror = false;
/* if (gl_finish.value)
CVAR_FIXME */
if (gl_finish->value)
glFinish ();
@ -1271,8 +1159,6 @@ void R_RenderView (void)
R_PolyBlend ();
/* if (r_speeds.value)
CVAR_FIXME */
if (r_speeds->value)
{
// glFinish ();

66
source/gl_rmisc.c
View file

@ -227,83 +227,35 @@ void R_Init (void)
Cmd_AddCommand ("pointfile", R_ReadPointFile_f);
Cmd_AddCommand ("loadsky", R_LoadSky_f);
/* Cvar_RegisterVariable (&r_norefresh);
CVAR_FIXME */
r_norefresh = Cvar_Get("r_norefresh", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&r_lightmap);
CVAR_FIXME */
r_lightmap = Cvar_Get("r_lightmap", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&r_fullbright);
CVAR_FIXME */
r_fullbright = Cvar_Get("r_fullbright", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&r_drawentities);
CVAR_FIXME */
r_drawentities = Cvar_Get("r_drawentities", "1", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&r_drawviewmodel);
CVAR_FIXME */
r_drawviewmodel = Cvar_Get("r_drawviewmodel", "1", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&r_shadows);
CVAR_FIXME */
r_shadows = Cvar_Get("r_shadows", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&r_mirroralpha);
CVAR_FIXME */
r_mirroralpha = Cvar_Get("r_mirroralpha", "1", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&r_wateralpha);
CVAR_FIXME */
r_wateralpha = Cvar_Get("r_wateralpha", "1", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&r_dynamic);
CVAR_FIXME */
r_dynamic = Cvar_Get("r_dynamic", "1", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&r_novis);
CVAR_FIXME */
r_novis = Cvar_Get("r_novis", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&r_speeds);
CVAR_FIXME */
r_speeds = Cvar_Get("r_speeds", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&r_netgraph);
CVAR_FIXME */
r_netgraph = Cvar_Get("r_netgraph", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&gl_clear);
CVAR_FIXME */
gl_clear = Cvar_Get("gl_clear", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&gl_texsort);
CVAR_FIXME */
gl_texsort = Cvar_Get("gl_texsort", "1", CVAR_NONE, "None");
if (gl_mtexable)
gl_texsort->value = 0.0;
/* Cvar_RegisterVariable (&gl_cull);
CVAR_FIXME */
gl_cull = Cvar_Get("gl_cull", "1", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&gl_smoothmodels);
CVAR_FIXME */
gl_smoothmodels = Cvar_Get("gl_smoothmodels", "1", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&gl_affinemodels);
CVAR_FIXME */
gl_affinemodels = Cvar_Get("gl_affinemodels", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&gl_polyblend);
CVAR_FIXME */
gl_polyblend = Cvar_Get("gl_polyblend", "1", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&gl_flashblend);
CVAR_FIXME */
gl_flashblend = Cvar_Get("gl_flashblend", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&gl_playermip);
CVAR_FIXME */
gl_playermip = Cvar_Get("gl_playermip", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&gl_nocolors);
CVAR_FIXME */
gl_nocolors = Cvar_Get("gl_nocolors", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&gl_finish);
CVAR_FIXME */
gl_finish = Cvar_Get("gl_finish", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&gl_keeptjunctions);
CVAR_FIXME */
gl_keeptjunctions = Cvar_Get("gl_keeptjunctions", "1", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&gl_reporttjunctions);
CVAR_FIXME */
gl_reporttjunctions = Cvar_Get("gl_reporttjunctions", "0", CVAR_NONE, "None");
r_skyname = Cvar_Get("r_skyname", "none", CVAR_NONE,
@ -314,10 +266,6 @@ void R_Init (void)
R_InitParticles ();
R_InitParticleTexture ();
#ifdef GLTEST
Test_Init ();
#endif
netgraphtexture = texture_extension_number;
texture_extension_number++;
@ -430,18 +378,12 @@ void R_TranslatePlayerSkin (int playernum)
false, false, true);
#endif
/* scaled_width = gl_max_size.value < 512 ? gl_max_size.value : 512;
CVAR_FIXME */
scaled_width = gl_max_size->value < 512 ? gl_max_size->value : 512;
/* scaled_height = gl_max_size->value < 256 ? gl_max_size.value : 256;
CVAR_FIXME */
scaled_height = gl_max_size->value < 256 ? gl_max_size->value : 256;
// FIXME deek: This 512x256 limit sucks!
scaled_width = min(gl_max_size->value, 512);
scaled_height = min(gl_max_size->value, 256);
// allow users to crunch sizes down even more if they want
/* scaled_width >>= (int)gl_playermip.value;
CVAR_FIXME */
scaled_width >>= (int)gl_playermip->value;
/* scaled_height >>= (int)gl_playermip.value;
CVAR_FIXME */
scaled_height >>= (int)gl_playermip->value;
if (VID_Is8bit()) { // 8bit texture upload

62
source/gl_rsurf.c
View file

@ -27,8 +27,9 @@
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
# include "config.h"
#endif
#include <stdio.h>
#include <string.h>
#include <math.h>
@ -187,8 +188,6 @@ void R_BuildLightMap (msurface_t *surf, byte *dest, int stride)
lightmap = surf->samples;
// set to full bright if no light data
/* if ( r_fullbright.value || !cl.worldmodel->lightdata)
CVAR_FIXME */
if (/* r_fullbright->value || */ !cl.worldmodel->lightdata)
{
for (i=0 ; i<size ; i++)
@ -229,8 +228,7 @@ store:
{
t = *bl++;
t >>= 7;
if (t > 255)
t = 255;
t = min(t, 255);
dest[3] = 255-t;
dest += 4;
}
@ -709,14 +707,6 @@ void R_BlendLightmaps (void)
float *v;
glRect_t *theRect;
#if 0
/* if (r_fullbright.value)
CVAR_FIXME */
if (r_fullbright->value)
return;
#endif
/* if (!gl_texsort.value)
CVAR_FIXME */
if (!gl_texsort->value)
return;
@ -731,8 +721,6 @@ void R_BlendLightmaps (void)
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
/* if (!r_lightmap.value)
CVAR_FIXME */
if (!r_lightmap->value)
{
glEnable (GL_BLEND);
@ -852,8 +840,6 @@ void R_RenderBrushPoly (msurface_t *fa)
|| fa->cached_dlight) // dynamic previously
{
dynamic:
/* if (r_dynamic.value)
CVAR_FIXME */
if (r_dynamic->value)
{
lightmap_modified[fa->lightmaptexturenum] = true;
@ -912,8 +898,6 @@ void R_RenderDynamicLightmaps (msurface_t *fa)
|| fa->cached_dlight) // dynamic previously
{
dynamic:
/* if (r_dynamic.value)
CVAR_FIXME */
if (r_dynamic->value)
{
lightmap_modified[fa->lightmaptexturenum] = true;
@ -967,8 +951,6 @@ void R_DrawWaterSurfaces (void)
msurface_t *s;
texture_t *t;
/* if (r_wateralpha.value == 1.0)
CVAR_FIXME */
if (r_wateralpha->value == 1.0)
return;
@ -978,9 +960,7 @@ void R_DrawWaterSurfaces (void)
glLoadMatrixf (r_world_matrix);
glEnable (GL_BLEND);
/* glColor4f (1,1,1,r_wateralpha.value);
CVAR_FIXME */
glColor4f (1,1,1,r_wateralpha->value);
glColor4f (1, 1, 1, r_wateralpha->value);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
for (i=0 ; i<cl.worldmodel->numtextures ; i++)
@ -1020,8 +1000,6 @@ void R_DrawWaterSurfaces (void)
msurface_t *s;
texture_t *t;
/* if (r_wateralpha.value == 1.0 && gl_texsort.value)
CVAR_FIXME */
if (r_wateralpha->value == 1.0 && gl_texsort->value)
return;
@ -1031,18 +1009,12 @@ void R_DrawWaterSurfaces (void)
glLoadMatrixf (r_world_matrix);
/* if (r_wateralpha.value < 1.0) {
CVAR_FIXME */
if (r_wateralpha->value < 1.0) {
glEnable (GL_BLEND);
/* glColor4f (1,1,1,r_wateralpha.value);
CVAR_FIXME */
glColor4f (1,1,1,r_wateralpha->value);
glColor4f (1, 1, 1, r_wateralpha->value);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
}
/* if (!gl_texsort.value) {
CVAR_FIXME */
if (!gl_texsort->value) {
if (!waterchain)
return;
@ -1078,8 +1050,6 @@ void R_DrawWaterSurfaces (void)
}
/* if (r_wateralpha.value < 1.0) {
CVAR_FIXME */
if (r_wateralpha->value < 1.0) {
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
@ -1102,8 +1072,6 @@ void DrawTextureChains (void)
msurface_t *s;
texture_t *t;
/* if (!gl_texsort.value) {
CVAR_FIXME */
if (!gl_texsort->value) {
GL_DisableMultitexture();
@ -1125,8 +1093,6 @@ void DrawTextureChains (void)
continue;
if (i == skytexturenum)
R_DrawSkyChain (s);
/* else if (i == mirrortexturenum && r_mirroralpha.value != 1.0)
CVAR_FIXME */
else if (i == mirrortexturenum && r_mirroralpha->value != 1.0)
{
R_MirrorChain (s);
@ -1134,8 +1100,6 @@ void DrawTextureChains (void)
}
else
{
/* if ((s->flags & SURF_DRAWTURB) && r_wateralpha.value != 1.0)
CVAR_FIXME */
if ((s->flags & SURF_DRAWTURB) && r_wateralpha->value != 1.0)
continue; // draw translucent water later
for ( ; s ; s=s->texturechain)
@ -1206,8 +1170,6 @@ void R_DrawBrushModel (entity_t *e)
// calculate dynamic lighting for bmodel if it's not an
// instanced model
/* if (clmodel->firstmodelsurface != 0 && !gl_flashblend.value)
CVAR_FIXME */
if (clmodel->firstmodelsurface != 0 && !gl_flashblend->value)
{
for (k=0 ; k<MAX_DLIGHTS ; k++)
@ -1240,8 +1202,6 @@ e->angles[0] = -e->angles[0]; // stupid quake bug
if (((psurf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON)) ||
(!(psurf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON)))
{
/* if (gl_texsort.value)
CVAR_FIXME */
if (gl_texsort->value)
R_RenderBrushPoly (psurf);
else
@ -1362,8 +1322,6 @@ void R_RecursiveWorldNode (mnode_t *node)
continue; // wrong side
// if sorting by texture, just store it out
/* if (gl_texsort.value)
CVAR_FIXME */
if (gl_texsort->value)
{
if (!mirror
@ -1437,8 +1395,6 @@ void R_MarkLeaves (void)
int i;
byte solid[4096];
/* if (r_oldviewleaf == r_viewleaf && !r_novis.value)
CVAR_FIXME */
if (r_oldviewleaf == r_viewleaf && !r_novis->value)
return;
@ -1448,8 +1404,6 @@ void R_MarkLeaves (void)
r_visframecount++;
r_oldviewleaf = r_viewleaf;
/* if (r_novis.value)
CVAR_FIXME */
if (r_novis->value)
{
vis = solid;
@ -1606,8 +1560,6 @@ void BuildSurfaceDisplayList (msurface_t *fa)
//
// remove co-linear points - Ed
//
/* if (!gl_keeptjunctions.value && !(fa->flags & SURF_UNDERWATER) )
CVAR_FIXME */
if (!gl_keeptjunctions->value && !(fa->flags & SURF_UNDERWATER) )
{
for (i = 0 ; i < lnumverts ; ++i)
@ -1743,8 +1695,6 @@ void GL_BuildLightmaps (void)
}
}
/* if (!gl_texsort.value)
CVAR_FIXME */
if (!gl_texsort->value)
GL_SelectTexture(TEXTURE1_SGIS);
@ -1768,8 +1718,6 @@ void GL_BuildLightmaps (void)
gl_lightmap_format, GL_UNSIGNED_BYTE, lightmaps+i*BLOCK_WIDTH*BLOCK_HEIGHT*lightmap_bytes);
}
/* if (!gl_texsort.value)
CVAR_FIXME */
if (!gl_texsort->value)
GL_SelectTexture(TEXTURE0_SGIS);

83
source/gl_screen.c
View file

@ -27,8 +27,9 @@
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
# include "config.h"
#endif
#include <math.h>
#include <string.h>
#include <stdio.h>
@ -121,38 +122,16 @@ float scr_con_current;
float scr_conlines; // lines of console to display
float oldscreensize, oldfov;
/* cvar_t scr_viewsize = {"viewsize","100", true};
CVAR_FIXME */
cvar_t *scr_viewsize;
/* cvar_t scr_fov = {"fov","90"}; // 10 - 170
CVAR_FIXME */
cvar_t *scr_fov; // 10 - 170
/* cvar_t scr_conspeed = {"scr_conspeed","300"};
CVAR_FIXME */
cvar_t *scr_conspeed;
/* cvar_t scr_centertime = {"scr_centertime","2"};
CVAR_FIXME */
cvar_t *scr_centertime;
/* cvar_t scr_showram = {"showram","1"};
CVAR_FIXME */
cvar_t *scr_showram;
/* cvar_t scr_showturtle = {"showturtle","0"};
CVAR_FIXME */
cvar_t *scr_showturtle;
/* cvar_t scr_showpause = {"showpause","1"};
CVAR_FIXME */
cvar_t *scr_showpause;
/* cvar_t scr_printspeed = {"scr_printspeed","8"};
CVAR_FIXME */
cvar_t *scr_printspeed;
/* cvar_t scr_allowsnap = {"scr_allowsnap", "1"};
CVAR_FIXME */
cvar_t *scr_allowsnap;
/* cvar_t gl_triplebuffer = {"gl_triplebuffer", "1", true };
CVAR_FIXME */
cvar_t *gl_triplebuffer;
/* extern cvar_t crosshair;
CVAR_FIXME */
extern cvar_t *crosshair;
qboolean scr_initialized; // ready to draw
@ -207,8 +186,6 @@ for a few moments
void SCR_CenterPrint (char *str)
{
strncpy (scr_centerstring, str, sizeof(scr_centerstring)-1);
/* scr_centertime_off = scr_centertime.value;
CVAR_FIXME */
scr_centertime_off = scr_centertime->value;
scr_centertime_start = cl.time;
@ -233,8 +210,6 @@ void SCR_DrawCenterString (void)
// the finale prints the characters one at a time
if (cl.intermission)
/* remaining = scr_printspeed.value * (cl.time - scr_centertime_start);
CVAR_FIXME */
remaining = scr_printspeed->value * (cl.time - scr_centertime_start);
else
remaining = 9999;
@ -336,22 +311,14 @@ static void SCR_CalcRefdef (void)
//========================================
// bound viewsize
/* if (scr_viewsize.value < 30)
CVAR_FIXME */
if (scr_viewsize->value < 30)
Cvar_Set (scr_viewsize,"30");
/* if (scr_viewsize.value > 120)
CVAR_FIXME */
if (scr_viewsize->value > 120)
Cvar_Set (scr_viewsize,"120");
// bound field of view
/* if (scr_fov.value < 10)
CVAR_FIXME */
if (scr_fov->value < 10)
Cvar_Set (scr_fov,"10");
/* if (scr_fov.value > 170)
CVAR_FIXME */
if (scr_fov->value > 170)
Cvar_Set (scr_fov,"170");
@ -359,8 +326,6 @@ static void SCR_CalcRefdef (void)
if (cl.intermission)
size = 120;
else
/* size = scr_viewsize.value;
CVAR_FIXME */
size = scr_viewsize->value;
if (size >= 120)
@ -370,14 +335,10 @@ static void SCR_CalcRefdef (void)
else
sb_lines = 24+16+8;
/* if (scr_viewsize.value >= 100.0) {
CVAR_FIXME */
if (scr_viewsize->value >= 100.0) {
full = true;
size = 100.0;
} else
/* size = scr_viewsize.value;
CVAR_FIXME */
size = scr_viewsize->value;
if (cl.intermission)
{
@ -387,8 +348,6 @@ static void SCR_CalcRefdef (void)
}
size /= 100.0;
/* if (!cl_sbar.value && full)
CVAR_FIXME */
if (!cl_sbar->value && full)
h = vid.height;
else
@ -402,8 +361,6 @@ static void SCR_CalcRefdef (void)
}
r_refdef.vrect.height = vid.height * size;
/* if (cl_sbar.value || !full) {
CVAR_FIXME */
if (cl_sbar->value || !full) {
if (r_refdef.vrect.height > vid.height - sb_lines)
r_refdef.vrect.height = vid.height - sb_lines;
@ -415,8 +372,6 @@ static void SCR_CalcRefdef (void)
else
r_refdef.vrect.y = (h - r_refdef.vrect.height)/2;
/* r_refdef.fov_x = scr_fov.value;
CVAR_FIXME */
r_refdef.fov_x = scr_fov->value;
r_refdef.fov_y = CalcFov (r_refdef.fov_x, r_refdef.vrect.width, r_refdef.vrect.height);
@ -433,8 +388,6 @@ Keybinding command
*/
void SCR_SizeUp_f (void)
{
/* Cvar_SetValue ("viewsize",scr_viewsize.value+10);
CVAR_FIXME */
Cvar_SetValue (scr_viewsize, scr_viewsize->value+10);
vid.recalc_refdef = 1;
@ -450,8 +403,6 @@ Keybinding command
*/
void SCR_SizeDown_f (void)
{
/* Cvar_SetValue ("viewsize",scr_viewsize.value-10);
CVAR_FIXME */
Cvar_SetValue (scr_viewsize, scr_viewsize->value-10);
vid.recalc_refdef = 1;
}
@ -504,8 +455,6 @@ SCR_DrawRam
*/
void SCR_DrawRam (void)
{
/* if (!scr_showram.value)
CVAR_FIXME */
if (!scr_showram->value)
return;
@ -524,8 +473,6 @@ void SCR_DrawTurtle (void)
{
static int count;
/* if (!scr_showturtle.value)
CVAR_FIXME */
if (!scr_showturtle->value)
return;
@ -559,8 +506,6 @@ void SCR_DrawNet (void)
void SCR_DrawFPS (void)
{
/* extern cvar_t show_fps;
CVAR_FIXME */
extern cvar_t *show_fps;
static double lastframetime;
double t;
@ -569,8 +514,6 @@ void SCR_DrawFPS (void)
int x, y;
char st[80];
/* if (!show_fps.value)
CVAR_FIXME */
if (!show_fps->value)
return;
@ -598,8 +541,6 @@ void SCR_DrawPause (void)
{
qpic_t *pic;
/* if (!scr_showpause.value) // turn off for screenshots
CVAR_FIXME */
if (!scr_showpause->value) // turn off for screenshots
return;
@ -660,8 +601,6 @@ void SCR_SetUpToDrawConsole (void)
if (scr_conlines < scr_con_current)
{
/* scr_con_current -= scr_conspeed.value*host_frametime;
CVAR_FIXME */
scr_con_current -= scr_conspeed->value*host_frametime;
if (scr_conlines > scr_con_current)
scr_con_current = scr_conlines;
@ -669,8 +608,6 @@ void SCR_SetUpToDrawConsole (void)
}
else if (scr_conlines > scr_con_current)
{
/* scr_con_current += scr_conspeed.value*host_frametime;
CVAR_FIXME */
scr_con_current += scr_conspeed->value*host_frametime;
if (scr_conlines < scr_con_current)
scr_con_current = scr_conlines;
@ -1195,9 +1132,7 @@ void SCR_UpdateScreen (void)
if (block_drawing)
return;
/* vid.numpages = 2 + gl_triplebuffer.value;
CVAR_FIXME */
vid.numpages = 2 + gl_triplebuffer->value;
vid.numpages = 2 + (int) gl_triplebuffer->value;
scr_copytop = 0;
scr_copyeverything = 0;
@ -1217,11 +1152,7 @@ void SCR_UpdateScreen (void)
return; // not initialized yet
/* if (oldsbar != cl_sbar.value) {
CVAR_FIXME */
if (oldsbar != cl_sbar->value) {
/* oldsbar = cl_sbar.value;
CVAR_FIXME */
oldsbar = cl_sbar->value;
vid.recalc_refdef = true;
}
@ -1231,12 +1162,8 @@ void SCR_UpdateScreen (void)
//
// determine size of refresh window
//
/* if (oldfov != scr_fov.value)
CVAR_FIXME */
if (oldfov != scr_fov->value)
{
/* oldfov = scr_fov.value;
CVAR_FIXME */
oldfov = scr_fov->value;
vid.recalc_refdef = true;
}
@ -1258,8 +1185,6 @@ void SCR_UpdateScreen (void)
//
SCR_TileClear ();
/* if (r_netgraph.value)
CVAR_FIXME */
if (r_netgraph->value)
R_NetGraph ();
@ -1286,8 +1211,6 @@ void SCR_UpdateScreen (void)
}
else
{
/* if (crosshair.value)
CVAR_FIXME */
if (crosshair->value)
Draw_Crosshair();

138
source/gl_warp.c
View file

@ -27,33 +27,19 @@
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
# include "config.h"
#endif
#include <string.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include "bothdefs.h" // needed by: common.h, net.h, client.h
#include "quakefs.h"
#include "bspfile.h" // needed by: glquake.h
#include "vid.h"
#include "sys.h"
#include "zone.h" // needed by: client.h, gl_model.h
#include "mathlib.h" // needed by: protocol.h, render.h, client.h,
// modelgen.h, glmodel.h
#include "wad.h"
#include "draw.h"
#include "cvar.h"
#include "net.h" // needed by: client.h
#include "protocol.h" // needed by: client.h
#include "cmd.h"
#include "sbar.h"
#include "render.h" // needed by: client.h, gl_model.h, glquake.h
#include "client.h" // need cls in this file
#include "model.h" // needed by: glquake.h
#include "bothdefs.h"
#include "console.h"
#include "model.h"
#include "glquake.h"
#include "sys.h"
extern double realtime;
extern model_t *loadmodel;
@ -69,8 +55,6 @@ qboolean skyloaded = false;
msurface_t *warpface;
/* extern cvar_t gl_subdivide_size;
CVAR_FIXME */
extern cvar_t *gl_subdivide_size;
void BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs)
@ -369,7 +353,7 @@ void LoadPCX (FILE *f)
//
// parse the PCX file
//
Qread (f, &pcxbuf, sizeof(pcxbuf));
fread (&pcxbuf, 1, sizeof(pcxbuf), f);
pcx = &pcxbuf;
@ -385,10 +369,10 @@ void LoadPCX (FILE *f)
}
// seek to palette
Qseek (f, -768, SEEK_END);
Qread (f, palette, 768);
fseek (f, -768, SEEK_END);
fread (palette, 1, 768, f);
Qseek (f, sizeof(pcxbuf) - 4, SEEK_SET);
fseek (f, sizeof(pcxbuf) - 4, SEEK_SET);
count = (pcx->xmax+1) * (pcx->ymax+1);
pcx_rgb = malloc( count * 4);
@ -398,12 +382,12 @@ void LoadPCX (FILE *f)
pix = pcx_rgb + 4*y*(pcx->xmax+1);
for (x=0 ; x<=pcx->ymax ; )
{
dataByte = Qgetc(f);
dataByte = fgetc(f);
if((dataByte & 0xC0) == 0xC0)
{
runLength = dataByte & 0x3F;
dataByte = Qgetc(f);
dataByte = fgetc(f);
}
else
runLength = 1;
@ -445,8 +429,8 @@ int fgetLittleShort (FILE *f)
{
byte b1, b2;
b1 = Qgetc(f);
b2 = Qgetc(f);
b1 = fgetc(f);
b2 = fgetc(f);
return (short)(b1 + b2*256);
}
@ -455,10 +439,10 @@ int fgetLittleLong (FILE *f)
{
byte b1, b2, b3, b4;
b1 = Qgetc(f);
b2 = Qgetc(f);
b3 = Qgetc(f);
b4 = Qgetc(f);
b1 = fgetc(f);
b2 = fgetc(f);
b3 = fgetc(f);
b4 = fgetc(f);
return b1 + (b2<<8) + (b3<<16) + (b4<<24);
}
@ -476,19 +460,19 @@ void LoadTGA (FILE *fin)
int row, column;
unsigned char red = 0, green = 0, blue = 0, alphabyte = 0;
targa_header.id_length = Qgetc(fin);
targa_header.colormap_type = Qgetc(fin);
targa_header.image_type = Qgetc(fin);
targa_header.id_length = fgetc(fin);
targa_header.colormap_type = fgetc(fin);
targa_header.image_type = fgetc(fin);
targa_header.colormap_index = fgetLittleShort(fin);
targa_header.colormap_length = fgetLittleShort(fin);
targa_header.colormap_size = Qgetc(fin);
targa_header.colormap_size = fgetc(fin);
targa_header.x_origin = fgetLittleShort(fin);
targa_header.y_origin = fgetLittleShort(fin);
targa_header.width = fgetLittleShort(fin);
targa_header.height = fgetLittleShort(fin);
targa_header.pixel_size = Qgetc(fin);
targa_header.attributes = Qgetc(fin);
targa_header.pixel_size = fgetc(fin);
targa_header.attributes = fgetc(fin);
if (targa_header.image_type!=2
&& targa_header.image_type!=10)
@ -505,7 +489,7 @@ void LoadTGA (FILE *fin)
targa_rgba = malloc (numPixels*4);
if (targa_header.id_length != 0)
Qseek(fin, targa_header.id_length, SEEK_CUR); // skip TARGA image comment
fseek(fin, targa_header.id_length, SEEK_CUR); // skip TARGA image comment
if (targa_header.image_type==2) { // Uncompressed, RGB images
for(row=rows-1; row>=0; row--) {
@ -514,19 +498,19 @@ void LoadTGA (FILE *fin)
switch (targa_header.pixel_size) {
case 24:
blue = Qgetc(fin);
green = Qgetc(fin);
red = Qgetc(fin);
blue = getc(fin);
green = getc(fin);
red = getc(fin);
*pixbuf++ = red;
*pixbuf++ = green;
*pixbuf++ = blue;
*pixbuf++ = 255;
break;
case 32:
blue = Qgetc(fin);
green = Qgetc(fin);
red = Qgetc(fin);
alphabyte = Qgetc(fin);
blue = getc(fin);
green = getc(fin);
red = getc(fin);
alphabyte = getc(fin);
*pixbuf++ = red;
*pixbuf++ = green;
*pixbuf++ = blue;
@ -541,21 +525,21 @@ void LoadTGA (FILE *fin)
for(row=rows-1; row>=0; row--) {
pixbuf = targa_rgba + row*columns*4;
for(column=0; column<columns; ) {
packetHeader=Qgetc(fin);
packetHeader=getc(fin);
packetSize = 1 + (packetHeader & 0x7f);
if (packetHeader & 0x80) { // run-length packet
switch (targa_header.pixel_size) {
case 24:
blue = Qgetc(fin);
green = Qgetc(fin);
red = Qgetc(fin);
blue = getc(fin);
green = getc(fin);
red = getc(fin);
alphabyte = 255;
break;
case 32:
blue = Qgetc(fin);
green = Qgetc(fin);
red = Qgetc(fin);
alphabyte = Qgetc(fin);
blue = getc(fin);
green = getc(fin);
red = getc(fin);
alphabyte = getc(fin);
break;
}
@ -579,19 +563,19 @@ void LoadTGA (FILE *fin)
for(j=0;j<packetSize;j++) {
switch (targa_header.pixel_size) {
case 24:
blue = Qgetc(fin);
green = Qgetc(fin);
red = Qgetc(fin);
blue = getc(fin);
green = getc(fin);
red = getc(fin);
*pixbuf++ = red;
*pixbuf++ = green;
*pixbuf++ = blue;
*pixbuf++ = 255;
break;
case 32:
blue = Qgetc(fin);
green = Qgetc(fin);
red = Qgetc(fin);
alphabyte = Qgetc(fin);
blue = getc(fin);
green = getc(fin);
red = getc(fin);
alphabyte = getc(fin);
*pixbuf++ = red;
*pixbuf++ = green;
*pixbuf++ = blue;
@ -614,7 +598,7 @@ void LoadTGA (FILE *fin)
}
}
Qclose(fin);
fclose(fin);
}
/*
@ -718,16 +702,6 @@ void DrawSkyPolygon (int nump, vec3_t vecs)
float *vp;
c_sky++;
#if 0
glBegin (GL_POLYGON);
for (i=0 ; i<nump ; i++, vecs+=3)
{
VectorAdd(vecs, r_origin, v);
glVertex3fv (v);
}
glEnd();
return;
#endif
// decide which face it maps to
VectorCopy (vec3_origin, v);
for (i=0, vp=vecs ; i<nump ; i++, vp+=3)
@ -1001,12 +975,6 @@ void R_DrawSkyBox (void)
{
int i;
#if 0
glEnable (GL_BLEND);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glColor4f (1,1,1,0.5);
glDisable (GL_DEPTH_TEST);
#endif
for (i=0 ; i<6 ; i++)
{
if (skymins[0][i] >= skymaxs[0][i]
@ -1014,12 +982,6 @@ glDisable (GL_DEPTH_TEST);
continue;
GL_Bind (SKY_TEX+skytexorder[i]);
#if 0
skymins[0][i] = -1;
skymins[1][i] = -1;
skymaxs[0][i] = 1;
skymaxs[1][i] = 1;
#endif
glBegin (GL_QUADS);
MakeSkyVec (skymins[0][i], skymins[1][i], i);
MakeSkyVec (skymins[0][i], skymaxs[1][i], i);
@ -1027,12 +989,6 @@ skymaxs[1][i] = 1;
MakeSkyVec (skymaxs[0][i], skymins[1][i], i);
glEnd ();
}
#if 0
glDisable (GL_BLEND);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
glColor4f (1,1,1,0.5);
glEnable (GL_DEPTH_TEST);
#endif
}