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.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.110 by root, Sat Jun 10 02:22:33 2006 UTC

48#define MAP_EXTEND_X 32 48#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 49#define MAP_EXTEND_Y 512
50 50
51#define MIN_FONT_HEIGHT 10 51#define MIN_FONT_HEIGHT 10
52 52
53#define GL_CALL(type,func,args) \ 53static struct
54 { \ 54{
55 static int init_; \ 55#define GL_FUNC(ptr,name) ptr name;
56 static type fptr_; \ 56#include "glfunc.h"
57 \ 57#undef GL_FUNC
58 if (!init_) \ 58} gl;
59 { \ 59
60 init_ = 1; \ 60static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 61{
62 } \ 62 if (gl.BlendFuncSeparate)
63 \ 63 gl.BlendFuncSeparate (sa, da, saa, daa);
64 if (fptr_) \ 64 else if (gl.BlendFuncSeparateEXT)
65 fptr_ args; \ 65 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 } 66 else
67 glBlendFunc (sa, da);
68}
67 69
68typedef Mix_Chunk *CFClient__MixChunk; 70typedef Mix_Chunk *CFClient__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 71typedef Mix_Music *CFClient__MixMusic;
70 72
71typedef PangoFontDescription *CFClient__Font; 73typedef PangoFontDescription *CFClient__Font;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 85static PangoFontMap *ft2_fontmap, *cairo_fontmap;
84 86
85static void 87static void
86substitute_func (FcPattern *pattern, gpointer data) 88substitute_func (FcPattern *pattern, gpointer data)
87{ 89{
88 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
89#ifdef _WIN32 94#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 95 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else 96#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 97 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif 98#endif
416} 421}
417 422
418void 423void
419pango_init () 424pango_init ()
420 CODE: 425 CODE:
421{
422 // 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 {
423 ft2_fontmap = pango_ft2_font_map_new (); 429 ft2_fontmap = pango_ft2_font_map_new ();
424 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);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 431 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426 432 }
433 {
434 cairo_font_options_t *fopt = cairo_font_options_create ();
427 cairo_fontmap = pango_cairo_font_map_get_default (); 435 cairo_fontmap = pango_cairo_font_map_get_default ();
428 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 }
429} 448}
430 449
431int 450int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 451SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
433 452
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 463 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 464 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 465 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 466
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 467 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 468 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450 469
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 470 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 471 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 472 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 473 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
470 489
471 ++m; 490 ++m;
472 } 491 }
473} 492}
474 493
494char *
495SDL_GetError ()
496
475int 497int
476SDL_SetVideoMode (int w, int h, int fullscreen) 498SDL_SetVideoMode (int w, int h, int fullscreen)
477 CODE: 499 CODE:
478 RETVAL = !!SDL_SetVideoMode ( 500 RETVAL = !!SDL_SetVideoMode (
479 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 501 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
480 ); 502 );
503 if (RETVAL)
504 {
481 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 }
482 OUTPUT: 510 OUTPUT:
483 RETVAL 511 RETVAL
484 512
485void 513void
486SDL_GL_SwapBuffers () 514SDL_GL_SwapBuffers ()
515
516char *
517SDL_GetKeyName (int sym)
487 518
488void 519void
489SDL_PollEvent () 520SDL_PollEvent ()
490 PPCODE: 521 PPCODE:
491{ 522{
510 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 541 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 542 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512 break; 543 break;
513 544
514 case SDL_MOUSEMOTION: 545 case SDL_MOUSEMOTION:
546 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
547
515 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 548 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 549 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 550 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 551 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 552 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520 break; 553 break;
521 554
522 case SDL_MOUSEBUTTONDOWN: 555 case SDL_MOUSEBUTTONDOWN:
523 case SDL_MOUSEBUTTONUP: 556 case SDL_MOUSEBUTTONUP:
557 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
558
524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 559 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 560 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 561 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 562 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break; 563 break;
554lowdelay (int fd, int val = 1) 589lowdelay (int fd, int val = 1)
555 CODE: 590 CODE:
556#ifndef _WIN32 591#ifndef _WIN32
557 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 592 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558#endif 593#endif
559
560char *
561gl_version ()
562 CODE:
563 RETVAL = (char *)glGetString (GL_VERSION);
564 OUTPUT:
565 RETVAL
566
567char *
568gl_extensions ()
569 CODE:
570 RETVAL = (char *)glGetString (GL_EXTENSIONS);
571 OUTPUT:
572 RETVAL
573 594
574void 595void
575add_font (char *file) 596add_font (char *file)
576 CODE: 597 CODE:
577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 598 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
670} 691}
671 692
672void 693void
673error (char *message) 694error (char *message)
674 CODE: 695 CODE:
696 fprintf (stderr, "ERROR: %s\n", message);
675#ifdef _WIN32 697#ifdef _WIN32
676 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 698 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
677#else
678 fprintf (stderr, "ERROR: %s\n", message);
679#endif 699#endif
680 700
681void 701void
682fatal (char *message) 702fatal (char *message)
683 CODE: 703 CODE:
704 fprintf (stderr, "FATAL: %s\n", message);
684#ifdef _WIN32 705#ifdef _WIN32
685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 706 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
686#else
687 fprintf (stderr, "FATAL: %s\n", message);
688#endif 707#endif
689 exit (1); 708 exit (1);
690 709
691MODULE = CFClient PACKAGE = CFClient::Font 710MODULE = CFClient PACKAGE = CFClient::Font
692 711
768 787
769SV * 788SV *
770get_text (CFClient::Layout self) 789get_text (CFClient::Layout self)
771 CODE: 790 CODE:
772 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 791 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
773 SvUTF8_on (RETVAL); 792 sv_utf8_decode (RETVAL);
774 OUTPUT: 793 OUTPUT:
775 RETVAL 794 RETVAL
776 795
777void 796void
778set_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.)
904 923
905 while (p < e) 924 while (p < e)
906 { 925 {
907 uint32_t rgba = *p; 926 uint32_t rgba = *p;
908 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
909 rgba = SDL_SwapBE32 (rgba); 940 rgba = SDL_SwapBE32 (rgba);
910 *p++ = rgba; 941 *p++ = rgba;
911 } 942 }
912 } 943 }
913 944
958{ 989{
959 HV *hv = (HV *)SvRV (self); 990 HV *hv = (HV *)SvRV (self);
960 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 991 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
961 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 992 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
962 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 993 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
963 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
964 994
965 if (items < 5) 995 if (items < 5)
966 { 996 {
967 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 997 w = SvNV (*hv_fetch (hv, "w", 1, 1));
968 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 998 h = SvNV (*hv_fetch (hv, "h", 1, 1));
969 } 999 }
970 1000
971 if (ix) 1001 if (ix)
972 { 1002 {
973 glEnable (GL_BLEND); 1003 glEnable (GL_BLEND);
1004
1005 if (ix == 2)
974 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);
975 } 1013 }
976 1014
977 glBindTexture (GL_TEXTURE_2D, name); 1015 glBindTexture (GL_TEXTURE_2D, name);
978
979 if (wrap_mode)
980 {
981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983 }
984 1016
985 glBegin (GL_QUADS); 1017 glBegin (GL_QUADS);
986 glTexCoord2f (0, 0); glVertex2f (x , y ); 1018 glTexCoord2f (0, 0); glVertex2f (x , y );
987 glTexCoord2f (0, t); glVertex2f (x , y + h); 1019 glTexCoord2f (0, t); glVertex2f (x , y + h);
988 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
989 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1021 glTexCoord2f (s, 0); glVertex2f (x + w, y );
990 glEnd (); 1022 glEnd ();
991 1023
992 if (ix) 1024 if (ix)
1025 {
1026 glDisable (GL_ALPHA_TEST);
993 glDisable (GL_BLEND); 1027 glDisable (GL_BLEND);
1028 }
994} 1029}
995 1030
996MODULE = CFClient PACKAGE = CFClient::Map 1031MODULE = CFClient PACKAGE = CFClient::Map
997 1032
998CFClient::Map 1033CFClient::Map
1062 tex->r = r; 1097 tex->r = r;
1063 tex->g = g; 1098 tex->g = g;
1064 tex->b = b; 1099 tex->b = b;
1065 tex->a = a; 1100 tex->a = a;
1066 } 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);
1067} 1111}
1068 1112
1069int 1113int
1070ox (CFClient::Map self) 1114ox (CFClient::Map self)
1071 ALIAS: 1115 ALIAS:
1072 oy = 1 1116 oy = 1
1117 x = 2
1118 y = 3
1119 w = 4
1120 h = 5
1073 CODE: 1121 CODE:
1074 switch (ix) 1122 switch (ix)
1075 { 1123 {
1076 case 0: RETVAL = self->ox; break; 1124 case 0: RETVAL = self->ox; break;
1077 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;
1078 } 1130 }
1079 OUTPUT: 1131 OUTPUT:
1080 RETVAL 1132 RETVAL
1081 1133
1082void 1134void
1509 const_iv (GL_COLOR_MATERIAL), 1561 const_iv (GL_COLOR_MATERIAL),
1510 const_iv (GL_SMOOTH), 1562 const_iv (GL_SMOOTH),
1511 const_iv (GL_FLAT), 1563 const_iv (GL_FLAT),
1512 const_iv (GL_DITHER), 1564 const_iv (GL_DITHER),
1513 const_iv (GL_BLEND), 1565 const_iv (GL_BLEND),
1566 const_iv (GL_CULL_FACE),
1514 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),
1515 const_iv (GL_AND), 1572 const_iv (GL_AND),
1516 const_iv (GL_ONE), 1573 const_iv (GL_ONE),
1517 const_iv (GL_ZERO), 1574 const_iv (GL_ZERO),
1518 const_iv (GL_SRC_ALPHA), 1575 const_iv (GL_SRC_ALPHA),
1519 const_iv (GL_SRC_ALPHA_SATURATE), 1576 const_iv (GL_DST_ALPHA),
1520 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1577 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1521 const_iv (GL_ONE_MINUS_DST_ALPHA), 1578 const_iv (GL_ONE_MINUS_DST_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE),
1522 const_iv (GL_RGB), 1580 const_iv (GL_RGB),
1523 const_iv (GL_RGBA), 1581 const_iv (GL_RGBA),
1524 const_iv (GL_UNSIGNED_BYTE), 1582 const_iv (GL_UNSIGNED_BYTE),
1583 const_iv (GL_UNSIGNED_SHORT),
1584 const_iv (GL_UNSIGNED_INT),
1525 const_iv (GL_ALPHA), 1585 const_iv (GL_ALPHA),
1586 const_iv (GL_INTENSITY),
1526 const_iv (GL_LUMINANCE), 1587 const_iv (GL_LUMINANCE),
1588 const_iv (GL_LUMINANCE_ALPHA),
1527 const_iv (GL_FLOAT), 1589 const_iv (GL_FLOAT),
1528 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1590 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1529 const_iv (GL_COMPILE), 1591 const_iv (GL_COMPILE),
1530 const_iv (GL_TEXTURE_1D), 1592 const_iv (GL_TEXTURE_1D),
1531 const_iv (GL_TEXTURE_2D), 1593 const_iv (GL_TEXTURE_2D),
1533 const_iv (GL_TEXTURE_MAG_FILTER), 1595 const_iv (GL_TEXTURE_MAG_FILTER),
1534 const_iv (GL_TEXTURE_MIN_FILTER), 1596 const_iv (GL_TEXTURE_MIN_FILTER),
1535 const_iv (GL_TEXTURE_ENV_MODE), 1597 const_iv (GL_TEXTURE_ENV_MODE),
1536 const_iv (GL_TEXTURE_WRAP_S), 1598 const_iv (GL_TEXTURE_WRAP_S),
1537 const_iv (GL_TEXTURE_WRAP_T), 1599 const_iv (GL_TEXTURE_WRAP_T),
1600 const_iv (GL_REPEAT),
1538 const_iv (GL_CLAMP), 1601 const_iv (GL_CLAMP),
1539 const_iv (GL_REPEAT), 1602 const_iv (GL_CLAMP_TO_EDGE),
1540 const_iv (GL_NEAREST), 1603 const_iv (GL_NEAREST),
1541 const_iv (GL_LINEAR), 1604 const_iv (GL_LINEAR),
1542 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1605 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1543 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1606 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1544 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1607 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1545 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1608 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1546 const_iv (GL_GENERATE_MIPMAP), 1609 const_iv (GL_GENERATE_MIPMAP),
1547 const_iv (GL_MODULATE), 1610 const_iv (GL_MODULATE),
1548 const_iv (GL_DECAL), 1611 const_iv (GL_DECAL),
1549 const_iv (GL_REPLACE), 1612 const_iv (GL_REPLACE),
1613 const_iv (GL_DEPTH_BUFFER_BIT),
1550 const_iv (GL_COLOR_BUFFER_BIT), 1614 const_iv (GL_COLOR_BUFFER_BIT),
1551 const_iv (GL_PROJECTION), 1615 const_iv (GL_PROJECTION),
1552 const_iv (GL_MODELVIEW), 1616 const_iv (GL_MODELVIEW),
1553 const_iv (GL_COLOR_LOGIC_OP), 1617 const_iv (GL_COLOR_LOGIC_OP),
1554 const_iv (GL_SEPARABLE_2D), 1618 const_iv (GL_SEPARABLE_2D),
1555 const_iv (GL_CONVOLUTION_2D), 1619 const_iv (GL_CONVOLUTION_2D),
1556 const_iv (GL_CONVOLUTION_BORDER_MODE), 1620 const_iv (GL_CONVOLUTION_BORDER_MODE),
1557 const_iv (GL_CONSTANT_BORDER), 1621 const_iv (GL_CONSTANT_BORDER),
1558 const_iv (GL_LINES), 1622 const_iv (GL_LINES),
1623 const_iv (GL_LINE_LOOP),
1559 const_iv (GL_QUADS), 1624 const_iv (GL_QUADS),
1560 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),
1561 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1629 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1562 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),
1563# undef const_iv 1635# undef const_iv
1564 }; 1636 };
1565 1637
1566 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; )
1567 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1639 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1568} 1640}
1569 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
1570int glGetError () 1663int glGetError ()
1571 1664
1572void glClear (int mask) 1665void glClear (int mask)
1573 1666
1574void glClearColor (float r, float g, float b, float a = 1.0) 1667void glClearColor (float r, float g, float b, float a = 1.0)
1582 1675
1583void glHint (int target, int mode) 1676void glHint (int target, int mode)
1584 1677
1585void glBlendFunc (int sfactor, int dfactor) 1678void glBlendFunc (int sfactor, int dfactor)
1586 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
1587void glLogicOp (int opcode) 1686void glLogicOp (int opcode)
1588 1687
1589void glColorMask (int red, int green, int blue, int alpha) 1688void glColorMask (int red, int green, int blue, int alpha)
1590 1689
1591void glMatrixMode (int mode) 1690void glMatrixMode (int mode)
1594 1693
1595void glPopMatrix () 1694void glPopMatrix ()
1596 1695
1597void glLoadIdentity () 1696void glLoadIdentity ()
1598 1697
1599# 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
1600void 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_)
1601 1703
1602void glViewport (int x, int y, int width, int height) 1704void glViewport (int x, int y, int width, int height)
1603 1705
1604void glScissor (int x, int y, int width, int height) 1706void glScissor (int x, int y, int width, int height)
1619 1721
1620void glEnd () 1722void glEnd ()
1621 1723
1622void glColor (float r, float g, float b, float a = 1.0) 1724void glColor (float r, float g, float b, float a = 1.0)
1623 PROTOTYPE: @ 1725 PROTOTYPE: @
1726 ALIAS:
1727 glColor_premultiply = 1
1624 CODE: 1728 CODE:
1729 if (ix)
1730 {
1731 r *= a;
1732 g *= a;
1733 b *= a;
1734 }
1735 // microsoft visual "c" rounds instead of truncating...
1625 glColor4ub (MIN ((int)(r * 255.f), 255), 1736 glColor4ub (MIN ((int)(r * 256.f), 255),
1626 MIN ((int)(g * 255.f), 255), 1737 MIN ((int)(g * 256.f), 255),
1627 MIN ((int)(b * 255.f), 255), 1738 MIN ((int)(b * 256.f), 255),
1628 MIN ((int)(a * 255.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);
1629 1751
1630void glVertex (float x, float y, float z = 0.) 1752void glVertex (float x, float y, float z = 0.)
1631 CODE: 1753 CODE:
1632 glVertex3f (x, y, z); 1754 glVertex3f (x, y, z);
1633 1755
1645 1767
1646void glBindTexture (int target, int name) 1768void glBindTexture (int target, int name)
1647 1769
1648void glConvolutionParameter (int target, int pname, float params) 1770void glConvolutionParameter (int target, int pname, float params)
1649 CODE: 1771 CODE:
1650 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1772 if (gl.ConvolutionParameterf)
1773 gl.ConvolutionParameterf (target, pname, params);
1651 1774
1652void 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)
1653 CODE: 1776 CODE:
1654 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1777 if (gl.ConvolutionFilter2D)
1655 (target, internalformat, width, height, format, type, data)); 1778 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1656 1779
1657void 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)
1658 CODE: 1781 CODE:
1659 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1782 if (gl.SeparableFilter2D)
1660 (target, internalformat, width, height, format, type, row, column)); 1783 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1661 1784
1662void 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)
1663 1786
1664void 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)
1665 1788
1666void glRasterPos (int x, int y) 1789void glDrawPixels (int width, int height, int format, int type, char *pixels)
1667 CODE:
1668 glRasterPos2i (x, y);
1669 1790
1670void 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)
1671 1792
1672int glGenTexture () 1793int glGenTexture ()
1673 CODE: 1794 CODE:
1700 1821
1701void glEndList () 1822void glEndList ()
1702 1823
1703void glCallList (int list) 1824void glCallList (int list)
1704 1825
1826

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines