mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added some GLUT4 functions (STR #1370) 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5323 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2006-08-17 09:56:59 +00:00
parent 51d67574ec
commit c8288bd7b4
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -1,5 +1,6 @@
CHANGES IN FLTK 1.1.8
- Added some GLUT4 functions (STR #1370)
- Added "context_changed()" function for OpenGL windows
which allows efficent texture loading (STR #1372)
- Added missing "const" to GLUT call (STR #1371)

3
FL/glut.H
View File

@ -125,6 +125,8 @@ FL_EXPORT void glutDestroyWindow(int win);
inline void glutPostRedisplay() {glut_window->redraw();}
FL_EXPORT void glutPostWindowRedisplay(int win);
FL_EXPORT void glutSwapBuffers();
inline int glutGetWindow() {return glut_window->number;}
@ -421,6 +423,7 @@ extern FL_EXPORT struct Glut_Bitmap_Font {uchar font; int size;}
FL_EXPORT void glutBitmapCharacter(void *font, int character);
FL_EXPORT int glutBitmapWidth(void *font, int character);
FL_EXPORT int glutBitmapLength(void *font, const unsigned char *string);
////////////////////////////////////////////////////////////////
// GLUT drawing functions. These are NOT emulated but you can

4
src/glut_compatability.cxx
View File

@ -257,6 +257,10 @@ void glutDestroyWindow(int win) {
delete windows[win];
}
void glutPostWindowRedisplay(int win) {
windows[win]->redraw();
}
void glutSetWindow(int win) {
windows[win]->make_current();
}

5
src/glut_font.cxx
View File

@ -53,6 +53,11 @@ int glutBitmapWidth(void* font, int character) {
return int(gl_width(character)+.5);
}
int glutBitmapLength(void *font, const unsigned char *string) {
gl_font(((Glut_Bitmap_Font *)font)->font,((Glut_Bitmap_Font *)font)->size);
return int(gl_width((const char*)string)+.5);
}
#endif
//