X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fcenterprint.qc;h=778892b914be8bc56252ce3b224634fcf891aa61;hb=0e5b409992f615de14932cb0c436fcc9ceb9cacb;hp=2fcf130fadadb920a7ca9f0b656efc47355b8c59;hpb=6ae488fa94396ad9ffa0dc3dbfbedb54c8b7983a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc
index 2fcf130fa..778892b91 100644
--- a/qcsrc/client/hud/panel/centerprint.qc
+++ b/qcsrc/client/hud/panel/centerprint.qc
@@ -1,8 +1,8 @@
 #include "centerprint.qh"
 
-#include "scoreboard.qh"
+#include <client/draw.qh>
+#include <client/hud/panel/scoreboard.qh>
 #include <common/notifications/all.qh>
-#include <client/miscfunctions.qh>
 
 // CenterPrint (#16)
 
@@ -33,16 +33,20 @@ void HUD_CenterPrint_Export(int fh)
 
 const int CENTERPRINT_MAX_MSGS = 10;
 const int CENTERPRINT_MAX_ENTRIES = 50;
-const float CENTERPRINT_SPACING = 0.7;
+const float CENTERPRINT_SPACING = 0.5;
+const float CENTERPRINT_TITLE_SPACING = 0.8;
 int cpm_index;
 string centerprint_messages[CENTERPRINT_MAX_MSGS];
 int centerprint_msgID[CENTERPRINT_MAX_MSGS];
-bool centerprint_bold[CENTERPRINT_MAX_MSGS];
 float centerprint_time[CENTERPRINT_MAX_MSGS];
+float centerprint_start_time[CENTERPRINT_MAX_MSGS];
 float centerprint_expire_time[CENTERPRINT_MAX_MSGS];
 int centerprint_countdown_num[CENTERPRINT_MAX_MSGS];
 bool centerprint_showing;
 
+bool centerprint_title_show;
+string centerprint_title;
+
 void centerprint_Add(int new_id, string strMessage, float duration, int countdown_num)
 {
 	TC(int, new_id); TC(int, countdown_num);
@@ -52,11 +56,6 @@ void centerprint_Add(int new_id, string strMessage, float duration, int countdow
 	if(strMessage == "" && new_id == 0)
 		return;
 
-	// strip BOLD_OPERATOR
-	bool is_bold = (substring(strMessage, 0, 5) == BOLD_OPERATOR);
-	if (is_bold)
-		strMessage = substring(strMessage, 5, -1);
-
 	// strip trailing newlines
 	j = strlen(strMessage) - 1;
 	while(substring(strMessage, j, 1) == "\n" && j >= 0)
@@ -97,6 +96,9 @@ void centerprint_Add(int new_id, string strMessage, float duration, int countdow
 		}
 	}
 
+	if (strMessage == "")
+		return;
+
 	if (i == CENTERPRINT_MAX_MSGS)
 	{
 		// a msg with the same id was not found, add the msg at the next position
@@ -106,7 +108,7 @@ void centerprint_Add(int new_id, string strMessage, float duration, int countdow
 		j = cpm_index;
 	}
 	strcpy(centerprint_messages[j], strMessage);
-	centerprint_bold[j] = is_bold;
+	centerprint_start_time[j] = time;
 	centerprint_msgID[j] = new_id;
 	if (duration < 0)
 	{
@@ -138,14 +140,31 @@ void centerprint_KillAll()
 {
 	for (int i=0; i<CENTERPRINT_MAX_MSGS; ++i)
 	{
+		centerprint_start_time[i] = 0;
 		centerprint_expire_time[i] = 0;
 		centerprint_time[i] = 1;
 		centerprint_msgID[i] = 0;
-		centerprint_bold[i] = false;
 		strfree(centerprint_messages[i]);
 	}
 }
 
+void centerprint_ClearTitle()
+{
+	strfree(centerprint_title);
+	centerprint_title_show = false;
+}
+
+void centerprint_SetTitle(string title)
+{
+	if(title != centerprint_title) {
+		if(centerprint_title)
+			strfree(centerprint_title);
+
+		centerprint_title = strzone(title);
+		centerprint_title_show = true;
+	}
+}
+
 float hud_configure_cp_generation_time;
 void HUD_CenterPrint()
 {
@@ -153,8 +172,10 @@ void HUD_CenterPrint()
 	{
 		if(!autocvar_hud_panel_centerprint) return;
 
-		if(hud_configure_prev)
+		if(hud_configure_prev) {
+			centerprint_ClearTitle();
 			centerprint_KillAll();
+		}
 	}
 	else
 	{
@@ -167,12 +188,14 @@ void HUD_CenterPrint()
 		{
 			if(highlightedPanel == HUD_PANEL(CENTERPRINT))
 			{
+				centerprint_SetTitle(strcat("Title at ", ftos(floor(hud_configure_cp_generation_time))));
+
 				float r;
 				r = random();
 				if (r > 0.8)
 					centerprint_Add(floor(r*1000), sprintf(_("^3Countdown message at time %s, seconds left: ^COUNT"), seconds_tostring(time)), 1, 10);
 				else if (r > 0.55)
-					centerprint_Add(0, sprintf(_("^1Multiline message at time %s that\n^1lasts longer than normal"), seconds_tostring(time)), 20, 0);
+					centerprint_Add(0, sprintf(_("^1Multiline message at time %s that\n^BOLDlasts longer than normal"), seconds_tostring(time)), 20, 0);
 				else
 					centerprint_AddStandard(sprintf(_("Message at time %s"), seconds_tostring(time)));
 				hud_configure_cp_generation_time = time + 1 + random()*4;
@@ -189,7 +212,7 @@ void HUD_CenterPrint()
 
 	if ( HUD_Radar_Clickable() )
 	{
-		if (hud_panel_radar_bottom >= 0.96 * vid_conheight)
+		if (hud_panel_radar_bottom >= vid_conheight)
 			return;
 
 		panel_pos.x = 0.5 * (vid_conwidth - panel_size.x);
@@ -198,15 +221,16 @@ void HUD_CenterPrint()
 	}
 	else if(!autocvar__hud_configure && scoreboard_fade_alpha)
 	{
-		// move the panel below the scoreboard
-		if (scoreboard_bottom >= 0.96 * vid_conheight)
-			return;
 		vector target_pos = vec2(0.5 * (vid_conwidth - panel_size.x), scoreboard_bottom);
 		if(target_pos.y > panel_pos.y)
 		{
 			panel_pos = panel_pos + (target_pos - panel_pos) * sqrt(scoreboard_fade_alpha);
 			panel_size.y = min(panel_size.y, vid_conheight - scoreboard_bottom);
 		}
+
+		// move the panel below the scoreboard
+		if (panel_pos.y >= vid_conheight)
+			return;
 	}
 
 	if (autocvar_hud_panel_centerprint_dynamichud)
@@ -224,31 +248,43 @@ void HUD_CenterPrint()
 		panel_size -= '2 2 0' * panel_bg_padding;
 	}
 
-	int entries;
-	float height;
-	vector fontsize;
-
 	int i, j, k, n, g;
-	float a, sz, align, current_msg_posY = 0, msg_size;
+	float a = 1, sz, align, current_msg_posY = 0, msg_size;
 	vector pos;
-	string ts;
+	vector cp_fontsize = hud_fontsize * 1.1;
+	string ts = "";
 	bool all_messages_expired = true;
 
 	pos = panel_pos;
 	if (autocvar_hud_panel_centerprint_flip)
 		pos.y += panel_size.y;
 	align = bound(0, autocvar_hud_panel_centerprint_align, 1);
-	for (g=0, i=0, j=cpm_index; i<CENTERPRINT_MAX_MSGS; ++i, ++j)
-	{
-		bool is_bold = centerprint_bold[j];
 
-		// entries = bound(1, floor(CENTERPRINT_MAX_ENTRIES * 4 * panel_size_y/panel_size_x), CENTERPRINT_MAX_ENTRIES);
-		// height = panel_size_y/entries;
-		// fontsize = '1 1 0' * height;
-		height = (is_bold) ? vid_conheight/50 * autocvar_hud_panel_centerprint_fontscale_bold : vid_conheight/50 * autocvar_hud_panel_centerprint_fontscale;
-		fontsize = '1 1 0' * height;
-		entries = bound(1, floor(panel_size.y/height), CENTERPRINT_MAX_ENTRIES);
+	// Show title if available
+	if(centerprint_title_show) {
+		vector fontsize = cp_fontsize * autocvar_hud_panel_centerprint_fontscale_title;
+		float width = stringwidth(centerprint_title, true, fontsize);
 
+		pos.x = panel_pos.x + (panel_size.x - width) * align;
+		drawcolorcodedstring(pos, centerprint_title, fontsize, 1, DRAWFLAG_NORMAL);
+
+		if (autocvar_hud_panel_centerprint_flip)
+			pos.y -= cp_fontsize.y * (CENTERPRINT_TITLE_SPACING / 2);
+		else
+			pos.y += fontsize.y + (cp_fontsize.y * (CENTERPRINT_TITLE_SPACING / 2));
+
+		drawfill(pos, vec2(width, 1), '1 1 1', 1, DRAWFLAG_NORMAL);
+
+		if (autocvar_hud_panel_centerprint_flip)
+			pos.y -= cp_fontsize.y * (CENTERPRINT_TITLE_SPACING / 2);
+		else
+			pos.y += cp_fontsize.y * (CENTERPRINT_TITLE_SPACING / 2);
+
+		all_messages_expired = false;
+	}
+
+	for (g=0, i=0, j=cpm_index; i<CENTERPRINT_MAX_MSGS; ++i, ++j)
+	{
 		if (j == CENTERPRINT_MAX_MSGS)
 			j = 0;
 		if (centerprint_expire_time[j] == -1)
@@ -273,25 +309,30 @@ void HUD_CenterPrint()
 
 		all_messages_expired = false;
 
+		if (time < centerprint_start_time[j]) continue;
+
+		float fade_in_time = autocvar_hud_panel_centerprint_fade_in;
+		float fade_out_time = autocvar_hud_panel_centerprint_fade_out;
+
+		if (centerprint_countdown_num[j]) {
+			fade_in_time = autocvar_hud_panel_centerprint_fade_in_short;
+			fade_out_time = 0;
+		}
+
 		// fade
-		if(centerprint_time[j] < 0)  // Expired but forced. Expire time is the fade-in time.
-			a = (time - centerprint_expire_time[j]) / max(0.0001, autocvar_hud_panel_centerprint_fade_in);
-		else if(centerprint_expire_time[j] - autocvar_hud_panel_centerprint_fade_out > time)  // Regularily printed. Not fading out yet.
-			a = (time - (centerprint_expire_time[j] - centerprint_time[j])) / max(0.0001, autocvar_hud_panel_centerprint_fade_in);
-		else // Expiring soon, so fade it out.
-			a = (centerprint_expire_time[j] - time) / max(0.0001, autocvar_hud_panel_centerprint_fade_out);
-
-		if(centerprint_msgID[j] == CPID_TIMEIN)
+		if(fade_in_time && centerprint_start_time[j] && time < centerprint_start_time[j] + fade_in_time) // Fade in
+			a = (time - centerprint_start_time[j]) / fade_in_time;
+		else if(time < centerprint_expire_time[j] - fade_out_time || centerprint_time[j] < 0) // Regularily printed or forced
+			a = 1;
+		else if(fade_out_time) // Expiring soon, so fade it out.
+			a = (centerprint_expire_time[j] - time) / fade_out_time;
+
+		if(centerprint_msgID[j] == ORDINAL(CPID_TIMEIN))
 			a = 1;
 
 		// while counting down show it anyway in order to hold the current message position
 		if (a <= 0.5/255.0 && centerprint_countdown_num[j] == 0)  // Guaranteed invisible - don't show.
 			continue;
-		if (a > 1)
-			a = 1;
-
-		// set the size from fading in/out before subsequent fading
-		sz = autocvar_hud_panel_centerprint_fade_minfontsize + a * (1 - autocvar_hud_panel_centerprint_fade_minfontsize);
 
 		// also fade it based on positioning
 		if(autocvar_hud_panel_centerprint_fade_subsequent)
@@ -303,12 +344,12 @@ void HUD_CenterPrint()
 		}
 		a *= panel_fg_alpha;
 
-		// finally set the size based on the new alpha from subsequent fading
-		sz = sz * (autocvar_hud_panel_centerprint_fade_subsequent_minfontsize + a * (1 - autocvar_hud_panel_centerprint_fade_subsequent_minfontsize));
+		// finally set the size based on the alpha
+		sz = autocvar_hud_panel_centerprint_fade_minfontsize + a * (1 - autocvar_hud_panel_centerprint_fade_minfontsize);
 		drawfontscale = hud_scale * sz;
 
 		if (centerprint_countdown_num[j])
-			n = tokenizebyseparator(strreplace("^COUNT", count_seconds(centerprint_countdown_num[j]), centerprint_messages[j]), "\n");
+			n = tokenizebyseparator(strreplace("^COUNT", ftos(centerprint_countdown_num[j]), centerprint_messages[j]), "\n");
 		else
 			n = tokenizebyseparator(centerprint_messages[j], "\n");
 
@@ -320,6 +361,9 @@ void HUD_CenterPrint()
 				getWrappedLine_remaining = argv(k);
 				while(getWrappedLine_remaining)
 				{
+					bool is_bold = (substring(getWrappedLine_remaining, 0, 5) == BOLD_OPERATOR);
+					vector fontsize = cp_fontsize * (is_bold ? autocvar_hud_panel_centerprint_fontscale_bold : autocvar_hud_panel_centerprint_fontscale);
+
 					ts = getWrappedLine(panel_size.x * hud_scale.x * sz, fontsize, stringwidth_colors);
 					if (ts != "")
 						pos.y -= fontsize.y;
@@ -334,6 +378,12 @@ void HUD_CenterPrint()
 		for(k = 0; k < n; ++k)
 		{
 			getWrappedLine_remaining = argv(k);
+
+			bool is_bold = (substring(getWrappedLine_remaining, 0, 5) == BOLD_OPERATOR);
+			vector fontsize = cp_fontsize * (is_bold ? autocvar_hud_panel_centerprint_fontscale_bold : autocvar_hud_panel_centerprint_fontscale);
+			if (is_bold)
+				getWrappedLine_remaining = substring(getWrappedLine_remaining, 5, -1);
+
 			while(getWrappedLine_remaining)
 			{
 				ts = getWrappedLine(panel_size.x * hud_scale.x * sz, fontsize, stringwidth_colors);
@@ -355,11 +405,12 @@ void HUD_CenterPrint()
 		++g; // move next position number up
 
 		msg_size = pos.y - msg_size;
+
 		if (autocvar_hud_panel_centerprint_flip)
 		{
-			pos.y = current_msg_posY - CENTERPRINT_SPACING * fontsize.y;
+			pos.y -= msg_size + CENTERPRINT_SPACING * cp_fontsize.y;
 			if (a < 1 && centerprint_msgID[j] == 0) // messages with id can be replaced just after they are faded out, so never move over them the next messages
-				pos.y += (msg_size + CENTERPRINT_SPACING * fontsize.y) * (1 - sqrt(sz));
+				pos.y += (1 - sqrt(a));
 
 			if (pos.y < panel_pos.y) // check if the next message can be shown
 			{
@@ -369,11 +420,11 @@ void HUD_CenterPrint()
 		}
 		else
 		{
-			pos.y += CENTERPRINT_SPACING * fontsize.y;
+			pos.y += CENTERPRINT_SPACING * cp_fontsize.y;
 			if (a < 1 && centerprint_msgID[j] == 0) // messages with id can be replaced just after they are faded out, so never move over them the next messages
-				pos.y -= (msg_size + CENTERPRINT_SPACING * fontsize.y) * (1 - sqrt(sz));
+				pos.y -= (1 - sqrt(a));
 
-			if(pos.y > panel_pos.y + panel_size.y - fontsize.y) // check if the next message can be shown
+			if(pos.y > panel_pos.y + panel_size.y - cp_fontsize.y) // check if the next message can be shown
 			{
 				drawfontscale = hud_scale;
 				return;