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.76 by root, Thu May 11 23:41:45 2006 UTC vs.
Revision 1.106 by root, Mon Jun 5 03:48:49 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 3# include <malloc.h>
4# include <windows.h>
3# pragma warning(disable:4244) 5# pragma warning(disable:4244)
4#endif 6#endif
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
8#include "XSUB.h" 10#include "XSUB.h"
9 11
12#include <math.h>
10#include <string.h> 13#include <string.h>
11#include <stdio.h> 14#include <stdio.h>
12 15
13#include <SDL.h> 16#include <SDL.h>
14#include <SDL_endian.h> 17#include <SDL_endian.h>
45#define MAP_EXTEND_X 32 48#define MAP_EXTEND_X 32
46#define MAP_EXTEND_Y 512 49#define MAP_EXTEND_Y 512
47 50
48#define MIN_FONT_HEIGHT 10 51#define MIN_FONT_HEIGHT 10
49 52
50#define GL_CALL(type,func,args) \ 53static struct
51 { \ 54{
52 static int init_; \ 55#define GL_FUNC(ptr,name) ptr name;
53 static type fptr_; \ 56#include "glfunc.h"
54 \ 57#undef GL_FUNC
55 if (!init_) \ 58} gl;
56 { \ 59
57 init_ = 1; \ 60static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
58 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 61{
59 } \ 62 if (gl.BlendFuncSeparate)
60 \ 63 gl.BlendFuncSeparate (sa, da, saa, daa);
61 if (fptr_) \ 64 else if (gl.BlendFuncSeparateEXT)
62 fptr_ args; \ 65 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
63 } 66 else
67 glBlendFunc (sa, da);
68}
64 69
65typedef Mix_Chunk *CFClient__MixChunk; 70typedef Mix_Chunk *CFClient__MixChunk;
66typedef Mix_Music *CFClient__MixMusic; 71typedef Mix_Music *CFClient__MixMusic;
67 72
68typedef PangoFontDescription *CFClient__Font; 73typedef PangoFontDescription *CFClient__Font;
81 86
82static void 87static void
83substitute_func (FcPattern *pattern, gpointer data) 88substitute_func (FcPattern *pattern, gpointer data)
84{ 89{
85 FcPatternAddBool (pattern, FC_HINTING , 1); 90 FcPatternAddBool (pattern, FC_HINTING , 1);
91#ifdef _WIN32
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
93#else
86 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 94 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif
87} 96}
88 97
89static void 98static void
90layout_update_font (CFClient__Layout self) 99layout_update_font (CFClient__Layout self)
91{ 100{
404# undef const_iv 413# undef const_iv
405 }; 414 };
406 415
407 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
408 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418}
409 419
420void
421pango_init ()
422 CODE:
423 // delayed, so it can pick up new fonts added by AddFontResourceEx
424{
425 {
410 ft2_fontmap = pango_ft2_font_map_new (); 426 ft2_fontmap = pango_ft2_font_map_new ();
411 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 427 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
412 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 428 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
413 429 }
430 {
431 cairo_font_options_t *fopt = cairo_font_options_create ();
414 cairo_fontmap = pango_cairo_font_map_get_default (); 432 cairo_fontmap = pango_cairo_font_map_get_default ();
415 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 433 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
434#ifdef _WIN32
435 // cairo looks like shit eaten twice on windows
436 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
437#else
438 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
439#endif
440 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
441 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
442 pango_cairo_context_set_font_options (cairo_context, fopt);
443 cairo_font_options_destroy (fopt);
444 }
416} 445}
417 446
418int 447int
419SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 448SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
420 449
430 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 459 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
431 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 460 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
432 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 461 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
433 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 462 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
434 463
464 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
465 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
466
435 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 467 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
436 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 468 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
437 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 469 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
438 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 470 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
439 471
440 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 472 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
441 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
442 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
443 473
444 SDL_EnableUNICODE (1); 474 SDL_EnableUNICODE (1);
445 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 475 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
446 476
447 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 477 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
456 486
457 ++m; 487 ++m;
458 } 488 }
459} 489}
460 490
491char *
492SDL_GetError ()
493
461int 494int
462SDL_SetVideoMode (int w, int h, int fullscreen) 495SDL_SetVideoMode (int w, int h, int fullscreen)
463 CODE: 496 CODE:
464 RETVAL = !!SDL_SetVideoMode ( 497 RETVAL = !!SDL_SetVideoMode (
465 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 498 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
466 ); 499 );
500 if (RETVAL)
501 {
467 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 502 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
503# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
504# include "glfunc.h"
505# undef GL_FUNC
506 }
468 OUTPUT: 507 OUTPUT:
469 RETVAL 508 RETVAL
470 509
471void 510void
472SDL_GL_SwapBuffers () 511SDL_GL_SwapBuffers ()
512
513char *
514SDL_GetKeyName (int sym)
473 515
474void 516void
475SDL_PollEvent () 517SDL_PollEvent ()
476 PPCODE: 518 PPCODE:
477{ 519{
496 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 538 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
497 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 539 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
498 break; 540 break;
499 541
500 case SDL_MOUSEMOTION: 542 case SDL_MOUSEMOTION:
543 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
544
501 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 545 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
502 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 546 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
503 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 547 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
504 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 548 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
505 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 549 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
506 break; 550 break;
507 551
508 case SDL_MOUSEBUTTONDOWN: 552 case SDL_MOUSEBUTTONDOWN:
509 case SDL_MOUSEBUTTONUP: 553 case SDL_MOUSEBUTTONUP:
554 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
555
510 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 556 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
511 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 557 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
512 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 558 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
513 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 559 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
514 break; 560 break;
541 CODE: 587 CODE:
542#ifndef _WIN32 588#ifndef _WIN32
543 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 589 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
544#endif 590#endif
545 591
546char *
547gl_version ()
548 CODE:
549 RETVAL = (char *)glGetString (GL_VERSION);
550 OUTPUT:
551 RETVAL
552
553char *
554gl_extensions ()
555 CODE:
556 RETVAL = (char *)glGetString (GL_EXTENSIONS);
557 OUTPUT:
558 RETVAL
559
560void 592void
561add_font (char *file) 593add_font (char *file)
562 CODE: 594 CODE:
563 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 595 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
596#ifdef _WIN32
597 // cairo... sigh... requires win2000
598 AddFontResourceEx (file, FR_PRIVATE, 0);
599#endif
564 600
565void 601void
566load_image_inline (SV *image_) 602load_image_inline (SV *image_)
567 ALIAS: 603 ALIAS:
568 load_image_file = 1 604 load_image_file = 1
652} 688}
653 689
654void 690void
655error (char *message) 691error (char *message)
656 CODE: 692 CODE:
693 fprintf (stderr, "ERROR: %s\n", message);
657#ifdef _WIN32 694#ifdef _WIN32
658 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 695 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
659#else
660 fprintf (stderr, "ERROR: %s\n", message);
661#endif 696#endif
662 697
663void 698void
664fatal (char *message) 699fatal (char *message)
665 CODE: 700 CODE:
701 fprintf (stderr, "FATAL: %s\n", message);
666#ifdef _WIN32 702#ifdef _WIN32
667 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 703 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
668#else
669 fprintf (stderr, "FATAL: %s\n", message);
670#endif 704#endif
671 exit (1); 705 exit (1);
672 706
673MODULE = CFClient PACKAGE = CFClient::Font 707MODULE = CFClient PACKAGE = CFClient::Font
674 708
786set_width (CFClient::Layout self, int max_width = -1) 820set_width (CFClient::Layout self, int max_width = -1)
787 CODE: 821 CODE:
788 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 822 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
789 823
790void 824void
825set_indent (CFClient::Layout self, int indent)
826 CODE:
827 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
828
829void
830set_spacing (CFClient::Layout self, int spacing)
831 CODE:
832 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
833
834void
835set_ellipsise (CFClient::Layout self, int ellipsise)
836 CODE:
837 pango_layout_set_ellipsize (self->pl,
838 ellipsise == 1 ? PANGO_ELLIPSIZE_START
839 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
840 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
841 : PANGO_ELLIPSIZE_NONE
842 );
843
844void
845set_single_paragraph_mode (CFClient::Layout self, int spm)
846 CODE:
847 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
848
849void
791size (CFClient::Layout self) 850size (CFClient::Layout self)
792 PPCODE: 851 PPCODE:
793{ 852{
794 int w, h; 853 int w, h;
795 854
861 920
862 while (p < e) 921 while (p < e)
863 { 922 {
864 uint32_t rgba = *p; 923 uint32_t rgba = *p;
865 rgba = (rgba >> 24) | (rgba << 8); 924 rgba = (rgba >> 24) | (rgba << 8);
925#if 0
926#ifdef _WIN32
927 {//D
928 uint8_t r = rgba >> 24;
929 uint8_t g = rgba >> 16;
930 uint8_t b = rgba >> 8;
931 uint8_t a = rgba >> 0;
932
933 rgba = (rgba & 0xffffff00) | a;
934 }
935#endif
936#endif
866 rgba = SDL_SwapBE32 (rgba); 937 rgba = SDL_SwapBE32 (rgba);
867 *p++ = rgba; 938 *p++ = rgba;
868 } 939 }
869 } 940 }
870 941
915{ 986{
916 HV *hv = (HV *)SvRV (self); 987 HV *hv = (HV *)SvRV (self);
917 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 988 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
918 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 989 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
919 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 990 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
920 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
921 991
922 if (items < 5) 992 if (items < 5)
923 { 993 {
924 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 994 w = SvNV (*hv_fetch (hv, "w", 1, 1));
925 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 995 h = SvNV (*hv_fetch (hv, "h", 1, 1));
926 } 996 }
927 997
928 if (ix) 998 if (ix)
929 { 999 {
930 glEnable (GL_BLEND); 1000 glEnable (GL_BLEND);
1001
1002 if (ix == 2)
931 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1003 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1004 else
1005 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1006 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1007
1008 glEnable (GL_ALPHA_TEST);
1009 glAlphaFunc (GL_GREATER, 0.01f);
932 } 1010 }
933 1011
934 glBindTexture (GL_TEXTURE_2D, name); 1012 glBindTexture (GL_TEXTURE_2D, name);
935
936 if (wrap_mode)
937 {
938 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
939 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
940 }
941 1013
942 glBegin (GL_QUADS); 1014 glBegin (GL_QUADS);
943 glTexCoord2f (0, 0); glVertex2f (x , y ); 1015 glTexCoord2f (0, 0); glVertex2f (x , y );
944 glTexCoord2f (0, t); glVertex2f (x , y + h); 1016 glTexCoord2f (0, t); glVertex2f (x , y + h);
945 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1017 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1018 glTexCoord2f (s, 0); glVertex2f (x + w, y );
947 glEnd (); 1019 glEnd ();
948 1020
949 if (ix) 1021 if (ix)
1022 {
1023 glDisable (GL_ALPHA_TEST);
950 glDisable (GL_BLEND); 1024 glDisable (GL_BLEND);
1025 }
951} 1026}
952 1027
953MODULE = CFClient PACKAGE = CFClient::Map 1028MODULE = CFClient PACKAGE = CFClient::Map
954 1029
955CFClient::Map 1030CFClient::Map
1019 tex->r = r; 1094 tex->r = r;
1020 tex->g = g; 1095 tex->g = g;
1021 tex->b = b; 1096 tex->b = b;
1022 tex->a = a; 1097 tex->a = a;
1023 } 1098 }
1099
1100 // somewhat hackish, but for textures that require it, it really
1101 // improves the look, and most others don't suffer.
1102 glBindTexture (GL_TEXTURE_2D, name);
1103 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1104 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1105 // use uglier nearest interpolation because linear suffers
1106 // from transparent color bleeding and ugly wrapping effects.
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1024} 1108}
1025 1109
1026int 1110int
1027ox (CFClient::Map self) 1111ox (CFClient::Map self)
1028 ALIAS: 1112 ALIAS:
1029 oy = 1 1113 oy = 1
1114 x = 2
1115 y = 3
1116 w = 4
1117 h = 5
1030 CODE: 1118 CODE:
1031 switch (ix) 1119 switch (ix)
1032 { 1120 {
1033 case 0: RETVAL = self->ox; break; 1121 case 0: RETVAL = self->ox; break;
1034 case 1: RETVAL = self->oy; break; 1122 case 1: RETVAL = self->oy; break;
1123 case 2: RETVAL = self->x; break;
1124 case 3: RETVAL = self->y; break;
1125 case 4: RETVAL = self->w; break;
1126 case 5: RETVAL = self->h; break;
1035 } 1127 }
1036 OUTPUT: 1128 OUTPUT:
1037 RETVAL 1129 RETVAL
1038 1130
1039void 1131void
1466 const_iv (GL_COLOR_MATERIAL), 1558 const_iv (GL_COLOR_MATERIAL),
1467 const_iv (GL_SMOOTH), 1559 const_iv (GL_SMOOTH),
1468 const_iv (GL_FLAT), 1560 const_iv (GL_FLAT),
1469 const_iv (GL_DITHER), 1561 const_iv (GL_DITHER),
1470 const_iv (GL_BLEND), 1562 const_iv (GL_BLEND),
1563 const_iv (GL_CULL_FACE),
1471 const_iv (GL_SCISSOR_TEST), 1564 const_iv (GL_SCISSOR_TEST),
1565 const_iv (GL_DEPTH_TEST),
1566 const_iv (GL_ALPHA_TEST),
1567 const_iv (GL_NORMALIZE),
1568 const_iv (GL_RESCALE_NORMAL),
1472 const_iv (GL_AND), 1569 const_iv (GL_AND),
1473 const_iv (GL_ONE), 1570 const_iv (GL_ONE),
1474 const_iv (GL_ZERO), 1571 const_iv (GL_ZERO),
1475 const_iv (GL_SRC_ALPHA), 1572 const_iv (GL_SRC_ALPHA),
1476 const_iv (GL_SRC_ALPHA_SATURATE), 1573 const_iv (GL_DST_ALPHA),
1477 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1574 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1478 const_iv (GL_ONE_MINUS_DST_ALPHA), 1575 const_iv (GL_ONE_MINUS_DST_ALPHA),
1576 const_iv (GL_SRC_ALPHA_SATURATE),
1479 const_iv (GL_RGB), 1577 const_iv (GL_RGB),
1480 const_iv (GL_RGBA), 1578 const_iv (GL_RGBA),
1481 const_iv (GL_UNSIGNED_BYTE), 1579 const_iv (GL_UNSIGNED_BYTE),
1580 const_iv (GL_UNSIGNED_SHORT),
1581 const_iv (GL_UNSIGNED_INT),
1482 const_iv (GL_ALPHA), 1582 const_iv (GL_ALPHA),
1583 const_iv (GL_INTENSITY),
1483 const_iv (GL_LUMINANCE), 1584 const_iv (GL_LUMINANCE),
1585 const_iv (GL_LUMINANCE_ALPHA),
1484 const_iv (GL_FLOAT), 1586 const_iv (GL_FLOAT),
1485 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1587 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486 const_iv (GL_COMPILE), 1588 const_iv (GL_COMPILE),
1487 const_iv (GL_TEXTURE_1D), 1589 const_iv (GL_TEXTURE_1D),
1488 const_iv (GL_TEXTURE_2D), 1590 const_iv (GL_TEXTURE_2D),
1490 const_iv (GL_TEXTURE_MAG_FILTER), 1592 const_iv (GL_TEXTURE_MAG_FILTER),
1491 const_iv (GL_TEXTURE_MIN_FILTER), 1593 const_iv (GL_TEXTURE_MIN_FILTER),
1492 const_iv (GL_TEXTURE_ENV_MODE), 1594 const_iv (GL_TEXTURE_ENV_MODE),
1493 const_iv (GL_TEXTURE_WRAP_S), 1595 const_iv (GL_TEXTURE_WRAP_S),
1494 const_iv (GL_TEXTURE_WRAP_T), 1596 const_iv (GL_TEXTURE_WRAP_T),
1597 const_iv (GL_REPEAT),
1495 const_iv (GL_CLAMP), 1598 const_iv (GL_CLAMP),
1496 const_iv (GL_REPEAT), 1599 const_iv (GL_CLAMP_TO_EDGE),
1497 const_iv (GL_NEAREST), 1600 const_iv (GL_NEAREST),
1498 const_iv (GL_LINEAR), 1601 const_iv (GL_LINEAR),
1499 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1602 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1500 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1603 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1501 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1604 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1502 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1605 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1503 const_iv (GL_GENERATE_MIPMAP), 1606 const_iv (GL_GENERATE_MIPMAP),
1504 const_iv (GL_MODULATE), 1607 const_iv (GL_MODULATE),
1505 const_iv (GL_DECAL), 1608 const_iv (GL_DECAL),
1506 const_iv (GL_REPLACE), 1609 const_iv (GL_REPLACE),
1610 const_iv (GL_DEPTH_BUFFER_BIT),
1507 const_iv (GL_COLOR_BUFFER_BIT), 1611 const_iv (GL_COLOR_BUFFER_BIT),
1508 const_iv (GL_PROJECTION), 1612 const_iv (GL_PROJECTION),
1509 const_iv (GL_MODELVIEW), 1613 const_iv (GL_MODELVIEW),
1510 const_iv (GL_COLOR_LOGIC_OP), 1614 const_iv (GL_COLOR_LOGIC_OP),
1511 const_iv (GL_SEPARABLE_2D), 1615 const_iv (GL_SEPARABLE_2D),
1512 const_iv (GL_CONVOLUTION_2D), 1616 const_iv (GL_CONVOLUTION_2D),
1513 const_iv (GL_CONVOLUTION_BORDER_MODE), 1617 const_iv (GL_CONVOLUTION_BORDER_MODE),
1514 const_iv (GL_CONSTANT_BORDER), 1618 const_iv (GL_CONSTANT_BORDER),
1515 const_iv (GL_LINES), 1619 const_iv (GL_LINES),
1620 const_iv (GL_LINE_LOOP),
1516 const_iv (GL_QUADS), 1621 const_iv (GL_QUADS),
1517 const_iv (GL_LINE_LOOP), 1622 const_iv (GL_QUAD_STRIP),
1623 const_iv (GL_TRIANGLES),
1624 const_iv (GL_TRIANGLE_STRIP),
1625 const_iv (GL_TRIANGLE_FAN),
1518 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1626 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1519 const_iv (GL_FASTEST), 1627 const_iv (GL_FASTEST),
1628 const_iv (GL_V2F),
1629 const_iv (GL_V3F),
1630 const_iv (GL_T2F_V3F),
1631 const_iv (GL_T2F_N3F_V3F),
1520# undef const_iv 1632# undef const_iv
1521 }; 1633 };
1522 1634
1523 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1635 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1524 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1636 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1525} 1637}
1526 1638
1639char *
1640gl_vendor ()
1641 CODE:
1642 RETVAL = (char *)glGetString (GL_VENDOR);
1643 OUTPUT:
1644 RETVAL
1645
1646char *
1647gl_version ()
1648 CODE:
1649 RETVAL = (char *)glGetString (GL_VERSION);
1650 OUTPUT:
1651 RETVAL
1652
1653char *
1654gl_extensions ()
1655 CODE:
1656 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1657 OUTPUT:
1658 RETVAL
1659
1527int glGetError () 1660int glGetError ()
1528 1661
1529void glClear (int mask) 1662void glClear (int mask)
1530 1663
1531void glClearColor (float r, float g, float b, float a = 1.0) 1664void glClearColor (float r, float g, float b, float a = 1.0)
1539 1672
1540void glHint (int target, int mode) 1673void glHint (int target, int mode)
1541 1674
1542void glBlendFunc (int sfactor, int dfactor) 1675void glBlendFunc (int sfactor, int dfactor)
1543 1676
1677void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1678 CODE:
1679 gl_BlendFuncSeparate (sa, da, saa, daa);
1680
1681void glDepthMask (int flag)
1682
1544void glLogicOp (int opcode) 1683void glLogicOp (int opcode)
1545 1684
1546void glColorMask (int red, int green, int blue, int alpha) 1685void glColorMask (int red, int green, int blue, int alpha)
1547 1686
1548void glMatrixMode (int mode) 1687void glMatrixMode (int mode)
1551 1690
1552void glPopMatrix () 1691void glPopMatrix ()
1553 1692
1554void glLoadIdentity () 1693void glLoadIdentity ()
1555 1694
1556# near and far are due to microsofts buggy c compiler 1695# near_ and far_ are due to microsofts buggy "c" compiler
1696void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1697
1698# near_ and far_ are due to microsofts buggy "c" compiler
1557void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1699void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1558 1700
1559void glViewport (int x, int y, int width, int height) 1701void glViewport (int x, int y, int width, int height)
1560 1702
1561void glScissor (int x, int y, int width, int height) 1703void glScissor (int x, int y, int width, int height)
1576 1718
1577void glEnd () 1719void glEnd ()
1578 1720
1579void glColor (float r, float g, float b, float a = 1.0) 1721void glColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1722 PROTOTYPE: @
1723 ALIAS:
1724 glColor_premultiply = 1
1581 CODE: 1725 CODE:
1582 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1726 if (ix)
1727 {
1728 r *= a;
1729 g *= a;
1730 b *= a;
1731 }
1732 // microsoft visual "c" rounds instead of truncating...
1733 glColor4ub (MIN ((int)(r * 256.f), 255),
1734 MIN ((int)(g * 256.f), 255),
1735 MIN ((int)(b * 256.f), 255),
1736 MIN ((int)(a * 256.f), 255));
1737
1738void glInterleavedArrays (int format, int stride, char *data)
1739
1740void glDrawElements (int mode, int count, int type, char *indices)
1741
1742# 1.2 void glDrawRangeElements (int mode, int start, int end
1743
1744void glRasterPos (float x, float y, float z = 0.)
1745 CODE:
1746 glRasterPos3f (0, 0, z);
1747 glBitmap (0, 0, 0, 0, x, y, 0);
1583 1748
1584void glVertex (float x, float y, float z = 0.) 1749void glVertex (float x, float y, float z = 0.)
1585 CODE: 1750 CODE:
1586 glVertex3f (x, y, z); 1751 glVertex3f (x, y, z);
1587 1752
1599 1764
1600void glBindTexture (int target, int name) 1765void glBindTexture (int target, int name)
1601 1766
1602void glConvolutionParameter (int target, int pname, float params) 1767void glConvolutionParameter (int target, int pname, float params)
1603 CODE: 1768 CODE:
1604 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1769 if (gl.ConvolutionParameterf)
1770 gl.ConvolutionParameterf (target, pname, params);
1605 1771
1606void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1772void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1607 CODE: 1773 CODE:
1608 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1774 if (gl.ConvolutionFilter2D)
1609 (target, internalformat, width, height, format, type, data)); 1775 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1610 1776
1611void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1777void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1612 CODE: 1778 CODE:
1613 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1779 if (gl.SeparableFilter2D)
1614 (target, internalformat, width, height, format, type, row, column)); 1780 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1615 1781
1616void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1782void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1617 1783
1618void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1784void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1619 1785
1620void glRasterPos (int x, int y) 1786void glDrawPixels (int width, int height, int format, int type, char *pixels)
1621 CODE:
1622 glRasterPos2i (x, y);
1623 1787
1624void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1788void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1625 1789
1626int glGenTexture () 1790int glGenTexture ()
1627 CODE: 1791 CODE:
1654 1818
1655void glEndList () 1819void glEndList ()
1656 1820
1657void glCallList (int list) 1821void glCallList (int list)
1658 1822
1823

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines