diff options
| author | lecoanet | 2004-04-30 14:46:57 +0000 |
|---|---|---|
| committer | lecoanet | 2004-04-30 14:46:57 +0000 |
| commit | df0244fa33345441ee08129301bd11e1eb4beec7 (patch) | |
| tree | e02253950687a49ea1c6edc69e23262a8e9b2d56 | |
| parent | 85656787616a87c1692c776e0bd5e0c33ec0b390 (diff) | |
| download | tkzinc-df0244fa33345441ee08129301bd11e1eb4beec7.zip tkzinc-df0244fa33345441ee08129301bd11e1eb4beec7.tar.gz tkzinc-df0244fa33345441ee08129301bd11e1eb4beec7.tar.bz2 tkzinc-df0244fa33345441ee08129301bd11e1eb4beec7.tar.xz | |
Adapted the ZnTexGVI structure and the public API for the new
GL font code.
| -rw-r--r-- | generic/Image.h | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/generic/Image.h b/generic/Image.h index 87860cb..2b81246 100644 --- a/generic/Image.h +++ b/generic/Image.h @@ -64,34 +64,26 @@ GLuint ZnImageTex(ZnImage image, ZnReal *t, ZnReal *s); typedef struct _ZnTexGlyphVertexInfo { - GLfloat t0[2]; - GLshort v0[2]; - GLfloat t1[2]; - GLshort v1[2]; - GLfloat t2[2]; - GLshort v2[2]; - GLfloat t3[2]; - GLshort v3[2]; - GLfloat advance; + GLfloat t0x; + GLfloat t0y; + GLshort v0x; + GLshort v0y; + GLfloat t1x; + GLfloat t1y; + GLshort v1x; + GLshort v1y; + GLfloat advance; + int code; } ZnTexGVI; typedef void *ZnTexFontInfo; -ZnTexFontInfo -ZnGetTexFont(struct _ZnWInfo *wi, Tk_Font font); -void -ZnFreeTexFont(ZnTexFontInfo tfi); -ZnBool -ZnCharInTexFont(ZnTexFontInfo tfi, unsigned int c); -ZnTexGVI * -ZnTexFontGVI(ZnTexFontInfo tfi, unsigned int c); -GLuint -ZnTexFontTex(ZnTexFontInfo tfi); -#ifndef PTK_800 -Tcl_Encoding -ZnTexFontEncoding(ZnTexFontInfo tfi); -#endif +ZnTexFontInfo ZnGetTexFont(struct _ZnWInfo *wi, Tk_Font font); +void ZnFreeTexFont(ZnTexFontInfo tfi); +ZnTexGVI *ZnTexFontGVI(ZnTexFontInfo tfi, int c); +int ZnGetFontIndex(ZnTexFontInfo tfi, int c); +GLuint ZnTexFontTex(ZnTexFontInfo tfi); #endif #endif /* _Image_h */ |