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.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC

7 7
8#include "EXTERN.h" 8#include "EXTERN.h"
9#include "perl.h" 9#include "perl.h"
10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h>
12#include <string.h> 13#include <string.h>
13#include <stdio.h> 14#include <stdio.h>
14 15
15#include <SDL.h> 16#include <SDL.h>
16#include <SDL_endian.h> 17#include <SDL_endian.h>
47#define MAP_EXTEND_X 32 48#define MAP_EXTEND_X 32
48#define MAP_EXTEND_Y 512 49#define MAP_EXTEND_Y 512
49 50
50#define MIN_FONT_HEIGHT 10 51#define MIN_FONT_HEIGHT 10
51 52
52#define GL_CALL(type,func,args) \ 53static struct
53 { \ 54{
54 static int init_; \ 55#define GL_FUNC(ptr,name) ptr name;
55 static type fptr_; \ 56#include "glfunc.h"
56 \ 57#undef GL_FUNC
57 if (!init_) \ 58} gl;
58 { \ 59
59 init_ = 1; \ 60static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
60 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 61{
61 } \ 62 if (gl.BlendFuncSeparate)
62 \ 63 gl.BlendFuncSeparate (sa, da, saa, daa);
63 if (fptr_) \ 64 else if (gl.BlendFuncSeparateEXT)
64 fptr_ args; \ 65 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
65 } 66 else
67 glBlendFunc (sa, da);
68}
66 69
67typedef Mix_Chunk *CFClient__MixChunk; 70typedef Mix_Chunk *CFClient__MixChunk;
68typedef Mix_Music *CFClient__MixMusic; 71typedef Mix_Music *CFClient__MixMusic;
69 72
70typedef PangoFontDescription *CFClient__Font; 73typedef PangoFontDescription *CFClient__Font;
83 86
84static void 87static void
85substitute_func (FcPattern *pattern, gpointer data) 88substitute_func (FcPattern *pattern, gpointer data)
86{ 89{
87 FcPatternAddBool (pattern, FC_HINTING , 1); 90 FcPatternAddBool (pattern, FC_HINTING , 1);
91#ifdef _WIN32
88 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
93#else
94 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif
89} 96}
90 97
91static void 98static void
92layout_update_font (CFClient__Layout self) 99layout_update_font (CFClient__Layout self)
93{ 100{
438 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
439 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 446 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
440 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 447 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
441 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 448 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
442 449
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
452
443 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
444 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
445 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 455 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 456 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
447 457
448 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 458 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
449 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
450 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
451 459
452 SDL_EnableUNICODE (1); 460 SDL_EnableUNICODE (1);
453 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 461 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
454 462
455 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 463 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
464 472
465 ++m; 473 ++m;
466 } 474 }
467} 475}
468 476
477char *
478SDL_GetError ()
479
469int 480int
470SDL_SetVideoMode (int w, int h, int fullscreen) 481SDL_SetVideoMode (int w, int h, int fullscreen)
471 CODE: 482 CODE:
472 RETVAL = !!SDL_SetVideoMode ( 483 RETVAL = !!SDL_SetVideoMode (
473 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 484 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
474 ); 485 );
486 if (RETVAL)
487 {
475 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 }
476 OUTPUT: 493 OUTPUT:
477 RETVAL 494 RETVAL
478 495
479void 496void
480SDL_GL_SwapBuffers () 497SDL_GL_SwapBuffers ()
498
499char *
500SDL_GetKeyName (int sym)
481 501
482void 502void
483SDL_PollEvent () 503SDL_PollEvent ()
484 PPCODE: 504 PPCODE:
485{ 505{
504 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 524 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
505 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 525 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
506 break; 526 break;
507 527
508 case SDL_MOUSEMOTION: 528 case SDL_MOUSEMOTION:
529 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
530
509 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 531 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
510 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 532 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
511 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 533 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
512 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 534 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
513 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 535 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
514 break; 536 break;
515 537
516 case SDL_MOUSEBUTTONDOWN: 538 case SDL_MOUSEBUTTONDOWN:
517 case SDL_MOUSEBUTTONUP: 539 case SDL_MOUSEBUTTONUP:
540 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
541
518 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 542 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
519 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 543 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
520 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 544 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
521 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 545 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
522 break; 546 break;
548lowdelay (int fd, int val = 1) 572lowdelay (int fd, int val = 1)
549 CODE: 573 CODE:
550#ifndef _WIN32 574#ifndef _WIN32
551 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 575 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
552#endif 576#endif
553
554char *
555gl_version ()
556 CODE:
557 RETVAL = (char *)glGetString (GL_VERSION);
558 OUTPUT:
559 RETVAL
560
561char *
562gl_extensions ()
563 CODE:
564 RETVAL = (char *)glGetString (GL_EXTENSIONS);
565 OUTPUT:
566 RETVAL
567 577
568void 578void
569add_font (char *file) 579add_font (char *file)
570 CODE: 580 CODE:
571 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 581 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
664} 674}
665 675
666void 676void
667error (char *message) 677error (char *message)
668 CODE: 678 CODE:
679 fprintf (stderr, "ERROR: %s\n", message);
669#ifdef _WIN32 680#ifdef _WIN32
670 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 681 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
671#else
672 fprintf (stderr, "ERROR: %s\n", message);
673#endif 682#endif
674 683
675void 684void
676fatal (char *message) 685fatal (char *message)
677 CODE: 686 CODE:
687 fprintf (stderr, "FATAL: %s\n", message);
678#ifdef _WIN32 688#ifdef _WIN32
679 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 689 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
680#else
681 fprintf (stderr, "FATAL: %s\n", message);
682#endif 690#endif
683 exit (1); 691 exit (1);
684 692
685MODULE = CFClient PACKAGE = CFClient::Font 693MODULE = CFClient PACKAGE = CFClient::Font
686 694
709MODULE = CFClient PACKAGE = CFClient::Layout 717MODULE = CFClient PACKAGE = CFClient::Layout
710 718
711CFClient::Layout 719CFClient::Layout
712new (SV *class, int rgba = 0) 720new (SV *class, int rgba = 0)
713 CODE: 721 CODE:
722#if _WIN32
723 //rgba = 0;//D makes text nicer, breaks TextView
724#endif
725 rgba=1;//D
714 New (0, RETVAL, 1, struct cf_layout); 726 New (0, RETVAL, 1, struct cf_layout);
715 727
716 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 728 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
717 RETVAL->rgba = rgba; 729 RETVAL->rgba = rgba;
718 RETVAL->r = 1.; 730 RETVAL->r = 1.;
798set_width (CFClient::Layout self, int max_width = -1) 810set_width (CFClient::Layout self, int max_width = -1)
799 CODE: 811 CODE:
800 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);
801 813
802void 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
803size (CFClient::Layout self) 840size (CFClient::Layout self)
804 PPCODE: 841 PPCODE:
805{ 842{
806 int w, h; 843 int w, h;
807 844
873 910
874 while (p < e) 911 while (p < e)
875 { 912 {
876 uint32_t rgba = *p; 913 uint32_t rgba = *p;
877 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
878 rgba = SDL_SwapBE32 (rgba); 927 rgba = SDL_SwapBE32 (rgba);
879 *p++ = rgba; 928 *p++ = rgba;
880 } 929 }
881 } 930 }
882 931
927{ 976{
928 HV *hv = (HV *)SvRV (self); 977 HV *hv = (HV *)SvRV (self);
929 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 978 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
930 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 979 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
931 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 980 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
932 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
933 981
934 if (items < 5) 982 if (items < 5)
935 { 983 {
936 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 984 w = SvNV (*hv_fetch (hv, "w", 1, 1));
937 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 985 h = SvNV (*hv_fetch (hv, "h", 1, 1));
938 } 986 }
939 987
940 if (ix) 988 if (ix)
941 { 989 {
942 glEnable (GL_BLEND); 990 glEnable (GL_BLEND);
991
992 if (ix == 2)
943 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);
944 } 1000 }
945 1001
946 glBindTexture (GL_TEXTURE_2D, name); 1002 glBindTexture (GL_TEXTURE_2D, name);
947
948 if (wrap_mode)
949 {
950 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
952 }
953 1003
954 glBegin (GL_QUADS); 1004 glBegin (GL_QUADS);
955 glTexCoord2f (0, 0); glVertex2f (x , y ); 1005 glTexCoord2f (0, 0); glVertex2f (x , y );
956 glTexCoord2f (0, t); glVertex2f (x , y + h); 1006 glTexCoord2f (0, t); glVertex2f (x , y + h);
957 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1007 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1008 glTexCoord2f (s, 0); glVertex2f (x + w, y );
959 glEnd (); 1009 glEnd ();
960 1010
961 if (ix) 1011 if (ix)
1012 {
1013 glDisable (GL_ALPHA_TEST);
962 glDisable (GL_BLEND); 1014 glDisable (GL_BLEND);
1015 }
963} 1016}
964 1017
965MODULE = CFClient PACKAGE = CFClient::Map 1018MODULE = CFClient PACKAGE = CFClient::Map
966 1019
967CFClient::Map 1020CFClient::Map
1031 tex->r = r; 1084 tex->r = r;
1032 tex->g = g; 1085 tex->g = g;
1033 tex->b = b; 1086 tex->b = b;
1034 tex->a = a; 1087 tex->a = a;
1035 } 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);
1036} 1098}
1037 1099
1038int 1100int
1039ox (CFClient::Map self) 1101ox (CFClient::Map self)
1040 ALIAS: 1102 ALIAS:
1041 oy = 1 1103 oy = 1
1104 x = 2
1105 y = 3
1106 w = 4
1107 h = 5
1042 CODE: 1108 CODE:
1043 switch (ix) 1109 switch (ix)
1044 { 1110 {
1045 case 0: RETVAL = self->ox; break; 1111 case 0: RETVAL = self->ox; break;
1046 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;
1047 } 1117 }
1048 OUTPUT: 1118 OUTPUT:
1049 RETVAL 1119 RETVAL
1050 1120
1051void 1121void
1478 const_iv (GL_COLOR_MATERIAL), 1548 const_iv (GL_COLOR_MATERIAL),
1479 const_iv (GL_SMOOTH), 1549 const_iv (GL_SMOOTH),
1480 const_iv (GL_FLAT), 1550 const_iv (GL_FLAT),
1481 const_iv (GL_DITHER), 1551 const_iv (GL_DITHER),
1482 const_iv (GL_BLEND), 1552 const_iv (GL_BLEND),
1553 const_iv (GL_CULL_FACE),
1483 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),
1484 const_iv (GL_AND), 1559 const_iv (GL_AND),
1485 const_iv (GL_ONE), 1560 const_iv (GL_ONE),
1486 const_iv (GL_ZERO), 1561 const_iv (GL_ZERO),
1487 const_iv (GL_SRC_ALPHA), 1562 const_iv (GL_SRC_ALPHA),
1488 const_iv (GL_SRC_ALPHA_SATURATE), 1563 const_iv (GL_DST_ALPHA),
1489 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1564 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1490 const_iv (GL_ONE_MINUS_DST_ALPHA), 1565 const_iv (GL_ONE_MINUS_DST_ALPHA),
1566 const_iv (GL_SRC_ALPHA_SATURATE),
1491 const_iv (GL_RGB), 1567 const_iv (GL_RGB),
1492 const_iv (GL_RGBA), 1568 const_iv (GL_RGBA),
1493 const_iv (GL_UNSIGNED_BYTE), 1569 const_iv (GL_UNSIGNED_BYTE),
1570 const_iv (GL_UNSIGNED_SHORT),
1571 const_iv (GL_UNSIGNED_INT),
1494 const_iv (GL_ALPHA), 1572 const_iv (GL_ALPHA),
1573 const_iv (GL_INTENSITY),
1495 const_iv (GL_LUMINANCE), 1574 const_iv (GL_LUMINANCE),
1575 const_iv (GL_LUMINANCE_ALPHA),
1496 const_iv (GL_FLOAT), 1576 const_iv (GL_FLOAT),
1497 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1577 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498 const_iv (GL_COMPILE), 1578 const_iv (GL_COMPILE),
1499 const_iv (GL_TEXTURE_1D), 1579 const_iv (GL_TEXTURE_1D),
1500 const_iv (GL_TEXTURE_2D), 1580 const_iv (GL_TEXTURE_2D),
1502 const_iv (GL_TEXTURE_MAG_FILTER), 1582 const_iv (GL_TEXTURE_MAG_FILTER),
1503 const_iv (GL_TEXTURE_MIN_FILTER), 1583 const_iv (GL_TEXTURE_MIN_FILTER),
1504 const_iv (GL_TEXTURE_ENV_MODE), 1584 const_iv (GL_TEXTURE_ENV_MODE),
1505 const_iv (GL_TEXTURE_WRAP_S), 1585 const_iv (GL_TEXTURE_WRAP_S),
1506 const_iv (GL_TEXTURE_WRAP_T), 1586 const_iv (GL_TEXTURE_WRAP_T),
1587 const_iv (GL_REPEAT),
1507 const_iv (GL_CLAMP), 1588 const_iv (GL_CLAMP),
1508 const_iv (GL_REPEAT), 1589 const_iv (GL_CLAMP_TO_EDGE),
1509 const_iv (GL_NEAREST), 1590 const_iv (GL_NEAREST),
1510 const_iv (GL_LINEAR), 1591 const_iv (GL_LINEAR),
1511 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1592 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1512 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1593 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1513 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1594 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1514 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1595 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1515 const_iv (GL_GENERATE_MIPMAP), 1596 const_iv (GL_GENERATE_MIPMAP),
1516 const_iv (GL_MODULATE), 1597 const_iv (GL_MODULATE),
1517 const_iv (GL_DECAL), 1598 const_iv (GL_DECAL),
1518 const_iv (GL_REPLACE), 1599 const_iv (GL_REPLACE),
1600 const_iv (GL_DEPTH_BUFFER_BIT),
1519 const_iv (GL_COLOR_BUFFER_BIT), 1601 const_iv (GL_COLOR_BUFFER_BIT),
1520 const_iv (GL_PROJECTION), 1602 const_iv (GL_PROJECTION),
1521 const_iv (GL_MODELVIEW), 1603 const_iv (GL_MODELVIEW),
1522 const_iv (GL_COLOR_LOGIC_OP), 1604 const_iv (GL_COLOR_LOGIC_OP),
1523 const_iv (GL_SEPARABLE_2D), 1605 const_iv (GL_SEPARABLE_2D),
1524 const_iv (GL_CONVOLUTION_2D), 1606 const_iv (GL_CONVOLUTION_2D),
1525 const_iv (GL_CONVOLUTION_BORDER_MODE), 1607 const_iv (GL_CONVOLUTION_BORDER_MODE),
1526 const_iv (GL_CONSTANT_BORDER), 1608 const_iv (GL_CONSTANT_BORDER),
1527 const_iv (GL_LINES), 1609 const_iv (GL_LINES),
1610 const_iv (GL_LINE_LOOP),
1528 const_iv (GL_QUADS), 1611 const_iv (GL_QUADS),
1529 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),
1530 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1616 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1531 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),
1532# undef const_iv 1622# undef const_iv
1533 }; 1623 };
1534 1624
1535 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; )
1536 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1626 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1537} 1627}
1538 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
1539int glGetError () 1650int glGetError ()
1540 1651
1541void glClear (int mask) 1652void glClear (int mask)
1542 1653
1543void glClearColor (float r, float g, float b, float a = 1.0) 1654void glClearColor (float r, float g, float b, float a = 1.0)
1551 1662
1552void glHint (int target, int mode) 1663void glHint (int target, int mode)
1553 1664
1554void glBlendFunc (int sfactor, int dfactor) 1665void glBlendFunc (int sfactor, int dfactor)
1555 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
1556void glLogicOp (int opcode) 1673void glLogicOp (int opcode)
1557 1674
1558void glColorMask (int red, int green, int blue, int alpha) 1675void glColorMask (int red, int green, int blue, int alpha)
1559 1676
1560void glMatrixMode (int mode) 1677void glMatrixMode (int mode)
1563 1680
1564void glPopMatrix () 1681void glPopMatrix ()
1565 1682
1566void glLoadIdentity () 1683void glLoadIdentity ()
1567 1684
1568# 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
1569void 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_)
1570 1690
1571void glViewport (int x, int y, int width, int height) 1691void glViewport (int x, int y, int width, int height)
1572 1692
1573void glScissor (int x, int y, int width, int height) 1693void glScissor (int x, int y, int width, int height)
1588 1708
1589void glEnd () 1709void glEnd ()
1590 1710
1591void glColor (float r, float g, float b, float a = 1.0) 1711void glColor (float r, float g, float b, float a = 1.0)
1592 PROTOTYPE: @ 1712 PROTOTYPE: @
1713 ALIAS:
1714 glColor_premultiply = 1
1593 CODE: 1715 CODE:
1594 // 255.999 is close enough to correctness (256 and clamp) 1716 if (ix)
1595 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999); 1717 {
1718 r *= a;
1719 g *= a;
1720 b *= a;
1721 }
1722 // microsoft visual "c" rounds instead of truncating...
1723 glColor4ub (MIN ((int)(r * 256.f), 255),
1724 MIN ((int)(g * 256.f), 255),
1725 MIN ((int)(b * 256.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);
1596 1738
1597void glVertex (float x, float y, float z = 0.) 1739void glVertex (float x, float y, float z = 0.)
1598 CODE: 1740 CODE:
1599 glVertex3f (x, y, z); 1741 glVertex3f (x, y, z);
1600 1742
1612 1754
1613void glBindTexture (int target, int name) 1755void glBindTexture (int target, int name)
1614 1756
1615void glConvolutionParameter (int target, int pname, float params) 1757void glConvolutionParameter (int target, int pname, float params)
1616 CODE: 1758 CODE:
1617 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1759 if (gl.ConvolutionParameterf)
1760 gl.ConvolutionParameterf (target, pname, params);
1618 1761
1619void 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)
1620 CODE: 1763 CODE:
1621 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1764 if (gl.ConvolutionFilter2D)
1622 (target, internalformat, width, height, format, type, data)); 1765 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1623 1766
1624void 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)
1625 CODE: 1768 CODE:
1626 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1769 if (gl.SeparableFilter2D)
1627 (target, internalformat, width, height, format, type, row, column)); 1770 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1628 1771
1629void 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)
1630 1773
1631void 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)
1632 1775
1633void glRasterPos (int x, int y) 1776void glDrawPixels (int width, int height, int format, int type, char *pixels)
1634 CODE:
1635 glRasterPos2i (x, y);
1636 1777
1637void 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)
1638 1779
1639int glGenTexture () 1780int glGenTexture ()
1640 CODE: 1781 CODE:
1667 1808
1668void glEndList () 1809void glEndList ()
1669 1810
1670void glCallList (int list) 1811void glCallList (int list)
1671 1812
1813

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines