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>2009-08-18 09:24:15 +0000
committerStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
commitf030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch)
treecd92baf9e4fa8a136523b9eb570e9811846c9250 /src/render/text.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/render/text.h')
-rw-r--r--src/render/text.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/render/text.h b/src/render/text.h
index 4762639..631f1cd 100644
--- a/src/render/text.h
+++ b/src/render/text.h
@@ -43,17 +43,21 @@ public:
/// set the font
static void setfont(const char *texture, float width, float height);
-
+
/// set the color
static void setcolor(const char color);
/// current font width
- static inline float fontwidth() { return text_fontwidth; }
+ static inline float fontwidth() {
+ return text_fontwidth;
+ }
/// current font height
- static inline float fontheight() { return text_fontheight; }
+ static inline float fontheight() {
+ return text_fontheight;
+ }
- enum Color {Black=0, Red=1, Green=2, Yellow=3, Blue=4, Cyan=5, Magenta=6, White=7};
+ enum Color {Black = 0, Red = 1, Green = 2, Yellow = 3, Blue = 4, Cyan = 5, Magenta = 6, White = 7};
static math::Color * base_color[10];
static math::Color * core_color[26];