openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Seperate the logic of calculating where to draw the text from the code that actually draws it

Browse Source
This commit is contained in:
Celtic Minstrel
2014-11-29 21:12:06 -05:00
parent 84f2e7b831
commit 3f857cc568
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
osx/tools/graphtool.cpp
View File

@@ -199,6 +199,11 @@ struct text_params_t {
location offset = {0,0}; location offset = {0,0};
}; };
struct snippet_t {
std::string text;
location at;
};
void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string str,text_params_t options); void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string str,text_params_t options);
void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string str,eTextMode mode,TextStyle style, location offset) { void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string str,eTextMode mode,TextStyle style, location offset) {
@@ -241,6 +246,7 @@ void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string st
}; };
location moveTo; location moveTo;
std::vector<snippet_t> snippets;
line_height -= 2; line_height -= 2;
if(mode == eTextMode::WRAP) { if(mode == eTextMode::WRAP) {
@@ -253,10 +259,7 @@ void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string st
last_word_break = i + 1; last_word_break = i + 1;
} }
size_t amount = last_word_break - last_line_break - 1; size_t amount = last_word_break - last_line_break - 1;
sf::Text line_to_draw(str_to_draw); snippets.push_back({str.substr(last_line_break,amount), moveTo});
line_to_draw.setString(str.substr(last_line_break,amount));
line_to_draw.setPosition(moveTo);
dest_window.draw(line_to_draw);
moveTo.y += line_height; moveTo.y += line_height;
last_line_break = last_word_break; last_line_break = last_word_break;
} }
@@ -264,12 +267,10 @@ void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string st
last_word_break = i + 1; last_word_break = i + 1;
} }
if (i - last_line_break > 1) { if(i - last_line_break > 1) {
str_to_draw.setPosition(moveTo); std::string snippet = str.substr(last_line_break);
str_to_draw.setString(str.substr(last_line_break)); if(snippet.size() > 2)
if(str_to_draw.getString().getSize() > 2){ snippets.push_back({snippet, moveTo});
dest_window.draw(str_to_draw);
}
} }
} else { } else {
switch(mode) { switch(mode) {
@@ -286,7 +287,12 @@ void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string st
case eTextMode::WRAP: case eTextMode::WRAP:
break; // Never happens, but put this here to silence warning break; // Never happens, but put this here to silence warning
} }
str_to_draw.setPosition(moveTo); snippets.push_back({str, moveTo});
}
for(auto& snippet : snippets) {
str_to_draw.setString(snippet.text);
str_to_draw.setPosition(snippet.at);
dest_window.draw(str_to_draw); dest_window.draw(str_to_draw);
} }
} }