Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 00:22:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed OpenGL text drawing...

Browse Source 
git-svn-id: file:///fltk/svn/fltk/trunk@124 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
1998-12-02 21:15:19 +00:00
parent 5c85287f32
commit be689f989a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gl_draw.cxx
+9 -6
View File
@@ -1,5 +1,5 @@
// //
// "$Id: gl_draw.cxx,v 1.5 1998/12/02 15:51:38 mike Exp $" // "$Id: gl_draw.cxx,v 1.6 1998/12/02 21:15:19 mike Exp $"
// //
// OpenGL drawing support routines for the Fast Light Tool Kit (FLTK). // OpenGL drawing support routines for the Fast Light Tool Kit (FLTK).
// //
@@ -50,18 +50,21 @@ void gl_draw(const char* str, int n) {
int base = fl_fontsize->metr.tmFirstChar; int base = fl_fontsize->metr.tmFirstChar;
int size = fl_fontsize->metr.tmLastChar-base+1; int size = fl_fontsize->metr.tmLastChar-base+1;
HFONT oldFid = (HFONT)SelectObject(fl_gc, fl_fontsize->fid); HFONT oldFid = (HFONT)SelectObject(fl_gc, fl_fontsize->fid);
fl_fontsize->listbase = glGenLists(size)-base; fl_fontsize->listbase = glGenLists(256);
wglUseFontBitmaps(fl_gc, base, size, fl_fontsize->listbase+base); wglUseFontBitmaps(fl_gc, base, size, fl_fontsize->listbase+base);
SelectObject(fl_gc, oldFid); SelectObject(fl_gc, oldFid);
#else #else
int base = fl_xfont->min_char_or_byte2; int base = fl_xfont->min_char_or_byte2;
int size = fl_xfont->max_char_or_byte2-base+1; int size = fl_xfont->max_char_or_byte2-base+1;
fl_fontsize->listbase = glGenLists(size)-base; fl_fontsize->listbase = glGenLists(256);
glXUseXFont(fl_xfont->fid, base, size, fl_fontsize->listbase+base); glXUseXFont(fl_xfont->fid, base, size, fl_fontsize->listbase+base);
#endif #endif
} }
glListBase(fl_fontsize->listbase);
glCallLists(n, GL_UNSIGNED_BYTE, str); glPushAttrib(GL_LIST_BIT);
glListBase(fl_fontsize->listbase);
glCallLists(n, GL_UNSIGNED_BYTE, str);
glPopAttrib();
} }
void gl_draw(const char* str, int n, int x, int y) { void gl_draw(const char* str, int n, int x, int y) {
@@ -139,5 +142,5 @@ void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) {
#endif #endif
// //
// End of "$Id: gl_draw.cxx,v 1.5 1998/12/02 15:51:38 mike Exp $". // End of "$Id: gl_draw.cxx,v 1.6 1998/12/02 21:15:19 mike Exp $".
// //