mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-29 07:02:08 +00:00
A TEMPORARY fix for gl_flashblend (it defaults to 0 in software now).
This commit is contained in:
parent
b3e1f9a8f5
commit
76db7204bc
1 changed files with 5 additions and 43 deletions
|
@ -143,11 +143,8 @@ void R_InitParticles (void);
|
||||||
void R_DrawParticles (void);
|
void R_DrawParticles (void);
|
||||||
#endif // UQUAKE
|
#endif // UQUAKE
|
||||||
|
|
||||||
//cvar_t r_draworder = {"r_draworder","0"};
|
|
||||||
cvar_t *r_draworder;
|
cvar_t *r_draworder;
|
||||||
//cvar_t r_speeds = {"r_speeds","0"};
|
|
||||||
cvar_t *r_speeds;
|
cvar_t *r_speeds;
|
||||||
//cvar_t r_timegraph = {"r_timegraph","0"};
|
|
||||||
cvar_t *r_timegraph;
|
cvar_t *r_timegraph;
|
||||||
//#ifdef QUAKEWORLD
|
//#ifdef QUAKEWORLD
|
||||||
//cvar_t r_netgraph = {"r_netgraph","0"};
|
//cvar_t r_netgraph = {"r_netgraph","0"};
|
||||||
|
@ -160,39 +157,22 @@ cvar_t *r_graphheight;
|
||||||
//cvar_t r_graphheight = {"r_graphheight","10"};
|
//cvar_t r_graphheight = {"r_graphheight","10"};
|
||||||
|
|
||||||
//#endif // QUAKEWORLD
|
//#endif // QUAKEWORLD
|
||||||
//cvar_t r_clearcolor = {"r_clearcolor","2"};
|
|
||||||
cvar_t *r_clearcolor;
|
cvar_t *r_clearcolor;
|
||||||
//cvar_t r_waterwarp = {"r_waterwarp","1"};
|
|
||||||
cvar_t *r_waterwarp;
|
cvar_t *r_waterwarp;
|
||||||
//cvar_t r_fullbright = {"r_fullbright","0"};
|
|
||||||
cvar_t *r_fullbright;
|
cvar_t *r_fullbright;
|
||||||
//cvar_t r_drawentities = {"r_drawentities","1"};
|
|
||||||
cvar_t *r_drawentities;
|
cvar_t *r_drawentities;
|
||||||
//cvar_t r_drawviewmodel = {"r_drawviewmodel","1"};
|
|
||||||
cvar_t *r_drawviewmodel;
|
cvar_t *r_drawviewmodel;
|
||||||
//cvar_t r_aliasstats = {"r_polymodelstats","0"};
|
|
||||||
cvar_t *r_aliasstats;
|
cvar_t *r_aliasstats;
|
||||||
//cvar_t r_dspeeds = {"r_dspeeds","0"};
|
|
||||||
cvar_t *r_dspeeds;
|
cvar_t *r_dspeeds;
|
||||||
//cvar_t r_drawflat = {"r_drawflat", "0"};
|
|
||||||
cvar_t *r_drawflat;
|
cvar_t *r_drawflat;
|
||||||
//cvar_t r_ambient = {"r_ambient", "0"};
|
|
||||||
cvar_t *r_ambient;
|
cvar_t *r_ambient;
|
||||||
//cvar_t r_reportsurfout = {"r_reportsurfout", "0"};
|
|
||||||
cvar_t *r_reportsurfout;
|
cvar_t *r_reportsurfout;
|
||||||
//cvar_t r_maxsurfs = {"r_maxsurfs", "0"};
|
|
||||||
cvar_t *r_maxsurfs;
|
cvar_t *r_maxsurfs;
|
||||||
//cvar_t r_numsurfs = {"r_numsurfs", "0"};
|
|
||||||
cvar_t *r_numsurfs;
|
cvar_t *r_numsurfs;
|
||||||
//cvar_t r_reportedgeout = {"r_reportedgeout", "0"};
|
|
||||||
cvar_t *r_reportedgeout;
|
cvar_t *r_reportedgeout;
|
||||||
// cvar_t r_maxedges = {"r_maxedges", "0"};
|
|
||||||
cvar_t *r_maxedges;
|
cvar_t *r_maxedges;
|
||||||
//cvar_t r_numedges = {"r_numedges", "0"};
|
|
||||||
cvar_t *r_numedges;
|
cvar_t *r_numedges;
|
||||||
//cvar_t r_aliastransbase = {"r_aliastransbase", "200"};
|
|
||||||
cvar_t *r_aliastransbase;
|
cvar_t *r_aliastransbase;
|
||||||
//cvar_t r_aliastransadj = {"r_aliastransadj", "100"};
|
|
||||||
cvar_t *r_aliastransadj;
|
cvar_t *r_aliastransadj;
|
||||||
|
|
||||||
extern cvar_t *scr_fov;
|
extern cvar_t *scr_fov;
|
||||||
|
@ -255,57 +235,39 @@ void R_Init (void)
|
||||||
Cmd_AddCommand ("timerefresh", R_TimeRefresh_f);
|
Cmd_AddCommand ("timerefresh", R_TimeRefresh_f);
|
||||||
Cmd_AddCommand ("pointfile", R_ReadPointFile_f);
|
Cmd_AddCommand ("pointfile", R_ReadPointFile_f);
|
||||||
|
|
||||||
// Cvar_RegisterVariable (&r_draworder);
|
|
||||||
r_draworder = Cvar_Get ("r_draworder","0",0,"None");
|
r_draworder = Cvar_Get ("r_draworder","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_speeds);
|
|
||||||
r_speeds = Cvar_Get ("r_speeds","0",0,"None");
|
r_speeds = Cvar_Get ("r_speeds","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_timegraph);
|
|
||||||
r_timegraph = Cvar_Get ("r_timegraph","0",0,"None");
|
r_timegraph = Cvar_Get ("r_timegraph","0",0,"None");
|
||||||
#ifdef QUAKEWORLD
|
#ifdef QUAKEWORLD
|
||||||
// Cvar_RegisterVariable (&r_netgraph);
|
|
||||||
r_netgraph = Cvar_Get ("r_netgraph","0",0,"None");
|
r_netgraph = Cvar_Get ("r_netgraph","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_zgraph);
|
|
||||||
r_zgraph = Cvar_Get ("r_zgraph","0",0,"None");
|
r_zgraph = Cvar_Get ("r_zgraph","0",0,"None");
|
||||||
r_graphheight = Cvar_Get ("r_graphheight","15",0,"None");
|
r_graphheight = Cvar_Get ("r_graphheight","15",0,"None");
|
||||||
#endif // QUAKEWORLD
|
#endif // QUAKEWORLD
|
||||||
// Cvar_RegisterVariable (&r_graphheight);
|
|
||||||
r_graphheight = Cvar_Get ("r_graphheight","10",0,"None");
|
r_graphheight = Cvar_Get ("r_graphheight","10",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_drawflat);
|
|
||||||
r_drawflat = Cvar_Get ("r_drawflat","0",0,"None");
|
r_drawflat = Cvar_Get ("r_drawflat","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_ambient);
|
|
||||||
r_ambient = Cvar_Get ("r_ambient","0",0,"None");
|
r_ambient = Cvar_Get ("r_ambient","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_clearcolor);
|
|
||||||
r_clearcolor = Cvar_Get ("r_clearcolor", "2",0,"None");
|
r_clearcolor = Cvar_Get ("r_clearcolor", "2",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_waterwarp);
|
|
||||||
r_waterwarp = Cvar_Get ("r_waterwarp","1",0,"None");
|
r_waterwarp = Cvar_Get ("r_waterwarp","1",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_fullbright);
|
|
||||||
r_fullbright = Cvar_Get ("r_fullbright","0",0,"None");
|
r_fullbright = Cvar_Get ("r_fullbright","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_drawentities);
|
|
||||||
r_drawentities = Cvar_Get ("r_drawentities","1",0,"None");
|
r_drawentities = Cvar_Get ("r_drawentities","1",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_drawviewmodel);
|
|
||||||
r_drawviewmodel = Cvar_Get ("r_drawviewmodel","1",0,"None");
|
r_drawviewmodel = Cvar_Get ("r_drawviewmodel","1",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_aliasstats);
|
|
||||||
r_aliasstats = Cvar_Get ("r_polymodelstats","0",0,"None");
|
r_aliasstats = Cvar_Get ("r_polymodelstats","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_dspeeds);
|
|
||||||
r_dspeeds = Cvar_Get ("r_dspeeds","0",0,"None");
|
r_dspeeds = Cvar_Get ("r_dspeeds","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_reportsurfout);
|
|
||||||
r_reportsurfout = Cvar_Get ("r_reportsurfout","0",0,"None");
|
r_reportsurfout = Cvar_Get ("r_reportsurfout","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_maxsurfs);
|
|
||||||
r_maxsurfs = Cvar_Get ("r_maxsurfs","0",0,"None");
|
r_maxsurfs = Cvar_Get ("r_maxsurfs","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_numsurfs);
|
|
||||||
r_numsurfs = Cvar_Get ("r_numsurfs","0",0,"None");
|
r_numsurfs = Cvar_Get ("r_numsurfs","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_reportedgeout,"0");
|
|
||||||
r_reportedgeout = Cvar_Get ("r_reportedgeout","0",0,"None");
|
r_reportedgeout = Cvar_Get ("r_reportedgeout","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_maxedges);
|
|
||||||
r_maxedges = Cvar_Get ("r_maxedges","0",0,"None");
|
r_maxedges = Cvar_Get ("r_maxedges","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_numedges);
|
|
||||||
r_numedges = Cvar_Get ("r_numedges","0",0,"None");
|
r_numedges = Cvar_Get ("r_numedges","0",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_aliastransbase);
|
|
||||||
r_aliastransbase = Cvar_Get ("r_aliastransbase","200",0,"None");
|
r_aliastransbase = Cvar_Get ("r_aliastransbase","200",0,"None");
|
||||||
// Cvar_RegisterVariable (&r_aliastransadj);
|
|
||||||
r_aliastransadj = Cvar_Get ("r_aliastransadj","100",0,"None");
|
r_aliastransadj = Cvar_Get ("r_aliastransadj","100",0,"None");
|
||||||
|
|
||||||
|
#ifdef GLQUAKE
|
||||||
gl_flashblend = Cvar_Get ("gl_flashblend","1",0,"None");
|
gl_flashblend = Cvar_Get ("gl_flashblend","1",0,"None");
|
||||||
|
#else
|
||||||
|
// FIXME: remove this someday -- Tonik
|
||||||
|
gl_flashblend = Cvar_Get ("gl_flashblend","0",0,"None");
|
||||||
|
#endif
|
||||||
|
|
||||||
r_maxedges->value = (float)NUMSTACKEDGES;
|
r_maxedges->value = (float)NUMSTACKEDGES;
|
||||||
r_maxsurfs->value = (float)NUMSTACKSURFACES;
|
r_maxsurfs->value = (float)NUMSTACKSURFACES;
|
||||||
|
|
Loading…
Reference in a new issue