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

Killed the mirror code completely.

Browse source
This commit is contained in:
Zephaniah E. Hull 2000-09-28 07:16:29 +00:00
parent 660b82e3ea
commit 3935e40c3a
4 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/gl_draw.c
View file

@ -956,12 +956,9 @@ void GL_Set2D (void)
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity (); glLoadIdentity ();
glEnable (GL_BLEND);
glDisable (GL_DEPTH_TEST); glDisable (GL_DEPTH_TEST);
glDisable (GL_CULL_FACE); glDisable (GL_CULL_FACE);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor3ubv(lighthalf_v); glColor3ubv(lighthalf_v);
} }

22
source/gl_rmain.c
View file

@ -64,10 +64,6 @@ qboolean envmap; // true during envmap command capture
int particletexture; // little dot for particles int particletexture; // little dot for particles
int playertextures; // up to 16 color translated skins int playertextures; // up to 16 color translated skins
int mirrortexturenum; // quake texturenum, not gltexturenum
qboolean mirror;
mplane_t *mirror_plane;
// //
// view origin // view origin
// //
@ -101,7 +97,6 @@ cvar_t *r_speeds;
cvar_t *r_fullbright; cvar_t *r_fullbright;
cvar_t *r_lightmap; cvar_t *r_lightmap;
cvar_t *r_shadows; cvar_t *r_shadows;
cvar_t *r_mirroralpha;
cvar_t *r_wateralpha; cvar_t *r_wateralpha;
cvar_t *r_waterripple; cvar_t *r_waterripple;
cvar_t *r_dynamic; cvar_t *r_dynamic;
@ -901,16 +896,7 @@ static void R_SetupGL (void)
// MYgluPerspective (yfov, screenaspect, 4, 4096); // MYgluPerspective (yfov, screenaspect, 4, 4096);
MYgluPerspective (r_refdef.fov_y, screenaspect, 4, 4096); MYgluPerspective (r_refdef.fov_y, screenaspect, 4, 4096);
if (mirror) glCullFace(GL_FRONT);
{
if (mirror_plane->normal[2])
glScalef (1, -1, 1);
else
glScalef (-1, 1, 1);
glCullFace(GL_BACK);
}
else
glCullFace(GL_FRONT);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity (); glLoadIdentity ();
@ -932,7 +918,6 @@ static void R_SetupGL (void)
else else
glDisable (GL_CULL_FACE); glDisable (GL_CULL_FACE);
glEnable (GL_BLEND);
glDisable (GL_ALPHA_TEST); glDisable (GL_ALPHA_TEST);
glAlphaFunc (GL_GREATER, 0.5); glAlphaFunc (GL_GREATER, 0.5);
glEnable (GL_DEPTH_TEST); glEnable (GL_DEPTH_TEST);
@ -1003,15 +988,10 @@ void R_RenderView (void)
// glFinish (); // glFinish ();
mirror = false;
R_Clear (); R_Clear ();
// render normal view // render normal view
R_RenderScene (); R_RenderScene ();
R_DrawViewModel (); R_DrawViewModel ();
R_DrawWaterSurfaces (); R_DrawWaterSurfaces ();
// render mirror view
// R_Mirror ();
} }

4
source/gl_rmisc.c
View file

@ -237,7 +237,6 @@ void R_Init (void)
r_drawentities = Cvar_Get("r_drawentities", "1", CVAR_NONE, "None"); r_drawentities = Cvar_Get("r_drawentities", "1", CVAR_NONE, "None");
r_drawviewmodel = Cvar_Get("r_drawviewmodel", "1", CVAR_NONE, "None"); r_drawviewmodel = Cvar_Get("r_drawviewmodel", "1", CVAR_NONE, "None");
r_shadows = Cvar_Get("r_shadows", "0", CVAR_NONE, "None"); r_shadows = Cvar_Get("r_shadows", "0", CVAR_NONE, "None");
r_mirroralpha = Cvar_Get("r_mirroralpha", "1", CVAR_NONE, "None");
r_wateralpha = Cvar_Get("r_wateralpha", "1", CVAR_NONE, "None"); r_wateralpha = Cvar_Get("r_wateralpha", "1", CVAR_NONE, "None");
r_waterripple = Cvar_Get ("r_waterripple", "0", CVAR_NONE, "None"); r_waterripple = Cvar_Get ("r_waterripple", "0", CVAR_NONE, "None");
r_dynamic = Cvar_Get("r_dynamic", "1", CVAR_NONE, "None"); r_dynamic = Cvar_Get("r_dynamic", "1", CVAR_NONE, "None");
@ -489,15 +488,12 @@ void R_NewMap (void)
// identify sky texture // identify sky texture
skytexturenum = -1; skytexturenum = -1;
mirrortexturenum = -1;
for (i=0 ; i<cl.worldmodel->numtextures ; i++) for (i=0 ; i<cl.worldmodel->numtextures ; i++)
{ {
if (!cl.worldmodel->textures[i]) if (!cl.worldmodel->textures[i])
continue; continue;
if (!strncmp(cl.worldmodel->textures[i]->name,"sky",3) ) if (!strncmp(cl.worldmodel->textures[i]->name,"sky",3) )
skytexturenum = i; skytexturenum = i;
if (!strncmp(cl.worldmodel->textures[i]->name,"window02_1",10) )
mirrortexturenum = i;
cl.worldmodel->textures[i]->texturechain = NULL; cl.worldmodel->textures[i]->texturechain = NULL;
} }
r_skyname = Cvar_FindVar ("r_skyname"); r_skyname = Cvar_FindVar ("r_skyname");

3
source/gl_rsurf.c
View file

@ -1001,9 +1001,6 @@ void R_MarkLeaves (void)
if (r_oldviewleaf == r_viewleaf && !r_novis->value) if (r_oldviewleaf == r_viewleaf && !r_novis->value)
return; return;
if (mirror)
return;
r_visframecount++; r_visframecount++;
r_oldviewleaf = r_viewleaf; r_oldviewleaf = r_viewleaf;