X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FText.h;h=584ca4ae28839643d333e158ef5938a6457242b0;hb=cd043e3f9e26c2b3406b40a354c2840941e9db7f;hp=8627479092ceaf9ad285a3bc6d216bbc3974fb7f;hpb=2ee52e8aac60f13cdbfb53adcacac57985f4e24f;p=lugaru.git

diff --git a/Source/Text.h b/Source/Text.h
index 8627479..584ca4a 100644
--- a/Source/Text.h
+++ b/Source/Text.h
@@ -3,20 +3,18 @@ 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 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.
 
-This program is distributed in the hope that it will be useful,
+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.
+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 this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _TEXT_H_
@@ -29,23 +27,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Quaternions.h"
 #include "gamegl.h"
 #include "TGALoader.h"
+#include "Texture.h"
 
-class Text{
+class Text
+{
 public:
-	GLuint FontTexture;
-	GLuint base;
-
-	void LoadFontTexture(const 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