eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Fix to r2901 hopefully, if it isn't, revert back to r2900

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2902 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Lance 2008-02-02 15:46:14 +00:00
parent 5cbcec8283
commit 4ffbf6fe06
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
engine/client/renderer.c
View file

@ -86,7 +86,7 @@ cvar_t r_drawviewmodelinvis = SCVAR ("r_drawviewmodelinvis", "0");
cvar_t r_dynamic = SCVARF ("r_dynamic", "1", cvar_t r_dynamic = SCVARF ("r_dynamic", "1",
CVAR_ARCHIVE); CVAR_ARCHIVE);
cvar_t r_fastsky = SCVAR ("r_fastsky", "0"); cvar_t r_fastsky = SCVAR ("r_fastsky", "0");
cvar_t r_fastskycolour = SCVARF ("r_fastskycolour", "0", cvar_t r_fastskycolour = SCVARF ("r_fastskycolour", "0",
CVAR_RENDERERCALLBACK); CVAR_RENDERERCALLBACK);
cvar_t r_fb_bmodels = SCVARF("gl_fb_bmodels", "1", cvar_t r_fb_bmodels = SCVARF("gl_fb_bmodels", "1",
CVAR_SEMICHEAT|CVAR_RENDERERLATCH); CVAR_SEMICHEAT|CVAR_RENDERERLATCH);
@ -134,7 +134,7 @@ cvar_t r_wateralpha = SCVAR ("r_wateralpha", "1");
cvar_t r_waterwarp = SCVARF ("r_waterwarp", "1", cvar_t r_waterwarp = SCVARF ("r_waterwarp", "1",
CVAR_ARCHIVE); CVAR_ARCHIVE);
cvar_t r_replacemodels = SCVARF ("r_replacemodels", "md3 md2", cvar_t r_replacemodels = SCVARF ("r_replacemodels", "md3 md2",
CVAR_ARCHIVE); CVAR_ARCHIVE);
//otherwise it would defeat the point. //otherwise it would defeat the point.
@ -1280,8 +1280,8 @@ qboolean M_VideoApply (union menuoption_s *op,struct menu_s *menu,int key)
Cbuf_AddText("setrenderer d3d7\n", RESTRICT_LOCAL); Cbuf_AddText("setrenderer d3d7\n", RESTRICT_LOCAL);
break; break;
case 3: case 3:
Cbuf_AddText("setrenderer d3d9\n", RESTRICT_LOCAL); Cbuf_AddText("setrenderer d3d7\n", RESTRICT_LOCAL);
break; break;
} }
M_RemoveMenu(menu); M_RemoveMenu(menu);
Cbuf_AddText("menu_video\n", RESTRICT_LOCAL); Cbuf_AddText("menu_video\n", RESTRICT_LOCAL);
@ -1943,7 +1943,7 @@ TRACE(("dbg: R_ApplyRenderer: efrags\n"));
"-----------------------------\n" "-----------------------------\n"
"OpenGL renderer initialized\n"); "OpenGL renderer initialized\n");
break; break;
case QR_DIRECT3D: case QR_DIRECT3D:
Con_Printf( "\n" Con_Printf( "\n"
"-----------------------------\n" "-----------------------------\n"
@ -2269,7 +2269,7 @@ void MYgluPerspective(double fovx, double fovy, double zNear, double zFar)
r_projection_matrix[6] = 0; r_projection_matrix[6] = 0;
r_projection_matrix[10] = - (zFar+zNear)/(zFar-zNear); r_projection_matrix[10] = - (zFar+zNear)/(zFar-zNear);
r_projection_matrix[14] = - (2.0f*zFar*zNear)/(zFar-zNear); r_projection_matrix[14] = - (2.0f*zFar*zNear)/(zFar-zNear);
r_projection_matrix[3] = 0; r_projection_matrix[3] = 0;
r_projection_matrix[7] = 0; r_projection_matrix[7] = 0;
r_projection_matrix[11] = -1; r_projection_matrix[11] = -1;
@ -2304,7 +2304,7 @@ void GL_InfinatePerspective(double fovx, double fovy,
r_projection_matrix[6] = 0; r_projection_matrix[6] = 0;
r_projection_matrix[10] = -1 * nudge; r_projection_matrix[10] = -1 * nudge;
r_projection_matrix[14] = -2*zNear * nudge; r_projection_matrix[14] = -2*zNear * nudge;
r_projection_matrix[3] = 0; r_projection_matrix[3] = 0;
r_projection_matrix[7] = 0; r_projection_matrix[7] = 0;
r_projection_matrix[11] = -1; r_projection_matrix[11] = -1;
@ -2328,7 +2328,7 @@ void GL_ParallelPerspective(double xmin, double xmax, double ymax, double ymin,
r_projection_matrix[6] = 0; r_projection_matrix[6] = 0;
r_projection_matrix[10] = -2/(zfar-znear); r_projection_matrix[10] = -2/(zfar-znear);
r_projection_matrix[14] = (zfar+znear)/(zfar-znear); r_projection_matrix[14] = (zfar+znear)/(zfar-znear);
r_projection_matrix[3] = 0; r_projection_matrix[3] = 0;
r_projection_matrix[7] = 0; r_projection_matrix[7] = 0;
r_projection_matrix[11] = 0; r_projection_matrix[11] = 0;
@ -2355,13 +2355,13 @@ texture_t *R_TextureAnimation (texture_t *base)
if (base->alternate_anims) if (base->alternate_anims)
base = base->alternate_anims; base = base->alternate_anims;
} }
if (!base->anim_total) if (!base->anim_total)
return base; return base;
reletive = (int)(cl.time*10) % base->anim_total; reletive = (int)(cl.time*10) % base->anim_total;
count = 0; count = 0;
while (base->anim_min > reletive || base->anim_max <= reletive) while (base->anim_min > reletive || base->anim_max <= reletive)
{ {
base = base->anim_next; base = base->anim_next;
@ -2485,7 +2485,7 @@ void R_MarkLeaves (void)
((int *)fatvis)[i] |= ((int *)vis)[i]; ((int *)fatvis)[i] |= ((int *)vis)[i];
vis = fatvis; vis = fatvis;
} }
for (i=0,leaf=cl.worldmodel->leafs ; i<cl.worldmodel->numleafs ; i++, leaf++) for (i=0,leaf=cl.worldmodel->leafs ; i<cl.worldmodel->numleafs ; i++, leaf++)
{ {
cluster = leaf->cluster; cluster = leaf->cluster;
@ -2509,7 +2509,7 @@ void R_MarkLeaves (void)
if (((r_oldviewleaf == r_viewleaf && r_oldviewleaf2 == r_viewleaf2) && !r_novis.value) || r_novis.value == 2) if (((r_oldviewleaf == r_viewleaf && r_oldviewleaf2 == r_viewleaf2) && !r_novis.value) || r_novis.value == 2)
return; return;
// if (mirror) // if (mirror)
// return; // return;
@ -2536,7 +2536,7 @@ void R_MarkLeaves (void)
} }
else else
vis = Q1BSP_LeafPVS (cl.worldmodel, r_viewleaf, NULL); vis = Q1BSP_LeafPVS (cl.worldmodel, r_viewleaf, NULL);
for (i=0 ; i<cl.worldmodel->numleafs ; i++) for (i=0 ; i<cl.worldmodel->numleafs ; i++)
{ {
if (vis[i>>3] & (1<<(i&7))) if (vis[i>>3] & (1<<(i&7)))
@ -2690,7 +2690,7 @@ void R_SetFrustum (void)
return; return;
/* removed - assumes fov_x == fov_y /* removed - assumes fov_x == fov_y
if (r_refdef.fov_x == 90) if (r_refdef.fov_x == 90)
{ {
// front side is visible // front side is visible