New texture-based gl_draw implementation now used also in 32-but compiles
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7027 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
001a756b15
commit
bb58589936
@ -110,7 +110,7 @@ void gl_font(int fontid, int size) {
|
|||||||
wglUseFontBitmaps(fl_gc, base, count, fl_fontsize->listbase+base);
|
wglUseFontBitmaps(fl_gc, base, count, fl_fontsize->listbase+base);
|
||||||
SelectObject(fl_gc, oldFid);
|
SelectObject(fl_gc, oldFid);
|
||||||
# elif defined(__APPLE_QUARTZ__)
|
# elif defined(__APPLE_QUARTZ__)
|
||||||
#if ! __LP64__
|
#if ! defined(__APPLE_COCOA__)
|
||||||
//AGL is not supported for use in 64-bit applications:
|
//AGL is not supported for use in 64-bit applications:
|
||||||
//http://developer.apple.com/mac/library/documentation/Carbon/Conceptual/Carbon64BitGuide/OtherAPIChanges/OtherAPIChanges.html
|
//http://developer.apple.com/mac/library/documentation/Carbon/Conceptual/Carbon64BitGuide/OtherAPIChanges/OtherAPIChanges.html
|
||||||
short font, face, size;
|
short font, face, size;
|
||||||
@ -132,7 +132,7 @@ void gl_font(int fontid, int size) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
gl_fontsize = fl_fontsize;
|
gl_fontsize = fl_fontsize;
|
||||||
#if !( defined(__APPLE__) && __LP64__ )
|
#if !( defined(__APPLE__) && defined(__APPLE_COCOA__) )
|
||||||
glListBase(fl_fontsize->listbase);
|
glListBase(fl_fontsize->listbase);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -210,14 +210,14 @@ void gl_remove_displaylist_fonts()
|
|||||||
Draws an array of n characters of the string in the current font
|
Draws an array of n characters of the string in the current font
|
||||||
at the current position.
|
at the current position.
|
||||||
*/
|
*/
|
||||||
#if defined(__APPLE__) && __LP64__
|
#if defined(__APPLE__) && defined(__APPLE_COCOA__)
|
||||||
static void gl_draw_cocoa(const char* str, int n);
|
static void gl_draw_cocoa(const char* str, int n);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void gl_draw(const char* str, int n) {
|
void gl_draw(const char* str, int n) {
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
|
|
||||||
#if __LP64__
|
#if defined(__APPLE_COCOA__)
|
||||||
gl_draw_cocoa(str, n);
|
gl_draw_cocoa(str, n);
|
||||||
#else
|
#else
|
||||||
// Should be converting the text here, as for other platforms???
|
// Should be converting the text here, as for other platforms???
|
||||||
@ -367,7 +367,7 @@ void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) {
|
|||||||
glDrawPixels(w,h,d<4?GL_RGB:GL_RGBA,GL_UNSIGNED_BYTE,(const ulong*)b);
|
glDrawPixels(w,h,d<4?GL_RGB:GL_RGBA,GL_UNSIGNED_BYTE,(const ulong*)b);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(__APPLE__) && defined(__APPLE_COCOA__) && __LP64__
|
#if defined(__APPLE__) && defined(__APPLE_COCOA__)
|
||||||
|
|
||||||
#include <FL/glu.h>
|
#include <FL/glu.h>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user