void GL_Backend_AllocArrays(void)
{
if (!gl_backend_mempool)
- gl_backend_mempool = Mem_AllocPool("GL_Backend");
+ gl_backend_mempool = Mem_AllocPool("GL_Backend", 0, NULL);
R_Mesh_CacheArray_Startup();
}
float CalcFov (float fov_x, float width, float height)
{
// calculate vision size and alter by aspect, then convert back to angle
- return atan (((height/width)/vid_pixelaspect.value)*tan(fov_x/360.*M_PI))*360./M_PI;
+ return atan (((height/width)/vid_pixelaspect.value)*tan(fov_x/360.0*M_PI))*360.0/M_PI;
}
int r_stereo_side;
if (r_stereo_sidebyside.integer)
{
r_refdef.width = vid.realwidth * size / 2.5;
- r_refdef.height = vid.realheight * size / 2.5;
+ r_refdef.height = vid.realheight * size / 2.5 * (1 - bound(0, r_letterbox.value, 100) / 100);
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)
else
{
r_refdef.width = vid.realwidth * size;
- r_refdef.height = vid.realheight * size;
+ r_refdef.height = vid.realheight * size * (1 - bound(0, r_letterbox.value, 100) / 100);
r_refdef.x = (vid.realwidth - r_refdef.width)/2;
r_refdef.y = (vid.realheight - r_refdef.height)/2;
}
R_TimeReport("meshfinish");
}
+ r_showtrispass = 0;
+}
+
+void SCR_UpdateLoadingScreen (void)
+{
+ float x, y;
+ cachepic_t *pic;
+ rmeshstate_t m;
+ // don't do anything if not initialized yet
+ if (vid_hidden)
+ return;
+ r_showtrispass = 0;
+ VID_GetWindowSize(&vid.realx, &vid.realy, &vid.realwidth, &vid.realheight);
+ VID_UpdateGamma(false);
+ 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);
+ //qglCullFace(GL_FRONT);
+ //qglDisable(GL_CULL_FACE);
+ //R_ClearScreen();
+ R_Textures_Frame();
+ GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
+ R_Mesh_Start();
+ R_Mesh_Matrix(&r_identitymatrix);
+ // draw the loading plaque
+ pic = Draw_CachePic("gfx/loading.lmp");
+ x = (vid_conwidth.integer - pic->width)/2;
+ y = (vid_conheight.integer - pic->height)/2;
+ GL_Color(1,1,1,1);
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ GL_DepthTest(false);
+ memset(&m, 0, sizeof(m));
+ m.pointer_vertex = varray_vertex3f;
+ m.pointer_texcoord[0] = varray_texcoord2f[0];
+ m.tex[0] = R_GetTexture(pic->tex);
+ R_Mesh_State(&m);
+ varray_vertex3f[0] = varray_vertex3f[9] = x;
+ varray_vertex3f[1] = varray_vertex3f[4] = y;
+ varray_vertex3f[3] = varray_vertex3f[6] = x + pic->width;
+ varray_vertex3f[7] = varray_vertex3f[10] = y + pic->height;
+ varray_texcoord2f[0][0] = 0;varray_texcoord2f[0][1] = 0;
+ varray_texcoord2f[0][2] = 1;varray_texcoord2f[0][3] = 0;
+ varray_texcoord2f[0][4] = 1;varray_texcoord2f[0][5] = 1;
+ varray_texcoord2f[0][6] = 0;varray_texcoord2f[0][7] = 1;
+ GL_LockArrays(0, 4);
+ R_Mesh_Draw(4, 2, polygonelements);
+ GL_LockArrays(0, 0);
+ R_Mesh_Finish();
+ // refresh
+ VID_Finish();
}
/*
*/
void SCR_UpdateScreen (void)
{
+ if (vid_hidden)
+ return;
+
if (r_textureunits.integer > gl_textureunits)
Cvar_SetValueQuick(&r_textureunits, gl_textureunits);
if (r_textureunits.integer < 1)
if (gl_combine.integer && (!gl_combine_extension || r_textureunits.integer < 2))
Cvar_SetValueQuick(&gl_combine, 0);
+ // don't allow cheats in multiplayer
+ if (!cl.islocalgame && cl.worldmodel)
+ {
+ if (r_fullbright.integer != 0)
+ Cvar_Set ("r_fullbright", "0");
+ if (r_ambient.value != 0)
+ Cvar_Set ("r_ambient", "0");
+ }
+
// bound viewsize
if (scr_viewsize.value < 30)
Cvar_Set ("viewsize","30");
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];
+ r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][1];
+ r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[1][1];
+ r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[2][1];
if (r_stereo_sidebyside.integer)
r_stereo_side = 0;
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][1];
+ r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[1][1];
+ r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[2][1];
if (r_stereo_sidebyside.integer)
r_stereo_side = 1;
// dynamic vertex array buffer subsystem
//===========================================================================
+// FIXME: someday this should be dynamically allocated and resized?
float varray_vertex3f[65536*3];
+float varray_svector3f[65536*3];
+float varray_tvector3f[65536*3];
+float varray_normal3f[65536*3];
float varray_color4f[65536*4];
float varray_texcoord2f[4][65536*2];
float varray_texcoord3f[4][65536*3];
-float varray_normal3f[65536*3];
int earray_element3i[65536];
+float varray_vertex3f2[65536*3];
//===========================================================================
// vertex array caching subsystem
projects / xonotic / darkplaces.git / blobdiff