aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DejaVuSans.ttfbin0 -> 611552 bytes
-rw-r--r--src/frames/loading_frame.cpp4
-rw-r--r--src/menu/text.cpp88
-rw-r--r--src/menu/text.hpp84
4 files changed, 176 insertions, 0 deletions
diff --git a/DejaVuSans.ttf b/DejaVuSans.ttf
new file mode 100644
index 00000000..e0699fec
--- /dev/null
+++ b/DejaVuSans.ttf
Binary files differ
diff --git a/src/frames/loading_frame.cpp b/src/frames/loading_frame.cpp
index 3be2af76..31458b7f 100644
--- a/src/frames/loading_frame.cpp
+++ b/src/frames/loading_frame.cpp
@@ -27,6 +27,7 @@
#include "loading_frame.hpp"
#include "menu/frame_background_image.hpp"
#include "menu/frame_background_color.hpp"
+#include "menu/text.hpp"
namespace usdx
{
@@ -39,6 +40,9 @@ namespace usdx
// RgbColor background(100, 100, 100);
// set_background(new FrameBackgroundColor(background));
set_background(new FrameBackgroundImage("game/themes/Deluxe/[bg-load]blue.jpg"));
+
+ DrawableControl *c = new Text(this, "Halloäöüß");
+ c->set_position(100, 100);
}
LoadingFrame::~LoadingFrame()
diff --git a/src/menu/text.cpp b/src/menu/text.cpp
new file mode 100644
index 00000000..8e3ae04a
--- /dev/null
+++ b/src/menu/text.cpp
@@ -0,0 +1,88 @@
+/*
+ * UltraStar Deluxe - Karaoke Game
+ *
+ * UltraStar Deluxe is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#include "text.hpp"
+#include <exception>
+#include <GL/gl.h>
+
+
+namespace usdx
+{
+ log4cpp::Category& Text::log =
+ log4cpp::Category::getInstance("usdx.menu.text");
+
+ Text::Text(Container *parent, const std::string text, const unsigned int size) :
+ DrawableControl(parent), text(text), auto_size(true), stretch(false)
+ {
+ font = new FTBufferFont("DejaVuSans.ttf");
+ font->FaceSize(size);
+
+ if (font->Error()) {
+ throw new std::exception();
+ }
+
+ }
+
+ Text::~Text()
+ {
+ if (font) {
+ delete font;
+ font = NULL;
+ }
+ }
+
+ void Text::draw(void)
+ {
+ glScalef(1, -1, 1);
+
+ {
+ boost::mutex::scoped_lock lock(text_mutex);
+ font->Render(text.c_str());
+ }
+ }
+
+ void Text::set_font_size(unsigned int value)
+ {
+ font->FaceSize(value);
+ }
+
+ unsigned int Text::get_font_size(void) const
+ {
+ return font->FaceSize();
+ }
+
+ void Text::set_text(const std::string value)
+ {
+ boost::mutex::scoped_lock lock(text_mutex);
+ text = value;
+ }
+
+ std::string Text::get_text(void) const
+ {
+ return text;
+ }
+};
+
diff --git a/src/menu/text.hpp b/src/menu/text.hpp
new file mode 100644
index 00000000..9cbef60b
--- /dev/null
+++ b/src/menu/text.hpp
@@ -0,0 +1,84 @@
+/*
+ * UltraStar Deluxe - Karaoke Game
+ *
+ * UltraStar Deluxe is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#ifndef TEXT_HPP
+#define TEXT_HPP
+
+#include <string>
+#include "drawable_control.hpp"
+#include "container.hpp"
+#include "utils/rectangle.hpp"
+#include <ftgl.h>
+#include <boost/thread/mutex.hpp>
+#include <log4cpp/Category.hh>
+
+namespace usdx
+{
+ class Text : public DrawableControl
+ {
+ private:
+ static log4cpp::Category& log;
+
+ /**
+ * text that should be displayed
+ */
+ std::string text;
+
+ /**
+ * If true, only the left and top coordinates of the bounds
+ * are used. If false and if the text is longer than the
+ * rectangle, it should be cut off.
+ */
+ bool auto_size;
+
+ /**
+ * If true, and the text to long and would exceeds the bounds,
+ * the font size is shirked until the text fit to the
+ * bounds. (Works only if auto size is false.)
+ */
+ bool stretch;
+
+ FTFont *font;
+
+ boost::mutex text_mutex;
+
+ protected:
+ virtual void draw(void);
+
+ public:
+ Text(Container* parent, const std::string text = "", const unsigned int size = 60);
+ virtual ~Text();
+
+ void set_font_size(const unsigned int value);
+ unsigned int get_font_size(void) const;
+
+ void set_text(const std::string value);
+ std::string get_text(void) const;
+ };
+};
+
+
+#endif