Skip to content

Commit

Permalink
Rename cl_stereo* cvars to gl_stereo*.
Browse files Browse the repository at this point in the history
They're renderer cvars, not client cvars.
  • Loading branch information
Yamagi committed Apr 7, 2016
1 parent 238ccb8 commit eaee1d7
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 33 deletions.
6 changes: 3 additions & 3 deletions README
Expand Up @@ -830,7 +830,7 @@ Stereo support was added back.

added cvars
-----------
- cl_stereo:
- gl_stereo:
- 0 - none
- 1 - native opengl (not tested)
- 2 - anaglyph
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/client/cl_main.c
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/client/cl_screen.c
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/client/cl_view.c
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions src/client/header/client.h
Expand Up @@ -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;
Expand Down
34 changes: 17 additions & 17 deletions src/client/refresh/r_main.c
Expand Up @@ -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
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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
{
Expand Down

0 comments on commit eaee1d7

Please sign in to comment.