From eaee1d71d55966dccde962791e765287866e4b4c Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Thu, 7 Apr 2016 17:01:09 +0200 Subject: [PATCH] Rename cl_stereo* cvars to gl_stereo*. They're renderer cvars, not client cvars. --- README | 6 +++--- src/client/cl_main.c | 12 ++++++------ src/client/cl_screen.c | 6 +++--- src/client/cl_view.c | 2 +- src/client/header/client.h | 6 +++--- src/client/refresh/r_main.c | 34 +++++++++++++++++----------------- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/README b/README index edb417de3..9d64c8563 100644 --- a/README +++ b/README @@ -830,7 +830,7 @@ Stereo support was added back. added cvars ----------- - - cl_stereo: + - gl_stereo: - 0 - none - 1 - native opengl (not tested) - 2 - anaglyph @@ -839,8 +839,8 @@ added cvars - 5 - pixel interleaved - 6 - horizontal split - 7 - vertical split - - cl_stereo_separation - - cl_stereo_convergence + - gl_stereo_separation + - gl_stereo_convergence - crosshair_3d - non-cheating 3d crosshair it does not work as iron sights, as is positioned exactly at the center of the view, similar to 2d crosshair diff --git a/src/client/cl_main.c b/src/client/cl_main.c index 685f72036..f2035ecbe 100644 --- a/src/client/cl_main.c +++ b/src/client/cl_main.c @@ -96,9 +96,9 @@ cvar_t *gender; cvar_t *gender_auto; -cvar_t *cl_stereo; -cvar_t *cl_stereo_separation; -cvar_t *cl_stereo_convergence; +cvar_t *gl_stereo; +cvar_t *gl_stereo_separation; +cvar_t *gl_stereo_convergence; cvar_t *cl_vwep; @@ -534,9 +534,9 @@ CL_InitLocal(void) cl_paused = Cvar_Get("paused", "0", 0); cl_timedemo = Cvar_Get("timedemo", "0", 0); - cl_stereo = Cvar_Get( "cl_stereo", "0", CVAR_ARCHIVE ); - cl_stereo_separation = Cvar_Get( "cl_stereo_separation", "1", CVAR_ARCHIVE ); - cl_stereo_convergence = Cvar_Get( "cl_stereo_convergence", "1.4", CVAR_ARCHIVE ); + gl_stereo = Cvar_Get( "gl_stereo", "0", CVAR_ARCHIVE ); + gl_stereo_separation = Cvar_Get( "gl_stereo_separation", "1", CVAR_ARCHIVE ); + gl_stereo_convergence = Cvar_Get( "gl_stereo_convergence", "1.4", CVAR_ARCHIVE ); rcon_client_password = Cvar_Get("rcon_password", "", 0); rcon_address = Cvar_Get("rcon_address", "", 0); diff --git a/src/client/cl_screen.c b/src/client/cl_screen.c index 650a38a55..5459db2dc 100644 --- a/src/client/cl_screen.c +++ b/src/client/cl_screen.c @@ -1443,11 +1443,11 @@ SCR_UpdateScreen(void) return; /* not initialized yet */ } - if ( cl_stereo->value ) + if ( gl_stereo->value ) { numframes = 2; - separation[0] = -cl_stereo_separation->value / 2; - separation[1] = +cl_stereo_separation->value / 2; + separation[0] = -gl_stereo_separation->value / 2; + separation[1] = +gl_stereo_separation->value / 2; } else { diff --git a/src/client/cl_view.c b/src/client/cl_view.c index 0cc635424..e2e07d6ee 100644 --- a/src/client/cl_view.c +++ b/src/client/cl_view.c @@ -584,7 +584,7 @@ V_RenderView(float stereo_separation) qsort(cl.refdef.entities, cl.refdef.num_entities, sizeof(cl.refdef.entities[0]), (int (*)(const void *, const void *)) entitycmpfnc); - } else if (cl.frame.valid && cl_paused->value && cl_stereo->value) { + } else if (cl.frame.valid && cl_paused->value && gl_stereo->value) { // We need to adjust the refdef in stereo mode when paused. vec3_t tmp; CL_CalcViewValues(); diff --git a/src/client/header/client.h b/src/client/header/client.h index abc54d12e..e1586e4e3 100644 --- a/src/client/header/client.h +++ b/src/client/header/client.h @@ -247,9 +247,9 @@ typedef struct extern client_static_t cls; /* cvars */ -extern cvar_t *cl_stereo_separation; -extern cvar_t *cl_stereo_convergence; -extern cvar_t *cl_stereo; +extern cvar_t *gl_stereo_separation; +extern cvar_t *gl_stereo_convergence; +extern cvar_t *gl_stereo; extern cvar_t *cl_gun; extern cvar_t *cl_add_blend; extern cvar_t *cl_add_lights; diff --git a/src/client/refresh/r_main.c b/src/client/refresh/r_main.c index 8c5f9fec5..a40a69231 100644 --- a/src/client/refresh/r_main.c +++ b/src/client/refresh/r_main.c @@ -142,10 +142,10 @@ cvar_t *gl_msaa_samples; cvar_t *vid_fullscreen; cvar_t *vid_gamma; -cvar_t *cl_stereo; -cvar_t *cl_stereo_separation; -cvar_t *cl_stereo_anaglyph_colors; -cvar_t *cl_stereo_convergence; +cvar_t *gl_stereo; +cvar_t *gl_stereo_separation; +cvar_t *gl_stereo_anaglyph_colors; +cvar_t *gl_stereo_convergence; /* * Returns true if the box is completely outside the frustom @@ -686,8 +686,8 @@ R_MYgluPerspective(GLdouble fovy, GLdouble aspect, xmin = ymin * aspect; xmax = ymax * aspect; - xmin += - cl_stereo_convergence->value * (2 * gl_state.camera_separation) / zNear; - xmax += - cl_stereo_convergence->value * (2 * gl_state.camera_separation) / zNear; + xmin += - gl_stereo_convergence->value * (2 * gl_state.camera_separation) / zNear; + xmax += - gl_stereo_convergence->value * (2 * gl_state.camera_separation) / zNear; glFrustum(xmin, xmax, ymin, ymax, zNear, zFar); } @@ -899,12 +899,12 @@ R_RenderView(refdef_t *fd) // Work out the colour for each eye. int anaglyph_colours[] = { 0x4, 0x3 }; // Left = red, right = cyan. - if (strlen(cl_stereo_anaglyph_colors->string) == 2) { + if (strlen(gl_stereo_anaglyph_colors->string) == 2) { int eye, colour, missing_bits; // Decode the colour name from its character. for (eye = 0; eye < 2; ++eye) { colour = 0; - switch (toupper(cl_stereo_anaglyph_colors->string[eye])) { + switch (toupper(gl_stereo_anaglyph_colors->string[eye])) { case 'B': ++colour; // 001 Blue case 'G': ++colour; // 010 Green case 'C': ++colour; // 011 Cyan @@ -1207,10 +1207,10 @@ R_Register(void) gl_retexturing = Cvar_Get("gl_retexturing", "1", CVAR_ARCHIVE); - cl_stereo = Cvar_Get( "cl_stereo", "0", CVAR_ARCHIVE ); - cl_stereo_separation = Cvar_Get( "cl_stereo_separation", "-0.4", CVAR_ARCHIVE ); - cl_stereo_anaglyph_colors = Cvar_Get( "cl_stereo_anaglyph_colors", "rc", CVAR_ARCHIVE ); - cl_stereo_convergence = Cvar_Get( "cl_stereo_convergence", "1", CVAR_ARCHIVE ); + gl_stereo = Cvar_Get( "gl_stereo", "0", CVAR_ARCHIVE ); + gl_stereo_separation = Cvar_Get( "gl_stereo_separation", "-0.4", CVAR_ARCHIVE ); + gl_stereo_anaglyph_colors = Cvar_Get( "gl_stereo_anaglyph_colors", "rc", CVAR_ARCHIVE ); + gl_stereo_convergence = Cvar_Get( "gl_stereo_convergence", "1", CVAR_ARCHIVE ); Cmd_AddCommand("imagelist", R_ImageList_f); Cmd_AddCommand("screenshot", R_ScreenShot); @@ -1322,7 +1322,7 @@ R_Init(void *hinstance, void *hWnd) /* set our "safe" mode */ gl_state.prev_mode = 4; - gl_state.stereo_mode = cl_stereo->value; + gl_state.stereo_mode = gl_stereo->value; /* create the window and set up the context */ if (!R_SetMode()) @@ -1539,11 +1539,11 @@ R_BeginFrame(float camera_separation) vid_fullscreen->modified = true; } - // force a vid_restart if cl_stereo has been modified. - if ( gl_state.stereo_mode != cl_stereo->value ) { + // force a vid_restart if gl_stereo has been modified. + if ( gl_state.stereo_mode != gl_stereo->value ) { // If we've gone from one mode to another with the same special buffer requirements there's no need to restart. - if ( GL_GetSpecialBufferModeForStereoMode( gl_state.stereo_mode ) == GL_GetSpecialBufferModeForStereoMode( cl_stereo->value ) ) { - gl_state.stereo_mode = cl_stereo->value; + if ( GL_GetSpecialBufferModeForStereoMode( gl_state.stereo_mode ) == GL_GetSpecialBufferModeForStereoMode( gl_stereo->value ) ) { + gl_state.stereo_mode = gl_stereo->value; } else {