X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_screen.c;h=ebff6f5315d9360968211b6017e6d5f31a47eaa0;hb=56619d1466eae24fdfc16a47dfbdbb1dd15c36ee;hp=613ef990e3e1447cd434a30e28b3427f6e77d900;hpb=dcfd91cf606568faf86a1826496f9f86927c45af;p=xonotic%2Fdarkplaces.git

diff --git a/cl_screen.c b/cl_screen.c
index 613ef990..ebff6f53 100644
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -51,6 +51,7 @@ cvar_t scr_screenshot_png = {CVAR_SAVE, "scr_screenshot_png","0", "save png inst
 cvar_t scr_screenshot_gammaboost = {CVAR_SAVE, "scr_screenshot_gammaboost","1", "gamma correction on saved screenshots and videos, 1.0 saves unmodified images"};
 cvar_t scr_screenshot_hwgamma = {CVAR_SAVE, "scr_screenshot_hwgamma","1", "apply the video gamma ramp to saved screenshots and videos"};
 cvar_t scr_screenshot_alpha = {CVAR_SAVE, "scr_screenshot_alpha","0", "try to write an alpha channel to screenshots (debugging feature)"};
+cvar_t scr_screenshot_timestamp = {CVAR_SAVE, "scr_screenshot_timestamp", "1", "use a timestamp based number of the type YYYYMMDDHHMMSSsss instead of sequential numbering"};
 // scr_screenshot_name is defined in fs.c
 cvar_t cl_capturevideo = {0, "cl_capturevideo", "0", "enables saving of video to a .avi file using uncompressed I420 colorspace and PCM audio, note that scr_screenshot_gammaboost affects the brightness of the output)"};
 cvar_t cl_capturevideo_printfps = {CVAR_SAVE, "cl_capturevideo_printfps", "1", "prints the frames per second captured in capturevideo (is only written to the log file, not to the console, as that would be visible on the video)"};
@@ -935,6 +936,7 @@ void CL_Screen_Init(void)
 	Cvar_RegisterVariable (&scr_screenshot_hwgamma);
 	Cvar_RegisterVariable (&scr_screenshot_name_in_mapdir);
 	Cvar_RegisterVariable (&scr_screenshot_alpha);
+	Cvar_RegisterVariable (&scr_screenshot_timestamp);
 	Cvar_RegisterVariable (&cl_capturevideo);
 	Cvar_RegisterVariable (&cl_capturevideo_printfps);
 	Cvar_RegisterVariable (&cl_capturevideo_width);
@@ -966,6 +968,10 @@ void CL_Screen_Init(void)
 	Cvar_RegisterVariable(&vid_touchscreen_outlinealpha);
 	Cvar_RegisterVariable(&vid_touchscreen_overlayalpha);
 
+	// if we want no console, turn it off here too
+	if (COM_CheckParm ("-noconsole"))
+		Cvar_SetQuick(&scr_conforcewhiledisconnected, "0");
+
 	Cmd_AddCommand ("sizeup",SCR_SizeUp_f, "increase view size (increases viewsize cvar)");
 	Cmd_AddCommand ("sizedown",SCR_SizeDown_f, "decrease view size (decreases viewsize cvar)");
 	Cmd_AddCommand ("screenshot",SCR_ScreenShot_f, "takes a screenshot of the next rendered frame");
@@ -1019,14 +1025,41 @@ void SCR_ScreenShot_f (void)
 			return;
 		}
 	}
+	else if (scr_screenshot_timestamp.integer)
+	{
+		int shotnumber100;
+
+		// TODO maybe make capturevideo and screenshot use similar name patterns?
+		if (scr_screenshot_name_in_mapdir.integer && cl.worldbasename[0])
+			dpsnprintf(prefix_name, sizeof(prefix_name), "%s/%s%s", cl.worldbasename, scr_screenshot_name.string, Sys_TimeString("%Y%m%d%H%M%S"));
+		else
+			dpsnprintf(prefix_name, sizeof(prefix_name), "%s%s", scr_screenshot_name.string, Sys_TimeString("%Y%m%d%H%M%S"));
+
+		// find a file name to save it to
+		for (shotnumber100 = 0;shotnumber100 < 100;shotnumber100++)
+			if (!FS_SysFileExists(va("%s/screenshots/%s-%02d.tga", fs_gamedir, prefix_name, shotnumber100))
+			 && !FS_SysFileExists(va("%s/screenshots/%s-%02d.jpg", fs_gamedir, prefix_name, shotnumber100))
+			 && !FS_SysFileExists(va("%s/screenshots/%s-%02d.png", fs_gamedir, prefix_name, shotnumber100)))
+				break;
+		if (shotnumber100 >= 100)
+		{
+			Con_Print("Couldn't create the image file - already 100 shots taken this second!\n");
+			return;
+		}
+
+		dpsnprintf(filename, sizeof(filename), "screenshots/%s-%02d.%s", prefix_name, shotnumber100, jpeg ? "jpg" : png ? "png" : "tga");
+	}
 	else
 	{
 		// TODO maybe make capturevideo and screenshot use similar name patterns?
 		if (scr_screenshot_name_in_mapdir.integer && cl.worldbasename[0])
-			dpsnprintf (prefix_name, sizeof(prefix_name), "%s/%s", cl.worldbasename, Sys_TimeString(scr_screenshot_name.string));
+			dpsnprintf(prefix_name, sizeof(prefix_name), "%s/%s", cl.worldbasename, Sys_TimeString(scr_screenshot_name.string));
 		else
-			dpsnprintf (prefix_name, sizeof(prefix_name), "%s", Sys_TimeString(scr_screenshot_name.string));
+			dpsnprintf(prefix_name, sizeof(prefix_name), "%s", Sys_TimeString(scr_screenshot_name.string));
 
+		// if prefix changed, gamedir or map changed, reset the shotnumber so
+		// we scan again
+		// FIXME: should probably do this whenever FS_Rescan or something like that occurs?
 		if (strcmp(old_prefix_name, prefix_name))
 		{
 			dpsnprintf(old_prefix_name, sizeof(old_prefix_name), "%s", prefix_name );
@@ -1035,15 +1068,19 @@ void SCR_ScreenShot_f (void)
 
 		// find a file name to save it to
 		for (;shotnumber < 1000000;shotnumber++)
-			if (!FS_SysFileExists(va("%s/screenshots/%s%06d.tga", fs_gamedir, prefix_name, shotnumber)) && !FS_SysFileExists(va("%s/screenshots/%s%06d.jpg", fs_gamedir, prefix_name, shotnumber)) && !FS_SysFileExists(va("%s/screenshots/%s%06d.png", fs_gamedir, prefix_name, shotnumber)))
+			if (!FS_SysFileExists(va("%s/screenshots/%s%06d.tga", fs_gamedir, prefix_name, shotnumber))
+			 && !FS_SysFileExists(va("%s/screenshots/%s%06d.jpg", fs_gamedir, prefix_name, shotnumber))
+			 && !FS_SysFileExists(va("%s/screenshots/%s%06d.png", fs_gamedir, prefix_name, shotnumber)))
 				break;
 		if (shotnumber >= 1000000)
 		{
-			Con_Print("Couldn't create the image file\n");
+			Con_Print("Couldn't create the image file - you already have 1000000 screenshots!\n");
 			return;
 		}
 
 		dpsnprintf(filename, sizeof(filename), "screenshots/%s%06d.%s", prefix_name, shotnumber, jpeg ? "jpg" : png ? "png" : "tga");
+
+		shotnumber++;
 	}
 
 	buffer1 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 4);
@@ -1066,8 +1103,6 @@ void SCR_ScreenShot_f (void)
 
 	Mem_Free (buffer1);
 	Mem_Free (buffer2);
-
-	shotnumber++;
 }
 
 void SCR_CaptureVideo_BeginVideo(void)
@@ -1608,17 +1643,16 @@ static void SCR_DrawTouchscreenOverlay(void)
 	}
 }
 
-extern void R_UpdateFogColor(void);
+extern void R_UpdateFog(void);
 void R_ClearScreen(qboolean fogcolor)
 {
 	float clearcolor[4];
 	// clear to black
 	Vector4Clear(clearcolor);
-	if (fogcolor)
+	if (fogcolor && r_fog_clear.integer)
 	{
-		R_UpdateFogColor();
-		if (r_fog_clear.integer)
-			VectorCopy(r_refdef.fogcolor, clearcolor);
+		R_UpdateFog();
+		VectorCopy(r_refdef.fogcolor, clearcolor);
 	}
 	// clear depth is 1.0
 	// LordHavoc: we use a stencil centered around 128 instead of 0,
@@ -2006,7 +2040,7 @@ static void SCR_DrawLoadingStack(void)
 		sscanf(scr_loadingscreen_barcolor.string, "%f %f %f", &colors[12], &colors[13], &colors[14]);  colors[15] = 1;
 
 		R_Mesh_PrepareVertices_Generic_Arrays(4, verts, colors, NULL);
-		R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
+		R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1, true, true);
 		R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
 
 		// make sure everything is cleared, including the progress indicator
@@ -2105,11 +2139,11 @@ static void SCR_DrawLoadingScreen (qboolean clear)
 	if(loadingscreentexture)
 	{
 		R_Mesh_PrepareVertices_Generic_Arrays(4, loadingscreentexture_vertex3f, NULL, loadingscreentexture_texcoord2f);
-		R_SetupShader_Generic(loadingscreentexture, NULL, GL_MODULATE, 1);
+		R_SetupShader_Generic(loadingscreentexture, NULL, GL_MODULATE, 1, true, true);
 		R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
 	}
 	R_Mesh_PrepareVertices_Generic_Arrays(4, loadingscreenpic_vertex3f, NULL, loadingscreenpic_texcoord2f);
-	R_SetupShader_Generic(Draw_GetPicTexture(loadingscreenpic), NULL, GL_MODULATE, 1);
+	R_SetupShader_Generic(Draw_GetPicTexture(loadingscreenpic), NULL, GL_MODULATE, 1, true, true);
 	R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
 	SCR_DrawLoadingStack();
 }
@@ -2151,6 +2185,10 @@ void SCR_UpdateLoadingScreen (qboolean clear)
 	}
 	loadingscreencleared = clear;
 
+#ifdef USE_GLES2
+	SCR_DrawLoadingScreen_SharedSetup(clear);
+	SCR_DrawLoadingScreen(clear);
+#else
 	if (qglDrawBuffer)
 		qglDrawBuffer(GL_BACK);
 	SCR_DrawLoadingScreen_SharedSetup(clear);
@@ -2167,6 +2205,7 @@ void SCR_UpdateLoadingScreen (qboolean clear)
 			qglDrawBuffer(GL_BACK);
 		SCR_DrawLoadingScreen(clear);
 	}
+#endif
 	SCR_DrawLoadingScreen_SharedFinish(clear);
 
 	// this goes into the event loop, and should prevent unresponsive cursor on vista
@@ -2277,6 +2316,7 @@ void CL_UpdateScreen(void)
 
 	SCR_SetUpToDrawConsole();
 
+#ifndef USE_GLES2
 	if (qglDrawBuffer)
 	{
 		CHECKGLERROR
@@ -2291,6 +2331,7 @@ void CL_UpdateScreen(void)
 			qglDisable(GL_DITHER);CHECKGLERROR
 		}
 	}
+#endif
 
 	R_Viewport_InitOrtho(&viewport, &identitymatrix, 0, 0, vid.width, vid.height, 0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100, NULL);
 	R_Mesh_ResetRenderTargets();
@@ -2305,6 +2346,7 @@ void CL_UpdateScreen(void)
 	f = pow((float)cl_updatescreen_quality, cl_minfps_qualitypower.value) * cl_minfps_qualityscale.value;
 	r_refdef.view.quality = bound(cl_minfps_qualitymin.value, f, cl_minfps_qualitymax.value);
 
+#ifndef USE_GLES2
 	if (qglPolygonStipple)
 	{
 		if(scr_stipple.integer)
@@ -2331,10 +2373,12 @@ void CL_UpdateScreen(void)
 			qglDisable(GL_POLYGON_STIPPLE);CHECKGLERROR
 		}
 	}
+#endif
 
 	if (r_viewscale_fpsscaling.integer)
 		GL_Finish();
 	drawscreenstart = Sys_DoubleTime();
+#ifndef USE_GLES2
 	if (R_Stereo_Active())
 	{
 		r_stereo_side = 0;
@@ -2366,6 +2410,7 @@ void CL_UpdateScreen(void)
 		SCR_DrawScreen();
 	}
 	else
+#endif
 		SCR_DrawScreen();
 	if (r_viewscale_fpsscaling.integer)
 		GL_Finish();