From: havoc Date: Fri, 9 Aug 2002 23:13:48 +0000 (+0000) Subject: changed viewblend to use R_Mesh_Draw_GetBuffer X-Git-Tag: RELEASE_0_2_0_RC1~350 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=ab96ea53f0a8f25fdf9da4bd3dddf49dad66e401 changed viewblend to use R_Mesh_Draw_GetBuffer git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2231 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/gl_rmain.c b/gl_rmain.c index 3ccc5a77..653d515c 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -525,12 +525,10 @@ static void R_SetupFrame (void) } -static int blendviewpolyindex[3] = {0, 1, 2}; - static void R_BlendView(void) { - rmeshinfo_t m; - float tvxyz[3][4], r; + rmeshbufferinfo_t m; + float r; if (r_refdef.viewblend[3] < 0.01f) return; @@ -542,25 +540,27 @@ static void R_BlendView(void) m.depthdisable = true; // magic m.numtriangles = 1; m.numverts = 3; - m.index = blendviewpolyindex; - m.vertex = &tvxyz[0][0]; - m.vertexstep = sizeof(float[4]); - m.cr = r_refdef.viewblend[0]; - m.cg = r_refdef.viewblend[1]; - m.cb = r_refdef.viewblend[2]; - m.ca = r_refdef.viewblend[3]; - r = 64000; - tvxyz[0][0] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r - vup[0] * r; - tvxyz[0][1] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r - vup[1] * r; - tvxyz[0][2] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r - vup[2] * r; - r *= 3; - tvxyz[1][0] = tvxyz[0][0] + vup[0] * r; - tvxyz[1][1] = tvxyz[0][1] + vup[1] * r; - tvxyz[1][2] = tvxyz[0][2] + vup[2] * r; - tvxyz[2][0] = tvxyz[0][0] + vright[0] * r; - tvxyz[2][1] = tvxyz[0][1] + vright[1] * r; - tvxyz[2][2] = tvxyz[0][2] + vright[2] * r; - R_Mesh_Draw(&m); + if (R_Mesh_Draw_GetBuffer(&m)) + { + m.index[0] = 0; + m.index[1] = 1; + m.index[2] = 2; + m.color[0] = m.color[4] = m.color[8] = r_refdef.viewblend[0]; + m.color[1] = m.color[5] = m.color[9] = r_refdef.viewblend[1]; + m.color[2] = m.color[6] = m.color[10] = r_refdef.viewblend[2]; + m.color[3] = m.color[7] = m.color[11] = r_refdef.viewblend[3]; + r = 64000; + m.vertex[0] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r - vup[0] * r; + m.vertex[1] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r - vup[1] * r; + m.vertex[2] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r - vup[2] * r; + r *= 3; + m.vertex[4] = m.vertex[0] + vup[0] * r; + m.vertex[5] = m.vertex[1] + vup[1] * r; + m.vertex[6] = m.vertex[2] + vup[2] * r; + m.vertex[8] = m.vertex[0] + vright[0] * r; + m.vertex[9] = m.vertex[1] + vright[1] * r; + m.vertex[10] = m.vertex[2] + vright[2] * r; + } } /*