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.88 by root, Fri May 19 23:18:40 2006 UTC vs.
Revision 1.105 by root, Mon Jun 5 03:33:09 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;
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);
89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 91 //FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 93}
95 94
96static void 95static void
97layout_update_font (CFClient__Layout self) 96layout_update_font (CFClient__Layout self)
98{ 97{
416} 415}
417 416
418void 417void
419pango_init () 418pango_init ()
420 CODE: 419 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx 420 // delayed, so it can pick up new fonts added by AddFontResourceEx
421{
422 {
423 ft2_fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 424 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); 425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426 }
426 427
428 {
429 cairo_font_options_t *fopt = cairo_font_options_create ();
427 cairo_fontmap = pango_cairo_font_map_get_default (); 430 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 431 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
432 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
433 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435 pango_cairo_context_set_font_options (cairo_context, fopt);
436 cairo_font_options_destroy (fopt);
437 }
429} 438}
430 439
431int 440int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 441SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
433 442
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 453 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 454 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 455 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 456
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 457 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 458 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450 459
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 460 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 461 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 462 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 463 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
479SDL_SetVideoMode (int w, int h, int fullscreen) 488SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 489 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 490 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 491 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 492 );
493 if (RETVAL)
494 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 495 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
496# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
497# include "glfunc.h"
498# undef GL_FUNC
499 }
485 OUTPUT: 500 OUTPUT:
486 RETVAL 501 RETVAL
487 502
488void 503void
489SDL_GL_SwapBuffers () 504SDL_GL_SwapBuffers ()
505
506char *
507SDL_GetKeyName (int sym)
490 508
491void 509void
492SDL_PollEvent () 510SDL_PollEvent ()
493 PPCODE: 511 PPCODE:
494{ 512{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 531 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 532 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 533 break;
516 534
517 case SDL_MOUSEMOTION: 535 case SDL_MOUSEMOTION:
536 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
537
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 538 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 539 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 540 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 541 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 542 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 543 break;
524 544
525 case SDL_MOUSEBUTTONDOWN: 545 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 546 case SDL_MOUSEBUTTONUP:
547 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
548
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 549 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 550 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 551 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 552 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 553 break;
557lowdelay (int fd, int val = 1) 579lowdelay (int fd, int val = 1)
558 CODE: 580 CODE:
559#ifndef _WIN32 581#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 582 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 583#endif
562
563char *
564gl_version ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VERSION);
567 OUTPUT:
568 RETVAL
569
570char *
571gl_extensions ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_EXTENSIONS);
574 OUTPUT:
575 RETVAL
576 584
577void 585void
578add_font (char *file) 586add_font (char *file)
579 CODE: 587 CODE:
580 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 588 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
717 725
718CFClient::Layout 726CFClient::Layout
719new (SV *class, int rgba = 0) 727new (SV *class, int rgba = 0)
720 CODE: 728 CODE:
721#if _WIN32 729#if _WIN32
722 rgba = 0;//D 730 //rgba = 0;//D makes text nicer, breaks TextView
723#endif 731#endif
732 rgba=1;//D
724 New (0, RETVAL, 1, struct cf_layout); 733 New (0, RETVAL, 1, struct cf_layout);
725 734
726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 735 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
727 RETVAL->rgba = rgba; 736 RETVAL->rgba = rgba;
728 RETVAL->r = 1.; 737 RETVAL->r = 1.;
974{ 983{
975 HV *hv = (HV *)SvRV (self); 984 HV *hv = (HV *)SvRV (self);
976 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 985 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 986 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 987 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980 988
981 if (items < 5) 989 if (items < 5)
982 { 990 {
983 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 991 w = SvNV (*hv_fetch (hv, "w", 1, 1));
984 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 992 h = SvNV (*hv_fetch (hv, "h", 1, 1));
985 } 993 }
986 994
987 if (ix) 995 if (ix)
988 { 996 {
989 glEnable (GL_BLEND); 997 glEnable (GL_BLEND);
998
999 if (ix == 2)
990 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1000 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1001 else
1002 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1003 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1004
991 glEnable (GL_ALPHA_TEST); 1005 glEnable (GL_ALPHA_TEST);
992 glAlphaFunc (GL_GREATER, 0.01f); 1006 glAlphaFunc (GL_GREATER, 0.01f);
993 } 1007 }
994 1008
995 glBindTexture (GL_TEXTURE_2D, name); 1009 glBindTexture (GL_TEXTURE_2D, name);
996
997 if (wrap_mode)
998 {
999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1001 }
1002 1010
1003 glBegin (GL_QUADS); 1011 glBegin (GL_QUADS);
1004 glTexCoord2f (0, 0); glVertex2f (x , y ); 1012 glTexCoord2f (0, 0); glVertex2f (x , y );
1005 glTexCoord2f (0, t); glVertex2f (x , y + h); 1013 glTexCoord2f (0, t); glVertex2f (x , y + h);
1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1014 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1083 tex->r = r; 1091 tex->r = r;
1084 tex->g = g; 1092 tex->g = g;
1085 tex->b = b; 1093 tex->b = b;
1086 tex->a = a; 1094 tex->a = a;
1087 } 1095 }
1096
1097 // somewhat hackish, but for textures that require it, it really
1098 // improves the look, and most others don't suffer.
1099 glBindTexture (GL_TEXTURE_2D, name);
1100 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1101 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1102 // use uglier nearest interpolation because linear suffers
1103 // from transparent color bleeding and ugly wrapping effects.
1104 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1088} 1105}
1089 1106
1090int 1107int
1091ox (CFClient::Map self) 1108ox (CFClient::Map self)
1092 ALIAS: 1109 ALIAS:
1093 oy = 1 1110 oy = 1
1111 x = 2
1112 y = 3
1113 w = 4
1114 h = 5
1094 CODE: 1115 CODE:
1095 switch (ix) 1116 switch (ix)
1096 { 1117 {
1097 case 0: RETVAL = self->ox; break; 1118 case 0: RETVAL = self->ox; break;
1098 case 1: RETVAL = self->oy; break; 1119 case 1: RETVAL = self->oy; break;
1120 case 2: RETVAL = self->x; break;
1121 case 3: RETVAL = self->y; break;
1122 case 4: RETVAL = self->w; break;
1123 case 5: RETVAL = self->h; break;
1099 } 1124 }
1100 OUTPUT: 1125 OUTPUT:
1101 RETVAL 1126 RETVAL
1102 1127
1103void 1128void
1530 const_iv (GL_COLOR_MATERIAL), 1555 const_iv (GL_COLOR_MATERIAL),
1531 const_iv (GL_SMOOTH), 1556 const_iv (GL_SMOOTH),
1532 const_iv (GL_FLAT), 1557 const_iv (GL_FLAT),
1533 const_iv (GL_DITHER), 1558 const_iv (GL_DITHER),
1534 const_iv (GL_BLEND), 1559 const_iv (GL_BLEND),
1560 const_iv (GL_CULL_FACE),
1535 const_iv (GL_SCISSOR_TEST), 1561 const_iv (GL_SCISSOR_TEST),
1562 const_iv (GL_DEPTH_TEST),
1563 const_iv (GL_ALPHA_TEST),
1564 const_iv (GL_NORMALIZE),
1565 const_iv (GL_RESCALE_NORMAL),
1536 const_iv (GL_AND), 1566 const_iv (GL_AND),
1537 const_iv (GL_ONE), 1567 const_iv (GL_ONE),
1538 const_iv (GL_ZERO), 1568 const_iv (GL_ZERO),
1539 const_iv (GL_SRC_ALPHA), 1569 const_iv (GL_SRC_ALPHA),
1540 const_iv (GL_SRC_ALPHA_SATURATE), 1570 const_iv (GL_DST_ALPHA),
1541 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1571 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1542 const_iv (GL_ONE_MINUS_DST_ALPHA), 1572 const_iv (GL_ONE_MINUS_DST_ALPHA),
1573 const_iv (GL_SRC_ALPHA_SATURATE),
1543 const_iv (GL_RGB), 1574 const_iv (GL_RGB),
1544 const_iv (GL_RGBA), 1575 const_iv (GL_RGBA),
1545 const_iv (GL_UNSIGNED_BYTE), 1576 const_iv (GL_UNSIGNED_BYTE),
1577 const_iv (GL_UNSIGNED_SHORT),
1578 const_iv (GL_UNSIGNED_INT),
1546 const_iv (GL_ALPHA), 1579 const_iv (GL_ALPHA),
1547 const_iv (GL_INTENSITY), 1580 const_iv (GL_INTENSITY),
1548 const_iv (GL_LUMINANCE), 1581 const_iv (GL_LUMINANCE),
1549 const_iv (GL_LUMINANCE_ALPHA), 1582 const_iv (GL_LUMINANCE_ALPHA),
1550 const_iv (GL_FLOAT), 1583 const_iv (GL_FLOAT),
1556 const_iv (GL_TEXTURE_MAG_FILTER), 1589 const_iv (GL_TEXTURE_MAG_FILTER),
1557 const_iv (GL_TEXTURE_MIN_FILTER), 1590 const_iv (GL_TEXTURE_MIN_FILTER),
1558 const_iv (GL_TEXTURE_ENV_MODE), 1591 const_iv (GL_TEXTURE_ENV_MODE),
1559 const_iv (GL_TEXTURE_WRAP_S), 1592 const_iv (GL_TEXTURE_WRAP_S),
1560 const_iv (GL_TEXTURE_WRAP_T), 1593 const_iv (GL_TEXTURE_WRAP_T),
1594 const_iv (GL_REPEAT),
1561 const_iv (GL_CLAMP), 1595 const_iv (GL_CLAMP),
1562 const_iv (GL_REPEAT), 1596 const_iv (GL_CLAMP_TO_EDGE),
1563 const_iv (GL_NEAREST), 1597 const_iv (GL_NEAREST),
1564 const_iv (GL_LINEAR), 1598 const_iv (GL_LINEAR),
1565 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1599 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1566 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1600 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1567 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1601 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1568 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1602 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1569 const_iv (GL_GENERATE_MIPMAP), 1603 const_iv (GL_GENERATE_MIPMAP),
1570 const_iv (GL_MODULATE), 1604 const_iv (GL_MODULATE),
1571 const_iv (GL_DECAL), 1605 const_iv (GL_DECAL),
1572 const_iv (GL_REPLACE), 1606 const_iv (GL_REPLACE),
1607 const_iv (GL_DEPTH_BUFFER_BIT),
1573 const_iv (GL_COLOR_BUFFER_BIT), 1608 const_iv (GL_COLOR_BUFFER_BIT),
1574 const_iv (GL_PROJECTION), 1609 const_iv (GL_PROJECTION),
1575 const_iv (GL_MODELVIEW), 1610 const_iv (GL_MODELVIEW),
1576 const_iv (GL_COLOR_LOGIC_OP), 1611 const_iv (GL_COLOR_LOGIC_OP),
1577 const_iv (GL_SEPARABLE_2D), 1612 const_iv (GL_SEPARABLE_2D),
1578 const_iv (GL_CONVOLUTION_2D), 1613 const_iv (GL_CONVOLUTION_2D),
1579 const_iv (GL_CONVOLUTION_BORDER_MODE), 1614 const_iv (GL_CONVOLUTION_BORDER_MODE),
1580 const_iv (GL_CONSTANT_BORDER), 1615 const_iv (GL_CONSTANT_BORDER),
1581 const_iv (GL_LINES), 1616 const_iv (GL_LINES),
1617 const_iv (GL_LINE_LOOP),
1582 const_iv (GL_QUADS), 1618 const_iv (GL_QUADS),
1583 const_iv (GL_LINE_LOOP), 1619 const_iv (GL_QUAD_STRIP),
1620 const_iv (GL_TRIANGLES),
1621 const_iv (GL_TRIANGLE_STRIP),
1622 const_iv (GL_TRIANGLE_FAN),
1584 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1623 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1585 const_iv (GL_FASTEST), 1624 const_iv (GL_FASTEST),
1625 const_iv (GL_V2F),
1626 const_iv (GL_V3F),
1627 const_iv (GL_T2F_V3F),
1628 const_iv (GL_T2F_N3F_V3F),
1586# undef const_iv 1629# undef const_iv
1587 }; 1630 };
1588 1631
1589 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1632 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1590 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1633 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1591} 1634}
1592 1635
1636char *
1637gl_vendor ()
1638 CODE:
1639 RETVAL = (char *)glGetString (GL_VENDOR);
1640 OUTPUT:
1641 RETVAL
1642
1643char *
1644gl_version ()
1645 CODE:
1646 RETVAL = (char *)glGetString (GL_VERSION);
1647 OUTPUT:
1648 RETVAL
1649
1650char *
1651gl_extensions ()
1652 CODE:
1653 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1654 OUTPUT:
1655 RETVAL
1656
1593int glGetError () 1657int glGetError ()
1594 1658
1595void glClear (int mask) 1659void glClear (int mask)
1596 1660
1597void glClearColor (float r, float g, float b, float a = 1.0) 1661void glClearColor (float r, float g, float b, float a = 1.0)
1605 1669
1606void glHint (int target, int mode) 1670void glHint (int target, int mode)
1607 1671
1608void glBlendFunc (int sfactor, int dfactor) 1672void glBlendFunc (int sfactor, int dfactor)
1609 1673
1674void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1675 CODE:
1676 gl_BlendFuncSeparate (sa, da, saa, daa);
1677
1678void glDepthMask (int flag)
1679
1610void glLogicOp (int opcode) 1680void glLogicOp (int opcode)
1611 1681
1612void glColorMask (int red, int green, int blue, int alpha) 1682void glColorMask (int red, int green, int blue, int alpha)
1613 1683
1614void glMatrixMode (int mode) 1684void glMatrixMode (int mode)
1617 1687
1618void glPopMatrix () 1688void glPopMatrix ()
1619 1689
1620void glLoadIdentity () 1690void glLoadIdentity ()
1621 1691
1622# near and far are due to microsofts buggy c compiler 1692# near_ and far_ are due to microsofts buggy "c" compiler
1693void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1694
1695# near_ and far_ are due to microsofts buggy "c" compiler
1623void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1696void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1624 1697
1625void glViewport (int x, int y, int width, int height) 1698void glViewport (int x, int y, int width, int height)
1626 1699
1627void glScissor (int x, int y, int width, int height) 1700void glScissor (int x, int y, int width, int height)
1642 1715
1643void glEnd () 1716void glEnd ()
1644 1717
1645void glColor (float r, float g, float b, float a = 1.0) 1718void glColor (float r, float g, float b, float a = 1.0)
1646 PROTOTYPE: @ 1719 PROTOTYPE: @
1720 ALIAS:
1721 glColor_premultiply = 1
1647 CODE: 1722 CODE:
1723 if (ix)
1724 {
1725 r *= a;
1726 g *= a;
1727 b *= a;
1728 }
1729 // microsoft visual "c" rounds instead of truncating...
1648 glColor4ub (MIN ((int)(r * 255.f), 255), 1730 glColor4ub (MIN ((int)(r * 256.f), 255),
1649 MIN ((int)(g * 255.f), 255), 1731 MIN ((int)(g * 256.f), 255),
1650 MIN ((int)(b * 255.f), 255), 1732 MIN ((int)(b * 256.f), 255),
1651 MIN ((int)(a * 255.f), 255)); 1733 MIN ((int)(a * 256.f), 255));
1734
1735void glInterleavedArrays (int format, int stride, char *data)
1736
1737void glDrawElements (int mode, int count, int type, char *indices)
1738
1739# 1.2 void glDrawRangeElements (int mode, int start, int end
1740
1741void glRasterPos (float x, float y, float z = 0.)
1742 CODE:
1743 glRasterPos3f (0, 0, z);
1744 glBitmap (0, 0, 0, 0, x, y, 0);
1652 1745
1653void glVertex (float x, float y, float z = 0.) 1746void glVertex (float x, float y, float z = 0.)
1654 CODE: 1747 CODE:
1655 glVertex3f (x, y, z); 1748 glVertex3f (x, y, z);
1656 1749
1668 1761
1669void glBindTexture (int target, int name) 1762void glBindTexture (int target, int name)
1670 1763
1671void glConvolutionParameter (int target, int pname, float params) 1764void glConvolutionParameter (int target, int pname, float params)
1672 CODE: 1765 CODE:
1673 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1766 if (gl.ConvolutionParameterf)
1767 gl.ConvolutionParameterf (target, pname, params);
1674 1768
1675void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1769void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1676 CODE: 1770 CODE:
1677 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1771 if (gl.ConvolutionFilter2D)
1678 (target, internalformat, width, height, format, type, data)); 1772 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1679 1773
1680void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1774void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1681 CODE: 1775 CODE:
1682 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1776 if (gl.SeparableFilter2D)
1683 (target, internalformat, width, height, format, type, row, column)); 1777 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1684 1778
1685void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1779void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1686 1780
1687void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1781void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1688 1782
1689void glRasterPos (int x, int y) 1783void glDrawPixels (int width, int height, int format, int type, char *pixels)
1690 CODE:
1691 glRasterPos2i (x, y);
1692 1784
1693void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1785void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1694 1786
1695int glGenTexture () 1787int glGenTexture ()
1696 CODE: 1788 CODE:
1723 1815
1724void glEndList () 1816void glEndList ()
1725 1817
1726void glCallList (int list) 1818void glCallList (int list)
1727 1819
1820

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines