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.104 by root, Mon Jun 5 00:17:47 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
441 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
442 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 446 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
443 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 447 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 448 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
445 449
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
452
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 455 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 456 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
450 457
451 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 458 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 459
455 SDL_EnableUNICODE (1); 460 SDL_EnableUNICODE (1);
456 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 461 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
457 462
458 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 463 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
467 472
468 ++m; 473 ++m;
469 } 474 }
470} 475}
471 476
477char *
478SDL_GetError ()
479
472int 480int
473SDL_SetVideoMode (int w, int h, int fullscreen) 481SDL_SetVideoMode (int w, int h, int fullscreen)
474 CODE: 482 CODE:
475 RETVAL = !!SDL_SetVideoMode ( 483 RETVAL = !!SDL_SetVideoMode (
476 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 484 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
477 ); 485 );
486 if (RETVAL)
487 {
478 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 488 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
489# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
490# include "glfunc.h"
491# undef GL_FUNC
492 }
479 OUTPUT: 493 OUTPUT:
480 RETVAL 494 RETVAL
481 495
482void 496void
483SDL_GL_SwapBuffers () 497SDL_GL_SwapBuffers ()
498
499char *
500SDL_GetKeyName (int sym)
484 501
485void 502void
486SDL_PollEvent () 503SDL_PollEvent ()
487 PPCODE: 504 PPCODE:
488{ 505{
507 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 524 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
508 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 525 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
509 break; 526 break;
510 527
511 case SDL_MOUSEMOTION: 528 case SDL_MOUSEMOTION:
529 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
530
512 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 531 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
513 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 532 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
514 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 533 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
515 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 534 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
516 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 535 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
517 break; 536 break;
518 537
519 case SDL_MOUSEBUTTONDOWN: 538 case SDL_MOUSEBUTTONDOWN:
520 case SDL_MOUSEBUTTONUP: 539 case SDL_MOUSEBUTTONUP:
540 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
541
521 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 542 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
522 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 543 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
523 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 544 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
524 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 545 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
525 break; 546 break;
551lowdelay (int fd, int val = 1) 572lowdelay (int fd, int val = 1)
552 CODE: 573 CODE:
553#ifndef _WIN32 574#ifndef _WIN32
554 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 575 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
555#endif 576#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 577
571void 578void
572add_font (char *file) 579add_font (char *file)
573 CODE: 580 CODE:
574 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 581 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
667} 674}
668 675
669void 676void
670error (char *message) 677error (char *message)
671 CODE: 678 CODE:
679 fprintf (stderr, "ERROR: %s\n", message);
672#ifdef _WIN32 680#ifdef _WIN32
673 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 681 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
674#else
675 fprintf (stderr, "ERROR: %s\n", message);
676#endif 682#endif
677 683
678void 684void
679fatal (char *message) 685fatal (char *message)
680 CODE: 686 CODE:
687 fprintf (stderr, "FATAL: %s\n", message);
681#ifdef _WIN32 688#ifdef _WIN32
682 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 689 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
683#else
684 fprintf (stderr, "FATAL: %s\n", message);
685#endif 690#endif
686 exit (1); 691 exit (1);
687 692
688MODULE = CFClient PACKAGE = CFClient::Font 693MODULE = CFClient PACKAGE = CFClient::Font
689 694
712MODULE = CFClient PACKAGE = CFClient::Layout 717MODULE = CFClient PACKAGE = CFClient::Layout
713 718
714CFClient::Layout 719CFClient::Layout
715new (SV *class, int rgba = 0) 720new (SV *class, int rgba = 0)
716 CODE: 721 CODE:
722#if _WIN32
723 //rgba = 0;//D makes text nicer, breaks TextView
724#endif
725 rgba=1;//D
717 New (0, RETVAL, 1, struct cf_layout); 726 New (0, RETVAL, 1, struct cf_layout);
718 727
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 728 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720 RETVAL->rgba = rgba; 729 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 730 RETVAL->r = 1.;
801set_width (CFClient::Layout self, int max_width = -1) 810set_width (CFClient::Layout self, int max_width = -1)
802 CODE: 811 CODE:
803 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 812 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804 813
805void 814void
815set_indent (CFClient::Layout self, int indent)
816 CODE:
817 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
818
819void
820set_spacing (CFClient::Layout self, int spacing)
821 CODE:
822 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
823
824void
825set_ellipsise (CFClient::Layout self, int ellipsise)
826 CODE:
827 pango_layout_set_ellipsize (self->pl,
828 ellipsise == 1 ? PANGO_ELLIPSIZE_START
829 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
830 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
831 : PANGO_ELLIPSIZE_NONE
832 );
833
834void
835set_single_paragraph_mode (CFClient::Layout self, int spm)
836 CODE:
837 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
838
839void
806size (CFClient::Layout self) 840size (CFClient::Layout self)
807 PPCODE: 841 PPCODE:
808{ 842{
809 int w, h; 843 int w, h;
810 844
876 910
877 while (p < e) 911 while (p < e)
878 { 912 {
879 uint32_t rgba = *p; 913 uint32_t rgba = *p;
880 rgba = (rgba >> 24) | (rgba << 8); 914 rgba = (rgba >> 24) | (rgba << 8);
915#if 0
916#ifdef _WIN32
917 {//D
918 uint8_t r = rgba >> 24;
919 uint8_t g = rgba >> 16;
920 uint8_t b = rgba >> 8;
921 uint8_t a = rgba >> 0;
922
923 rgba = (rgba & 0xffffff00) | a;
924 }
925#endif
926#endif
881 rgba = SDL_SwapBE32 (rgba); 927 rgba = SDL_SwapBE32 (rgba);
882 *p++ = rgba; 928 *p++ = rgba;
883 } 929 }
884 } 930 }
885 931
930{ 976{
931 HV *hv = (HV *)SvRV (self); 977 HV *hv = (HV *)SvRV (self);
932 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 978 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
933 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 979 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
934 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 980 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
935 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
936 981
937 if (items < 5) 982 if (items < 5)
938 { 983 {
939 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 984 w = SvNV (*hv_fetch (hv, "w", 1, 1));
940 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 985 h = SvNV (*hv_fetch (hv, "h", 1, 1));
941 } 986 }
942 987
943 if (ix) 988 if (ix)
944 { 989 {
945 glEnable (GL_BLEND); 990 glEnable (GL_BLEND);
991
992 if (ix == 2)
946 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 993 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
994 else
995 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
996 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
997
998 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f);
947 } 1000 }
948 1001
949 glBindTexture (GL_TEXTURE_2D, name); 1002 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 1003
957 glBegin (GL_QUADS); 1004 glBegin (GL_QUADS);
958 glTexCoord2f (0, 0); glVertex2f (x , y ); 1005 glTexCoord2f (0, 0); glVertex2f (x , y );
959 glTexCoord2f (0, t); glVertex2f (x , y + h); 1006 glTexCoord2f (0, t); glVertex2f (x , y + h);
960 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1007 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
961 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1008 glTexCoord2f (s, 0); glVertex2f (x + w, y );
962 glEnd (); 1009 glEnd ();
963 1010
964 if (ix) 1011 if (ix)
1012 {
1013 glDisable (GL_ALPHA_TEST);
965 glDisable (GL_BLEND); 1014 glDisable (GL_BLEND);
1015 }
966} 1016}
967 1017
968MODULE = CFClient PACKAGE = CFClient::Map 1018MODULE = CFClient PACKAGE = CFClient::Map
969 1019
970CFClient::Map 1020CFClient::Map
1034 tex->r = r; 1084 tex->r = r;
1035 tex->g = g; 1085 tex->g = g;
1036 tex->b = b; 1086 tex->b = b;
1037 tex->a = a; 1087 tex->a = a;
1038 } 1088 }
1089
1090 // somewhat hackish, but for textures that require it, it really
1091 // improves the look, and most others don't suffer.
1092 glBindTexture (GL_TEXTURE_2D, name);
1093 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1094 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1095 // use uglier nearest interpolation because linear suffers
1096 // from transparent color bleeding and ugly wrapping effects.
1097 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1039} 1098}
1040 1099
1041int 1100int
1042ox (CFClient::Map self) 1101ox (CFClient::Map self)
1043 ALIAS: 1102 ALIAS:
1044 oy = 1 1103 oy = 1
1104 x = 2
1105 y = 3
1106 w = 4
1107 h = 5
1045 CODE: 1108 CODE:
1046 switch (ix) 1109 switch (ix)
1047 { 1110 {
1048 case 0: RETVAL = self->ox; break; 1111 case 0: RETVAL = self->ox; break;
1049 case 1: RETVAL = self->oy; break; 1112 case 1: RETVAL = self->oy; break;
1113 case 2: RETVAL = self->x; break;
1114 case 3: RETVAL = self->y; break;
1115 case 4: RETVAL = self->w; break;
1116 case 5: RETVAL = self->h; break;
1050 } 1117 }
1051 OUTPUT: 1118 OUTPUT:
1052 RETVAL 1119 RETVAL
1053 1120
1054void 1121void
1481 const_iv (GL_COLOR_MATERIAL), 1548 const_iv (GL_COLOR_MATERIAL),
1482 const_iv (GL_SMOOTH), 1549 const_iv (GL_SMOOTH),
1483 const_iv (GL_FLAT), 1550 const_iv (GL_FLAT),
1484 const_iv (GL_DITHER), 1551 const_iv (GL_DITHER),
1485 const_iv (GL_BLEND), 1552 const_iv (GL_BLEND),
1553 const_iv (GL_CULL_FACE),
1486 const_iv (GL_SCISSOR_TEST), 1554 const_iv (GL_SCISSOR_TEST),
1555 const_iv (GL_DEPTH_TEST),
1556 const_iv (GL_ALPHA_TEST),
1557 const_iv (GL_NORMALIZE),
1558 const_iv (GL_RESCALE_NORMAL),
1487 const_iv (GL_AND), 1559 const_iv (GL_AND),
1488 const_iv (GL_ONE), 1560 const_iv (GL_ONE),
1489 const_iv (GL_ZERO), 1561 const_iv (GL_ZERO),
1490 const_iv (GL_SRC_ALPHA), 1562 const_iv (GL_SRC_ALPHA),
1491 const_iv (GL_SRC_ALPHA_SATURATE), 1563 const_iv (GL_DST_ALPHA),
1492 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1564 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1493 const_iv (GL_ONE_MINUS_DST_ALPHA), 1565 const_iv (GL_ONE_MINUS_DST_ALPHA),
1566 const_iv (GL_SRC_ALPHA_SATURATE),
1494 const_iv (GL_RGB), 1567 const_iv (GL_RGB),
1495 const_iv (GL_RGBA), 1568 const_iv (GL_RGBA),
1496 const_iv (GL_UNSIGNED_BYTE), 1569 const_iv (GL_UNSIGNED_BYTE),
1570 const_iv (GL_UNSIGNED_SHORT),
1571 const_iv (GL_UNSIGNED_INT),
1497 const_iv (GL_ALPHA), 1572 const_iv (GL_ALPHA),
1573 const_iv (GL_INTENSITY),
1498 const_iv (GL_LUMINANCE), 1574 const_iv (GL_LUMINANCE),
1575 const_iv (GL_LUMINANCE_ALPHA),
1499 const_iv (GL_FLOAT), 1576 const_iv (GL_FLOAT),
1500 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1577 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1501 const_iv (GL_COMPILE), 1578 const_iv (GL_COMPILE),
1502 const_iv (GL_TEXTURE_1D), 1579 const_iv (GL_TEXTURE_1D),
1503 const_iv (GL_TEXTURE_2D), 1580 const_iv (GL_TEXTURE_2D),
1505 const_iv (GL_TEXTURE_MAG_FILTER), 1582 const_iv (GL_TEXTURE_MAG_FILTER),
1506 const_iv (GL_TEXTURE_MIN_FILTER), 1583 const_iv (GL_TEXTURE_MIN_FILTER),
1507 const_iv (GL_TEXTURE_ENV_MODE), 1584 const_iv (GL_TEXTURE_ENV_MODE),
1508 const_iv (GL_TEXTURE_WRAP_S), 1585 const_iv (GL_TEXTURE_WRAP_S),
1509 const_iv (GL_TEXTURE_WRAP_T), 1586 const_iv (GL_TEXTURE_WRAP_T),
1587 const_iv (GL_REPEAT),
1510 const_iv (GL_CLAMP), 1588 const_iv (GL_CLAMP),
1511 const_iv (GL_REPEAT), 1589 const_iv (GL_CLAMP_TO_EDGE),
1512 const_iv (GL_NEAREST), 1590 const_iv (GL_NEAREST),
1513 const_iv (GL_LINEAR), 1591 const_iv (GL_LINEAR),
1514 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1592 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1515 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1593 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1516 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1594 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1517 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1595 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1518 const_iv (GL_GENERATE_MIPMAP), 1596 const_iv (GL_GENERATE_MIPMAP),
1519 const_iv (GL_MODULATE), 1597 const_iv (GL_MODULATE),
1520 const_iv (GL_DECAL), 1598 const_iv (GL_DECAL),
1521 const_iv (GL_REPLACE), 1599 const_iv (GL_REPLACE),
1600 const_iv (GL_DEPTH_BUFFER_BIT),
1522 const_iv (GL_COLOR_BUFFER_BIT), 1601 const_iv (GL_COLOR_BUFFER_BIT),
1523 const_iv (GL_PROJECTION), 1602 const_iv (GL_PROJECTION),
1524 const_iv (GL_MODELVIEW), 1603 const_iv (GL_MODELVIEW),
1525 const_iv (GL_COLOR_LOGIC_OP), 1604 const_iv (GL_COLOR_LOGIC_OP),
1526 const_iv (GL_SEPARABLE_2D), 1605 const_iv (GL_SEPARABLE_2D),
1527 const_iv (GL_CONVOLUTION_2D), 1606 const_iv (GL_CONVOLUTION_2D),
1528 const_iv (GL_CONVOLUTION_BORDER_MODE), 1607 const_iv (GL_CONVOLUTION_BORDER_MODE),
1529 const_iv (GL_CONSTANT_BORDER), 1608 const_iv (GL_CONSTANT_BORDER),
1530 const_iv (GL_LINES), 1609 const_iv (GL_LINES),
1610 const_iv (GL_LINE_LOOP),
1531 const_iv (GL_QUADS), 1611 const_iv (GL_QUADS),
1532 const_iv (GL_LINE_LOOP), 1612 const_iv (GL_QUAD_STRIP),
1613 const_iv (GL_TRIANGLES),
1614 const_iv (GL_TRIANGLE_STRIP),
1615 const_iv (GL_TRIANGLE_FAN),
1533 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1616 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1534 const_iv (GL_FASTEST), 1617 const_iv (GL_FASTEST),
1618 const_iv (GL_V2F),
1619 const_iv (GL_V3F),
1620 const_iv (GL_T2F_V3F),
1621 const_iv (GL_T2F_N3F_V3F),
1535# undef const_iv 1622# undef const_iv
1536 }; 1623 };
1537 1624
1538 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1625 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1539 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1626 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1540} 1627}
1541 1628
1629char *
1630gl_vendor ()
1631 CODE:
1632 RETVAL = (char *)glGetString (GL_VENDOR);
1633 OUTPUT:
1634 RETVAL
1635
1636char *
1637gl_version ()
1638 CODE:
1639 RETVAL = (char *)glGetString (GL_VERSION);
1640 OUTPUT:
1641 RETVAL
1642
1643char *
1644gl_extensions ()
1645 CODE:
1646 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1647 OUTPUT:
1648 RETVAL
1649
1542int glGetError () 1650int glGetError ()
1543 1651
1544void glClear (int mask) 1652void glClear (int mask)
1545 1653
1546void glClearColor (float r, float g, float b, float a = 1.0) 1654void glClearColor (float r, float g, float b, float a = 1.0)
1554 1662
1555void glHint (int target, int mode) 1663void glHint (int target, int mode)
1556 1664
1557void glBlendFunc (int sfactor, int dfactor) 1665void glBlendFunc (int sfactor, int dfactor)
1558 1666
1667void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1668 CODE:
1669 gl_BlendFuncSeparate (sa, da, saa, daa);
1670
1671void glDepthMask (int flag)
1672
1559void glLogicOp (int opcode) 1673void glLogicOp (int opcode)
1560 1674
1561void glColorMask (int red, int green, int blue, int alpha) 1675void glColorMask (int red, int green, int blue, int alpha)
1562 1676
1563void glMatrixMode (int mode) 1677void glMatrixMode (int mode)
1566 1680
1567void glPopMatrix () 1681void glPopMatrix ()
1568 1682
1569void glLoadIdentity () 1683void glLoadIdentity ()
1570 1684
1571# near and far are due to microsofts buggy c compiler 1685# near_ and far_ are due to microsofts buggy "c" compiler
1686void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1687
1688# near_ and far_ are due to microsofts buggy "c" compiler
1572void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1689void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1573 1690
1574void glViewport (int x, int y, int width, int height) 1691void glViewport (int x, int y, int width, int height)
1575 1692
1576void glScissor (int x, int y, int width, int height) 1693void glScissor (int x, int y, int width, int height)
1591 1708
1592void glEnd () 1709void glEnd ()
1593 1710
1594void glColor (float r, float g, float b, float a = 1.0) 1711void glColor (float r, float g, float b, float a = 1.0)
1595 PROTOTYPE: @ 1712 PROTOTYPE: @
1713 ALIAS:
1714 glColor_premultiply = 1
1596 CODE: 1715 CODE:
1716 if (ix)
1717 {
1718 r *= a;
1719 g *= a;
1720 b *= a;
1721 }
1722 // microsoft visual "c" rounds instead of truncating...
1597 glColor4ub (MIN ((int)(r * 255.f), 255), 1723 glColor4ub (MIN ((int)(r * 256.f), 255),
1598 MIN ((int)(g * 255.f), 255), 1724 MIN ((int)(g * 256.f), 255),
1599 MIN ((int)(b * 255.f), 255), 1725 MIN ((int)(b * 256.f), 255),
1600 MIN ((int)(a * 255.f), 255)); 1726 MIN ((int)(a * 256.f), 255));
1727
1728void glInterleavedArrays (int format, int stride, char *data)
1729
1730void glDrawElements (int mode, int count, int type, char *indices)
1731
1732# 1.2 void glDrawRangeElements (int mode, int start, int end
1733
1734void glRasterPos (float x, float y, float z = 0.)
1735 CODE:
1736 glRasterPos3f (0, 0, z);
1737 glBitmap (0, 0, 0, 0, x, y, 0);
1601 1738
1602void glVertex (float x, float y, float z = 0.) 1739void glVertex (float x, float y, float z = 0.)
1603 CODE: 1740 CODE:
1604 glVertex3f (x, y, z); 1741 glVertex3f (x, y, z);
1605 1742
1617 1754
1618void glBindTexture (int target, int name) 1755void glBindTexture (int target, int name)
1619 1756
1620void glConvolutionParameter (int target, int pname, float params) 1757void glConvolutionParameter (int target, int pname, float params)
1621 CODE: 1758 CODE:
1622 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1759 if (gl.ConvolutionParameterf)
1760 gl.ConvolutionParameterf (target, pname, params);
1623 1761
1624void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1762void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1625 CODE: 1763 CODE:
1626 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1764 if (gl.ConvolutionFilter2D)
1627 (target, internalformat, width, height, format, type, data)); 1765 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1628 1766
1629void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1767void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1630 CODE: 1768 CODE:
1631 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1769 if (gl.SeparableFilter2D)
1632 (target, internalformat, width, height, format, type, row, column)); 1770 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1633 1771
1634void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1772void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1635 1773
1636void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1774void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1637 1775
1638void glRasterPos (int x, int y) 1776void glDrawPixels (int width, int height, int format, int type, char *pixels)
1639 CODE:
1640 glRasterPos2i (x, y);
1641 1777
1642void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1778void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1643 1779
1644int glGenTexture () 1780int glGenTexture ()
1645 CODE: 1781 CODE:
1672 1808
1673void glEndList () 1809void glEndList ()
1674 1810
1675void glCallList (int list) 1811void glCallList (int list)
1676 1812
1813

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines