#include "quakedef.h"
+extern cvar_t cl_capturevideo;
int old_vsync = 0;
void CL_FinishTimeDemo (void);
if (cls.timedemo)
CL_FinishTimeDemo ();
- if (COM_CheckParm("-demo") || COM_CheckParm("-demolooponly"))
+ if (COM_CheckParm("-demo") || COM_CheckParm("-capturedemo"))
Host_Quit_f();
}
Dumps the current net message, prefixed by the length and view angles
====================
*/
-void CL_WriteDemoMessage (void)
+void CL_WriteDemoMessage (sizebuf_t *message)
{
int len;
int i;
if (cls.demopaused) // LordHavoc: pausedemo
return;
- len = LittleLong (net_message.cursize);
+ len = LittleLong (message->cursize);
FS_Write (cls.demofile, &len, 4);
for (i=0 ; i<3 ; i++)
{
f = LittleFloat (cl.viewangles[i]);
FS_Write (cls.demofile, &f, 4);
}
- FS_Write (cls.demofile, net_message.data, net_message.cursize);
+ FS_Write (cls.demofile, message->data, message->cursize);
}
/*
}
if (cls.td_lastframe == -1)
{
- // we start counting on the second frame
- // (after parsing connection stuff)
- cls.td_startframe = host_framecount + 1;
+ // render a couple frames before we start counting
+ cls.td_startframe = host_framecount + 3;
}
cls.td_lastframe = host_framecount;
+ cls.td_onesecondframes++;
+ // don't read any new messages during the warm-up period
+ if (host_framecount < cls.td_startframe)
+ return;
// if this is the first official frame we can now grab the real
// td_starttime so the bogus time on the first frame doesn't
// count against the final report
if (host_framecount == cls.td_startframe)
+ {
cls.td_starttime = realtime;
- if (host_framecount > cls.td_startframe + 2)
+ cls.td_onesecondnexttime = realtime + 1;
+ cls.td_onesecondframes = 0;
+ cls.td_onesecondminframes = 0;
+ cls.td_onesecondmaxframes = 0;
+ cls.td_onesecondavgframes = 0;
+ cls.td_onesecondavgcount = 0;
+ }
+ if (realtime >= cls.td_onesecondnexttime)
{
- cls.td_minframetime = min(cls.td_minframetime, host_realframetime);
- cls.td_maxframetime = max(cls.td_maxframetime, host_realframetime);
+ if (cls.td_onesecondavgcount == 0)
+ {
+ cls.td_onesecondminframes = cls.td_onesecondframes;
+ cls.td_onesecondmaxframes = cls.td_onesecondframes;
+ }
+ cls.td_onesecondminframes = min(cls.td_onesecondminframes, cls.td_onesecondframes);
+ cls.td_onesecondmaxframes = max(cls.td_onesecondmaxframes, cls.td_onesecondframes);
+ cls.td_onesecondavgframes += cls.td_onesecondframes;
+ cls.td_onesecondavgcount++;
+ cls.td_onesecondframes = 0;
+ cls.td_onesecondnexttime++;
}
- else
- cls.td_minframetime = cls.td_maxframetime = host_realframetime;
}
else if (cl.time <= cl.mtime[0])
{
*/
void CL_Stop_f (void)
{
- if (cmd_source != src_command)
- return;
+ sizebuf_t buf;
+ unsigned char bufdata[64];
if (!cls.demorecording)
{
}
// write a disconnect message to the demo file
- SZ_Clear (&net_message);
- MSG_WriteByte (&net_message, svc_disconnect);
- CL_WriteDemoMessage ();
+ // LordHavoc: don't replace the net_message when doing this
+ buf.data = bufdata;
+ buf.maxsize = sizeof(bufdata);
+ SZ_Clear(&buf);
+ MSG_WriteByte(&buf, svc_disconnect);
+ CL_WriteDemoMessage(&buf);
// finish up
FS_Close (cls.demofile);
int c, track;
char name[MAX_OSPATH];
- if (cmd_source != src_command)
- return;
-
c = Cmd_Argc();
if (c != 2 && c != 3 && c != 4)
{
return;
}
+ if (cls.state == ca_connected)
+ CL_Disconnect();
+
// write the forced cd track number, or -1
if (c == 4)
{
int c;
qboolean neg = false;
- if (cmd_source != src_command)
- return;
-
if (Cmd_Argc() != 2)
{
Con_Print("play <demoname> : plays a demo\n");
// disconnect from server
CL_Disconnect ();
- Host_ShutdownServer (false);
+ Host_ShutdownServer ();
// update networking ports (this is mainly just needed at startup)
- NetConn_ClientFrame();
+ NetConn_UpdateSockets();
// open the demo file
strlcpy (name, Cmd_Argv(1), sizeof (name));
FS_DefaultExtension (name, ".dem", sizeof (name));
+ cls.protocol = PROTOCOL_QUAKE;
Con_Printf("Playing demo from %s.\n", name);
cls.demofile = FS_Open (name, "rb", false, false);
void CL_FinishTimeDemo (void)
{
int frames;
- double time; // LordHavoc: changed timedemo accuracy to double
+ double time, totalfpsavg;
double fpsmin, fpsavg, fpsmax; // report min/avg/max fps
cls.timedemo = false;
// the first frame didn't count
frames = (host_framecount - cls.td_startframe) - 1;
time = realtime - cls.td_starttime;
- fpsmin = cls.td_maxframetime > 0 ? 1.0 / cls.td_maxframetime : 0;
- fpsavg = time > 0 ? frames / time : 0;
- fpsmax = cls.td_minframetime > 0 ? 1.0 / cls.td_minframetime : 0;
+ totalfpsavg = time > 0 ? frames / time : 0;
+ fpsmin = cls.td_onesecondminframes;
+ fpsavg = cls.td_onesecondavgcount ? cls.td_onesecondavgframes / cls.td_onesecondavgcount : 0;
+ fpsmax = cls.td_onesecondmaxframes;
// LordHavoc: timedemo now prints out 7 digits of fraction, and min/avg/max
- Con_Printf("%i frames %5.7f seconds %5.7f fps\nmin/avg/max: %5.7f/%5.7f/%5.7f\n", frames, time, fpsavg, fpsmin, fpsavg, fpsmax);
- Log_Printf("benchmark.log", "date %s | enginedate %s | demo %s | commandline %s | result %i frames %5.7f seconds %5.7f fps min/avg/max: %5.7f/%5.7f/%5.7f\n", Sys_TimeString("%Y-%m-%d %H:%M:%S"), buildstring, cls.demoname, cmdline.string, frames, time, fpsavg, fpsmin, fpsavg, fpsmax);
+ Con_Printf("%i frames %5.7f seconds %5.7f fps, one-second min/avg/max: %.0f %.0f %.0f\n", frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax);
+ Log_Printf("benchmark.log", "date %s | enginedate %s | demo %s | commandline %s | result %i frames %5.7f seconds %5.7f fps, one-second min/avg/max: %.0f %.0f %.0f\n", Sys_TimeString("%Y-%m-%d %H:%M:%S"), buildstring, cls.demoname, cmdline.string, frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax);
if (COM_CheckParm("-benchmark"))
Host_Quit_f();
}
*/
void CL_TimeDemo_f (void)
{
- if (cmd_source != src_command)
- return;
-
if (Cmd_Argc() != 2)
{
Con_Print("timedemo <demoname> : gets demo speeds\n");
return;
}
+ srand(0); // predictable random sequence for benchmarking
+
CL_PlayDemo_f ();
// cls.td_starttime will be grabbed at the second frame of the demo, so
projects / xonotic / darkplaces.git / blobdiff