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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines