X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FText.h;h=cec999569450723082be3f462a8cde904575561c;hb=26debbd380c6922e5a0b60d99567c6374a4fef9a;hp=d2502abed9d3e5cc4f8ffd7bc5185af6fa1974fc;hpb=c32ed0b5dc3912d78dbf6d99baeaceb1f51799d7;p=lugaru.git diff --git a/Source/Text.h b/Source/Text.h index d2502ab..cec9995 100644 --- a/Source/Text.h +++ b/Source/Text.h @@ -29,26 +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(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, char *string, int set, float size, float width, float height, int start, int end, int offset); + void _glPrint(float x, float y, const char *string, int set, float size, float width, float height, int start, int end, int offset); }; #endif