ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.106 by root, Mon Jun 5 03:48:49 2006 UTC

48#define MAP_EXTEND_X 32 48#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 49#define MAP_EXTEND_Y 512
50 50
51#define MIN_FONT_HEIGHT 10 51#define MIN_FONT_HEIGHT 10
52 52
53#define GL_CALL(type,func,args) \ 53static struct
54 { \ 54{
55 static int init_; \ 55#define GL_FUNC(ptr,name) ptr name;
56 static type fptr_; \ 56#include "glfunc.h"
57 \ 57#undef GL_FUNC
58 if (!init_) \ 58} gl;
59 { \ 59
60 init_ = 1; \ 60static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 61{
62 } \ 62 if (gl.BlendFuncSeparate)
63 \ 63 gl.BlendFuncSeparate (sa, da, saa, daa);
64 if (fptr_) \ 64 else if (gl.BlendFuncSeparateEXT)
65 fptr_ args; \ 65 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 } 66 else
67 glBlendFunc (sa, da);
68}
67 69
68typedef Mix_Chunk *CFClient__MixChunk; 70typedef Mix_Chunk *CFClient__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 71typedef Mix_Music *CFClient__MixMusic;
70 72
71typedef PangoFontDescription *CFClient__Font; 73typedef PangoFontDescription *CFClient__Font;
84 86
85static void 87static void
86substitute_func (FcPattern *pattern, gpointer data) 88substitute_func (FcPattern *pattern, gpointer data)
87{ 89{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 90 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifndef _WIN32 91#ifdef _WIN32
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
93#else
90 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 94 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
91#endif 95#endif
92} 96}
93 97
94static void 98static void
414} 418}
415 419
416void 420void
417pango_init () 421pango_init ()
418 CODE: 422 CODE:
419{
420 // delayed, so it can pick up new fonts added by AddFontResourceEx 423 // delayed, so it can pick up new fonts added by AddFontResourceEx
424{
425 {
421 ft2_fontmap = pango_ft2_font_map_new (); 426 ft2_fontmap = pango_ft2_font_map_new ();
422 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 427 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
423 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 428 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
424 429 }
430 {
431 cairo_font_options_t *fopt = cairo_font_options_create ();
425 cairo_fontmap = pango_cairo_font_map_get_default (); 432 cairo_fontmap = pango_cairo_font_map_get_default ();
426 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 433 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
434#ifdef _WIN32
435 // cairo looks like shit eaten twice on windows
436 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
437#else
438 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
439#endif
440 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
441 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
442 pango_cairo_context_set_font_options (cairo_context, fopt);
443 cairo_font_options_destroy (fopt);
444 }
427} 445}
428 446
429int 447int
430SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 448SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
431 449
441 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 459 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
442 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 460 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
443 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 461 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 462 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
445 463
464 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
465 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
466
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 467 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 468 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 469 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 470 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
450 471
451 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 472 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
452 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
453 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
454 473
455 SDL_EnableUNICODE (1); 474 SDL_EnableUNICODE (1);
456 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 475 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
457 476
458 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 477 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
467 486
468 ++m; 487 ++m;
469 } 488 }
470} 489}
471 490
491char *
492SDL_GetError ()
493
472int 494int
473SDL_SetVideoMode (int w, int h, int fullscreen) 495SDL_SetVideoMode (int w, int h, int fullscreen)
474 CODE: 496 CODE:
475 RETVAL = !!SDL_SetVideoMode ( 497 RETVAL = !!SDL_SetVideoMode (
476 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 498 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
477 ); 499 );
500 if (RETVAL)
501 {
478 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 502 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
503# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
504# include "glfunc.h"
505# undef GL_FUNC
506 }
479 OUTPUT: 507 OUTPUT:
480 RETVAL 508 RETVAL
481 509
482void 510void
483SDL_GL_SwapBuffers () 511SDL_GL_SwapBuffers ()
512
513char *
514SDL_GetKeyName (int sym)
484 515
485void 516void
486SDL_PollEvent () 517SDL_PollEvent ()
487 PPCODE: 518 PPCODE:
488{ 519{
507 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 538 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
508 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 539 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
509 break; 540 break;
510 541
511 case SDL_MOUSEMOTION: 542 case SDL_MOUSEMOTION:
543 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
544
512 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 545 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
513 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 546 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
514 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 547 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
515 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 548 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
516 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 549 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
517 break; 550 break;
518 551
519 case SDL_MOUSEBUTTONDOWN: 552 case SDL_MOUSEBUTTONDOWN:
520 case SDL_MOUSEBUTTONUP: 553 case SDL_MOUSEBUTTONUP:
554 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
555
521 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 556 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
522 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 557 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
523 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 558 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
524 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 559 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
525 break; 560 break;
551lowdelay (int fd, int val = 1) 586lowdelay (int fd, int val = 1)
552 CODE: 587 CODE:
553#ifndef _WIN32 588#ifndef _WIN32
554 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 589 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
555#endif 590#endif
556
557char *
558gl_version ()
559 CODE:
560 RETVAL = (char *)glGetString (GL_VERSION);
561 OUTPUT:
562 RETVAL
563
564char *
565gl_extensions ()
566 CODE:
567 RETVAL = (char *)glGetString (GL_EXTENSIONS);
568 OUTPUT:
569 RETVAL
570 591
571void 592void
572add_font (char *file) 593add_font (char *file)
573 CODE: 594 CODE:
574 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 595 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
667} 688}
668 689
669void 690void
670error (char *message) 691error (char *message)
671 CODE: 692 CODE:
693 fprintf (stderr, "ERROR: %s\n", message);
672#ifdef _WIN32 694#ifdef _WIN32
673 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 695 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
674#else
675 fprintf (stderr, "ERROR: %s\n", message);
676#endif 696#endif
677 697
678void 698void
679fatal (char *message) 699fatal (char *message)
680 CODE: 700 CODE:
701 fprintf (stderr, "FATAL: %s\n", message);
681#ifdef _WIN32 702#ifdef _WIN32
682 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 703 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
683#else
684 fprintf (stderr, "FATAL: %s\n", message);
685#endif 704#endif
686 exit (1); 705 exit (1);
687 706
688MODULE = CFClient PACKAGE = CFClient::Font 707MODULE = CFClient PACKAGE = CFClient::Font
689 708
801set_width (CFClient::Layout self, int max_width = -1) 820set_width (CFClient::Layout self, int max_width = -1)
802 CODE: 821 CODE:
803 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 822 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804 823
805void 824void
825set_indent (CFClient::Layout self, int indent)
826 CODE:
827 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
828
829void
830set_spacing (CFClient::Layout self, int spacing)
831 CODE:
832 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
833
834void
835set_ellipsise (CFClient::Layout self, int ellipsise)
836 CODE:
837 pango_layout_set_ellipsize (self->pl,
838 ellipsise == 1 ? PANGO_ELLIPSIZE_START
839 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
840 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
841 : PANGO_ELLIPSIZE_NONE
842 );
843
844void
845set_single_paragraph_mode (CFClient::Layout self, int spm)
846 CODE:
847 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
848
849void
806size (CFClient::Layout self) 850size (CFClient::Layout self)
807 PPCODE: 851 PPCODE:
808{ 852{
809 int w, h; 853 int w, h;
810 854
876 920
877 while (p < e) 921 while (p < e)
878 { 922 {
879 uint32_t rgba = *p; 923 uint32_t rgba = *p;
880 rgba = (rgba >> 24) | (rgba << 8); 924 rgba = (rgba >> 24) | (rgba << 8);
925#if 0
926#ifdef _WIN32
927 {//D
928 uint8_t r = rgba >> 24;
929 uint8_t g = rgba >> 16;
930 uint8_t b = rgba >> 8;
931 uint8_t a = rgba >> 0;
932
933 rgba = (rgba & 0xffffff00) | a;
934 }
935#endif
936#endif
881 rgba = SDL_SwapBE32 (rgba); 937 rgba = SDL_SwapBE32 (rgba);
882 *p++ = rgba; 938 *p++ = rgba;
883 } 939 }
884 } 940 }
885 941
930{ 986{
931 HV *hv = (HV *)SvRV (self); 987 HV *hv = (HV *)SvRV (self);
932 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 988 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
933 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 989 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
934 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 990 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
935 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
936 991
937 if (items < 5) 992 if (items < 5)
938 { 993 {
939 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 994 w = SvNV (*hv_fetch (hv, "w", 1, 1));
940 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 995 h = SvNV (*hv_fetch (hv, "h", 1, 1));
941 } 996 }
942 997
943 if (ix) 998 if (ix)
944 { 999 {
945 glEnable (GL_BLEND); 1000 glEnable (GL_BLEND);
1001
1002 if (ix == 2)
946 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1003 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1004 else
1005 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1006 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1007
1008 glEnable (GL_ALPHA_TEST);
1009 glAlphaFunc (GL_GREATER, 0.01f);
947 } 1010 }
948 1011
949 glBindTexture (GL_TEXTURE_2D, name); 1012 glBindTexture (GL_TEXTURE_2D, name);
950
951 if (wrap_mode)
952 {
953 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
954 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
955 }
956 1013
957 glBegin (GL_QUADS); 1014 glBegin (GL_QUADS);
958 glTexCoord2f (0, 0); glVertex2f (x , y ); 1015 glTexCoord2f (0, 0); glVertex2f (x , y );
959 glTexCoord2f (0, t); glVertex2f (x , y + h); 1016 glTexCoord2f (0, t); glVertex2f (x , y + h);
960 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1017 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
961 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1018 glTexCoord2f (s, 0); glVertex2f (x + w, y );
962 glEnd (); 1019 glEnd ();
963 1020
964 if (ix) 1021 if (ix)
1022 {
1023 glDisable (GL_ALPHA_TEST);
965 glDisable (GL_BLEND); 1024 glDisable (GL_BLEND);
1025 }
966} 1026}
967 1027
968MODULE = CFClient PACKAGE = CFClient::Map 1028MODULE = CFClient PACKAGE = CFClient::Map
969 1029
970CFClient::Map 1030CFClient::Map
1034 tex->r = r; 1094 tex->r = r;
1035 tex->g = g; 1095 tex->g = g;
1036 tex->b = b; 1096 tex->b = b;
1037 tex->a = a; 1097 tex->a = a;
1038 } 1098 }
1099
1100 // somewhat hackish, but for textures that require it, it really
1101 // improves the look, and most others don't suffer.
1102 glBindTexture (GL_TEXTURE_2D, name);
1103 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1104 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1105 // use uglier nearest interpolation because linear suffers
1106 // from transparent color bleeding and ugly wrapping effects.
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1039} 1108}
1040 1109
1041int 1110int
1042ox (CFClient::Map self) 1111ox (CFClient::Map self)
1043 ALIAS: 1112 ALIAS:
1044 oy = 1 1113 oy = 1
1114 x = 2
1115 y = 3
1116 w = 4
1117 h = 5
1045 CODE: 1118 CODE:
1046 switch (ix) 1119 switch (ix)
1047 { 1120 {
1048 case 0: RETVAL = self->ox; break; 1121 case 0: RETVAL = self->ox; break;
1049 case 1: RETVAL = self->oy; break; 1122 case 1: RETVAL = self->oy; break;
1123 case 2: RETVAL = self->x; break;
1124 case 3: RETVAL = self->y; break;
1125 case 4: RETVAL = self->w; break;
1126 case 5: RETVAL = self->h; break;
1050 } 1127 }
1051 OUTPUT: 1128 OUTPUT:
1052 RETVAL 1129 RETVAL
1053 1130
1054void 1131void
1481 const_iv (GL_COLOR_MATERIAL), 1558 const_iv (GL_COLOR_MATERIAL),
1482 const_iv (GL_SMOOTH), 1559 const_iv (GL_SMOOTH),
1483 const_iv (GL_FLAT), 1560 const_iv (GL_FLAT),
1484 const_iv (GL_DITHER), 1561 const_iv (GL_DITHER),
1485 const_iv (GL_BLEND), 1562 const_iv (GL_BLEND),
1563 const_iv (GL_CULL_FACE),
1486 const_iv (GL_SCISSOR_TEST), 1564 const_iv (GL_SCISSOR_TEST),
1565 const_iv (GL_DEPTH_TEST),
1566 const_iv (GL_ALPHA_TEST),
1567 const_iv (GL_NORMALIZE),
1568 const_iv (GL_RESCALE_NORMAL),
1487 const_iv (GL_AND), 1569 const_iv (GL_AND),
1488 const_iv (GL_ONE), 1570 const_iv (GL_ONE),
1489 const_iv (GL_ZERO), 1571 const_iv (GL_ZERO),
1490 const_iv (GL_SRC_ALPHA), 1572 const_iv (GL_SRC_ALPHA),
1491 const_iv (GL_SRC_ALPHA_SATURATE), 1573 const_iv (GL_DST_ALPHA),
1492 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1574 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1493 const_iv (GL_ONE_MINUS_DST_ALPHA), 1575 const_iv (GL_ONE_MINUS_DST_ALPHA),
1576 const_iv (GL_SRC_ALPHA_SATURATE),
1494 const_iv (GL_RGB), 1577 const_iv (GL_RGB),
1495 const_iv (GL_RGBA), 1578 const_iv (GL_RGBA),
1496 const_iv (GL_UNSIGNED_BYTE), 1579 const_iv (GL_UNSIGNED_BYTE),
1580 const_iv (GL_UNSIGNED_SHORT),
1581 const_iv (GL_UNSIGNED_INT),
1497 const_iv (GL_ALPHA), 1582 const_iv (GL_ALPHA),
1583 const_iv (GL_INTENSITY),
1498 const_iv (GL_LUMINANCE), 1584 const_iv (GL_LUMINANCE),
1585 const_iv (GL_LUMINANCE_ALPHA),
1499 const_iv (GL_FLOAT), 1586 const_iv (GL_FLOAT),
1500 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1587 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1501 const_iv (GL_COMPILE), 1588 const_iv (GL_COMPILE),
1502 const_iv (GL_TEXTURE_1D), 1589 const_iv (GL_TEXTURE_1D),
1503 const_iv (GL_TEXTURE_2D), 1590 const_iv (GL_TEXTURE_2D),
1505 const_iv (GL_TEXTURE_MAG_FILTER), 1592 const_iv (GL_TEXTURE_MAG_FILTER),
1506 const_iv (GL_TEXTURE_MIN_FILTER), 1593 const_iv (GL_TEXTURE_MIN_FILTER),
1507 const_iv (GL_TEXTURE_ENV_MODE), 1594 const_iv (GL_TEXTURE_ENV_MODE),
1508 const_iv (GL_TEXTURE_WRAP_S), 1595 const_iv (GL_TEXTURE_WRAP_S),
1509 const_iv (GL_TEXTURE_WRAP_T), 1596 const_iv (GL_TEXTURE_WRAP_T),
1597 const_iv (GL_REPEAT),
1510 const_iv (GL_CLAMP), 1598 const_iv (GL_CLAMP),
1511 const_iv (GL_REPEAT), 1599 const_iv (GL_CLAMP_TO_EDGE),
1512 const_iv (GL_NEAREST), 1600 const_iv (GL_NEAREST),
1513 const_iv (GL_LINEAR), 1601 const_iv (GL_LINEAR),
1514 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1602 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1515 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1603 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1516 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1604 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1517 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1605 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1518 const_iv (GL_GENERATE_MIPMAP), 1606 const_iv (GL_GENERATE_MIPMAP),
1519 const_iv (GL_MODULATE), 1607 const_iv (GL_MODULATE),
1520 const_iv (GL_DECAL), 1608 const_iv (GL_DECAL),
1521 const_iv (GL_REPLACE), 1609 const_iv (GL_REPLACE),
1610 const_iv (GL_DEPTH_BUFFER_BIT),
1522 const_iv (GL_COLOR_BUFFER_BIT), 1611 const_iv (GL_COLOR_BUFFER_BIT),
1523 const_iv (GL_PROJECTION), 1612 const_iv (GL_PROJECTION),
1524 const_iv (GL_MODELVIEW), 1613 const_iv (GL_MODELVIEW),
1525 const_iv (GL_COLOR_LOGIC_OP), 1614 const_iv (GL_COLOR_LOGIC_OP),
1526 const_iv (GL_SEPARABLE_2D), 1615 const_iv (GL_SEPARABLE_2D),
1527 const_iv (GL_CONVOLUTION_2D), 1616 const_iv (GL_CONVOLUTION_2D),
1528 const_iv (GL_CONVOLUTION_BORDER_MODE), 1617 const_iv (GL_CONVOLUTION_BORDER_MODE),
1529 const_iv (GL_CONSTANT_BORDER), 1618 const_iv (GL_CONSTANT_BORDER),
1530 const_iv (GL_LINES), 1619 const_iv (GL_LINES),
1620 const_iv (GL_LINE_LOOP),
1531 const_iv (GL_QUADS), 1621 const_iv (GL_QUADS),
1532 const_iv (GL_LINE_LOOP), 1622 const_iv (GL_QUAD_STRIP),
1623 const_iv (GL_TRIANGLES),
1624 const_iv (GL_TRIANGLE_STRIP),
1625 const_iv (GL_TRIANGLE_FAN),
1533 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1626 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1534 const_iv (GL_FASTEST), 1627 const_iv (GL_FASTEST),
1628 const_iv (GL_V2F),
1629 const_iv (GL_V3F),
1630 const_iv (GL_T2F_V3F),
1631 const_iv (GL_T2F_N3F_V3F),
1535# undef const_iv 1632# undef const_iv
1536 }; 1633 };
1537 1634
1538 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1635 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1539 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1636 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1540} 1637}
1541 1638
1639char *
1640gl_vendor ()
1641 CODE:
1642 RETVAL = (char *)glGetString (GL_VENDOR);
1643 OUTPUT:
1644 RETVAL
1645
1646char *
1647gl_version ()
1648 CODE:
1649 RETVAL = (char *)glGetString (GL_VERSION);
1650 OUTPUT:
1651 RETVAL
1652
1653char *
1654gl_extensions ()
1655 CODE:
1656 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1657 OUTPUT:
1658 RETVAL
1659
1542int glGetError () 1660int glGetError ()
1543 1661
1544void glClear (int mask) 1662void glClear (int mask)
1545 1663
1546void glClearColor (float r, float g, float b, float a = 1.0) 1664void glClearColor (float r, float g, float b, float a = 1.0)
1554 1672
1555void glHint (int target, int mode) 1673void glHint (int target, int mode)
1556 1674
1557void glBlendFunc (int sfactor, int dfactor) 1675void glBlendFunc (int sfactor, int dfactor)
1558 1676
1677void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1678 CODE:
1679 gl_BlendFuncSeparate (sa, da, saa, daa);
1680
1681void glDepthMask (int flag)
1682
1559void glLogicOp (int opcode) 1683void glLogicOp (int opcode)
1560 1684
1561void glColorMask (int red, int green, int blue, int alpha) 1685void glColorMask (int red, int green, int blue, int alpha)
1562 1686
1563void glMatrixMode (int mode) 1687void glMatrixMode (int mode)
1566 1690
1567void glPopMatrix () 1691void glPopMatrix ()
1568 1692
1569void glLoadIdentity () 1693void glLoadIdentity ()
1570 1694
1571# near and far are due to microsofts buggy c compiler 1695# near_ and far_ are due to microsofts buggy "c" compiler
1696void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1697
1698# near_ and far_ are due to microsofts buggy "c" compiler
1572void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1699void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1573 1700
1574void glViewport (int x, int y, int width, int height) 1701void glViewport (int x, int y, int width, int height)
1575 1702
1576void glScissor (int x, int y, int width, int height) 1703void glScissor (int x, int y, int width, int height)
1591 1718
1592void glEnd () 1719void glEnd ()
1593 1720
1594void glColor (float r, float g, float b, float a = 1.0) 1721void glColor (float r, float g, float b, float a = 1.0)
1595 PROTOTYPE: @ 1722 PROTOTYPE: @
1723 ALIAS:
1724 glColor_premultiply = 1
1596 CODE: 1725 CODE:
1726 if (ix)
1727 {
1728 r *= a;
1729 g *= a;
1730 b *= a;
1731 }
1732 // microsoft visual "c" rounds instead of truncating...
1597 glColor4ub (MIN ((int)(r * 255.f), 255), 1733 glColor4ub (MIN ((int)(r * 256.f), 255),
1598 MIN ((int)(g * 255.f), 255), 1734 MIN ((int)(g * 256.f), 255),
1599 MIN ((int)(b * 255.f), 255), 1735 MIN ((int)(b * 256.f), 255),
1600 MIN ((int)(a * 255.f), 255)); 1736 MIN ((int)(a * 256.f), 255));
1737
1738void glInterleavedArrays (int format, int stride, char *data)
1739
1740void glDrawElements (int mode, int count, int type, char *indices)
1741
1742# 1.2 void glDrawRangeElements (int mode, int start, int end
1743
1744void glRasterPos (float x, float y, float z = 0.)
1745 CODE:
1746 glRasterPos3f (0, 0, z);
1747 glBitmap (0, 0, 0, 0, x, y, 0);
1601 1748
1602void glVertex (float x, float y, float z = 0.) 1749void glVertex (float x, float y, float z = 0.)
1603 CODE: 1750 CODE:
1604 glVertex3f (x, y, z); 1751 glVertex3f (x, y, z);
1605 1752
1617 1764
1618void glBindTexture (int target, int name) 1765void glBindTexture (int target, int name)
1619 1766
1620void glConvolutionParameter (int target, int pname, float params) 1767void glConvolutionParameter (int target, int pname, float params)
1621 CODE: 1768 CODE:
1622 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1769 if (gl.ConvolutionParameterf)
1770 gl.ConvolutionParameterf (target, pname, params);
1623 1771
1624void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1772void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1625 CODE: 1773 CODE:
1626 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1774 if (gl.ConvolutionFilter2D)
1627 (target, internalformat, width, height, format, type, data)); 1775 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1628 1776
1629void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1777void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1630 CODE: 1778 CODE:
1631 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1779 if (gl.SeparableFilter2D)
1632 (target, internalformat, width, height, format, type, row, column)); 1780 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1633 1781
1634void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1782void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1635 1783
1636void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1784void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1637 1785
1638void glRasterPos (int x, int y) 1786void glDrawPixels (int width, int height, int format, int type, char *pixels)
1639 CODE:
1640 glRasterPos2i (x, y);
1641 1787
1642void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1788void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1643 1789
1644int glGenTexture () 1790int glGenTexture ()
1645 CODE: 1791 CODE:
1672 1818
1673void glEndList () 1819void glEndList ()
1674 1820
1675void glCallList (int list) 1821void glCallList (int list)
1676 1822
1823

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines