X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=713c3b944d4d39c05c48a099ed631179a1517186;hp=d169bdbd1b2209c8714378b7699ec488a6d94f5a;hb=09ae4d8636130d4c86ab3f8df8f823482f948f97;hpb=3a708ad09d26d955393edfedbffdf668c58ccd48 diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index d169bdb..713c3b9 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -1,15 +1,18 @@ #include #include +#include +#include "resolution.h" #include "groupscreen.h" #include "fetch_group.h" -#include "fetch_max_score_for_song.h" -#include "fetch_max_score_for_player.h" +#include "fetch_max_score_for_songs.h" +#include "fetch_max_score_for_players.h" #include "fetch_needs_update.h" +#include "fetch_highscore.h" #include "fonts.h" -GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel) - : tournament(tournament), round(round), parallel(parallel), scores_changed(conn, "scores"), conn(conn), valid(false) +GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel, unsigned machine, unsigned num_machines) + : tournament(tournament), round(round), parallel(parallel), machine(machine), num_machines(num_machines), scores_changed(conn, "scores"), conn(conn), valid(false) { } @@ -33,68 +36,85 @@ bool GroupScreen::check_invalidated() return needs_update; } -void GroupScreen::draw(unsigned char *buf) +void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) { std::vector td; scores_changed.reset_flag(); + set_screen_size(width, height); + /* + * We'll probably need some values from here later on (although not all), just fetch them + * all while we're at it. + */ + std::map song_scores, player_scores; + conn.perform(FetchMaxScoreForSongs(tournament, &song_scores)); + conn.perform(FetchMaxScoreForPlayers(tournament, round, &player_scores)); + Group group; conn.perform(FetchGroup(tournament, round, parallel, &group)); gettimeofday(&last_updated, NULL); - memset(buf, 0, 800 * 600 * 4); + memset(buf, 0, width * height * 4); // main heading char heading[64]; - if (parallel == 0) { - sprintf(heading, "Round %u", round); + if (num_machines == 1) { + if (parallel == 0) { + std::sprintf(heading, "Round %u", round); + } else { + std::sprintf(heading, "Round %u, Group %u", round, parallel); + } } else { - sprintf(heading, "Round %u, Group %u", round, parallel); + if (parallel == 0) { + std::sprintf(heading, "Round %u, Machine %u", round, machine + 1); + } else { + std::sprintf(heading, "Round %u, Group %u, Machine %u", round, parallel, machine + 1); + } } { - unsigned width = my_draw_text(heading, NULL, 48.0); - my_draw_text_deferred(td, heading, 48.0, 800/2 - width/2, 60); + unsigned width = my_draw_text(heading, NULL, 40.0); + my_draw_text_deferred(td, heading, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60); } // Find out how wide each column has to be. First try unlimited width (ie. // long titles for everything); if that gets too long, try again with short // titles for chosen songs. - unsigned width[16], num_scores; + unsigned colwidth[16], num_scores; unsigned max_num_width = my_draw_text("8888", NULL, 22.0); - unsigned mode, sumwidth; - for (mode = 0; mode < 2; ++mode) { + unsigned sumcolwidth; + for (unsigned mode = 0; mode < 2; ++mode) { for (unsigned i = 0; i < 16; ++i) - width[i] = 0; + colwidth[i] = 0; for (std::vector::const_iterator i = group.players.begin(); i != group.players.end(); ++i) { unsigned col = 1; - width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 18.0)); + colwidth[0] = std::max(colwidth[0], my_draw_text(i->nick, NULL, 18.0)); for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) { if (j->chosen) { - width[col] = std::max(width[col], my_draw_text((mode == 0) ? j->song.title : j->song.short_title, NULL, 12.0) + + colwidth[col] = std::max(colwidth[col], my_draw_text((mode == 0) ? j->song.title : j->song.short_title, NULL, 12.0) + max_num_width + 10); } else { - width[col] = std::max(width[col], my_draw_text(j->song.short_title, NULL, 12.0)); - width[col] = std::max(width[col], max_num_width); + colwidth[col] = std::max(colwidth[col], my_draw_text(j->song.short_title, NULL, 12.0)); + colwidth[col] = std::max(colwidth[col], max_num_width); } } } num_scores = group.players[0].scores.size(); - width[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width); - width[num_scores + 2] = my_draw_text("Rank", NULL, 12.0); + colwidth[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width); + colwidth[num_scores + 2] = my_draw_text("Rank", NULL, 12.0); // if we're at long titles and that works, don't try the short ones - sumwidth = 0; + sumcolwidth = 0; for (unsigned i = 0; i <= num_scores + 2; ++i) - sumwidth += width[i] + 20; + sumcolwidth += colwidth[i] + 20; - if (sumwidth < 780) + if (sumcolwidth < 780) break; } @@ -102,7 +122,7 @@ void GroupScreen::draw(unsigned char *buf) * If we have space to go, distribute as much as we can to the chosen song column, so we won't have * total and rank jumping around. */ - if (sumwidth < 780) { + if (sumcolwidth < 780) { int first_chosen_col = -1; unsigned col = 1; @@ -114,61 +134,78 @@ void GroupScreen::draw(unsigned char *buf) } if (first_chosen_col != -1) { - printf("first_chosen_col=%u\n", first_chosen_col); - width[first_chosen_col] += 780 - sumwidth; + colwidth[first_chosen_col] += 780 - sumcolwidth; } } // make column headings from the first player's songs unsigned col = 1; - unsigned x = 40 + width[0]; + unsigned x = 40 + colwidth[0]; for (std::vector::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) { if (!i->chosen) { unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0); - my_draw_text_deferred(td, i->song.short_title, 12.0, x + width[col] / 2 - this_width / 2, 100); + my_draw_text_deferred(td, i->song.short_title, 12.0, x + colwidth[col] / 2 - this_width / 2, 100); } - x += width[col] + 20; + x += colwidth[col] + 20; } - my_draw_text_deferred(td, "Total", 12.0, x + width[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100); - x += width[num_scores + 1] + 20; - my_draw_text_deferred(td, "Rank", 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100); + my_draw_text_deferred(td, "Total", 12.0, x + colwidth[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100); + x += colwidth[num_scores + 1] + 20; + my_draw_text_deferred(td, "Rank", 12.0, x + colwidth[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100); // show all the players and the scores - unsigned y = 140; - for (std::vector::const_iterator i = group.players.begin(); i != group.players.end(); ++i) { + unsigned num_players_this_machine = (group.players.size() + num_machines - machine - 1) / num_machines; + unsigned show_players = std::min(num_players_this_machine, 9U); + unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5); + + unsigned row = 0, m = 0; + for (std::vector::const_iterator i = group.players.begin(); i != group.players.end() && row < 9; ++i) { + if (m++ % num_machines != machine) + continue; + my_draw_text_deferred(td, i->nick, 18.0, 20, y); - unsigned x = 40 + width[0]; + unsigned x = 40 + colwidth[0]; unsigned col = 1; for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) { char text[16] = ""; if (j->score != -1) { - sprintf(text, "%u", j->score); + std::sprintf(text, "%u", j->score); } unsigned this_width = my_draw_text(text, NULL, 22.0); if (j->chosen) { my_draw_text_deferred(td, text, 22.0, x + max_num_width - this_width, y); - my_draw_text_deferred(td, (mode == 0) ? j->song.title : j->song.short_title, 12.0, x + max_num_width + 10, y); + + // draw the long name if we can, otherwise use the short one + if (my_draw_text(j->song.title, NULL, 12.0) > (colwidth[col] - 10 - max_num_width)) { + my_draw_text_deferred(td, j->song.short_title, 12.0, x + max_num_width + 10, y); + } else { + my_draw_text_deferred(td, j->song.title, 12.0, x + max_num_width + 10, y); + } } else { - my_draw_text_deferred(td, text, 22.0, x + width[col] / 2 - this_width / 2, y); + my_draw_text_deferred(td, text, 22.0, x + colwidth[col] / 2 - this_width / 2, y); } - x += width[col] + 20; + x += colwidth[col] + 20; } // draw total { char text[16]; - sprintf(text, "%u", i->total); + std::sprintf(text, "%u", i->total); unsigned this_width = my_draw_text(text, NULL, 22.0); - my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 1] / 2 - this_width / 2, y); - x += width[num_scores + 1] + 20; + my_draw_text_deferred(td, text, 22.0, x + colwidth[num_scores + 1] / 2 - this_width / 2, y); + x += colwidth[num_scores + 1] + 20; } - y += 40; + if (show_players > 7) + y += 40 - (show_players - 7) * 4; + else + y += 40; + ++row; + } /* @@ -191,8 +228,6 @@ void GroupScreen::draw(unsigned char *buf) * matter of sorting; the best attainable rank for player X is obtained if * X gets max score and all others get min score, the worst attainable rank * is obtained if X gets min score and all others get max score. - * - * This is a bit SQL-heavy, but heck... */ std::vector max_score, min_score; for (std::vector::const_iterator i = group.players.begin(); i != group.players.end(); ++i) { @@ -206,9 +241,9 @@ void GroupScreen::draw(unsigned char *buf) unsigned max_score_this_song; if (j->song.id != -1) { // random song, or we know what song the player picked - conn.perform(FetchMaxScoreForSong(tournament, j->song.id, &max_score_this_song)); + max_score_this_song = song_scores[j->song.id]; } else { - conn.perform(FetchMaxScoreForPlayer(tournament, i->id, round, &max_score_this_song)); + max_score_this_song = player_scores[i->id]; } max_score_tp += max_score_this_song; } @@ -218,8 +253,8 @@ void GroupScreen::draw(unsigned char *buf) } // now finally find min and max rank, and draw it all - y = 140; - for (unsigned i = 0; i < group.players.size(); ++i) { + y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5); + for (unsigned i = 0; i < group.players.size() && (i/num_machines) < show_players; ++i) { unsigned best_rank = 1, worst_rank = 1; for (unsigned j = 0; j < group.players.size(); ++j) { if (i == j) @@ -237,10 +272,16 @@ void GroupScreen::draw(unsigned char *buf) else std::sprintf(text, "%u-%u", best_rank, worst_rank); + if (i % num_machines != machine) + continue; + unsigned this_width = my_draw_text(text, NULL, 22.0); - my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 2] / 2 - this_width / 2, y); + my_draw_text_deferred(td, text, 22.0, x + colwidth[num_scores + 2] / 2 - this_width / 2, y); - y += 40; + if (show_players > 7) + y += 40 - (show_players - 7) * 4; + else + y += 40; } /* @@ -262,9 +303,10 @@ void GroupScreen::draw(unsigned char *buf) * Needs to win group: */ - /* Find the first player with the fewest songs played. */ + /* Find the first player with the fewest songs played and part of this machine. */ unsigned min_played_songs = 9999, num_random_songs = 0; Player *next_player = NULL; + m = 0; for (std::vector::iterator i = group.players.begin(); i != group.players.end(); ++i) { unsigned this_played = 0, this_random_songs = 0; for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) { @@ -274,7 +316,7 @@ void GroupScreen::draw(unsigned char *buf) ++this_random_songs; } - if (this_played < min_played_songs) { + if ((m++ % num_machines == machine) && this_played < min_played_songs) { min_played_songs = this_played; next_player = &(*i); num_random_songs = this_random_songs; // should be equal for all @@ -288,7 +330,6 @@ void GroupScreen::draw(unsigned char *buf) unsigned j = (i + next_player->position - 1) % num_random_songs; if (next_player->scores[j].score == -1) { next_song = &(next_player->scores[j]); - printf("Selecting score %u\n", j); break; } } @@ -299,7 +340,6 @@ void GroupScreen::draw(unsigned char *buf) unsigned j = (i + next_player->position) % num_scores; if (next_player->scores[j].score == -1) { next_song = &(next_player->scores[j]); - printf("Selecting score %u\n", j); break; } } @@ -308,17 +348,21 @@ void GroupScreen::draw(unsigned char *buf) if (next_song != NULL) { widestring text = widestring("Next player: ") + next_player->nick; unsigned this_width = my_draw_text(text, NULL, 24.0); - my_draw_text(text, buf, 24.0, 400 - this_width/2, 450); + my_draw_text(text, buf, 24.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); if (next_song->song.id != -1) { this_width = my_draw_text(next_song->song.title, NULL, 20.0); - my_draw_text(next_song->song.title, buf, 20.0, 400 - this_width/2, 487); + my_draw_text(next_song->song.title, buf, 20.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); - // fetch the high score later - text = widestring("High score: ") + widestring(pqxx::to_string(1234)) + - widestring(", by dufF in Challenge Cup 1, 2004"); - this_width = my_draw_text(text, NULL, 16.0); - my_draw_text(text, buf, 16.0, 400 - this_width/2, 517); + Highscore hs; + conn.perform(FetchHighscore(next_song->song.id, &hs)); + + if (hs.score != -1) { + text = widestring("High score: ") + widestring(pqxx::to_string(hs.score)) + + widestring(", by ") + hs.nick + widestring(" in ") + hs.tournament_name; + this_width = my_draw_text(text, NULL, 16.0); + my_draw_text(text, buf, 16.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); + } } // only show lead/win/qualify for the last song @@ -333,12 +377,12 @@ void GroupScreen::draw(unsigned char *buf) unsigned max_score_this_song; if (next_song->song.id != -1) { // random song, or we know what song the player picked - conn.perform(FetchMaxScoreForSong(tournament, next_song->song.id, &max_score_this_song)); + max_score_this_song = song_scores[next_song->song.id]; } else { - conn.perform(FetchMaxScoreForPlayer(tournament, next_player->id, round, &max_score_this_song)); + max_score_this_song = player_scores[next_player->id]; } - unsigned y = 540; + unsigned y = 520; // see what score this player must beat to lead unsigned lead_beat = 0, win_beat = 0; @@ -410,38 +454,46 @@ void GroupScreen::draw(unsigned char *buf) // print out the lines we can attain if (next_player->total + max_score_this_song > lead_beat && (lead_beat != win_beat)) { int lead_need = std::max(lead_beat - next_player->total + 1, 0U); - - text = widestring("Needs to lead: ") + widestring(pqxx::to_string(lead_need)); - this_width = my_draw_text(text, NULL, 18.0); - my_draw_text(text, buf, 18.0, 400 - this_width/2, y); + + if (lead_need > 0) { + text = widestring("Needs to lead: ") + widestring(pqxx::to_string(lead_need)); + this_width = my_draw_text(text, NULL, 18.0); + my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); - y += 30; + y += 30; + } } if (next_player->total + max_score_this_song > win_beat) { int win_need = std::max(win_beat - next_player->total + 1, 0U); - text = widestring("Needs to win: ") + widestring(pqxx::to_string(win_need)); + if (win_need > 0) { + text = widestring("Needs to win: ") + widestring(pqxx::to_string(win_need)); - this_width = my_draw_text(text, NULL, 18.0); - my_draw_text(text, buf, 18.0, 400 - this_width/2, y); + this_width = my_draw_text(text, NULL, 18.0); + my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); - y += 30; + y += 30; + } } - if (next_player->total + max_score_this_song > qualify_beat_worst_case) { + if (group.num_qualifying > 0 && + next_player->total + max_score_this_song > unsigned(qualify_beat_worst_case) && + (unsigned(qualify_beat_worst_case) != win_beat)) { int qual_need = std::max(qualify_beat_worst_case - next_player->total + 1, 0U); - if (qualify_beat_worst_case == qualify_beat_best_case) { - text = widestring("Needs to qualify: ") + widestring(pqxx::to_string(qual_need)); - } else { - text = widestring("Needs to secure qualification: ") + widestring(pqxx::to_string(qual_need)); - } + if (qual_need > 0) { + if (qualify_beat_worst_case == qualify_beat_best_case) { + text = widestring("Needs to qualify: ") + widestring(pqxx::to_string(qual_need)); + } else { + text = widestring("Needs to secure qualification: ") + widestring(pqxx::to_string(qual_need)); + } + + this_width = my_draw_text(text, NULL, 18.0); + my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); - this_width = my_draw_text(text, NULL, 18.0); - my_draw_text(text, buf, 18.0, 400 - this_width/2, y); - - y += 30; + y += 30; + } } } } @@ -451,3 +503,7 @@ void GroupScreen::draw(unsigned char *buf) last_text = td; } +int GroupScreen::get_priority() +{ + return 10; +}