X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FText.h;h=b3165b738c8c9c1cb7e43e91298d0f01847374b0;hb=97989f58ab13c64fbe05e629d2b2a024a2c3cfa4;hp=741d1a9b4306bd430384ea756b9a80390a43b039;hpb=8562aa5bebc97ea8a61d056aec3847030c6985b7;p=lugaru.git

diff --git a/Source/Text.h b/Source/Text.h
index 741d1a9..b3165b7 100644
--- a/Source/Text.h
+++ b/Source/Text.h
@@ -1,3 +1,22 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+Lugaru is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #ifndef _TEXT_H_
 #define _TEXT_H_
 
@@ -7,24 +26,29 @@
 //#include "Files.h"
 #include "Quaternions.h"
 #include "gamegl.h"
-#include "TGALoader.h"
+#include "ImageIO.h"
+#include "Texture.h"
 
-class Text{
+class Text
+{
 public:
-	GLuint FontTexture;
-	GLuint base;
-
-	void LoadFontTexture(char *fileName);
-	void BuildFont();
-	void glPrint(float x, float y, char *string, int set, float size, float width, float height);
-	void glPrintOutline(float x, float y, char *string, int set, float size, float width, float height);
-	void glPrint(float x, float y, char *string, int set, float size, float width, float height,int start,int end);
-	void glPrintOutline(float x, float y, char *string, int set, float size, float width, float height,int start,int end);
-	void glPrintOutlined(float x, float y, char *string, int set, float size, float width, float height);
-	void glPrintOutlined(float r, float g, float b, float x, float y, char *string, int set, float size, float width, float height);
-
-	Text();
-	~Text();
+    Texture FontTexture;
+    GLuint base;
+
+    void LoadFontTexture(const char *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);
+
+    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);
 };
 
-#endif
\ No newline at end of file
+#endif