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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines