X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FText.hpp;h=494ee91524ac412b7e5a8ad67c016befcc10168a;hb=6a8cb464330e92163c8feaf101b8b5837c973bba;hp=73dc621b8b91d593fa9044d03b58507f1ca120a0;hpb=eadd0bae922f47c50bc3450ecd43b521025e4b75;p=lugaru.git diff --git a/Source/Graphic/Text.hpp b/Source/Graphic/Text.hpp index 73dc621..494ee91 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. @@ -21,9 +21,9 @@ along with Lugaru. If not, see . #ifndef _TEXT_HPP_ #define _TEXT_HPP_ -#include "Graphic/gamegl.hpp" #include "Graphic/Texture.hpp" -#include "Math/Quaternions.hpp" +#include "Graphic/gamegl.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();