Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-09-19 19:44:13 +0000
committerStijn Buys <ingar@osirion.org>2010-09-19 19:44:13 +0000
commitcc18095cded14f5e7e3f049e47fca2224134b647 (patch)
tree2a057f4836925083a19988d571dc0664925c9e48 /src/render/text.h
parentbadfb31888a6bd62e0a019b3f3dec517df4121ec (diff)
text rendering cleanups, inventory capacity & cargo volume
Diffstat (limited to 'src/render/text.h')
-rw-r--r--src/render/text.h39
1 files changed, 25 insertions, 14 deletions
diff --git a/src/render/text.h b/src/render/text.h
index 631f1cd..3f743ae 100644
--- a/src/render/text.h
+++ b/src/render/text.h
@@ -26,23 +26,34 @@ public:
/// assign system colors
static void assign_color(const char c, const math::Color &color);
- /// draw a text string
- static void draw(float x, float y, const std::string & text);
-
- /// draw a text string
-
- static void draw(float x, float y, const char *text);
- /// draw a text stream
- /** If the stream contains multiple lines, each new line will be
- * drawn at the same x value. The stream is cleared after reading
- */
- static void draw(float x, float y, std::stringstream & textstream);
+ /**
+ * @brief draw a single character
+ */
+ static void draw(const float x, const float y, const char ascii);
+
+ /**
+ * @brief draw a text string
+ * end-of-characters will be respected
+ */
+ static void draw(const float x, const float y, const char *text);
+
+ /**
+ * @brief draw a text string
+ * end-of-characters will be respected
+ */
+ inline static void draw(const float x, const float y, const std::string & text) {
+ draw(x, y, text.c_str());
+ }
- /// draw a character
- static void draw(float x, float y, const char ascii);
+ /* *
+ * @brief draw a text stream
+ * If the stream contains multiple lines, each new line will be
+ * drawn at the same x value. The stream is cleared after reading
+ */
+ //static void draw(float x, float y, std::stringstream & textstream);
/// set the font
- static void setfont(const char *texture, float width, float height);
+ static void setfont(const char *texture, const float width, const float height);
/// set the color
static void setcolor(const char color);