Benennen die Funktionen in gl_rmain.c konsistent

This commit is contained in:
Yamagi Burmeister 2010-10-23 06:29:01 +00:00
parent 05cef57735
commit 3679d302db
3 changed files with 10 additions and 10 deletions

View file

@ -413,7 +413,7 @@ R_DrawEntitiesOnList ( void )
}
void
GL_DrawParticles ( int num_particles, const particle_t particles[], const unsigned colortable [ 768 ] )
R_DrawParticles2 ( int num_particles, const particle_t particles[], const unsigned colortable [ 768 ] )
{
const particle_t *p;
int i;
@ -508,7 +508,7 @@ R_DrawParticles ( void )
}
else
{
GL_DrawParticles( r_newrefdef.num_particles, r_newrefdef.particles, d_8to24table );
R_DrawParticles2( r_newrefdef.num_particles, r_newrefdef.particles, d_8to24table );
}
}
@ -553,7 +553,7 @@ R_PolyBlend ( void )
}
int
SignbitsForPlane ( cplane_t *out )
R_SignbitsForPlane ( cplane_t *out )
{
int bits, j;
@ -589,7 +589,7 @@ R_SetFrustum ( void )
{
frustum [ i ].type = PLANE_ANYZ;
frustum [ i ].dist = DotProduct( r_origin, frustum [ i ].normal );
frustum [ i ].signbits = SignbitsForPlane( &frustum [ i ] );
frustum [ i ].signbits = R_SignbitsForPlane( &frustum [ i ] );
}
}
@ -667,7 +667,7 @@ R_SetupFrame ( void )
}
void
MYgluPerspective ( GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar )
R_MYgluPerspective ( GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar )
{
GLdouble xmin, xmax, ymin, ymax;
@ -704,7 +704,7 @@ R_SetupGL ( void )
screenaspect = (float) r_newrefdef.width / r_newrefdef.height;
qglMatrixMode( GL_PROJECTION );
qglLoadIdentity();
MYgluPerspective( r_newrefdef.fov_y, screenaspect, 4, 4096 );
R_MYgluPerspective( r_newrefdef.fov_y, screenaspect, 4, 4096 );
qglCullFace( GL_FRONT );
@ -1388,7 +1388,7 @@ R_DrawBeam ( entity_t *e )
}
refexport_t
GetRefAPI ( refimport_t rimp )
R_GetRefAPI ( refimport_t rimp )
{
refexport_t re;

View file

@ -314,7 +314,7 @@ void R_TextureSolidMode ( char *string );
int Scrap_AllocBlock ( int w, int h, int *x, int *y );
/* GL extension emulation functions */
void GL_DrawParticles ( int n, const particle_t particles[], const unsigned colortable [ 768 ] );
void R_DrawParticles2 ( int n, const particle_t particles[], const unsigned colortable [ 768 ] );
/*
** GL config stuff

View file

@ -688,13 +688,13 @@ R_DrawAliasModel ( entity_t *e )
if ( ( currententity->flags & RF_WEAPONMODEL ) && ( r_lefthand->value == 1.0F ) )
{
extern void MYgluPerspective ( GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar );
extern void R_MYgluPerspective ( GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar );
qglMatrixMode( GL_PROJECTION );
qglPushMatrix();
qglLoadIdentity();
qglScalef( -1, 1, 1 );
MYgluPerspective( r_newrefdef.fov_y, (float) r_newrefdef.width / r_newrefdef.height, 4, 4096 );
R_MYgluPerspective( r_newrefdef.fov_y, (float) r_newrefdef.width / r_newrefdef.height, 4, 4096 );
qglMatrixMode( GL_MODELVIEW );
qglCullFace( GL_BACK );