From 0d3d375842764cddf50381c115e4f4762f876d6a Mon Sep 17 00:00:00 2001 From: havoc Date: Fri, 6 Aug 2004 13:06:07 +0000 Subject: [PATCH] rearranged SCR_UpdateScreen, now puts 2D graphics in the two views in r_stereo_sidebyside mode (but not in any other mode), and 2D graphics are rendered into both color planes with the anaglyph modes git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4305 d7cf8633-e32d-0410-b094-e92efae38249 --- client.h | 4 + gl_backend.c | 295 +++++++++++++++++++++++++++------------------------ gl_draw.c | 14 ++- 3 files changed, 172 insertions(+), 141 deletions(-) diff --git a/client.h b/client.h index 8e040c95..726d16f1 100644 --- a/client.h +++ b/client.h @@ -751,6 +751,10 @@ typedef struct int x, y, width, height; float fov_x, fov_y; + // these are set for water warping before + // fov_x/fov_y are calculated + float fovscale_x, fovscale_y; + // view transform matrix4x4_t viewentitymatrix; diff --git a/gl_backend.c b/gl_backend.c index 46323955..45040c5c 100644 --- a/gl_backend.c +++ b/gl_backend.c @@ -1260,6 +1260,78 @@ float CalcFov (float fov_x, float width, float height) return atan (((height/width)/vid_pixelaspect.value)*tan(fov_x/360.*M_PI))*360./M_PI; } +int r_stereo_side; + +void SCR_DrawScreen (void) +{ + for (r_showtrispass = 0;r_showtrispass <= (r_showtris.value > 0);r_showtrispass++) + { + R_Mesh_Start(); + + R_TimeReport("setup"); + + if (scr_conlines < vid.conheight && cls.signon == SIGNONS) + { + float size; + + size = scr_viewsize.value * (1.0 / 100.0); + size = min(size, 1); + + if (r_stereo_sidebyside.integer) + { + r_refdef.width = vid.realwidth * size / 2.5; + r_refdef.height = vid.realheight * size / 2.5; + r_refdef.x = (vid.realwidth - r_refdef.width * 2.5) * 0.5; + r_refdef.y = (vid.realheight - r_refdef.height)/2; + if (r_stereo_side) + r_refdef.x += r_refdef.width * 1.5; + } + else + { + r_refdef.width = vid.realwidth * size; + r_refdef.height = vid.realheight * size; + r_refdef.x = (vid.realwidth - r_refdef.width)/2; + r_refdef.y = (vid.realheight - r_refdef.height)/2; + } + + // LordHavoc: viewzoom (zoom in for sniper rifles, etc) + r_refdef.fov_x = scr_fov.value * cl.viewzoom * r_refdef.fovscale_x; + r_refdef.fov_y = CalcFov (r_refdef.fov_x, r_refdef.width, r_refdef.height) * r_refdef.fovscale_y; + + R_RenderView(); + + if (scr_zoomwindow.integer) + { + float sizex = bound(10, scr_zoomwindow_viewsizex.value, 100) / 100.0; + float sizey = bound(10, scr_zoomwindow_viewsizey.value, 100) / 100.0; + r_refdef.width = vid.realwidth * sizex; + r_refdef.height = vid.realheight * sizey; + r_refdef.x = (vid.realwidth - r_refdef.width)/2; + r_refdef.y = 0; + r_refdef.fov_x = scr_zoomwindow_fov.value * r_refdef.fovscale_x; + r_refdef.fov_y = CalcFov(r_refdef.fov_x, r_refdef.width, r_refdef.height) * r_refdef.fovscale_y; + + R_RenderView(); + } + } + + if (!r_stereo_sidebyside.integer) + { + r_refdef.width = vid.realwidth; + r_refdef.height = vid.realheight; + r_refdef.x = 0; + r_refdef.y = 0; + } + + // draw 2D stuff + R_DrawQueue(); + + R_Mesh_Finish(); + + R_TimeReport("meshfinish"); + } +} + /* ================== SCR_UpdateScreen @@ -1270,8 +1342,6 @@ text to the screen. */ void SCR_UpdateScreen (void) { - R_Mesh_Start(); - if (r_textureunits.integer > gl_textureunits) Cvar_SetValueQuick(&r_textureunits, gl_textureunits); if (r_textureunits.integer < 1) @@ -1280,170 +1350,115 @@ void SCR_UpdateScreen (void) if (gl_combine.integer && (!gl_combine_extension || r_textureunits.integer < 2)) Cvar_SetValueQuick(&gl_combine, 0); -showtris: - R_TimeReport("setup"); - - R_ClearScreen(); - - R_TimeReport("clear"); - - if (scr_conlines < vid.conheight && cls.signon == SIGNONS) + // bound viewsize + if (scr_viewsize.value < 30) + Cvar_Set ("viewsize","30"); + if (scr_viewsize.value > 120) + Cvar_Set ("viewsize","120"); + + // bound field of view + if (scr_fov.value < 1) + Cvar_Set ("fov","1"); + if (scr_fov.value > 170) + Cvar_Set ("fov","170"); + + // intermission is always full screen + if (cl.intermission) + sb_lines = 0; + else { - float size; - int contents; - - // bound viewsize - if (scr_viewsize.value < 30) - Cvar_Set ("viewsize","30"); - if (scr_viewsize.value > 120) - Cvar_Set ("viewsize","120"); - - // bound field of view - if (scr_fov.value < 1) - Cvar_Set ("fov","1"); - if (scr_fov.value > 170) - Cvar_Set ("fov","170"); - - // intermission is always full screen - if (cl.intermission) - { - size = 1; - sb_lines = 0; - } + if (scr_viewsize.value >= 120) + sb_lines = 0; // no status bar at all + else if (scr_viewsize.value >= 110) + sb_lines = 24; // no inventory else + sb_lines = 24+16+8; + } + + r_refdef.fovscale_x = 1; + r_refdef.fovscale_y = 1; + if (r_waterwarp.value > 0 && cl.worldmodel) + { + Mod_CheckLoaded(cl.worldmodel); + if (CL_PointSuperContents(r_vieworigin) & SUPERCONTENTS_LIQUIDSMASK) { - if (scr_viewsize.value >= 120) - sb_lines = 0; // no status bar at all - else if (scr_viewsize.value >= 110) - sb_lines = 24; // no inventory - else - sb_lines = 24+16+8; - size = scr_viewsize.value * (1.0 / 100.0); - size = min(size, 1); + r_refdef.fovscale_x = 1 - (((sin(cl.time * 4.7) + 1) * 0.015) * r_waterwarp.value); + r_refdef.fovscale_y = 1 - (((sin(cl.time * 3.0) + 1) * 0.015) * r_waterwarp.value); } + } - r_refdef.width = vid.realwidth * size; - r_refdef.height = vid.realheight * size; - r_refdef.x = (vid.realwidth - r_refdef.width)/2; - r_refdef.y = (vid.realheight - r_refdef.height)/2; + r_refdef.colormask[0] = 1; + r_refdef.colormask[1] = 1; + r_refdef.colormask[2] = 1; - // LordHavoc: viewzoom (zoom in for sniper rifles, etc) - r_refdef.fov_x = scr_fov.value * cl.viewzoom; - r_refdef.fov_y = CalcFov (r_refdef.fov_x, r_refdef.width, r_refdef.height); + CHECKGLERROR + qglViewport(0, 0, vid.realwidth, vid.realheight); + qglDisable(GL_SCISSOR_TEST); + qglDepthMask(1); + qglColorMask(1,1,1,1); + qglClearColor(0,0,0,0); + qglClear(GL_COLOR_BUFFER_BIT); + CHECKGLERROR - if (r_waterwarp.value > 0) - { - if (cl.worldmodel) - { - Mod_CheckLoaded(cl.worldmodel); - contents = CL_PointSuperContents(r_vieworigin); - if (contents & SUPERCONTENTS_LIQUIDSMASK) - { - r_refdef.fov_x *= 1 - (((sin(cl.time * 4.7) + 1) * 0.015) * r_waterwarp.value); - r_refdef.fov_y *= 1 - (((sin(cl.time * 3.0) + 1) * 0.015) * r_waterwarp.value); - } - } - } + R_TimeReport("clear"); - r_refdef.colormask[0] = 1; - r_refdef.colormask[1] = 1; - r_refdef.colormask[2] = 1; + if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer || r_stereo_sidebyside.integer) + { + matrix4x4_t originalmatrix = r_refdef.viewentitymatrix; + r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][0]; + r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][1]; + r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][2]; - if (r_stereo_redblue.integer || r_stereo_redcyan.integer || r_stereo_redgreen.integer) - { - matrix4x4_t originalmatrix = r_refdef.viewentitymatrix; - r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][0]; - r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][1]; - r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][2]; + if (r_stereo_sidebyside.integer) + r_stereo_side = 0; + if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer) + { r_refdef.colormask[0] = 1; r_refdef.colormask[1] = 0; r_refdef.colormask[2] = 0; + } - R_RenderView(); + SCR_DrawScreen(); - r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][0]; - r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][1]; - r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][2]; + r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][0]; + r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][1]; + r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][2]; + if (r_stereo_sidebyside.integer) + r_stereo_side = 1; + + if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer) + { r_refdef.colormask[0] = 0; r_refdef.colormask[1] = r_stereo_redcyan.integer || r_stereo_redgreen.integer; r_refdef.colormask[2] = r_stereo_redcyan.integer || r_stereo_redblue.integer; - - R_RenderView(); - - r_refdef.viewentitymatrix = originalmatrix; - } - else if (r_stereo_sidebyside.integer) - { - matrix4x4_t originalmatrix = r_refdef.viewentitymatrix; - r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][0]; - r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][1]; - r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][2]; - - r_refdef.width = vid.realwidth * size / 2.5; - r_refdef.height = vid.realheight * size / 2.5; - r_refdef.x = (vid.realwidth - r_refdef.width * 2.5) * 0.5; - r_refdef.y = (vid.realheight - r_refdef.height)/2; - - R_RenderView(); - - r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][0]; - r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][1]; - r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][2]; - - r_refdef.x = (vid.realwidth - r_refdef.width * 2.5) * 0.5 + r_refdef.width * 1.5; - - R_RenderView(); - - r_refdef.viewentitymatrix = originalmatrix; } - else - { - R_RenderView(); - if (scr_zoomwindow.integer) - { - float sizex = bound(10, scr_zoomwindow_viewsizex.value, 100) / 100.0; - float sizey = bound(10, scr_zoomwindow_viewsizey.value, 100) / 100.0; - r_refdef.width = vid.realwidth * sizex; - r_refdef.height = vid.realheight * sizey; - r_refdef.x = (vid.realwidth - r_refdef.width)/2; - r_refdef.y = 0; - r_refdef.fov_x = scr_zoomwindow_fov.value; - r_refdef.fov_y = CalcFov(r_refdef.fov_x, r_refdef.width, r_refdef.height); + SCR_DrawScreen(); - R_RenderView(); - } - } - - r_refdef.colormask[0] = 1; - r_refdef.colormask[1] = 1; - r_refdef.colormask[2] = 1; + r_refdef.viewentitymatrix = originalmatrix; } - - GL_ColorMask(1,1,1,1); - - // draw 2D stuff - R_DrawQueue(); - - if (r_showtrispass) - r_showtrispass = false; - else if (r_showtris.value > 0) + else { - rmeshstate_t m; - GL_BlendFunc(GL_ONE, GL_ONE); - GL_DepthTest(GL_FALSE); - GL_DepthMask(GL_FALSE); - memset(&m, 0, sizeof(m)); - R_Mesh_State(&m); - r_showtrispass = true; - GL_ShowTrisColor(0.2,0.2,0.2,1); - goto showtris; + r_showtrispass = false; + SCR_DrawScreen(); + + if (r_showtris.value > 0) + { + rmeshstate_t m; + GL_BlendFunc(GL_ONE, GL_ONE); + GL_DepthTest(GL_FALSE); + GL_DepthMask(GL_FALSE); + memset(&m, 0, sizeof(m)); + R_Mesh_State(&m); + r_showtrispass = true; + GL_ShowTrisColor(0.2,0.2,0.2,1); + SCR_DrawScreen(); + r_showtrispass = false; + } } - R_Mesh_Finish(); - R_TimeReport("meshfinish"); VID_Finish(); R_TimeReport("finish"); } diff --git a/gl_draw.c b/gl_draw.c index 52ae5a62..3f2cddee 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -418,7 +418,19 @@ void R_DrawQueue(void) quadelements[pos++] = num + 3; } } - qglViewport(0, 0, vid.realwidth, vid.realheight); + + r_view_width = bound(0, r_refdef.width, vid.realwidth); + r_view_height = bound(0, r_refdef.height, vid.realheight); + r_view_depth = 1; + r_view_x = bound(0, r_refdef.x, vid.realwidth - r_refdef.width); + r_view_y = bound(0, r_refdef.y, vid.realheight - r_refdef.height); + r_view_z = 0; + r_view_fov_x = bound(1, r_refdef.fov_x, 170); + r_view_fov_y = bound(1, r_refdef.fov_y, 170); + r_view_matrix = r_refdef.viewentitymatrix; + GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1); + + qglViewport(r_view_x, vid.realheight - (r_view_y + r_view_height), r_view_width, r_view_height); GL_SetupView_Mode_Ortho(0, 0, vid.conwidth, vid.conheight, -10, 100); qglDepthFunc(GL_LEQUAL); R_Mesh_Matrix(&r_identitymatrix); -- 2.39.2