qf/quake2forge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quake2forge synced 2024-12-13 14:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Reformatted R_DrawAlphaSurfaces, confirming bugfix.

Browse source 
(icculus patchset #6)
This commit is contained in:
Jamie Wilkinson 2002-11-30 06:47:09 +00:00
parent d40369a39b
commit 085cead6f3
1 changed files with 36 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/r_poly.c
View file

@ -1,22 +1,24 @@
/* /* $Id$
Copyright (C) 1997-2001 Id Software, Inc. *
* Copyright (C) 1997-2001 Id Software, Inc.
This program is free software; you can redistribute it and/or * Copyright (c) 2002 The Quakeforge Project.
modify it under the terms of the GNU General Public License *
as published by the Free Software Foundation; either version 2 * This program is free software; you can redistribute it and/or
of the License, or (at your option) any later version. * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
This program is distributed in the hope that it will be useful, * of the License, or (at your option) any later version.
but WITHOUT ANY WARRANTY; without even the implied warranty of *
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
See the GNU General Public License for more details. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
You should have received a copy of the GNU General Public License * See the GNU General Public License for more details.
along with this program; if not, write to the Free Software *
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <assert.h> #include <assert.h>
#include "r_local.h" #include "r_local.h"
@ -1189,8 +1191,7 @@ static void R_DrawPoly( int iswater )
/* /*
** R_DrawAlphaSurfaces ** R_DrawAlphaSurfaces
*/ */
void R_DrawAlphaSurfaces( void ) void R_DrawAlphaSurfaces(void) {
{
msurface_t * s = r_alpha_surfaces; msurface_t * s = r_alpha_surfaces;
currentmodel = r_worldmodel; currentmodel = r_worldmodel;
@ -1199,24 +1200,14 @@ void R_DrawAlphaSurfaces( void )
modelorg[1] = -r_origin[1]; modelorg[1] = -r_origin[1];
modelorg[2] = -r_origin[2]; modelorg[2] = -r_origin[2];
while ( s ) while (s) {
{
R_BuildPolygonFromSurface( s ); R_BuildPolygonFromSurface( s );
//=======
//PGM
// if (s->texinfo->flags & SURF_TRANS66)
// R_ClipAndDrawPoly( 0.60f, ( s->texinfo->flags & SURF_WARP) != 0, true );
// else
// R_ClipAndDrawPoly( 0.30f, ( s->texinfo->flags & SURF_WARP) != 0, true );
// PGM - pass down all the texinfo flags, not just SURF_WARP. // PGM - pass down all the texinfo flags, not just SURF_WARP.
if (s->texinfo->flags & SURF_TRANS66) if (s->texinfo->flags & SURF_TRANS66)
R_ClipAndDrawPoly(0.60f, (s->texinfo->flags & (SURF_WARP|SURF_FLOWING)), true); R_ClipAndDrawPoly(0.60f, (s->texinfo->flags & (SURF_WARP|SURF_FLOWING)), true);
else else
R_ClipAndDrawPoly(0.30f, (s->texinfo->flags & (SURF_WARP|SURF_FLOWING)), true); R_ClipAndDrawPoly(0.30f, (s->texinfo->flags & (SURF_WARP|SURF_FLOWING)), true);
//PGM
//=======
s = s->nextalphasurface; s = s->nextalphasurface;
} }