diff options
author | Stijn Buys <ingar@osirion.org> | 2008-10-05 21:14:09 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-10-05 21:14:09 +0000 |
commit | e8b466caefa3b0b3b70458035d1c52e9fd9c0662 (patch) | |
tree | 8a7f019040f446237ce9cc72ee4181888eab2339 /src/render | |
parent | aaf2809dbb28fdd6dd7c09adf5c79c12f6f4926a (diff) |
internally removes bitmaps/fonts prefix from render::Text
Diffstat (limited to 'src/render')
-rw-r--r-- | src/render/primitives.h | 2 | ||||
-rw-r--r-- | src/render/text.cc | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/render/primitives.h b/src/render/primitives.h index fa03c3c..679a76e 100644 --- a/src/render/primitives.h +++ b/src/render/primitives.h @@ -52,7 +52,7 @@ inline void bitmap(math::Vector2f const &location, math::Vector2f const &size, s using namespace render::gl; - render::Textures::bind(texture); + render::Textures::bind("bitmaps/" + texture); gl::enable(GL_TEXTURE_2D); begin(Quads); diff --git a/src/render/text.cc b/src/render/text.cc index c64e331..127605b 100644 --- a/src/render/text.cc +++ b/src/render/text.cc @@ -80,7 +80,10 @@ void Text::setcolor(const char color) void Text::setfont(const char *texture, float width, float height) { - Textures::bind(texture, false); + std::string tf("bitmaps/fonts/"); + tf.append(texture); + + Textures::bind(tf, false); text_fontwidth = width; text_fontheight = height; |