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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines