major refactor of texture system

[lugaru.git] / Source / Text.h

diff --git a/Source/Text.h b/Source/Text.h
index 09499c5e4389202470e39de0f3e58ede8ce90ebd..cec999569450723082be3f462a8cde904575561c 100644 (file)
--- a/Source/Text.h
+++ b/Source/Text.h
@@ -29,23 +29,27 @@ 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{
 public:
-       GLuint FontTexture;
+       Texture FontTexture;
        GLuint base;
 
-       void LoadFontTexture(char *fileName);
+       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);
+       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