X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FText.h;h=201c9bf0a04deb333608a191e4e27f981efbdf16;hb=e9b773733850c91db5ab24c52dc2cfc57caf51e0;hp=8627479092ceaf9ad285a3bc6d216bbc3974fb7f;hpb=79b5064ce9bf996395b8605691b09bcdbf503d2a;p=lugaru.git

diff --git a/Source/Text.h b/Source/Text.h
index 8627479..201c9bf 100644
--- a/Source/Text.h
+++ b/Source/Text.h
@@ -10,7 +10,7 @@ of the License, or (at your option) any later version.
 
 This program 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.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -29,23 +29,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