X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftextscroller.cpp;h=b2d60bf91eeec3ccfa21aa45df67fb9f02cdf8f8;hb=d84d73b701cc7fa2bd74f3490b9be1bf8b6f705a;hp=2c7139df58168f7b067ff995bf78362cf1c58f13;hpb=e6a940db5904743e8220491ce10b5107e119a44c;p=supertux.git diff --git a/src/textscroller.cpp b/src/textscroller.cpp index 2c7139df5..b2d60bf91 100644 --- a/src/textscroller.cpp +++ b/src/textscroller.cpp @@ -1,7 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -12,7 +12,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -28,12 +28,12 @@ #include "video/font.hpp" #include "video/drawing_context.hpp" #include "video/surface.hpp" -#include "video/screen.hpp" #include "gui/menu.hpp" #include "lisp/parser.hpp" #include "lisp/lisp.hpp" #include "audio/sound_manager.hpp" #include "main.hpp" +#include "fadeout.hpp" #include "control/joystickkeyboardcontroller.hpp" static const float DEFAULT_SPEED = 20; @@ -41,25 +41,6 @@ static const float LEFT_BORDER = 50; static const float SCROLL = 60; static const float ITEMS_SPACE = 4; -static void split_text(const std::string& text, std::vector& lines) -{ - // Split text string lines into a vector - lines.clear(); - std::string::size_type i, l; - i = 0; - while(true) { - l = text.find("\n", i); - - if(l == std::string::npos) { - lines.push_back(text.substr(i, text.size()-i)); - break; - } - - lines.push_back(text.substr(i, l-i)); - i = l+1; - } -} - TextScroller::TextScroller(const std::string& filename) { defaultspeed = DEFAULT_SPEED; @@ -89,29 +70,18 @@ TextScroller::TextScroller(const std::string& filename) } // Split text string lines into a vector - split_text(text, lines); - - for(size_t i = 0; i < lines.size(); ++i) { - const std::string& line = lines[i]; - if(line.size() == 0) - continue; - if(line[0] == '!') { - std::string imagename = line.substr(1, line.size()-1); - images.insert(std::make_pair(imagename, new Surface(imagename))); - } - } + lines = InfoBoxLine::split(text, 40); // load background image background.reset(new Surface("images/background/" + background_file)); scroll = 0; + fading = false; } TextScroller::~TextScroller() { - for(std::map::iterator i = images.begin(); - i != images.end(); ++i) - delete i->second; + for(std::vector::iterator i = lines.begin(); i != lines.end(); i++) delete *i; } void @@ -136,8 +106,7 @@ TextScroller::update(float elapsed_time) || main_controller->pressed(Controller::MENU_SELECT)) scroll += SCROLL; if(main_controller->pressed(Controller::PAUSE_MENU)) { - fadeout(500); - main_loop->exit_screen(); + main_loop->exit_screen(new FadeOut(0.5)); } scroll += speed * elapsed_time; @@ -153,74 +122,21 @@ TextScroller::draw(DrawingContext& context) float y = SCREEN_HEIGHT - scroll; for(size_t i = 0; i < lines.size(); i++) { - const std::string& line = lines[i]; - if(line.size() == 0) { - y += white_text->get_height() + ITEMS_SPACE; - continue; - } - - const Font* font = 0; - const Surface* image = 0; - bool center = true; - switch(line[0]) - { - case ' ': font = white_small_text; break; - case '\t': font = white_text; break; - case '-': font = white_big_text; break; - case '*': font = blue_text; break; - case '#': font = white_text; center = false; break; - case '!': { - std::string imagename = line.substr(1, line.size()-1); - image = images[imagename]; - break; - } - default: - log_warning << "text contains an unformated line" << std::endl; - font = white_text; - center = false; - break; - } - - if(font != 0) { - if(center) { - context.draw_text(font, - line.substr(1, line.size()-1), - Vector(SCREEN_WIDTH/2, y), - CENTER_ALLIGN, LAYER_FOREGROUND1); - } else { - context.draw_text(font, - line.substr(1, line.size()-1), - Vector(LEFT_BORDER, y), - LEFT_ALLIGN, LAYER_FOREGROUND1); - } - y += font->get_height() + ITEMS_SPACE; - } - if(image != 0) { - context.draw_surface(image, - Vector( (SCREEN_WIDTH - image->get_width()) / 2, y), 255); - y += image->get_height() + ITEMS_SPACE; - } + lines[i]->draw(context, Vector(LEFT_BORDER, y), LAYER_GUI); + y += lines[i]->get_height(); } - if(y < 0) { - fadeout(500); - main_loop->exit_screen(); + if(y < 0 && !fading ) { + fading = true; + main_loop->exit_screen(new FadeOut(0.5)); } } InfoBox::InfoBox(const std::string& text) : firstline(0) { - split_text(text, lines); - - for(size_t i = 0; i < lines.size(); ++i) { - if(lines[i].size() == 0) - continue; - if(lines[i][0] == '!') { - std::string imagename = lines[i].substr(1, lines[i].size()-1); - images.insert(std::make_pair(imagename, new Surface(imagename))); - } - } + // Split text string lines into a vector + lines = InfoBoxLine::split(text, 23); try { @@ -238,9 +154,7 @@ InfoBox::InfoBox(const std::string& text) InfoBox::~InfoBox() { - for(std::map::iterator i = images.begin(); - i != images.end(); ++i) - delete i->second; + for(std::vector::iterator i = lines.begin(); i != lines.end(); i++) delete *i; delete arrow_scrollup; delete arrow_scrolldown; } @@ -248,11 +162,6 @@ InfoBox::~InfoBox() void InfoBox::draw(DrawingContext& context) { - const Font* heading_font = white_big_text; - const Font* normal_font = white_text; - const Font* small_font = white_small_text; - const Font* reference_font = blue_text; - float x1 = 200; float y1 = 100; float width = 400; @@ -263,55 +172,10 @@ InfoBox::draw(DrawingContext& context) float y = y1; for(size_t i = firstline; i < lines.size(); ++i) { - const std::string& line = lines[i]; - if(y >= y1 + height) - break; + if(y >= y1 + height) break; - if(line.size() == 0) { - y += normal_font->get_height() + ITEMS_SPACE; - continue; - } - - const Font* font = 0; - const Surface* image = 0; - bool center = true; - switch(line[0]) - { - case ' ': font = small_font; break; - case '\t': font = normal_font; break; - case '-': font = heading_font; break; - case '*': font = reference_font; break; - case '#': font = normal_font; center = false; break; - case '!': { - std::string imagename = line.substr(1, line.size()-1); - image = images[imagename]; - break; - } - default: - log_warning << "text contains an unformatted line" << std::endl; - font = normal_font; - center = false; - break; - } - - if(image != 0) { - context.draw_surface(image, - Vector( (SCREEN_WIDTH - image->get_width()) / 2, - y), LAYER_GUI); - y += image->get_height() + ITEMS_SPACE; - } else if(center) { - context.draw_text(font, - line.substr(1, line.size()-1), - Vector(SCREEN_WIDTH/2, y), - CENTER_ALLIGN, LAYER_GUI); - y += font->get_height() + ITEMS_SPACE; - } else { - context.draw_text(font, - line.substr(1, line.size()-1), - Vector(x1, y), - LEFT_ALLIGN, LAYER_GUI); - y += font->get_height() + ITEMS_SPACE; - } + lines[i]->draw(context, Vector(x1, y), LAYER_GUI); + y += lines[i]->get_height(); // draw the scrolling arrows if (arrow_scrollup && firstline > 0) @@ -351,3 +215,116 @@ InfoBox::pagedown() { } +InfoBoxLine::InfoBoxLine(char format_char, const std::string& text) : lineType(NORMAL), font(white_text), text(text), image(0) +{ + switch(format_char) + { + case ' ': + lineType = SMALL; + font = white_small_text; + break; + case '\t': + lineType = NORMAL; + font = white_text; + break; + case '-': + lineType = HEADING; + font = white_big_text; + break; + case '*': + lineType = REFERENCE; + font = blue_text; + break; + case '#': + lineType = NORMAL_LEFT; + font = white_text; + break; + case '!': + lineType = IMAGE; + image = new Surface(text); + break; + default: + log_warning << "Unknown format_char: '" << format_char << "'" << std::endl; + break; + } +} + +InfoBoxLine::~InfoBoxLine() +{ + delete image; +} + +const std::vector +InfoBoxLine::split(const std::string& text, int line_length) +{ + std::vector lines; + + std::string::size_type i = 0; + std::string::size_type l; + char format_char = '#'; + while(i < text.size()) { + // take care of empty lines - represent them as blank lines of normal text + if (text[i] == '\n') { + lines.push_back(new InfoBoxLine('\t', "")); + i++; + continue; + } + + // extract the format_char + format_char = text[i]; + i++; + if (i >= text.size()) break; + + // extract one line + l = text.find("\n", i); + if (l == std::string::npos) l=text.size(); + std::string s = text.substr(i, l-i); + i = l+1; + + // if we are dealing with an image, just store the line + if (format_char == '!') { + lines.push_back(new InfoBoxLine(format_char, s)); + continue; + } + + // append wrapped parts of line into list + std::string overflow; + do { + lines.push_back(new InfoBoxLine(format_char, Font::wrap_to_chars(s, line_length, &overflow))); + s = overflow; + } while (s.length() > 0); + + } + + return lines; +} + +void +InfoBoxLine::draw(DrawingContext& context, const Vector& position, int layer) +{ + switch (lineType) { + case IMAGE: + context.draw_surface(image, Vector( (SCREEN_WIDTH - image->get_width()) / 2, position.y), layer); + break; + case NORMAL_LEFT: + context.draw_text(font, text, Vector(position.x, position.y), LEFT_ALLIGN, layer); + break; + default: + context.draw_text(font, text, Vector(SCREEN_WIDTH/2, position.y), CENTER_ALLIGN, layer); + break; + } +} + +float +InfoBoxLine::get_height() +{ + switch (lineType) { + case IMAGE: + return image->get_height() + ITEMS_SPACE; + case NORMAL_LEFT: + return font->get_height() + ITEMS_SPACE; + default: + return font->get_height() + ITEMS_SPACE; + } +} +