X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FText.hpp;h=efa6a4e8e634f0087bc0eb407be51cb826eec0c9;hb=00a07ffc6abc6e36cf790448e694155f021c7b9d;hp=73dc621b8b91d593fa9044d03b58507f1ca120a0;hpb=eadd0bae922f47c50bc3450ecd43b521025e4b75;p=lugaru.git diff --git a/Source/Graphic/Text.hpp b/Source/Graphic/Text.hpp index 73dc621..efa6a4e 100644 --- a/Source/Graphic/Text.hpp +++ b/Source/Graphic/Text.hpp @@ -1,6 +1,6 @@ /* Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) +Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. @@ -23,7 +23,7 @@ along with Lugaru. If not, see . #include "Graphic/gamegl.hpp" #include "Graphic/Texture.hpp" -#include "Math/Quaternions.hpp" +#include "Math/XYZ.hpp" #include "Utils/ImageIO.hpp" #include @@ -36,12 +36,10 @@ public: void LoadFontTexture(const std::string& fileName); void BuildFont(); - void glPrint(float x, float y, const std::string& string, int set, float size, float width, float height); - void glPrintOutline(float x, float y, const std::string& string, int set, float size, float width, float height); - void glPrint(float x, float y, const std::string& string, int set, float size, float width, float height, int start, int end); - void glPrintOutline(float x, float y, const std::string& string, int set, float size, float width, float height, int start, int end); - void glPrintOutlined(float x, float y, const std::string& string, int set, float size, float width, float height); - void glPrintOutlined(float r, float g, float b, float x, float y, const std::string& string, int set, float size, float width, float height); + void glPrint(float x, float y, const std::string& string, int set, float size, float width, float height, int start = 0, int end = -1); + void glPrintOutline(float x, float y, const std::string& string, int set, float size, float width, float height, int start = 0, int end = -1); + void glPrintOutlined(float x, float y, const std::string& string, int set, float size, float width, float height, int start = 0, int end = -1); + void glPrintOutlined(float r, float g, float b, float a, float x, float y, const std::string& string, int set, float size, float width, float height, int start = 0, int end = -1); Text(); ~Text();