gl_rmisc in Sachen Funktionsnamen aufgeräumt

This commit is contained in:
Yamagi Burmeister 2010-10-23 07:19:40 +00:00
parent d1aaaf06b0
commit cbc6e22c6f
3 changed files with 27 additions and 22 deletions

View file

@ -1,23 +1,28 @@
/* /*
* 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 * This program is free software; you can redistribute it and/or modify
* modify it under the terms of the GNU General Public License * it under the terms of the GNU General Public License as published by
* as published by the Free Software Foundation; either version 2 * the Free Software Foundation; either version 2 of the License, or (at
* of the License, or (at your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful, but
* but WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* *
* See the GNU General Public License for more details. * See the GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* *
*/ * =======================================================================
/* r_misc.c */ *
* Misc refresher functions
*
* =======================================================================
*/
#include "header/local.h" #include "header/local.h"
@ -78,7 +83,7 @@ R_InitParticleTexture ( void )
} }
void void
GL_ScreenShot_f ( void ) R_ScreenShot ( void )
{ {
byte *buffer; byte *buffer;
char picname [ 80 ]; char picname [ 80 ];
@ -144,7 +149,7 @@ GL_ScreenShot_f ( void )
} }
void void
GL_Strings_f ( void ) R_Strings ( void )
{ {
ri.Con_Printf( PRINT_ALL, "GL_VENDOR: %s\n", gl_config.vendor_string ); ri.Con_Printf( PRINT_ALL, "GL_VENDOR: %s\n", gl_config.vendor_string );
ri.Con_Printf( PRINT_ALL, "GL_RENDERER: %s\n", gl_config.renderer_string ); ri.Con_Printf( PRINT_ALL, "GL_RENDERER: %s\n", gl_config.renderer_string );
@ -153,7 +158,7 @@ GL_Strings_f ( void )
} }
void void
GL_SetDefaultState ( void ) R_SetDefaultState ( void )
{ {
qglClearColor( 1, 0, 0.5, 0.5 ); qglClearColor( 1, 0, 0.5, 0.5 );
qglCullFace( GL_FRONT ); qglCullFace( GL_FRONT );
@ -199,11 +204,11 @@ GL_SetDefaultState ( void )
qglPointParameterfvEXT( GL_DISTANCE_ATTENUATION_EXT, attenuations ); qglPointParameterfvEXT( GL_DISTANCE_ATTENUATION_EXT, attenuations );
} }
GL_UpdateSwapInterval(); R_UpdateSwapInterval();
} }
void void
GL_UpdateSwapInterval ( void ) R_UpdateSwapInterval ( void )
{ {
if ( gl_swapinterval->modified ) if ( gl_swapinterval->modified )
{ {

View file

@ -122,8 +122,8 @@ typedef enum
void GL_BeginRendering ( int *x, int *y, int *width, int *height ); void GL_BeginRendering ( int *x, int *y, int *width, int *height );
void GL_EndRendering ( void ); void GL_EndRendering ( void );
void GL_SetDefaultState ( void ); void R_SetDefaultState ( void );
void GL_UpdateSwapInterval ( void ); void R_UpdateSwapInterval ( void );
extern float gldepthmin, gldepthmax; extern float gldepthmin, gldepthmax;
@ -254,7 +254,7 @@ int R_Init ( void *hinstance, void *hWnd );
void R_Shutdown ( void ); void R_Shutdown ( void );
void R_RenderView ( refdef_t *fd ); void R_RenderView ( refdef_t *fd );
void GL_ScreenShot_f ( void ); void R_ScreenShot ( void );
void R_DrawAliasModel ( entity_t *e ); void R_DrawAliasModel ( entity_t *e );
void R_DrawBrushModel ( entity_t *e ); void R_DrawBrushModel ( entity_t *e );
void R_DrawSpriteModel ( entity_t *e ); void R_DrawSpriteModel ( entity_t *e );

View file

@ -71,7 +71,7 @@ int c_brush_polys, c_alias_polys;
float v_blend [ 4 ]; /* final blending color */ float v_blend [ 4 ]; /* final blending color */
void GL_Strings_f ( void ); void R_Strings ( void );
/* view origin */ /* view origin */
vec3_t vup; vec3_t vup;
@ -995,9 +995,9 @@ R_Register ( void )
gl_customheight = ri.Cvar_Get( "gl_customheight", "768", CVAR_ARCHIVE ); gl_customheight = ri.Cvar_Get( "gl_customheight", "768", CVAR_ARCHIVE );
ri.Cmd_AddCommand( "imagelist", R_ImageList_f ); ri.Cmd_AddCommand( "imagelist", R_ImageList_f );
ri.Cmd_AddCommand( "screenshot", GL_ScreenShot_f ); ri.Cmd_AddCommand( "screenshot", R_ScreenShot );
ri.Cmd_AddCommand( "modellist", Mod_Modellist_f ); ri.Cmd_AddCommand( "modellist", Mod_Modellist_f );
ri.Cmd_AddCommand( "gl_strings", GL_Strings_f ); ri.Cmd_AddCommand( "gl_strings", R_Strings );
} }
qboolean qboolean
@ -1160,7 +1160,7 @@ R_Init ( void *hinstance, void *hWnd )
ri.Con_Printf( PRINT_ALL, "...GL_EXT_point_parameters not found\n" ); ri.Con_Printf( PRINT_ALL, "...GL_EXT_point_parameters not found\n" );
} }
GL_SetDefaultState(); R_SetDefaultState();
R_InitImages(); R_InitImages();
Mod_Init(); Mod_Init();
@ -1284,7 +1284,7 @@ R_BeginFrame ( float camera_separation )
} }
/* swapinterval stuff */ /* swapinterval stuff */
GL_UpdateSwapInterval(); R_UpdateSwapInterval();
/* clear screen if desired */ /* clear screen if desired */
R_Clear(); R_Clear();