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.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.113 by root, Wed Jun 14 16:20:21 2006 UTC

10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h> 12#include <math.h>
13#include <string.h> 13#include <string.h>
14#include <stdio.h> 14#include <stdio.h>
15#include <stdlib.h>
15 16
16#include <SDL.h> 17#include <SDL.h>
17#include <SDL_endian.h> 18#include <SDL_endian.h>
18#include <SDL_image.h> 19#include <SDL_image.h>
19#include <SDL_mixer.h> 20#include <SDL_mixer.h>
48#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
50 51
51#define MIN_FONT_HEIGHT 10 52#define MIN_FONT_HEIGHT 10
52 53
53#define GL_CALL(type,func,args) \ 54static struct
54 { \ 55{
55 static int init_; \ 56#define GL_FUNC(ptr,name) ptr name;
56 static type fptr_; \ 57#include "glfunc.h"
57 \ 58#undef GL_FUNC
58 if (!init_) \ 59} gl;
59 { \ 60
60 init_ = 1; \ 61static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 62{
62 } \ 63 if (gl.BlendFuncSeparate)
63 \ 64 gl.BlendFuncSeparate (sa, da, saa, daa);
64 if (fptr_) \ 65 else if (gl.BlendFuncSeparateEXT)
65 fptr_ args; \ 66 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 } 67 else
68 glBlendFunc (sa, da);
69}
67 70
68typedef Mix_Chunk *CFClient__MixChunk; 71typedef Mix_Chunk *CFClient__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 72typedef Mix_Music *CFClient__MixMusic;
70 73
71typedef PangoFontDescription *CFClient__Font; 74typedef PangoFontDescription *CFClient__Font;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 86static PangoFontMap *ft2_fontmap, *cairo_fontmap;
84 87
85static void 88static void
86substitute_func (FcPattern *pattern, gpointer data) 89substitute_func (FcPattern *pattern, gpointer data)
87{ 90{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 91 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif
89#ifdef _WIN32 95#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else 97#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 98 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif 99#endif
294 ev.code = 1; 300 ev.code = 1;
295 ev.data1 = (void *)(long)channel; 301 ev.data1 = (void *)(long)channel;
296 ev.data2 = 0; 302 ev.data2 = 0;
297 303
298 SDL_PushEvent ((SDL_Event *)&ev); 304 SDL_PushEvent ((SDL_Event *)&ev);
305}
306
307static unsigned int
308minpot (unsigned int n)
309{
310 if (!n)
311 return 0;
312
313 --n;
314
315 n |= n >> 1;
316 n |= n >> 2;
317 n |= n >> 4;
318 n |= n >> 8;
319 n |= n >> 16;
320
321 return n + 1;
299} 322}
300 323
301MODULE = CFClient PACKAGE = CFClient 324MODULE = CFClient PACKAGE = CFClient
302 325
303PROTOTYPES: ENABLE 326PROTOTYPES: ENABLE
416} 439}
417 440
418void 441void
419pango_init () 442pango_init ()
420 CODE: 443 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx 444 // delayed, so it can pick up new fonts added by AddFontResourceEx
445{
446 {
423 ft2_fontmap = pango_ft2_font_map_new (); 447 ft2_fontmap = pango_ft2_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 448 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 449 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426 450 }
451 {
452 cairo_font_options_t *fopt = cairo_font_options_create ();
427 cairo_fontmap = pango_cairo_font_map_get_default (); 453 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 454 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455#ifdef _WIN32
456 // cairo looks like shit eaten twice on windows
457 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458#else
459 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460#endif
461 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463 pango_cairo_context_set_font_options (cairo_context, fopt);
464 cairo_font_options_destroy (fopt);
465 }
429} 466}
430 467
431int 468int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 469SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
433 470
443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 480 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 481 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 482 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 483 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 484
485 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
487
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 488 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 489 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 490 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 491 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452 492
453 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 493 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
454 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
455 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
456 494
457 SDL_EnableUNICODE (1); 495 SDL_EnableUNICODE (1);
458 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 496 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459 497
460 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 498 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
469 507
470 ++m; 508 ++m;
471 } 509 }
472} 510}
473 511
512char *
513SDL_GetError ()
514
474int 515int
475SDL_SetVideoMode (int w, int h, int fullscreen) 516SDL_SetVideoMode (int w, int h, int fullscreen)
476 CODE: 517 CODE:
477 RETVAL = !!SDL_SetVideoMode ( 518 RETVAL = !!SDL_SetVideoMode (
478 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 519 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
479 ); 520 );
521 if (RETVAL)
522 {
480 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 523 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
524# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
525# include "glfunc.h"
526# undef GL_FUNC
527 }
481 OUTPUT: 528 OUTPUT:
482 RETVAL 529 RETVAL
483 530
484void 531void
485SDL_GL_SwapBuffers () 532SDL_GL_SwapBuffers ()
533
534char *
535SDL_GetKeyName (int sym)
486 536
487void 537void
488SDL_PollEvent () 538SDL_PollEvent ()
489 PPCODE: 539 PPCODE:
490{ 540{
509 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 559 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 560 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511 break; 561 break;
512 562
513 case SDL_MOUSEMOTION: 563 case SDL_MOUSEMOTION:
564 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
565
514 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 566 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 567 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 568 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 569 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 570 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519 break; 571 break;
520 572
521 case SDL_MOUSEBUTTONDOWN: 573 case SDL_MOUSEBUTTONDOWN:
522 case SDL_MOUSEBUTTONUP: 574 case SDL_MOUSEBUTTONUP:
575 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
576
523 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 577 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 578 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 579 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 580 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527 break; 581 break;
553lowdelay (int fd, int val = 1) 607lowdelay (int fd, int val = 1)
554 CODE: 608 CODE:
555#ifndef _WIN32 609#ifndef _WIN32
556 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 610 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557#endif 611#endif
558
559char *
560gl_version ()
561 CODE:
562 RETVAL = (char *)glGetString (GL_VERSION);
563 OUTPUT:
564 RETVAL
565
566char *
567gl_extensions ()
568 CODE:
569 RETVAL = (char *)glGetString (GL_EXTENSIONS);
570 OUTPUT:
571 RETVAL
572 612
573void 613void
574add_font (char *file) 614add_font (char *file)
575 CODE: 615 CODE:
576 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 616 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
669} 709}
670 710
671void 711void
672error (char *message) 712error (char *message)
673 CODE: 713 CODE:
714 fprintf (stderr, "ERROR: %s\n", message);
674#ifdef _WIN32 715#ifdef _WIN32
675 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 716 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
676#else
677 fprintf (stderr, "ERROR: %s\n", message);
678#endif 717#endif
679 718
680void 719void
681fatal (char *message) 720fatal (char *message)
682 CODE: 721 CODE:
722 fprintf (stderr, "FATAL: %s\n", message);
683#ifdef _WIN32 723#ifdef _WIN32
684 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 724 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
685#else
686 fprintf (stderr, "FATAL: %s\n", message);
687#endif 725#endif
688 exit (1); 726 _exit (1);
727
728void
729_exit (int retval)
730 CODE:
731 _exit (retval);
689 732
690MODULE = CFClient PACKAGE = CFClient::Font 733MODULE = CFClient PACKAGE = CFClient::Font
691 734
692CFClient::Font 735CFClient::Font
693new_from_file (SV *class, char *path, int id = 0) 736new_from_file (SV *class, char *path, int id = 0)
767 810
768SV * 811SV *
769get_text (CFClient::Layout self) 812get_text (CFClient::Layout self)
770 CODE: 813 CODE:
771 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 814 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
772 SvUTF8_on (RETVAL); 815 sv_utf8_decode (RETVAL);
773 OUTPUT: 816 OUTPUT:
774 RETVAL 817 RETVAL
775 818
776void 819void
777set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 820set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
903 946
904 while (p < e) 947 while (p < e)
905 { 948 {
906 uint32_t rgba = *p; 949 uint32_t rgba = *p;
907 rgba = (rgba >> 24) | (rgba << 8); 950 rgba = (rgba >> 24) | (rgba << 8);
951#if 0
952#ifdef _WIN32
953 {//D
954 uint8_t r = rgba >> 24;
955 uint8_t g = rgba >> 16;
956 uint8_t b = rgba >> 8;
957 uint8_t a = rgba >> 0;
958
959 rgba = (rgba & 0xffffff00) | a;
960 }
961#endif
962#endif
908 rgba = SDL_SwapBE32 (rgba); 963 rgba = SDL_SwapBE32 (rgba);
909 *p++ = rgba; 964 *p++ = rgba;
910 } 965 }
911 } 966 }
912 967
946} 1001}
947 1002
948MODULE = CFClient PACKAGE = CFClient::Texture 1003MODULE = CFClient PACKAGE = CFClient::Texture
949 1004
950void 1005void
1006pad2pot (SV *data_, SV *w_, SV *h_)
1007 CODE:
1008{
1009 int ow = SvIV (w_);
1010 int oh = SvIV (h_);
1011
1012 if (ow && oh)
1013 {
1014 int nw = minpot (ow);
1015 int nh = minpot (oh);
1016
1017 if (nw != ow || nh != oh)
1018 {
1019 if (SvOK (data_))
1020 {
1021 STRLEN datalen;
1022 char *data = SvPVbyte (data_, datalen);
1023 int bpp = datalen / (ow * oh);
1024 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1025
1026 SvPOK_only (result_);
1027 SvCUR_set (result_, nw * nh * bpp);
1028
1029 memset (SvPVX (result_), 0, nw * nh * bpp);
1030 while (oh--)
1031 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1032
1033 sv_setsv (data_, result_);
1034 }
1035
1036 sv_setiv (w_, nw);
1037 sv_setiv (h_, nh);
1038 }
1039 }
1040}
1041
1042void
951draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1043draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
952 PROTOTYPE: $$$;$$ 1044 PROTOTYPE: $$$;$$
953 ALIAS: 1045 ALIAS:
954 draw_quad_alpha = 1 1046 draw_quad_alpha = 1
955 draw_quad_alpha_premultiplied = 2 1047 draw_quad_alpha_premultiplied = 2
957{ 1049{
958 HV *hv = (HV *)SvRV (self); 1050 HV *hv = (HV *)SvRV (self);
959 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1051 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
960 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1052 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
961 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1053 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
962 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
963 1054
964 if (items < 5) 1055 if (items < 5)
965 { 1056 {
966 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1057 w = SvNV (*hv_fetch (hv, "w", 1, 1));
967 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1058 h = SvNV (*hv_fetch (hv, "h", 1, 1));
968 } 1059 }
969 1060
970 if (ix) 1061 if (ix)
971 { 1062 {
972 glEnable (GL_BLEND); 1063 glEnable (GL_BLEND);
1064
1065 if (ix == 2)
973 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1066 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1067 else
1068 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1069 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1070
1071 glEnable (GL_ALPHA_TEST);
1072 glAlphaFunc (GL_GREATER, 0.01f);
974 } 1073 }
975 1074
976 glBindTexture (GL_TEXTURE_2D, name); 1075 glBindTexture (GL_TEXTURE_2D, name);
977
978 if (wrap_mode)
979 {
980 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
982 }
983 1076
984 glBegin (GL_QUADS); 1077 glBegin (GL_QUADS);
985 glTexCoord2f (0, 0); glVertex2f (x , y ); 1078 glTexCoord2f (0, 0); glVertex2f (x , y );
986 glTexCoord2f (0, t); glVertex2f (x , y + h); 1079 glTexCoord2f (0, t); glVertex2f (x , y + h);
987 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1080 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
988 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1081 glTexCoord2f (s, 0); glVertex2f (x + w, y );
989 glEnd (); 1082 glEnd ();
990 1083
991 if (ix) 1084 if (ix)
1085 {
1086 glDisable (GL_ALPHA_TEST);
992 glDisable (GL_BLEND); 1087 glDisable (GL_BLEND);
1088 }
993} 1089}
994 1090
995MODULE = CFClient PACKAGE = CFClient::Map 1091MODULE = CFClient PACKAGE = CFClient::Map
996 1092
997CFClient::Map 1093CFClient::Map
1017DESTROY (CFClient::Map self) 1113DESTROY (CFClient::Map self)
1018 CODE: 1114 CODE:
1019{ 1115{
1020 map_clear (self); 1116 map_clear (self);
1021 Safefree (self->face); 1117 Safefree (self->face);
1118 Safefree (self->tex);
1022 Safefree (self); 1119 Safefree (self);
1023} 1120}
1024 1121
1025void 1122void
1026clear (CFClient::Map self) 1123clear (CFClient::Map self)
1061 tex->r = r; 1158 tex->r = r;
1062 tex->g = g; 1159 tex->g = g;
1063 tex->b = b; 1160 tex->b = b;
1064 tex->a = a; 1161 tex->a = a;
1065 } 1162 }
1163
1164 // somewhat hackish, but for textures that require it, it really
1165 // improves the look, and most others don't suffer.
1166 glBindTexture (GL_TEXTURE_2D, name);
1167 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1168 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1169 // use uglier nearest interpolation because linear suffers
1170 // from transparent color bleeding and ugly wrapping effects.
1171 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1066} 1172}
1067 1173
1068int 1174int
1069ox (CFClient::Map self) 1175ox (CFClient::Map self)
1070 ALIAS: 1176 ALIAS:
1071 oy = 1 1177 oy = 1
1178 x = 2
1179 y = 3
1180 w = 4
1181 h = 5
1072 CODE: 1182 CODE:
1073 switch (ix) 1183 switch (ix)
1074 { 1184 {
1075 case 0: RETVAL = self->ox; break; 1185 case 0: RETVAL = self->ox; break;
1076 case 1: RETVAL = self->oy; break; 1186 case 1: RETVAL = self->oy; break;
1187 case 2: RETVAL = self->x; break;
1188 case 3: RETVAL = self->y; break;
1189 case 4: RETVAL = self->w; break;
1190 case 5: RETVAL = self->h; break;
1077 } 1191 }
1078 OUTPUT: 1192 OUTPUT:
1079 RETVAL 1193 RETVAL
1080 1194
1081void 1195void
1508 const_iv (GL_COLOR_MATERIAL), 1622 const_iv (GL_COLOR_MATERIAL),
1509 const_iv (GL_SMOOTH), 1623 const_iv (GL_SMOOTH),
1510 const_iv (GL_FLAT), 1624 const_iv (GL_FLAT),
1511 const_iv (GL_DITHER), 1625 const_iv (GL_DITHER),
1512 const_iv (GL_BLEND), 1626 const_iv (GL_BLEND),
1627 const_iv (GL_CULL_FACE),
1513 const_iv (GL_SCISSOR_TEST), 1628 const_iv (GL_SCISSOR_TEST),
1629 const_iv (GL_DEPTH_TEST),
1630 const_iv (GL_ALPHA_TEST),
1631 const_iv (GL_NORMALIZE),
1632 const_iv (GL_RESCALE_NORMAL),
1514 const_iv (GL_AND), 1633 const_iv (GL_AND),
1515 const_iv (GL_ONE), 1634 const_iv (GL_ONE),
1516 const_iv (GL_ZERO), 1635 const_iv (GL_ZERO),
1517 const_iv (GL_SRC_ALPHA), 1636 const_iv (GL_SRC_ALPHA),
1518 const_iv (GL_SRC_ALPHA_SATURATE), 1637 const_iv (GL_DST_ALPHA),
1519 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1638 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1520 const_iv (GL_ONE_MINUS_DST_ALPHA), 1639 const_iv (GL_ONE_MINUS_DST_ALPHA),
1640 const_iv (GL_SRC_ALPHA_SATURATE),
1521 const_iv (GL_RGB), 1641 const_iv (GL_RGB),
1522 const_iv (GL_RGBA), 1642 const_iv (GL_RGBA),
1523 const_iv (GL_UNSIGNED_BYTE), 1643 const_iv (GL_UNSIGNED_BYTE),
1644 const_iv (GL_UNSIGNED_SHORT),
1645 const_iv (GL_UNSIGNED_INT),
1524 const_iv (GL_ALPHA), 1646 const_iv (GL_ALPHA),
1647 const_iv (GL_INTENSITY),
1525 const_iv (GL_LUMINANCE), 1648 const_iv (GL_LUMINANCE),
1649 const_iv (GL_LUMINANCE_ALPHA),
1526 const_iv (GL_FLOAT), 1650 const_iv (GL_FLOAT),
1527 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1651 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528 const_iv (GL_COMPILE), 1652 const_iv (GL_COMPILE),
1529 const_iv (GL_TEXTURE_1D), 1653 const_iv (GL_TEXTURE_1D),
1530 const_iv (GL_TEXTURE_2D), 1654 const_iv (GL_TEXTURE_2D),
1532 const_iv (GL_TEXTURE_MAG_FILTER), 1656 const_iv (GL_TEXTURE_MAG_FILTER),
1533 const_iv (GL_TEXTURE_MIN_FILTER), 1657 const_iv (GL_TEXTURE_MIN_FILTER),
1534 const_iv (GL_TEXTURE_ENV_MODE), 1658 const_iv (GL_TEXTURE_ENV_MODE),
1535 const_iv (GL_TEXTURE_WRAP_S), 1659 const_iv (GL_TEXTURE_WRAP_S),
1536 const_iv (GL_TEXTURE_WRAP_T), 1660 const_iv (GL_TEXTURE_WRAP_T),
1661 const_iv (GL_REPEAT),
1537 const_iv (GL_CLAMP), 1662 const_iv (GL_CLAMP),
1538 const_iv (GL_REPEAT), 1663 const_iv (GL_CLAMP_TO_EDGE),
1539 const_iv (GL_NEAREST), 1664 const_iv (GL_NEAREST),
1540 const_iv (GL_LINEAR), 1665 const_iv (GL_LINEAR),
1541 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1666 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1542 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1667 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1543 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1668 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1544 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1669 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1545 const_iv (GL_GENERATE_MIPMAP), 1670 const_iv (GL_GENERATE_MIPMAP),
1546 const_iv (GL_MODULATE), 1671 const_iv (GL_MODULATE),
1547 const_iv (GL_DECAL), 1672 const_iv (GL_DECAL),
1548 const_iv (GL_REPLACE), 1673 const_iv (GL_REPLACE),
1674 const_iv (GL_DEPTH_BUFFER_BIT),
1549 const_iv (GL_COLOR_BUFFER_BIT), 1675 const_iv (GL_COLOR_BUFFER_BIT),
1550 const_iv (GL_PROJECTION), 1676 const_iv (GL_PROJECTION),
1551 const_iv (GL_MODELVIEW), 1677 const_iv (GL_MODELVIEW),
1552 const_iv (GL_COLOR_LOGIC_OP), 1678 const_iv (GL_COLOR_LOGIC_OP),
1553 const_iv (GL_SEPARABLE_2D), 1679 const_iv (GL_SEPARABLE_2D),
1554 const_iv (GL_CONVOLUTION_2D), 1680 const_iv (GL_CONVOLUTION_2D),
1555 const_iv (GL_CONVOLUTION_BORDER_MODE), 1681 const_iv (GL_CONVOLUTION_BORDER_MODE),
1556 const_iv (GL_CONSTANT_BORDER), 1682 const_iv (GL_CONSTANT_BORDER),
1557 const_iv (GL_LINES), 1683 const_iv (GL_LINES),
1684 const_iv (GL_LINE_LOOP),
1558 const_iv (GL_QUADS), 1685 const_iv (GL_QUADS),
1559 const_iv (GL_LINE_LOOP), 1686 const_iv (GL_QUAD_STRIP),
1687 const_iv (GL_TRIANGLES),
1688 const_iv (GL_TRIANGLE_STRIP),
1689 const_iv (GL_TRIANGLE_FAN),
1560 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1690 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1561 const_iv (GL_FASTEST), 1691 const_iv (GL_FASTEST),
1692 const_iv (GL_V2F),
1693 const_iv (GL_V3F),
1694 const_iv (GL_T2F_V3F),
1695 const_iv (GL_T2F_N3F_V3F),
1562# undef const_iv 1696# undef const_iv
1563 }; 1697 };
1564 1698
1565 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1699 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1566 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1700 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1567} 1701}
1568 1702
1703char *
1704gl_vendor ()
1705 CODE:
1706 RETVAL = (char *)glGetString (GL_VENDOR);
1707 OUTPUT:
1708 RETVAL
1709
1710char *
1711gl_version ()
1712 CODE:
1713 RETVAL = (char *)glGetString (GL_VERSION);
1714 OUTPUT:
1715 RETVAL
1716
1717char *
1718gl_extensions ()
1719 CODE:
1720 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1721 OUTPUT:
1722 RETVAL
1723
1569int glGetError () 1724int glGetError ()
1570 1725
1571void glClear (int mask) 1726void glClear (int mask)
1572 1727
1573void glClearColor (float r, float g, float b, float a = 1.0) 1728void glClearColor (float r, float g, float b, float a = 1.0)
1581 1736
1582void glHint (int target, int mode) 1737void glHint (int target, int mode)
1583 1738
1584void glBlendFunc (int sfactor, int dfactor) 1739void glBlendFunc (int sfactor, int dfactor)
1585 1740
1741void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1742 CODE:
1743 gl_BlendFuncSeparate (sa, da, saa, daa);
1744
1745void glDepthMask (int flag)
1746
1586void glLogicOp (int opcode) 1747void glLogicOp (int opcode)
1587 1748
1588void glColorMask (int red, int green, int blue, int alpha) 1749void glColorMask (int red, int green, int blue, int alpha)
1589 1750
1590void glMatrixMode (int mode) 1751void glMatrixMode (int mode)
1593 1754
1594void glPopMatrix () 1755void glPopMatrix ()
1595 1756
1596void glLoadIdentity () 1757void glLoadIdentity ()
1597 1758
1598# near and far are due to microsofts buggy c compiler 1759# near_ and far_ are due to microsofts buggy "c" compiler
1760void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1761
1762# near_ and far_ are due to microsofts buggy "c" compiler
1599void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1763void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1600 1764
1601void glViewport (int x, int y, int width, int height) 1765void glViewport (int x, int y, int width, int height)
1602 1766
1603void glScissor (int x, int y, int width, int height) 1767void glScissor (int x, int y, int width, int height)
1618 1782
1619void glEnd () 1783void glEnd ()
1620 1784
1621void glColor (float r, float g, float b, float a = 1.0) 1785void glColor (float r, float g, float b, float a = 1.0)
1622 PROTOTYPE: @ 1786 PROTOTYPE: @
1787 ALIAS:
1788 glColor_premultiply = 1
1623 CODE: 1789 CODE:
1790 if (ix)
1791 {
1792 r *= a;
1793 g *= a;
1794 b *= a;
1795 }
1796 // microsoft visual "c" rounds instead of truncating...
1624 glColor4ub (MIN ((int)(r * 255.f), 255), 1797 glColor4ub (MIN ((int)(r * 256.f), 255),
1625 MIN ((int)(g * 255.f), 255), 1798 MIN ((int)(g * 256.f), 255),
1626 MIN ((int)(b * 255.f), 255), 1799 MIN ((int)(b * 256.f), 255),
1627 MIN ((int)(a * 255.f), 255)); 1800 MIN ((int)(a * 256.f), 255));
1801
1802void glInterleavedArrays (int format, int stride, char *data)
1803
1804void glDrawElements (int mode, int count, int type, char *indices)
1805
1806# 1.2 void glDrawRangeElements (int mode, int start, int end
1807
1808void glRasterPos (float x, float y, float z = 0.)
1809 CODE:
1810 glRasterPos3f (0, 0, z);
1811 glBitmap (0, 0, 0, 0, x, y, 0);
1628 1812
1629void glVertex (float x, float y, float z = 0.) 1813void glVertex (float x, float y, float z = 0.)
1630 CODE: 1814 CODE:
1631 glVertex3f (x, y, z); 1815 glVertex3f (x, y, z);
1632 1816
1644 1828
1645void glBindTexture (int target, int name) 1829void glBindTexture (int target, int name)
1646 1830
1647void glConvolutionParameter (int target, int pname, float params) 1831void glConvolutionParameter (int target, int pname, float params)
1648 CODE: 1832 CODE:
1649 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1833 if (gl.ConvolutionParameterf)
1834 gl.ConvolutionParameterf (target, pname, params);
1650 1835
1651void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1836void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1652 CODE: 1837 CODE:
1653 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1838 if (gl.ConvolutionFilter2D)
1654 (target, internalformat, width, height, format, type, data)); 1839 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1655 1840
1656void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1841void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1657 CODE: 1842 CODE:
1658 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1843 if (gl.SeparableFilter2D)
1659 (target, internalformat, width, height, format, type, row, column)); 1844 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1660 1845
1661void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1846void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1662 1847
1663void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1848void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1664 1849
1665void glRasterPos (int x, int y) 1850void glDrawPixels (int width, int height, int format, int type, char *pixels)
1666 CODE:
1667 glRasterPos2i (x, y);
1668 1851
1669void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1852void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1670 1853
1671int glGenTexture () 1854int glGenTexture ()
1672 CODE: 1855 CODE:
1699 1882
1700void glEndList () 1883void glEndList ()
1701 1884
1702void glCallList (int list) 1885void glCallList (int list)
1703 1886
1887

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines