#include "quakedef.h"
+#include "cl_video.h"
cvar_t scr_viewsize = {CVAR_SAVE, "viewsize","100"};
cvar_t scr_fov = {CVAR_SAVE, "fov","90"}; // 10 - 170
cvar_t scr_showpause = {CVAR_SAVE, "showpause","1"};
cvar_t scr_printspeed = {0, "scr_printspeed","8"};
cvar_t scr_2dresolution = {CVAR_SAVE, "scr_2dresolution", "1"};
+cvar_t cl_avidemo = {0, "cl_avidemo", "0"};
qboolean scr_initialized; // ready to draw
int clearconsole;
int clearnotify;
-qboolean scr_disabled_for_loading;
-//qboolean scr_drawloading;
-//float scr_disabled_time;
+qboolean scr_drawloading = false;
-static byte menuplyr_pixels[4096];
+static qbyte menuplyr_pixels[4096];
+
+void DrawCrosshair(int num);
+void V_CalcRefdef (void);
+static void SCR_ScreenShot_f (void);
+static void R_Envmap_f (void);
+
+// backend
+void R_ClearScreen(void);
/*
===============================================================================
scr_centertime_off -= host_frametime;
+ // don't draw if this is a normal stats-screen intermission,
+ // only if it is not an intermission, or a finale intermission
+ if (cl.intermission == 1)
+ return;
if (scr_centertime_off <= 0 && !cl.intermission)
return;
if (key_dest != key_game)
SCR_DrawCenterString ();
}
-/*
-==============
-SCR_DrawRam
-==============
-*/
-void SCR_DrawRam (void)
-{
-// if (!scr_showram.integer)
-// return;
-// DrawQ_Pic (32, 0, "ram", 0, 0, 1, 1, 1, 1, 0);
-}
-
/*
==============
SCR_DrawTurtle
SCR_DrawLoading
==============
*/
-/*
void SCR_DrawLoading (void)
{
cachepic_t *pic;
- if (!scr_drawloading)
- return;
-
pic = Draw_CachePic ("gfx/loading.lmp");
DrawQ_Pic ((vid.conwidth - pic->width)/2, (vid.conheight - pic->height)/2, "gfx/loading.lmp", 0, 0, 1, 1, 1, 1, 0);
}
-*/
{
Con_CheckResize ();
-// decide on the height of the console
- con_forcedup = !cl.worldmodel || cls.signon != SIGNONS;
+ if (key_dest == key_game && cls.signon != SIGNONS)
+ key_consoleactive |= KEY_CONSOLEACTIVE_FORCED;
+ else
+ key_consoleactive &= ~KEY_CONSOLEACTIVE_FORCED;
- if (con_forcedup)
- {
- scr_conlines = vid.conheight; // full screen
- scr_con_current = scr_conlines;
- }
- else if (key_dest == key_console)
+// decide on the height of the console
+ if (key_consoleactive & KEY_CONSOLEACTIVE_FORCED)
+ scr_conlines = vid.conheight; // full screen
+ else if (key_consoleactive & KEY_CONSOLEACTIVE_USER)
scr_conlines = vid.conheight/2; // half screen
else
scr_conlines = 0; // none visible
- if (scr_conlines < scr_con_current)
+ if (scr_conspeed.value)
{
- scr_con_current -= scr_conspeed.value*host_realframetime;
- if (scr_conlines > scr_con_current)
- scr_con_current = scr_conlines;
-
- }
- else if (scr_conlines > scr_con_current)
- {
- scr_con_current += scr_conspeed.value*host_realframetime;
if (scr_conlines < scr_con_current)
- scr_con_current = scr_conlines;
+ {
+ scr_con_current -= scr_conspeed.value*host_realframetime;
+ if (scr_conlines > scr_con_current)
+ scr_con_current = scr_conlines;
+
+ }
+ else if (scr_conlines > scr_con_current)
+ {
+ scr_con_current += scr_conspeed.value*host_realframetime;
+ if (scr_conlines < scr_con_current)
+ scr_con_current = scr_conlines;
+ }
}
+ else
+ scr_con_current = scr_conlines;
}
/*
================
*/
-/*
void SCR_BeginLoadingPlaque (void)
{
- S_StopAllSounds (true);
-
-// if (cls.state != ca_connected)
-// return;
-// if (cls.signon != SIGNONS)
-// return;
+ if (scr_drawloading)
+ return;
-// redraw with no console and the loading plaque
-// Con_ClearNotify ();
-// scr_centertime_off = 0;
-// scr_con_current = 0;
+ S_StopAllSounds (true);
scr_drawloading = true;
- SCR_UpdateScreen ();
-
-// scr_disabled_for_loading = true;
-// scr_disabled_time = realtime;
-}
-*/
-
-/*
-===============
-SCR_EndLoadingPlaque
-
-================
-*/
-/*
-void SCR_EndLoadingPlaque (void)
-{
-// scr_disabled_for_loading = false;
- scr_drawloading = false;
- Con_ClearNotify ();
+ CL_UpdateScreen ();
+ scr_drawloading = true;
+ CL_UpdateScreen ();
}
-*/
//=============================================================================
-char *scr_notifystring;
-
-void SCR_DrawNotifyString (void)
-{
- char *start;
- int l;
- int x, y;
-
- start = scr_notifystring;
-
- y = vid.conheight*0.35;
-
- do
- {
- // scan the width of the line
- for (l=0 ; l<40 ; l++)
- if (start[l] == '\n' || !start[l])
- break;
- x = (vid.conwidth - l*8)/2;
- DrawQ_String (x, y, start, l, 8, 8, 1, 1, 1, 1, 0);
-
- y += 8;
-
- while (*start && *start != '\n')
- start++;
-
- if (!*start)
- break;
- start++; // skip the \n
- }
- while (1);
-}
-
-void DrawCrosshair(int num);
-
char r_speeds_string[1024];
int speedstringcount, r_timereport_active;
double r_timereport_temp = 0, r_timereport_current = 0, r_timereport_start = 0;
}
}
+extern int c_rt_lights, c_rt_clears, c_rt_scissored;
+extern int c_rt_shadowmeshes, c_rt_shadowtris, c_rt_lightmeshes, c_rt_lighttris;
+extern int c_rtcached_shadowmeshes, c_rtcached_shadowtris;
+extern int r_shadow_lightingmode;
void R_TimeReport_Start(void)
{
- r_timereport_active = r_speeds.integer && cl.worldmodel && cls.state == ca_connected;
+ r_timereport_active = r_speeds.integer && cls.signon == SIGNONS && cls.state == ca_connected;
r_speeds_string[0] = 0;
if (r_timereport_active)
{
speedstringcount = 0;
AngleVectors (r_refdef.viewangles, vpn, NULL, NULL);
- //sprintf(r_speeds_string, "org:'%c%6.2f %c%6.2f %c%6.2f' ang:'%c%3.0f %c%3.0f %c%3.0f' dir:'%c%2.3f %c%2.3f %c%2.3f'\n%6i walls %6i dlitwalls %7i modeltris %7i meshtris\nBSP: %6i faces %6i nodes %6i leafs\n%4i models %4i bmodels %4i sprites %5i particles %3i dlights\n",
- // r_refdef.vieworg[0] < 0 ? '-' : ' ', fabs(r_refdef.vieworg[0]), r_refdef.vieworg[1] < 0 ? '-' : ' ', fabs(r_refdef.vieworg[1]), r_refdef.vieworg[2] < 0 ? '-' : ' ', fabs(r_refdef.vieworg[2]),
- // r_refdef.viewangles[0] < 0 ? '-' : ' ', fabs(r_refdef.viewangles[0]), r_refdef.viewangles[1] < 0 ? '-' : ' ', fabs(r_refdef.viewangles[1]), r_refdef.viewangles[2] < 0 ? '-' : ' ', fabs(r_refdef.viewangles[2]),
- // vpn[0] < 0 ? '-' : ' ', fabs(vpn[0]), vpn[1] < 0 ? '-' : ' ', fabs(vpn[1]), vpn[2] < 0 ? '-' : ' ', fabs(vpn[2]),
sprintf(r_speeds_string,
"org:'%+8.2f %+8.2f %+8.2f' ang:'%+4.0f %+4.0f %+4.0f' dir:'%+2.3f %+2.3f %+2.3f'\n"
- "world:%6i faces%6i nodes%6i leafs%6i walls%6i dlitwalls\n"
+ "world:%6i faces%6i nodes%6i leafs%6i dlitwalls\n"
"%5i models%5i bmodels%5i sprites%6i particles%4i dlights\n"
- "%6i modeltris%6i transmeshs%6i transtris%6i meshs%6i meshtris\n",
+ "%6i modeltris%6i meshs%6i meshtris\n",
r_refdef.vieworg[0], r_refdef.vieworg[1], r_refdef.vieworg[2], r_refdef.viewangles[0], r_refdef.viewangles[1], r_refdef.viewangles[2], vpn[0], vpn[1], vpn[2],
- c_faces, c_nodes, c_leafs, c_brush_polys, c_light_polys,
+ c_faces, c_nodes, c_leafs, c_light_polys,
c_models, c_bmodels, c_sprites, c_particles, c_dlights,
- c_alias_polys, c_transmeshs, c_transtris, c_meshs, c_meshtris);
+ c_alias_polys, c_meshs, c_meshelements / 3);
+ if (r_shadow_lightingmode)
+ {
+ sprintf(r_speeds_string + strlen(r_speeds_string),
+ "realtime lighting:%4i lights%4i clears%4i scissored\n"
+ "dynamic: %6i shadowmeshes%6i shadowtris%6i lightmeshes%6i lighttris\n"
+ "precomputed: %6i shadowmeshes%6i shadowtris\n",
+ c_rt_lights, c_rt_clears, c_rt_scissored,
+ c_rt_shadowmeshes, c_rt_shadowtris, c_rt_lightmeshes, c_rt_lighttris,
+ c_rtcached_shadowmeshes, c_rtcached_shadowtris);
+ }
- c_brush_polys = 0;
c_alias_polys = 0;
c_light_polys = 0;
c_faces = 0;
c_bmodels = 0;
c_sprites = 0;
c_particles = 0;
- // c_dlights = 0;
+ c_meshs = 0;
+ c_meshelements = 0;
r_timereport_start = Sys_DoubleTime();
}
for (i = 0;r_speeds_string[i];i++)
if (r_speeds_string[i] == '\n')
lines++;
- y = vid.conheight - sb_lines - lines * 8/* - 8*/;
+ y = vid.conheight - sb_lines - lines * 8;
i = j = 0;
DrawQ_Fill(0, y, vid.conwidth, lines * 8, 0, 0, 0, 0.5, 0);
while (r_speeds_string[i])
Cvar_RegisterVariable (&scr_showpause);
Cvar_RegisterVariable (&scr_centertime);
Cvar_RegisterVariable (&scr_printspeed);
- Cvar_RegisterVariable(&scr_2dresolution);
+ Cvar_RegisterVariable (&scr_2dresolution);
+ Cvar_RegisterVariable (&cl_avidemo);
Cmd_AddCommand ("sizeup",SCR_SizeUp_f);
Cmd_AddCommand ("sizedown",SCR_SizeDown_f);
+ Cmd_AddCommand ("screenshot",SCR_ScreenShot_f);
+ Cmd_AddCommand ("envmap", R_Envmap_f);
scr_initialized = true;
// HACK HACK HACK
// load the image data for the player image in the config menu
- dat = (qpic_t *)COM_LoadFile ("gfx/menuplyr.lmp", false);
+ dat = (qpic_t *)FS_LoadFile ("gfx/menuplyr.lmp", false);
if (!dat)
Sys_Error("unable to load gfx/menuplyr.lmp");
SwapPic (dat);
r_refdef.drawqueuesize = 0;
}
+static int picelements[6] = {0, 1, 2, 0, 2, 3};
void DrawQ_Pic(float x, float y, char *picname, float width, float height, float red, float green, float blue, float alpha, int flags)
{
+#if 1
+ DrawQ_SuperPic(x,y,picname,width,height,0,0,red,green,blue,alpha,1,0,red,green,blue,alpha,0,1,red,green,blue,alpha,1,1,red,green,blue,alpha,flags);
+#elif 1
+ float floats[48];
+ cachepic_t *pic;
+ drawqueuemesh_t mesh;
+ if (alpha < (1.0f / 255.0f) || !picname || !picname[0])
+ return;
+ pic = Draw_CachePic(picname);
+ if (width == 0)
+ width = pic->width;
+ if (height == 0)
+ height = pic->height;
+ mesh.texture = pic->tex;
+ mesh.numtriangles = 2;
+ mesh.numvertices = 4;
+ mesh.indices = picelements;
+ mesh.vertex3f = floats;
+ mesh.texcoord2f = floats + 16;
+ mesh.color4f = floats + 32;
+ memset(floats, 0, sizeof(floats));
+ mesh.vertex3f[0] = mesh.vertex3f[12] = x;
+ mesh.vertex3f[1] = mesh.vertex3f[5] = y;
+ mesh.vertex3f[4] = mesh.vertex3f[8] = x + width;
+ mesh.vertex3f[9] = mesh.vertex3f[13] = y + height;
+ mesh.texcoord2f[4] = mesh.texcoord2f[8] = mesh.texcoord2f[9] = mesh.texcoord2f[13] = 1;
+ mesh.color4f[0] = mesh.color4f[4] = mesh.color4f[8] = mesh.color4f[12] = red;
+ mesh.color4f[1] = mesh.color4f[5] = mesh.color4f[9] = mesh.color4f[13] = green;
+ mesh.color4f[2] = mesh.color4f[6] = mesh.color4f[10] = mesh.color4f[14] = blue;
+ mesh.color4f[3] = mesh.color4f[7] = mesh.color4f[11] = mesh.color4f[15] = alpha;
+ DrawQ_Mesh (&mesh, flags);
+#else
int size;
drawqueue_t *dq;
- if (alpha < (1.0f / 255.0f))
+ if (alpha < (1.0f / 255.0f) || !picname || !picname[0])
return;
size = sizeof(*dq) + ((strlen(picname) + 1 + 3) & ~3);
- if (r_refdef.drawqueuesize + size > MAX_DRAWQUEUE)
+ if (r_refdef.drawqueuesize + size > r_refdef.maxdrawqueuesize)
return;
red = bound(0, red, 1);
green = bound(0, green, 1);
dq->scaley = height;
strcpy((char *)(dq + 1), picname);
r_refdef.drawqueuesize += dq->size;
+#endif
}
-void DrawQ_String(float x, float y, char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags)
+void DrawQ_String(float x, float y, const char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags)
{
int size, len;
drawqueue_t *dq;
if (x >= vid.conwidth || y >= vid.conheight || x < (-scalex * maxlen) || y < (-scaley))
return;
size = sizeof(*dq) + ((len + 1 + 3) & ~3);
- if (r_refdef.drawqueuesize + size > MAX_DRAWQUEUE)
+ if (r_refdef.drawqueuesize + size > r_refdef.maxdrawqueuesize)
return;
red = bound(0, red, 1);
green = bound(0, green, 1);
void DrawQ_Fill (float x, float y, float w, float h, float red, float green, float blue, float alpha, int flags)
{
+#if 1
+ DrawQ_SuperPic(x,y,NULL,w,h,0,0,red,green,blue,alpha,1,0,red,green,blue,alpha,0,1,red,green,blue,alpha,1,1,red,green,blue,alpha,flags);
+#elif 1
+ float floats[48];
+ drawqueuemesh_t mesh;
+ if (alpha < (1.0f / 255.0f))
+ return;
+ mesh.texture = NULL;
+ mesh.numtriangles = 2;
+ mesh.numvertices = 4;
+ mesh.indices = picelements;
+ mesh.vertex3f = floats;
+ mesh.texcoord2f = floats + 16;
+ mesh.color4f = floats + 32;
+ memset(floats, 0, sizeof(floats));
+ mesh.vertex3f[0] = mesh.vertex3f[12] = x;
+ mesh.vertex3f[1] = mesh.vertex3f[5] = y;
+ mesh.vertex3f[4] = mesh.vertex3f[8] = x + w;
+ mesh.vertex3f[9] = mesh.vertex3f[13] = y + h;
+ mesh.color4f[0] = mesh.color4f[4] = mesh.color4f[8] = mesh.color4f[12] = red;
+ mesh.color4f[1] = mesh.color4f[5] = mesh.color4f[9] = mesh.color4f[13] = green;
+ mesh.color4f[2] = mesh.color4f[6] = mesh.color4f[10] = mesh.color4f[14] = blue;
+ mesh.color4f[3] = mesh.color4f[7] = mesh.color4f[11] = mesh.color4f[15] = alpha;
+ DrawQ_Mesh (&mesh, flags);
+#else
int size;
drawqueue_t *dq;
if (alpha < (1.0f / 255.0f))
return;
size = sizeof(*dq) + 4;
- if (r_refdef.drawqueuesize + size > MAX_DRAWQUEUE)
+ if (r_refdef.drawqueuesize + size > r_refdef.maxdrawqueuesize)
return;
red = bound(0, red, 1);
green = bound(0, green, 1);
// empty pic name
*((char *)(dq + 1)) = 0;
r_refdef.drawqueuesize += dq->size;
+#endif
}
-//only used for the player color selection menu
-void DrawQ_PicTranslate (int x, int y, char *picname, byte *translation)
+void DrawQ_SuperPic(float x, float y, char *picname, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags)
{
- int i, c;
- unsigned int trans[4096];
+ float floats[36];
cachepic_t *pic;
-
- pic = Draw_CachePic(picname);
- if (pic == NULL)
- return;
-
- c = pic->width * pic->height;
- if (c > 4096)
+ drawqueuemesh_t mesh;
+ memset(&mesh, 0, sizeof(mesh));
+ if (picname && picname[0])
{
- Con_Printf("DrawQ_PicTranslate: image larger than 4k buffer\n");
- return;
+ pic = Draw_CachePic(picname);
+ if (width == 0)
+ width = pic->width;
+ if (height == 0)
+ height = pic->height;
+ mesh.texture = pic->tex;
}
-
- for (i = 0;i < c;i++)
- trans[i] = d_8to24table[translation[menuplyr_pixels[i]]];
-
- // FIXME: this is renderer stuff?
- R_UpdateTexture (pic->tex, (byte *)trans);
-
- DrawQ_Pic(x, y, picname, 0, 0, 1, 1, 1, 1, 0);
+ mesh.numtriangles = 2;
+ mesh.numvertices = 4;
+ mesh.element3i = picelements;
+ mesh.vertex3f = floats;
+ mesh.texcoord2f = floats + 12;
+ mesh.color4f = floats + 20;
+ memset(floats, 0, sizeof(floats));
+ mesh.vertex3f[0] = mesh.vertex3f[9] = x;
+ mesh.vertex3f[1] = mesh.vertex3f[4] = y;
+ mesh.vertex3f[3] = mesh.vertex3f[6] = x + width;
+ mesh.vertex3f[7] = mesh.vertex3f[10] = y + height;
+ mesh.texcoord2f[0] = s1;mesh.texcoord2f[1] = t1;mesh.color4f[ 0] = r1;mesh.color4f[ 1] = g1;mesh.color4f[ 2] = b1;mesh.color4f[ 3] = a1;
+ mesh.texcoord2f[2] = s2;mesh.texcoord2f[3] = t2;mesh.color4f[ 4] = r2;mesh.color4f[ 5] = g2;mesh.color4f[ 6] = b2;mesh.color4f[ 7] = a2;
+ mesh.texcoord2f[4] = s4;mesh.texcoord2f[5] = t4;mesh.color4f[ 8] = r4;mesh.color4f[ 9] = g4;mesh.color4f[10] = b4;mesh.color4f[11] = a4;
+ mesh.texcoord2f[6] = s3;mesh.texcoord2f[7] = t3;mesh.color4f[12] = r3;mesh.color4f[13] = g3;mesh.color4f[14] = b3;mesh.color4f[15] = a3;
+ DrawQ_Mesh (&mesh, flags);
}
+void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
+{
+ int size;
+ void *p;
+ drawqueue_t *dq;
+ drawqueuemesh_t *m;
+ size = sizeof(*dq);
+ size += sizeof(drawqueuemesh_t);
+ size += sizeof(int[3]) * mesh->numtriangles;
+ size += sizeof(float[3]) * mesh->numvertices;
+ size += sizeof(float[2]) * mesh->numvertices;
+ size += sizeof(float[4]) * mesh->numvertices;
+ if (r_refdef.drawqueuesize + size > r_refdef.maxdrawqueuesize)
+ return;
+ dq = (void *)(r_refdef.drawqueue + r_refdef.drawqueuesize);
+ dq->size = size;
+ dq->command = DRAWQUEUE_MESH;
+ dq->flags = flags;
+ dq->color = 0;
+ dq->x = 0;
+ dq->y = 0;
+ dq->scalex = 0;
+ dq->scaley = 0;
+ p = (void *)(dq + 1);
+ m = p;(qbyte *)p += sizeof(drawqueuemesh_t);
+ m->numtriangles = mesh->numtriangles;
+ m->numvertices = mesh->numvertices;
+ m->texture = mesh->texture;
+ m->element3i = p;memcpy(m->element3i , mesh->element3i , m->numtriangles * sizeof(int[3]));(qbyte *)p += m->numtriangles * sizeof(int[3]);
+ m->vertex3f = p;memcpy(m->vertex3f , mesh->vertex3f , m->numvertices * sizeof(float[3]));(qbyte *)p += m->numvertices * sizeof(float[3]);
+ m->texcoord2f = p;memcpy(m->texcoord2f, mesh->texcoord2f, m->numvertices * sizeof(float[2]));(qbyte *)p += m->numvertices * sizeof(float[2]);
+ m->color4f = p;memcpy(m->color4f , mesh->color4f , m->numvertices * sizeof(float[4]));(qbyte *)p += m->numvertices * sizeof(float[4]);
+ r_refdef.drawqueuesize += dq->size;
+}
/*
====================
r_refdef.x = bound(0, r_refdef.x, vid.realwidth - r_refdef.width) + vid.realx;
r_refdef.y = bound(0, r_refdef.y, vid.realheight - r_refdef.height) + vid.realy;
- r_refdef.fov_x = scr_fov.value;
+ // 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);
if (cl.worldmodel)
{
Mod_CheckLoaded(cl.worldmodel);
- contents = Mod_PointInLeaf(r_refdef.vieworg, cl.worldmodel)->contents;
+ contents = Mod_PointContents(r_refdef.vieworg, cl.worldmodel);
if (contents != CONTENTS_EMPTY && contents != CONTENTS_SOLID)
{
- r_refdef.fov_x *= (sin(cl.time * 4.7) * 0.03 + 0.97);
- r_refdef.fov_y *= (sin(cl.time * 3.0) * 0.03 + 0.97);
+ r_refdef.fov_x *= (sin(cl.time * 4.7) * 0.015 + 0.985);
+ r_refdef.fov_y *= (sin(cl.time * 3.0) * 0.015 + 0.985);
}
}
}
+/*
+==================
+SCR_ScreenShot_f
+==================
+*/
+void SCR_ScreenShot_f (void)
+{
+ static int i = 0;
+ char filename[16];
+ char checkname[MAX_OSPATH];
+//
+// find a file name to save it to
+//
+ for (; i<=9999 ; i++)
+ {
+ sprintf (filename, "dp%04i.tga", i);
+ sprintf (checkname, "%s/%s", fs_gamedir, filename);
+ if (!FS_SysFileExists(checkname))
+ break;
+ }
+ if (i==10000)
+ {
+ Con_Printf ("SCR_ScreenShot_f: Couldn't create a TGA file\n");
+ return;
+ }
-void V_CalcRefdef (void);
+ if (SCR_ScreenShot(filename, vid.realx, vid.realy, vid.realwidth, vid.realheight))
+ Con_Printf ("Wrote %s\n", filename);
+ else
+ Con_Printf ("unable to write %s\n", filename);
+}
+
+static int cl_avidemo_frame = 0;
+
+void SCR_CaptureAVIDemo(void)
+{
+ char filename[32];
+ sprintf(filename, "dpavi%06d.tga", cl_avidemo_frame);
+ if (SCR_ScreenShot(filename, vid.realx, vid.realy, vid.realwidth, vid.realheight))
+ cl_avidemo_frame++;
+ else
+ {
+ Cvar_SetValueQuick(&cl_avidemo, 0);
+ Con_Printf("avi saving failed on frame %i, out of disk space? stopping avi demo catpure.\n", cl_avidemo_frame);
+ cl_avidemo_frame = 0;
+ }
+}
+
+/*
+===============
+R_Envmap_f
+
+Grab six views for environment mapping tests
+===============
+*/
+struct
+{
+ float angles[3];
+ char *name;
+}
+envmapinfo[6] =
+{
+ {{ 0, 0, 0}, "ft"},
+ {{ 0, 90, 0}, "rt"},
+ {{ 0, 180, 0}, "bk"},
+ {{ 0, 270, 0}, "lf"},
+ {{-90, 90, 0}, "up"},
+ {{ 90, 90, 0}, "dn"}
+};
+
+static void R_Envmap_f (void)
+{
+ int j, size;
+ char filename[256], basename[256];
+
+ if (Cmd_Argc() != 3)
+ {
+ Con_Printf ("envmap <basename> <size>: save out 6 cubic environment map images, usable with loadsky, note that size must one of 128, 256, 512, or 1024 and can't be bigger than your current resolution\n");
+ return;
+ }
+
+ strcpy(basename, Cmd_Argv(1));
+ size = atoi(Cmd_Argv(2));
+ if (size != 128 && size != 256 && size != 512 && size != 1024)
+ {
+ Con_Printf("envmap: size must be one of 128, 256, 512, or 1024\n");
+ return;
+ }
+ if (size > vid.realwidth || size > vid.realheight)
+ {
+ Con_Printf("envmap: your resolution is not big enough to render that size\n");
+ return;
+ }
+
+ envmap = true;
+
+ r_refdef.x = 0;
+ r_refdef.y = 0;
+ r_refdef.width = size;
+ r_refdef.height = size;
+
+ r_refdef.fov_x = 90;
+ r_refdef.fov_y = 90;
+
+ for (j = 0;j < 6;j++)
+ {
+ sprintf(filename, "env/%s%s.tga", basename, envmapinfo[j].name);
+ VectorCopy(envmapinfo[j].angles, r_refdef.viewangles);
+ R_ClearScreen();
+ R_RenderView ();
+ SCR_ScreenShot(filename, vid.realx, vid.realy, size, size);
+ }
+
+ envmap = false;
+}
//=============================================================================
void SHOWLMP_decodehide(void)
{
int i;
- byte *lmplabel;
+ qbyte *lmplabel;
lmplabel = MSG_ReadString();
for (i = 0;i < SHOWLMP_MAXLABELS;i++)
if (showlmp[i].isactive && strcmp(showlmp[i].label, lmplabel) == 0)
void SHOWLMP_decodeshow(void)
{
int i, k;
- byte lmplabel[256], picname[256];
+ qbyte lmplabel[256], picname[256];
float x, y;
strcpy(lmplabel,MSG_ReadString());
strcpy(picname, MSG_ReadString());
void SHOWLMP_drawall(void)
{
int i;
- if (cl.worldmodel)
- for (i = 0;i < SHOWLMP_MAXLABELS;i++)
- if (showlmp[i].isactive)
- DrawQ_Pic(showlmp[i].x, showlmp[i].y, showlmp[i].pic, 0, 0, 1, 1, 1, 1, 0);
+ for (i = 0;i < SHOWLMP_MAXLABELS;i++)
+ if (showlmp[i].isactive)
+ DrawQ_Pic(showlmp[i].x, showlmp[i].y, showlmp[i].pic, 0, 0, 1, 1, 1, 1, 0);
}
void SHOWLMP_clear(void)
showlmp[i].isactive = false;
}
-void CL_UpdateScreen(void)
+void CL_SetupScreenSize(void)
{
static float old2dresolution = -1;
- if (scr_disabled_for_loading)
- return;
-
- if (!scr_initialized || !con_initialized)
- return; // not initialized yet
-
- R_TimeReport("other");
-
VID_GetWindowSize (&vid.realx, &vid.realy, &vid.realwidth, &vid.realheight);
VID_UpdateGamma(false);
// determine size of refresh window
SCR_CalcRefdef();
+}
- DrawQ_Clear();
-
- V_UpdateBlends();
- V_CalcRefdef ();
+extern void R_Shadow_EditLights_DrawSelectedLightProperties(void);
+void CL_UpdateScreen(void)
+{
+ if (!scr_initialized || !con_initialized || vid_hidden)
+ return; // not initialized yet
- R_TimeReport("setup");
+ if (cl_avidemo.integer)
+ SCR_CaptureAVIDemo();
+ else
+ cl_avidemo_frame = 0;
- SCR_DrawRam();
- SCR_DrawNet();
- SCR_DrawTurtle();
- SCR_DrawPause();
- SCR_CheckDrawCenterString();
- Sbar_Draw();
- SHOWLMP_drawall();
+ if (cls.signon == SIGNONS)
+ R_TimeReport("other");
- SCR_DrawConsole();
+ CL_SetupScreenSize();
- ui_draw();
+ DrawQ_Clear();
- R_TimeReport("2d");
+ V_UpdateBlends();
+ V_CalcRefdef ();
- // add r_speeds text to queue
- R_TimeReport_End();
+ if (cls.signon == SIGNONS)
+ R_TimeReport("setup");
- // start a new timing run
- R_TimeReport_Start();
+ //FIXME: force menu if nothing else to look at?
+ //if (key_dest == key_game && cls.signon != SIGNONS && cls.state == ca_disconnected)
- // make menu fade everything else on the screen
- M_Draw();
+ if (scr_drawloading)
+ {
+ scr_drawloading = false;
+ SCR_DrawLoading();
+ }
+ else
+ {
+ if (cls.signon == SIGNONS)
+ {
+ SCR_DrawNet ();
+ SCR_DrawTurtle ();
+ SCR_DrawPause ();
+ Sbar_Draw();
+ SHOWLMP_drawall();
+ SCR_CheckDrawCenterString();
+ }
+ ui_draw();
+ CL_DrawVideo();
+ M_Draw();
+ if (cls.signon == SIGNONS)
+ {
+ R_TimeReport("2d");
+ R_TimeReport_End();
+ R_TimeReport_Start();
+ }
+ R_Shadow_EditLights_DrawSelectedLightProperties();
+ }
+ SCR_DrawConsole();
SCR_UpdateScreen();
}
{
SHOWLMP_clear();
}
+
projects / xonotic / darkplaces.git / blobdiff