X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_demo.c;h=580125b2d925b7a43fb3dd3ae91767a6bef60a89;hb=a3a9fdaf8edba37e4c895b2f10926481c46916a0;hp=78f14fe21a9740f790a91e1a7792450808af23ac;hpb=8ee2396ccf926ee8221f533dd930e016d41c0755;p=xonotic%2Fdarkplaces.git diff --git a/cl_demo.c b/cl_demo.c index 78f14fe2..580125b2 100644 --- a/cl_demo.c +++ b/cl_demo.c @@ -20,6 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" +extern cvar_t cl_capturevideo; +int old_vsync = 0; + void CL_FinishTimeDemo (void); /* @@ -44,7 +47,7 @@ Called to play the next demo in the demo loop */ void CL_NextDemo (void) { - char str[1024]; + char str[MAX_INPUTLINE]; if (cls.demonum == -1) return; // don't play demos @@ -54,13 +57,13 @@ void CL_NextDemo (void) cls.demonum = 0; if (!cls.demos[cls.demonum][0]) { - Con_Printf ("No demos listed with startdemos\n"); + Con_Print("No demos listed with startdemos\n"); cls.demonum = -1; return; } } - sprintf (str,"playdemo %s\n", cls.demos[cls.demonum]); + dpsnprintf (str, sizeof(str), "playdemo %s\n", cls.demos[cls.demonum]); Cbuf_InsertText (str); cls.demonum++; } @@ -84,6 +87,10 @@ void CL_StopPlayback (void) if (cls.timedemo) CL_FinishTimeDemo (); + + if (COM_CheckParm("-demo") || COM_CheckParm("-capturedemo")) + Host_Quit_f(); + } /* @@ -93,7 +100,7 @@ CL_WriteDemoMessage 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; @@ -102,15 +109,14 @@ void CL_WriteDemoMessage (void) 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_Flush (cls.demofile); + FS_Write (cls.demofile, message->data, message->cursize); } /* @@ -132,7 +138,7 @@ void CL_ReadDemoMessage(void) if (cls.demopaused) return; - while (1) + for (;;) { // decide if it is time to grab the next message // always grab until fully connected @@ -140,23 +146,38 @@ void CL_ReadDemoMessage(void) { if (cls.timedemo) { - if (host_framecount == cls.td_lastframe) - { - // already read this frame's message - return; - } - if (cls.td_lastframe == -1) - { - // we start counting on the second frame - // (after parsing connection stuff) - cls.td_startframe = host_framecount + 1; - } - cls.td_lastframe = host_framecount; + cls.td_frames++; + cls.td_onesecondframes++; // 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) + if (cls.td_frames == 0) + { cls.td_starttime = realtime; + cls.td_onesecondnexttime = cl.time + 1; + cls.td_onesecondrealtime = realtime; + cls.td_onesecondframes = 0; + cls.td_onesecondminfps = 0; + cls.td_onesecondmaxfps = 0; + cls.td_onesecondavgfps = 0; + cls.td_onesecondavgcount = 0; + } + if (cl.time >= cls.td_onesecondnexttime) + { + double fps = cls.td_onesecondframes / (realtime - cls.td_onesecondrealtime); + if (cls.td_onesecondavgcount == 0) + { + cls.td_onesecondminfps = fps; + cls.td_onesecondmaxfps = fps; + } + cls.td_onesecondrealtime = realtime; + cls.td_onesecondminfps = min(cls.td_onesecondminfps, fps); + cls.td_onesecondmaxfps = max(cls.td_onesecondmaxfps, fps); + cls.td_onesecondavgfps += fps; + cls.td_onesecondavgcount++; + cls.td_onesecondframes = 0; + cls.td_onesecondnexttime++; + } } else if (cl.time <= cl.mtime[0]) { @@ -168,19 +189,32 @@ void CL_ReadDemoMessage(void) // get the next message FS_Read(cls.demofile, &net_message.cursize, 4); net_message.cursize = LittleLong(net_message.cursize); + if(net_message.cursize & DEMOMSG_CLIENT_TO_SERVER) // This is a client->server message! Ignore for now! + { + // skip over demo packet + FS_Seek(cls.demofile, 12 + (net_message.cursize & (~DEMOMSG_CLIENT_TO_SERVER)), SEEK_CUR); + continue; + } if (net_message.cursize > net_message.maxsize) Host_Error("Demo message (%i) > net_message.maxsize (%i)", net_message.cursize, net_message.maxsize); VectorCopy(cl.mviewangles[0], cl.mviewangles[1]); for (i = 0;i < 3;i++) { - r = FS_Read(cls.demofile, &f, 4); + r = (int)FS_Read(cls.demofile, &f, 4); cl.mviewangles[0][i] = LittleFloat(f); } - if (FS_Read(cls.demofile, net_message.data, net_message.cursize) == (size_t)net_message.cursize) + if (FS_Read(cls.demofile, net_message.data, net_message.cursize) == net_message.cursize) { MSG_BeginReading(); CL_ParseServerMessage(); + + // In case the demo contains a "svc_disconnect" message + if (!cls.demoplayback) + return; + + if (cls.timedemo) + return; } else { @@ -200,25 +234,28 @@ stop recording a demo */ void CL_Stop_f (void) { - if (cmd_source != src_command) - return; + sizebuf_t buf; + unsigned char bufdata[64]; if (!cls.demorecording) { - Con_Printf ("Not recording a demo.\n"); + Con_Print("Not recording a demo.\n"); return; } // 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); cls.demofile = NULL; cls.demorecording = false; - Con_Printf ("Completed demo\n"); + Con_Print("Completed demo\n"); } /* @@ -233,33 +270,33 @@ void CL_Record_f (void) int c, track; char name[MAX_OSPATH]; - if (cmd_source != src_command) - return; - c = Cmd_Argc(); if (c != 2 && c != 3 && c != 4) { - Con_Printf ("record [ [cd track]]\n"); + Con_Print("record [ [cd track]]\n"); return; } if (strstr(Cmd_Argv(1), "..")) { - Con_Printf ("Relative pathnames are not allowed.\n"); + Con_Print("Relative pathnames are not allowed.\n"); return; } if (c == 2 && cls.state == ca_connected) { - Con_Printf("Can not record - already connected to server\nClient demo recording must be started before connecting\n"); + Con_Print("Can not record - already connected to server\nClient demo recording must be started before connecting\n"); return; } + if (cls.state == ca_connected) + CL_Disconnect(); + // write the forced cd track number, or -1 if (c == 4) { track = atoi(Cmd_Argv(3)); - Con_Printf ("Forcing CD track to %i\n", cls.forcetrack); + Con_Printf("Forcing CD track to %i\n", cls.forcetrack); } else track = -1; @@ -273,16 +310,16 @@ void CL_Record_f (void) Cmd_ExecuteString ( va("map %s", Cmd_Argv(2)), src_command); // open the demo file - Con_Printf ("recording to %s.\n", name); - cls.demofile = FS_Open (name, "wb", false); + Con_Printf("recording to %s.\n", name); + cls.demofile = FS_Open (name, "wb", false, false); if (!cls.demofile) { - Con_Printf ("ERROR: couldn't open.\n"); + Con_Print("ERROR: couldn't open.\n"); return; } cls.forcetrack = track; - FS_Printf (cls.demofile, "%i\n", cls.forcetrack); + FS_Printf(cls.demofile, "%i\n", cls.forcetrack); cls.demorecording = true; } @@ -297,40 +334,38 @@ play [demoname] */ void CL_PlayDemo_f (void) { - char name[256]; + char name[MAX_QPATH]; int c; qboolean neg = false; - if (cmd_source != src_command) - return; - if (Cmd_Argc() != 2) { - Con_Printf ("play : plays a demo\n"); + Con_Print("play : plays a demo\n"); return; } // disconnect from server CL_Disconnect (); + 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); + Con_Printf("Playing demo %s.\n", name); + cls.demofile = FS_Open (name, "rb", false, false); if (!cls.demofile) { - Con_Printf ("ERROR: couldn't open.\n"); + Con_Print("ERROR: couldn't open.\n"); cls.demonum = -1; // stop demo loop return; } - SCR_BeginLoadingPlaque (); - + strlcpy(cls.demoname, name, sizeof(cls.demoname)); cls.demoplayback = true; cls.state = ca_connected; cls.forcetrack = 0; @@ -353,18 +388,23 @@ CL_FinishTimeDemo */ void CL_FinishTimeDemo (void) { - int frames; - double time; // LordHavoc: changed timedemo accuracy to double + int frames; + 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; + frames = cls.td_frames; time = realtime - cls.td_starttime; - if (!time) - time = 1; - // LordHavoc: timedemo now prints out 7 digits of fraction - Con_Printf ("%i frames %5.7f seconds %5.7f fps\n", frames, time, frames/time); + totalfpsavg = time > 0 ? frames / time : 0; + fpsmin = cls.td_onesecondminfps; + fpsavg = cls.td_onesecondavgcount ? cls.td_onesecondavgfps / cls.td_onesecondavgcount : 0; + fpsmax = cls.td_onesecondmaxfps; + // LordHavoc: timedemo now prints out 7 digits of fraction, and min/avg/max + Con_Printf("%i frames %5.7f seconds %5.7f fps, one-second fps min/avg/max: %.0f %.0f %.0f (%i seconds)\n", frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax, cls.td_onesecondavgcount); + Log_Printf("benchmark.log", "date %s | enginedate %s | demo %s | commandline %s | result %i frames %5.7f seconds %5.7f fps, one-second fps min/avg/max: %.0f %.0f %.0f (%i seconds)\n", Sys_TimeString("%Y-%m-%d %H:%M:%S"), buildstring, cls.demoname, cmdline.string, frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax, cls.td_onesecondavgcount); + if (COM_CheckParm("-benchmark")) + Host_Quit_f(); } /* @@ -376,15 +416,14 @@ timedemo [demoname] */ void CL_TimeDemo_f (void) { - if (cmd_source != src_command) - return; - if (Cmd_Argc() != 2) { - Con_Printf ("timedemo : gets demo speeds\n"); + Con_Print("timedemo : 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 @@ -393,11 +432,11 @@ void CL_TimeDemo_f (void) // instantly hide console and deactivate it key_dest = key_game; key_consoleactive = 0; - scr_conlines = 0; scr_con_current = 0; cls.timedemo = true; - // get first message this frame - cls.td_lastframe = -1; + cls.td_frames = -2; // skip the first frame + cls.demonum = -1; // stop demo loop + cls.demonum = -1; // stop demo loop }