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.103 by root, Sun Jun 4 23:05:05 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{
424 // delayed, so it can pick up new fonts added by AddFontResourceEx
410 ft2_fontmap = pango_ft2_font_map_new (); 425 ft2_fontmap = pango_ft2_font_map_new ();
411 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 426 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); 427 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
413 428
414 cairo_fontmap = pango_cairo_font_map_get_default (); 429 cairo_fontmap = pango_cairo_font_map_get_default ();
415 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 430 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
416} 431}
417 432
418int 433int
419SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 434SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
420 435
430 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
431 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 446 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
432 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 447 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
433 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 448 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
434 449
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
452
435 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
436 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
437 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 455 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
438 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 456 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
439 457
440 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 458 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 459
444 SDL_EnableUNICODE (1); 460 SDL_EnableUNICODE (1);
445 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 461 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
446 462
447 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 463 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
456 472
457 ++m; 473 ++m;
458 } 474 }
459} 475}
460 476
477char *
478SDL_GetError ()
479
461int 480int
462SDL_SetVideoMode (int w, int h, int fullscreen) 481SDL_SetVideoMode (int w, int h, int fullscreen)
463 CODE: 482 CODE:
464 RETVAL = !!SDL_SetVideoMode ( 483 RETVAL = !!SDL_SetVideoMode (
465 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 484 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
466 ); 485 );
486 if (RETVAL)
487 {
467 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 }
468 OUTPUT: 493 OUTPUT:
469 RETVAL 494 RETVAL
470 495
471void 496void
472SDL_GL_SwapBuffers () 497SDL_GL_SwapBuffers ()
498
499char *
500SDL_GetKeyName (int sym)
473 501
474void 502void
475SDL_PollEvent () 503SDL_PollEvent ()
476 PPCODE: 504 PPCODE:
477{ 505{
496 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 524 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
497 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 525 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
498 break; 526 break;
499 527
500 case SDL_MOUSEMOTION: 528 case SDL_MOUSEMOTION:
529 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
530
501 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 531 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
502 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 532 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
503 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 533 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
504 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 534 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
505 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 535 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
506 break; 536 break;
507 537
508 case SDL_MOUSEBUTTONDOWN: 538 case SDL_MOUSEBUTTONDOWN:
509 case SDL_MOUSEBUTTONUP: 539 case SDL_MOUSEBUTTONUP:
540 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
541
510 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 542 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
511 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 543 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
512 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 544 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
513 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 545 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
514 break; 546 break;
541 CODE: 573 CODE:
542#ifndef _WIN32 574#ifndef _WIN32
543 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 575 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
544#endif 576#endif
545 577
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 578void
561add_font (char *file) 579add_font (char *file)
562 CODE: 580 CODE:
563 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 581 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
582#ifdef _WIN32
583 // cairo... sigh... requires win2000
584 AddFontResourceEx (file, FR_PRIVATE, 0);
585#endif
564 586
565void 587void
566load_image_inline (SV *image_) 588load_image_inline (SV *image_)
567 ALIAS: 589 ALIAS:
568 load_image_file = 1 590 load_image_file = 1
652} 674}
653 675
654void 676void
655error (char *message) 677error (char *message)
656 CODE: 678 CODE:
679 fprintf (stderr, "ERROR: %s\n", message);
657#ifdef _WIN32 680#ifdef _WIN32
658 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 681 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
659#else
660 fprintf (stderr, "ERROR: %s\n", message);
661#endif 682#endif
662 683
663void 684void
664fatal (char *message) 685fatal (char *message)
665 CODE: 686 CODE:
687 fprintf (stderr, "FATAL: %s\n", message);
666#ifdef _WIN32 688#ifdef _WIN32
667 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 689 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
668#else
669 fprintf (stderr, "FATAL: %s\n", message);
670#endif 690#endif
671 exit (1); 691 exit (1);
672 692
673MODULE = CFClient PACKAGE = CFClient::Font 693MODULE = CFClient PACKAGE = CFClient::Font
674 694
697MODULE = CFClient PACKAGE = CFClient::Layout 717MODULE = CFClient PACKAGE = CFClient::Layout
698 718
699CFClient::Layout 719CFClient::Layout
700new (SV *class, int rgba = 0) 720new (SV *class, int rgba = 0)
701 CODE: 721 CODE:
722#if _WIN32
723 //rgba = 0;//D makes text nicer, breaks TextView
724#endif
702 New (0, RETVAL, 1, struct cf_layout); 725 New (0, RETVAL, 1, struct cf_layout);
703 726
704 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 727 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
705 RETVAL->rgba = rgba; 728 RETVAL->rgba = rgba;
706 RETVAL->r = 1.; 729 RETVAL->r = 1.;
786set_width (CFClient::Layout self, int max_width = -1) 809set_width (CFClient::Layout self, int max_width = -1)
787 CODE: 810 CODE:
788 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);
789 812
790void 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
791size (CFClient::Layout self) 839size (CFClient::Layout self)
792 PPCODE: 840 PPCODE:
793{ 841{
794 int w, h; 842 int w, h;
795 843
861 909
862 while (p < e) 910 while (p < e)
863 { 911 {
864 uint32_t rgba = *p; 912 uint32_t rgba = *p;
865 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
866 rgba = SDL_SwapBE32 (rgba); 926 rgba = SDL_SwapBE32 (rgba);
867 *p++ = rgba; 927 *p++ = rgba;
868 } 928 }
869 } 929 }
870 930
915{ 975{
916 HV *hv = (HV *)SvRV (self); 976 HV *hv = (HV *)SvRV (self);
917 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 977 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
918 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 978 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
919 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 979 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
920 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
921 980
922 if (items < 5) 981 if (items < 5)
923 { 982 {
924 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 983 w = SvNV (*hv_fetch (hv, "w", 1, 1));
925 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 984 h = SvNV (*hv_fetch (hv, "h", 1, 1));
926 } 985 }
927 986
928 if (ix) 987 if (ix)
929 { 988 {
930 glEnable (GL_BLEND); 989 glEnable (GL_BLEND);
990
991 if (ix == 2)
931 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);
932 } 999 }
933 1000
934 glBindTexture (GL_TEXTURE_2D, name); 1001 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 1002
942 glBegin (GL_QUADS); 1003 glBegin (GL_QUADS);
943 glTexCoord2f (0, 0); glVertex2f (x , y ); 1004 glTexCoord2f (0, 0); glVertex2f (x , y );
944 glTexCoord2f (0, t); glVertex2f (x , y + h); 1005 glTexCoord2f (0, t); glVertex2f (x , y + h);
945 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1007 glTexCoord2f (s, 0); glVertex2f (x + w, y );
947 glEnd (); 1008 glEnd ();
948 1009
949 if (ix) 1010 if (ix)
1011 {
1012 glDisable (GL_ALPHA_TEST);
950 glDisable (GL_BLEND); 1013 glDisable (GL_BLEND);
1014 }
951} 1015}
952 1016
953MODULE = CFClient PACKAGE = CFClient::Map 1017MODULE = CFClient PACKAGE = CFClient::Map
954 1018
955CFClient::Map 1019CFClient::Map
1019 tex->r = r; 1083 tex->r = r;
1020 tex->g = g; 1084 tex->g = g;
1021 tex->b = b; 1085 tex->b = b;
1022 tex->a = a; 1086 tex->a = a;
1023 } 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);
1024} 1097}
1025 1098
1026int 1099int
1027ox (CFClient::Map self) 1100ox (CFClient::Map self)
1028 ALIAS: 1101 ALIAS:
1029 oy = 1 1102 oy = 1
1103 x = 2
1104 y = 3
1105 w = 4
1106 h = 5
1030 CODE: 1107 CODE:
1031 switch (ix) 1108 switch (ix)
1032 { 1109 {
1033 case 0: RETVAL = self->ox; break; 1110 case 0: RETVAL = self->ox; break;
1034 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;
1035 } 1116 }
1036 OUTPUT: 1117 OUTPUT:
1037 RETVAL 1118 RETVAL
1038 1119
1039void 1120void
1466 const_iv (GL_COLOR_MATERIAL), 1547 const_iv (GL_COLOR_MATERIAL),
1467 const_iv (GL_SMOOTH), 1548 const_iv (GL_SMOOTH),
1468 const_iv (GL_FLAT), 1549 const_iv (GL_FLAT),
1469 const_iv (GL_DITHER), 1550 const_iv (GL_DITHER),
1470 const_iv (GL_BLEND), 1551 const_iv (GL_BLEND),
1552 const_iv (GL_CULL_FACE),
1471 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),
1472 const_iv (GL_AND), 1558 const_iv (GL_AND),
1473 const_iv (GL_ONE), 1559 const_iv (GL_ONE),
1474 const_iv (GL_ZERO), 1560 const_iv (GL_ZERO),
1475 const_iv (GL_SRC_ALPHA), 1561 const_iv (GL_SRC_ALPHA),
1476 const_iv (GL_SRC_ALPHA_SATURATE), 1562 const_iv (GL_SRC_ALPHA_SATURATE),
1477 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1563 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1478 const_iv (GL_ONE_MINUS_DST_ALPHA), 1564 const_iv (GL_ONE_MINUS_DST_ALPHA),
1479 const_iv (GL_RGB), 1565 const_iv (GL_RGB),
1480 const_iv (GL_RGBA), 1566 const_iv (GL_RGBA),
1481 const_iv (GL_UNSIGNED_BYTE), 1567 const_iv (GL_UNSIGNED_BYTE),
1568 const_iv (GL_UNSIGNED_SHORT),
1569 const_iv (GL_UNSIGNED_INT),
1482 const_iv (GL_ALPHA), 1570 const_iv (GL_ALPHA),
1571 const_iv (GL_INTENSITY),
1483 const_iv (GL_LUMINANCE), 1572 const_iv (GL_LUMINANCE),
1573 const_iv (GL_LUMINANCE_ALPHA),
1484 const_iv (GL_FLOAT), 1574 const_iv (GL_FLOAT),
1485 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1575 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486 const_iv (GL_COMPILE), 1576 const_iv (GL_COMPILE),
1487 const_iv (GL_TEXTURE_1D), 1577 const_iv (GL_TEXTURE_1D),
1488 const_iv (GL_TEXTURE_2D), 1578 const_iv (GL_TEXTURE_2D),
1490 const_iv (GL_TEXTURE_MAG_FILTER), 1580 const_iv (GL_TEXTURE_MAG_FILTER),
1491 const_iv (GL_TEXTURE_MIN_FILTER), 1581 const_iv (GL_TEXTURE_MIN_FILTER),
1492 const_iv (GL_TEXTURE_ENV_MODE), 1582 const_iv (GL_TEXTURE_ENV_MODE),
1493 const_iv (GL_TEXTURE_WRAP_S), 1583 const_iv (GL_TEXTURE_WRAP_S),
1494 const_iv (GL_TEXTURE_WRAP_T), 1584 const_iv (GL_TEXTURE_WRAP_T),
1585 const_iv (GL_REPEAT),
1495 const_iv (GL_CLAMP), 1586 const_iv (GL_CLAMP),
1496 const_iv (GL_REPEAT), 1587 const_iv (GL_CLAMP_TO_EDGE),
1497 const_iv (GL_NEAREST), 1588 const_iv (GL_NEAREST),
1498 const_iv (GL_LINEAR), 1589 const_iv (GL_LINEAR),
1499 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1590 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1500 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1591 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1501 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1592 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1502 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1593 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1503 const_iv (GL_GENERATE_MIPMAP), 1594 const_iv (GL_GENERATE_MIPMAP),
1504 const_iv (GL_MODULATE), 1595 const_iv (GL_MODULATE),
1505 const_iv (GL_DECAL), 1596 const_iv (GL_DECAL),
1506 const_iv (GL_REPLACE), 1597 const_iv (GL_REPLACE),
1598 const_iv (GL_DEPTH_BUFFER_BIT),
1507 const_iv (GL_COLOR_BUFFER_BIT), 1599 const_iv (GL_COLOR_BUFFER_BIT),
1508 const_iv (GL_PROJECTION), 1600 const_iv (GL_PROJECTION),
1509 const_iv (GL_MODELVIEW), 1601 const_iv (GL_MODELVIEW),
1510 const_iv (GL_COLOR_LOGIC_OP), 1602 const_iv (GL_COLOR_LOGIC_OP),
1511 const_iv (GL_SEPARABLE_2D), 1603 const_iv (GL_SEPARABLE_2D),
1512 const_iv (GL_CONVOLUTION_2D), 1604 const_iv (GL_CONVOLUTION_2D),
1513 const_iv (GL_CONVOLUTION_BORDER_MODE), 1605 const_iv (GL_CONVOLUTION_BORDER_MODE),
1514 const_iv (GL_CONSTANT_BORDER), 1606 const_iv (GL_CONSTANT_BORDER),
1515 const_iv (GL_LINES), 1607 const_iv (GL_LINES),
1608 const_iv (GL_LINE_LOOP),
1516 const_iv (GL_QUADS), 1609 const_iv (GL_QUADS),
1517 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),
1518 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1614 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1519 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),
1520# undef const_iv 1620# undef const_iv
1521 }; 1621 };
1522 1622
1523 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; )
1524 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1624 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1525} 1625}
1526 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
1527int glGetError () 1648int glGetError ()
1528 1649
1529void glClear (int mask) 1650void glClear (int mask)
1530 1651
1531void glClearColor (float r, float g, float b, float a = 1.0) 1652void glClearColor (float r, float g, float b, float a = 1.0)
1539 1660
1540void glHint (int target, int mode) 1661void glHint (int target, int mode)
1541 1662
1542void glBlendFunc (int sfactor, int dfactor) 1663void glBlendFunc (int sfactor, int dfactor)
1543 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
1544void glLogicOp (int opcode) 1671void glLogicOp (int opcode)
1545 1672
1546void glColorMask (int red, int green, int blue, int alpha) 1673void glColorMask (int red, int green, int blue, int alpha)
1547 1674
1548void glMatrixMode (int mode) 1675void glMatrixMode (int mode)
1551 1678
1552void glPopMatrix () 1679void glPopMatrix ()
1553 1680
1554void glLoadIdentity () 1681void glLoadIdentity ()
1555 1682
1556# 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
1557void 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_)
1558 1688
1559void glViewport (int x, int y, int width, int height) 1689void glViewport (int x, int y, int width, int height)
1560 1690
1561void glScissor (int x, int y, int width, int height) 1691void glScissor (int x, int y, int width, int height)
1576 1706
1577void glEnd () 1707void glEnd ()
1578 1708
1579void glColor (float r, float g, float b, float a = 1.0) 1709void glColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1710 PROTOTYPE: @
1711 ALIAS:
1712 glColor_premultiply = 1
1581 CODE: 1713 CODE:
1582 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1714 if (ix)
1715 {
1716 r *= a;
1717 g *= a;
1718 b *= a;
1719 }
1720 // microsoft visual "c" rounds instead of truncating...
1721 glColor4ub (MIN ((int)(r * 256.f), 255),
1722 MIN ((int)(g * 256.f), 255),
1723 MIN ((int)(b * 256.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);
1583 1736
1584void glVertex (float x, float y, float z = 0.) 1737void glVertex (float x, float y, float z = 0.)
1585 CODE: 1738 CODE:
1586 glVertex3f (x, y, z); 1739 glVertex3f (x, y, z);
1587 1740
1599 1752
1600void glBindTexture (int target, int name) 1753void glBindTexture (int target, int name)
1601 1754
1602void glConvolutionParameter (int target, int pname, float params) 1755void glConvolutionParameter (int target, int pname, float params)
1603 CODE: 1756 CODE:
1604 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1757 if (gl.ConvolutionParameterf)
1758 gl.ConvolutionParameterf (target, pname, params);
1605 1759
1606void 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)
1607 CODE: 1761 CODE:
1608 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1762 if (gl.ConvolutionFilter2D)
1609 (target, internalformat, width, height, format, type, data)); 1763 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1610 1764
1611void 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)
1612 CODE: 1766 CODE:
1613 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1767 if (gl.SeparableFilter2D)
1614 (target, internalformat, width, height, format, type, row, column)); 1768 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1615 1769
1616void 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)
1617 1771
1618void 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)
1619 1773
1620void glRasterPos (int x, int y) 1774void glDrawPixels (int width, int height, int format, int type, char *pixels)
1621 CODE:
1622 glRasterPos2i (x, y);
1623 1775
1624void 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)
1625 1777
1626int glGenTexture () 1778int glGenTexture ()
1627 CODE: 1779 CODE:
1654 1806
1655void glEndList () 1807void glEndList ()
1656 1808
1657void glCallList (int list) 1809void glCallList (int list)
1658 1810
1811

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines