X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Ffonts.cpp;h=86910a6b2757a4c27974274eecc2b874fde95eb4;hb=d4ec885cadcbcce077579bdd24c93ead18b06852;hp=cedd03affddd01fa4c859d3642177ea88bd9d646;hpb=416d3d469d9ce4c15a860f61e24aee79da12402d;p=ccbs diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp index cedd03a..86910a6 100644 --- a/bigscreen/fonts.cpp +++ b/bigscreen/fonts.cpp @@ -1,3 +1,4 @@ +#include #include #include #include "fonts.h" @@ -125,13 +126,19 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in return x * LOGICAL_SCREEN_WIDTH / screen_width; } -void my_draw_text_deferred(std::vector &td, const widestring &str, double size, int xpos, int ypos) +void my_draw_text_deferred(std::vector &td, const widestring &str, double size, int xpos, int ypos, int r, int g, int b, int rn, int gn, int bn) { TextDefer newtd; newtd.str = str; newtd.size = size; newtd.xpos = xpos; newtd.ypos = ypos; + newtd.r = r; + newtd.g = g; + newtd.b = b; + newtd.rn = rn; + newtd.gn = gn; + newtd.bn = bn; td.push_back(newtd); } @@ -141,11 +148,13 @@ void draw_all_deferred_text(unsigned char *buf, std::vector ¤t, int r, g, b; if (i < old.size() && current[i].str != old[i].str) { // changed text - r = 255; - g = 0; - b = 0; + r = current[i].rn; + g = current[i].gn; + b = current[i].bn; } else { - r = g = b = 255; + r = current[i].r; + g = current[i].g; + b = current[i].b; } my_draw_text(current[i].str, buf, current[i].size, current[i].xpos, current[i].ypos, r, g, b);