]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/client/hud/panel/centerprint.qc
Slightly extend underline of normal centerprint titles (it looks better and is consis...
[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / centerprint.qc
index 2f5aab5ed9f49b021e57db2a9fa0ee73f23a6525..1e388c4d8c6dd165a1fbdacc3ccb7d52e7ab63df 100644 (file)
@@ -1,9 +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/defs.qh>
-#include <client/miscfunctions.qh>
 
 // CenterPrint (#16)
 
@@ -26,25 +25,34 @@ void HUD_CenterPrint_Export(int fh)
        HUD_Write_Cvar("hud_panel_centerprint_fade_minfontsize");
 }
 
-// These are the functions that draw the text at the center of the screen (e.g. frag messages and server MOTDs).
-// Usually local_notification_centerprint_generic() is called, which in turn calls centerprint_generic(), which
-// uses some kind of macro magic to call HUD_CenterPrint, which draws them on screen using drawcolorcodedstring().
+// These are the functions that draw the text at the center of the screen (e.g. frag messages and server MOTD).
+// centerprint_Add parses a message and puts it in the circular buffer centerprint_messages
+// centerprint_Add is usually called by Local_Notification_centerprint_Add, which is called
+// by Local_Notification.
+// HUD_CenterPrint draws all the messages on screen
 
 const int CENTERPRINT_MAX_MSGS = 10;
 const int CENTERPRINT_MAX_ENTRIES = 50;
-const float CENTERPRINT_SPACING = 0.7;
+const float CENTERPRINT_BASE_SIZE = 1.3;
+const float CENTERPRINT_SPACING = 0.3;
+const float CENTERPRINT_TITLE_SPACING = 0.35;
 int cpm_index;
 string centerprint_messages[CENTERPRINT_MAX_MSGS];
 int centerprint_msgID[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;
 
-void centerprint_generic(int new_id, string strMessage, float duration, int countdown_num)
+string centerprint_title;
+string centerprint_title_left;
+string centerprint_title_right;
+
+void centerprint_Add(int new_id, string strMessage, float duration, int countdown_num)
 {
        TC(int, new_id); TC(int, countdown_num);
-       //printf("centerprint_generic(%d, '%s^7', %d, %d);\n", new_id, strMessage, duration, countdown_num);
+       //LOG_INFOF("centerprint_Add: ^2id: %d ^3dur: %d ^5countdown: %d\n'%s'", new_id, duration, countdown_num, strreplace("\n", "^7\\n^7", strMessage));
        int i, j;
 
        if(strMessage == "" && new_id == 0)
@@ -79,9 +87,10 @@ void centerprint_generic(int new_id, string strMessage, float duration, int coun
                        j = 0;
                if (new_id && new_id == centerprint_msgID[j])
                {
-                       if (strMessage == "" && centerprint_messages[j] != "" && centerprint_countdown_num[j] == 0)
+                       if (strMessage == "" && centerprint_messages[j] != "")
                        {
                                // fade out the current msg (duration and countdown_num are ignored)
+                               centerprint_start_time[j] = 0;
                                centerprint_time[j] = min(5, autocvar_hud_panel_centerprint_fade_out);
                                centerprint_expire_time[j] = -1; // don't use the variable time here!
                                return;
@@ -90,6 +99,9 @@ void centerprint_generic(int new_id, string strMessage, float duration, int coun
                }
        }
 
+       if (strMessage == "")
+               return;
+
        if (i == CENTERPRINT_MAX_MSGS)
        {
                // a msg with the same id was not found, add the msg at the next position
@@ -99,6 +111,7 @@ void centerprint_generic(int new_id, string strMessage, float duration, int coun
                j = cpm_index;
        }
        strcpy(centerprint_messages[j], strMessage);
+       centerprint_start_time[j] = time;
        centerprint_msgID[j] = new_id;
        if (duration < 0)
        {
@@ -115,21 +128,22 @@ void centerprint_generic(int new_id, string strMessage, float duration, int coun
        centerprint_countdown_num[j] = countdown_num;
 }
 
-void centerprint_kill(int id)
+void centerprint_Kill(int id)
 {
        TC(int, id);
-       centerprint_generic(id, "", 0, 0);
+       centerprint_Add(id, "", 0, 0);
 }
 
-void centerprint_hud(string strMessage)
+void centerprint_AddStandard(string strMessage)
 {
-       centerprint_generic(0, strMessage, autocvar_hud_panel_centerprint_time, 0);
+       centerprint_Add(0, strMessage, autocvar_hud_panel_centerprint_time, 0);
 }
 
-void reset_centerprint_messages()
+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;
@@ -137,40 +151,64 @@ void reset_centerprint_messages()
        }
 }
 
+void centerprint_SetDuelTitle(string left, string right)
+{
+       float namesize = autocvar_hud_panel_scoreboard_namesize * hud_fontsize.x;
+       strcpy(centerprint_title_left, textShortenToWidth(left, namesize, hud_fontsize, stringwidth_colors));
+       strcpy(centerprint_title_right, textShortenToWidth(right, namesize, hud_fontsize, stringwidth_colors));
+}
+
+void centerprint_SetTitle(string title)
+{
+       if(title != centerprint_title)
+               strcpy(centerprint_title, CCR(title));
+}
+
+void centerprint_ClearTitle()
+{
+       strfree(centerprint_title);
+       strfree(centerprint_title_left);
+       strfree(centerprint_title_right);
+}
+
 float hud_configure_cp_generation_time;
-void HUD_CenterPrint ()
+void HUD_CenterPrint()
 {
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_centerprint) return;
 
-               if(hud_configure_prev)
-                       reset_centerprint_messages();
+               if(hud_configure_prev) {
+                       centerprint_ClearTitle();
+                       centerprint_KillAll();
+               }
        }
        else
        {
                if(!hud_configure_prev)
                {
-                       reset_centerprint_messages();
+                       centerprint_KillAll();
                        hud_configure_cp_generation_time = time; // show a message immediately
                }
                if (time > hud_configure_cp_generation_time)
                {
                        if(highlightedPanel == HUD_PANEL(CENTERPRINT))
                        {
+                               centerprint_SetTitle(sprintf(_("Title at %s"), seconds_tostring(hud_configure_cp_generation_time)));
+
                                float r;
                                r = random();
                                if (r > 0.8)
-                                       centerprint_generic(floor(r*1000), sprintf(_("^3Countdown message at time %s, seconds left: ^COUNT"), seconds_tostring(time)), 1, 10);
+                                       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_generic(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_hud(sprintf(_("Message at time %s"), seconds_tostring(time)));
+                                       centerprint_AddStandard(sprintf(_("Message at time %s"), seconds_tostring(time)));
                                hud_configure_cp_generation_time = time + 1 + random()*4;
                        }
                        else
                        {
-                               centerprint_generic(0, _("Generic message"), 10, 0);
+                               centerprint_Add(0, _("Generic message"), 10, 0);
                                hud_configure_cp_generation_time = time + 10 - random()*3;
                        }
                }
@@ -180,7 +218,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);
@@ -189,15 +227,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)
@@ -215,39 +254,89 @@ void HUD_CenterPrint ()
                panel_size -= '2 2 0' * panel_bg_padding;
        }
 
-       bool is_bold;
-       string centerprint_message = strzone("");
-       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 * CENTERPRINT_BASE_SIZE;
+       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)
-       {
-               // if the notification starts with ^BOLD make it bold (e.g. frag messages);
-               is_bold = (substring(centerprint_messages[j], 0, 5) == BOLD_OPERATOR);
-               // remove ^BOLD so it doesn't get printed onscreen
-               if (is_bold)
-                       strcpy(centerprint_message, substring(centerprint_messages[j], 5, -1));
+
+       // Show title if available
+       if(centerprint_title != "" || centerprint_title_left != "") {
+               vector fontsize = cp_fontsize * autocvar_hud_panel_centerprint_fontscale_title;
+               float width = 0, right_width = 0, left_width = 0, max_rl_width = 0;
+               if (centerprint_title != "")
+                       width = stringwidth(centerprint_title, true, fontsize);
                else
-                       strcpy(centerprint_message, centerprint_messages[j]);
+               {
+                       right_width = stringwidth(centerprint_title_right, true, fontsize);
+                       left_width = stringwidth(centerprint_title_left, true, fontsize);
+               }
 
-               // 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);
+               if (autocvar_hud_panel_centerprint_flip)
+                       pos.y -= fontsize.y;
+
+               vector duel_title_pos = '0 0 0';
+               float padding = stringwidth(" ", false, fontsize) * 2;
+               if (centerprint_title_left != "")
+               {
+                       if (left_width > right_width)
+                               max_rl_width = left_width;
+                       else
+                               max_rl_width = right_width;
 
+                       width = max_rl_width * 2 + padding * 6 + stringwidth(_("vs"), false, fontsize);
+                       pos.x += (panel_size.x - width) * align;
+                       duel_title_pos = pos;
+
+                       pos.x += padding;
+                       if (left_width < right_width)
+                               pos.x += (max_rl_width - left_width) * 0.5;
+                       drawcolorcodedstring(pos, centerprint_title_left, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+
+                       pos.x = duel_title_pos.x + max_rl_width + padding * 3;
+                       drawstring(pos, _("vs"), fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+
+                       pos.x = duel_title_pos.x + width - padding - max_rl_width;
+                       if (left_width >= right_width)
+                               pos.x += (max_rl_width - right_width) * 0.5;
+                       drawcolorcodedstring(pos, centerprint_title_right, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+               }
+               else
+               {
+                       pos.x = panel_pos.x + (panel_size.x - width) * align;
+                       drawcolorcodedstring(pos, centerprint_title, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+               }
+
+               if (autocvar_hud_panel_centerprint_flip)
+                       pos.y -= cp_fontsize.y * CENTERPRINT_TITLE_SPACING;
+               else
+                       pos.y += fontsize.y + (hud_fontsize.y * CENTERPRINT_TITLE_SPACING);
+
+               if (centerprint_title_left != "")
+               {
+                       pos.x = duel_title_pos.x;
+                       drawfill(pos, vec2(max_rl_width + padding * 2, 1), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                       drawfill(pos + vec2(width - max_rl_width - padding * 2, 0), vec2(max_rl_width + padding * 2, 1), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               }
+               else
+                       drawfill(pos - eX * padding, vec2(width + 2 * padding, 1), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+
+               if (autocvar_hud_panel_centerprint_flip)
+                       pos.y -= cp_fontsize.y * CENTERPRINT_TITLE_SPACING;
+               else
+                       pos.y += cp_fontsize.y * CENTERPRINT_TITLE_SPACING;
+
+               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)
@@ -259,7 +348,7 @@ void HUD_CenterPrint ()
                }
                if (centerprint_expire_time[j] <= time)
                {
-                       if (centerprint_countdown_num[j] && centerprint_time[j] > 0)
+                       if (centerprint_countdown_num[j] && centerprint_time[j] > 0 && centerprint_start_time[j])
                        {
                                centerprint_countdown_num[j] = centerprint_countdown_num[j] - 1;
                                if (centerprint_countdown_num[j] == 0)
@@ -272,25 +361,30 @@ void HUD_CenterPrint ()
 
                all_messages_expired = false;
 
-               // fade the centerprint_hud in/out
-               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 (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] && centerprint_start_time[j]) {
+                       fade_in_time = 0;
+                       fade_out_time = 0;
+               }
+
+               // fade
+               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] == CPID_TIMEIN)
+               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)
@@ -302,14 +396,14 @@ 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_message), "\n");
+                       n = tokenizebyseparator(strreplace("^COUNT", ftos(centerprint_countdown_num[j]), centerprint_messages[j]), "\n");
                else
-                       n = tokenizebyseparator(centerprint_message, "\n");
+                       n = tokenizebyseparator(centerprint_messages[j], "\n");
 
                if (autocvar_hud_panel_centerprint_flip)
                {
@@ -319,6 +413,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;
@@ -333,6 +430,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);
@@ -354,39 +457,37 @@ 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
                        {
                                drawfontscale = hud_scale;
-                               strfree(centerprint_message);
                                return;
                        }
                }
                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;
-                               strfree(centerprint_message);
                                return;
                        }
                }
        }
-       strfree(centerprint_message);
 
        drawfontscale = hud_scale;
        if (all_messages_expired)
        {
                centerprint_showing = false;
-               reset_centerprint_messages();
+               centerprint_KillAll();
        }
 }