Removed lots of unused code from Math folder, renamed Quaternion file to XYZ

[lugaru.git] / Source / Graphic / Text.hpp

diff --git a/Source/Graphic/Text.hpp b/Source/Graphic/Text.hpp
index d830af42f9d3ab158c49fe42d83cb5303fb8f714..65c4ca1d98de063ee91561dd9524165fd5a47f55 100644 (file)
--- a/Source/Graphic/Text.hpp
+++ b/Source/Graphic/Text.hpp
@@ -23,9 +23,11 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Graphic/gamegl.hpp"
 #include "Graphic/Texture.hpp"
-#include "Math/Quaternions.hpp"
+#include "Math/XYZ.hpp"
 #include "Utils/ImageIO.hpp"
 
+#include <string>
+
 class Text
 {
 public:
@@ -34,18 +36,16 @@ public:
 
     void LoadFontTexture(const std::string& fileName);
     void BuildFont();
-    void glPrint(float x, float y, const char *string, int set, float size, float width, float height);
-    void glPrintOutline(float x, float y, const char *string, int set, float size, float width, float height);
-    void glPrint(float x, float y, const char *string, int set, float size, float width, float height, int start, int end);
-    void glPrintOutline(float x, float y, const char *string, int set, float size, float width, float height, int start, int end);
-    void glPrintOutlined(float x, float y, const char *string, int set, float size, float width, float height);
-    void glPrintOutlined(float r, float g, float b, float x, float y, const char *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();
 
 private:
-    void _glPrint(float x, float y, const char *string, int set, float size, float width, float height, int start, int end, int offset);
+    void _glPrint(float x, float y, const std::string& string, int set, float size, float width, float height, int start, int end, int offset);
 };
 
 #endif