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.90 by root, Sun May 21 00:34:58 2006 UTC vs.
Revision 1.106 by root, Mon Jun 5 03:48:49 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;
416} 418}
417 419
418void 420void
419pango_init () 421pango_init ()
420 CODE: 422 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx 423 // delayed, so it can pick up new fonts added by AddFontResourceEx
424{
425 {
423 ft2_fontmap = pango_ft2_font_map_new (); 426 ft2_fontmap = pango_ft2_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 427 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 428 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426 429 }
430 {
431 cairo_font_options_t *fopt = cairo_font_options_create ();
427 cairo_fontmap = pango_cairo_font_map_get_default (); 432 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 433 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
434#ifdef _WIN32
435 // cairo looks like shit eaten twice on windows
436 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
437#else
438 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
439#endif
440 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
441 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
442 pango_cairo_context_set_font_options (cairo_context, fopt);
443 cairo_font_options_destroy (fopt);
444 }
429} 445}
430 446
431int 447int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 448SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
433 449
479SDL_SetVideoMode (int w, int h, int fullscreen) 495SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 496 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 497 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 498 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 499 );
500 if (RETVAL)
501 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 502 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
503# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
504# include "glfunc.h"
505# undef GL_FUNC
506 }
485 OUTPUT: 507 OUTPUT:
486 RETVAL 508 RETVAL
487 509
488void 510void
489SDL_GL_SwapBuffers () 511SDL_GL_SwapBuffers ()
512
513char *
514SDL_GetKeyName (int sym)
490 515
491void 516void
492SDL_PollEvent () 517SDL_PollEvent ()
493 PPCODE: 518 PPCODE:
494{ 519{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 538 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 539 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 540 break;
516 541
517 case SDL_MOUSEMOTION: 542 case SDL_MOUSEMOTION:
543 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
544
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 545 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 546 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 547 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 548 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 549 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 550 break;
524 551
525 case SDL_MOUSEBUTTONDOWN: 552 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 553 case SDL_MOUSEBUTTONUP:
554 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
555
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 556 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 557 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 558 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 559 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 560 break;
557lowdelay (int fd, int val = 1) 586lowdelay (int fd, int val = 1)
558 CODE: 587 CODE:
559#ifndef _WIN32 588#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 589 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 590#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 591
577void 592void
578add_font (char *file) 593add_font (char *file)
579 CODE: 594 CODE:
580 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 595 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
716MODULE = CFClient PACKAGE = CFClient::Layout 731MODULE = CFClient PACKAGE = CFClient::Layout
717 732
718CFClient::Layout 733CFClient::Layout
719new (SV *class, int rgba = 0) 734new (SV *class, int rgba = 0)
720 CODE: 735 CODE:
721#if _WIN32
722 rgba = 0;//D
723#endif
724 New (0, RETVAL, 1, struct cf_layout); 736 New (0, RETVAL, 1, struct cf_layout);
725 737
726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 738 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
727 RETVAL->rgba = rgba; 739 RETVAL->rgba = rgba;
728 RETVAL->r = 1.; 740 RETVAL->r = 1.;
974{ 986{
975 HV *hv = (HV *)SvRV (self); 987 HV *hv = (HV *)SvRV (self);
976 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 988 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 989 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 990 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980 991
981 if (items < 5) 992 if (items < 5)
982 { 993 {
983 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 994 w = SvNV (*hv_fetch (hv, "w", 1, 1));
984 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 995 h = SvNV (*hv_fetch (hv, "h", 1, 1));
985 } 996 }
986 997
987 if (ix) 998 if (ix)
988 { 999 {
989 glEnable (GL_BLEND); 1000 glEnable (GL_BLEND);
1001
1002 if (ix == 2)
990 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1003 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1004 else
1005 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1006 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1007
991 glEnable (GL_ALPHA_TEST); 1008 glEnable (GL_ALPHA_TEST);
992 glAlphaFunc (GL_GREATER, 0.01f); 1009 glAlphaFunc (GL_GREATER, 0.01f);
993 } 1010 }
994 1011
995 glBindTexture (GL_TEXTURE_2D, name); 1012 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 1013
1003 glBegin (GL_QUADS); 1014 glBegin (GL_QUADS);
1004 glTexCoord2f (0, 0); glVertex2f (x , y ); 1015 glTexCoord2f (0, 0); glVertex2f (x , y );
1005 glTexCoord2f (0, t); glVertex2f (x , y + h); 1016 glTexCoord2f (0, t); glVertex2f (x , y + h);
1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1017 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1083 tex->r = r; 1094 tex->r = r;
1084 tex->g = g; 1095 tex->g = g;
1085 tex->b = b; 1096 tex->b = b;
1086 tex->a = a; 1097 tex->a = a;
1087 } 1098 }
1099
1100 // somewhat hackish, but for textures that require it, it really
1101 // improves the look, and most others don't suffer.
1102 glBindTexture (GL_TEXTURE_2D, name);
1103 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1104 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1105 // use uglier nearest interpolation because linear suffers
1106 // from transparent color bleeding and ugly wrapping effects.
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1088} 1108}
1089 1109
1090int 1110int
1091ox (CFClient::Map self) 1111ox (CFClient::Map self)
1092 ALIAS: 1112 ALIAS:
1093 oy = 1 1113 oy = 1
1114 x = 2
1115 y = 3
1116 w = 4
1117 h = 5
1094 CODE: 1118 CODE:
1095 switch (ix) 1119 switch (ix)
1096 { 1120 {
1097 case 0: RETVAL = self->ox; break; 1121 case 0: RETVAL = self->ox; break;
1098 case 1: RETVAL = self->oy; break; 1122 case 1: RETVAL = self->oy; break;
1123 case 2: RETVAL = self->x; break;
1124 case 3: RETVAL = self->y; break;
1125 case 4: RETVAL = self->w; break;
1126 case 5: RETVAL = self->h; break;
1099 } 1127 }
1100 OUTPUT: 1128 OUTPUT:
1101 RETVAL 1129 RETVAL
1102 1130
1103void 1131void
1540 const_iv (GL_RESCALE_NORMAL), 1568 const_iv (GL_RESCALE_NORMAL),
1541 const_iv (GL_AND), 1569 const_iv (GL_AND),
1542 const_iv (GL_ONE), 1570 const_iv (GL_ONE),
1543 const_iv (GL_ZERO), 1571 const_iv (GL_ZERO),
1544 const_iv (GL_SRC_ALPHA), 1572 const_iv (GL_SRC_ALPHA),
1545 const_iv (GL_SRC_ALPHA_SATURATE), 1573 const_iv (GL_DST_ALPHA),
1546 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1574 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1547 const_iv (GL_ONE_MINUS_DST_ALPHA), 1575 const_iv (GL_ONE_MINUS_DST_ALPHA),
1576 const_iv (GL_SRC_ALPHA_SATURATE),
1548 const_iv (GL_RGB), 1577 const_iv (GL_RGB),
1549 const_iv (GL_RGBA), 1578 const_iv (GL_RGBA),
1550 const_iv (GL_UNSIGNED_BYTE), 1579 const_iv (GL_UNSIGNED_BYTE),
1551 const_iv (GL_UNSIGNED_SHORT), 1580 const_iv (GL_UNSIGNED_SHORT),
1552 const_iv (GL_UNSIGNED_INT), 1581 const_iv (GL_UNSIGNED_INT),
1563 const_iv (GL_TEXTURE_MAG_FILTER), 1592 const_iv (GL_TEXTURE_MAG_FILTER),
1564 const_iv (GL_TEXTURE_MIN_FILTER), 1593 const_iv (GL_TEXTURE_MIN_FILTER),
1565 const_iv (GL_TEXTURE_ENV_MODE), 1594 const_iv (GL_TEXTURE_ENV_MODE),
1566 const_iv (GL_TEXTURE_WRAP_S), 1595 const_iv (GL_TEXTURE_WRAP_S),
1567 const_iv (GL_TEXTURE_WRAP_T), 1596 const_iv (GL_TEXTURE_WRAP_T),
1597 const_iv (GL_REPEAT),
1568 const_iv (GL_CLAMP), 1598 const_iv (GL_CLAMP),
1569 const_iv (GL_REPEAT), 1599 const_iv (GL_CLAMP_TO_EDGE),
1570 const_iv (GL_NEAREST), 1600 const_iv (GL_NEAREST),
1571 const_iv (GL_LINEAR), 1601 const_iv (GL_LINEAR),
1572 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1602 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1573 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1603 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1574 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1604 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1604 1634
1605 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1635 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1606 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1636 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1607} 1637}
1608 1638
1639char *
1640gl_vendor ()
1641 CODE:
1642 RETVAL = (char *)glGetString (GL_VENDOR);
1643 OUTPUT:
1644 RETVAL
1645
1646char *
1647gl_version ()
1648 CODE:
1649 RETVAL = (char *)glGetString (GL_VERSION);
1650 OUTPUT:
1651 RETVAL
1652
1653char *
1654gl_extensions ()
1655 CODE:
1656 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1657 OUTPUT:
1658 RETVAL
1659
1609int glGetError () 1660int glGetError ()
1610 1661
1611void glClear (int mask) 1662void glClear (int mask)
1612 1663
1613void glClearColor (float r, float g, float b, float a = 1.0) 1664void glClearColor (float r, float g, float b, float a = 1.0)
1620void glShadeModel (int mode) 1671void glShadeModel (int mode)
1621 1672
1622void glHint (int target, int mode) 1673void glHint (int target, int mode)
1623 1674
1624void glBlendFunc (int sfactor, int dfactor) 1675void glBlendFunc (int sfactor, int dfactor)
1676
1677void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1678 CODE:
1679 gl_BlendFuncSeparate (sa, da, saa, daa);
1625 1680
1626void glDepthMask (int flag) 1681void glDepthMask (int flag)
1627 1682
1628void glLogicOp (int opcode) 1683void glLogicOp (int opcode)
1629 1684
1663 1718
1664void glEnd () 1719void glEnd ()
1665 1720
1666void glColor (float r, float g, float b, float a = 1.0) 1721void glColor (float r, float g, float b, float a = 1.0)
1667 PROTOTYPE: @ 1722 PROTOTYPE: @
1723 ALIAS:
1724 glColor_premultiply = 1
1668 CODE: 1725 CODE:
1726 if (ix)
1727 {
1728 r *= a;
1729 g *= a;
1730 b *= a;
1731 }
1669 // microsoft visual "c" rounds instead of truncating... 1732 // microsoft visual "c" rounds instead of truncating...
1670 glColor4ub (MIN ((int)(r * 255.f), 255), 1733 glColor4ub (MIN ((int)(r * 256.f), 255),
1671 MIN ((int)(g * 255.f), 255), 1734 MIN ((int)(g * 256.f), 255),
1672 MIN ((int)(b * 255.f), 255), 1735 MIN ((int)(b * 256.f), 255),
1673 MIN ((int)(a * 255.f), 255)); 1736 MIN ((int)(a * 256.f), 255));
1674 1737
1675void glInterleavedArrays (int format, int stride, char *data) 1738void glInterleavedArrays (int format, int stride, char *data)
1676 1739
1677void glDrawElements (int mode, int count, int type, char *indices) 1740void glDrawElements (int mode, int count, int type, char *indices)
1678 1741
1679# 1.2 void glDrawRangeElements (int mode, int start, int end 1742# 1.2 void glDrawRangeElements (int mode, int start, int end
1743
1744void glRasterPos (float x, float y, float z = 0.)
1745 CODE:
1746 glRasterPos3f (0, 0, z);
1747 glBitmap (0, 0, 0, 0, x, y, 0);
1680 1748
1681void glVertex (float x, float y, float z = 0.) 1749void glVertex (float x, float y, float z = 0.)
1682 CODE: 1750 CODE:
1683 glVertex3f (x, y, z); 1751 glVertex3f (x, y, z);
1684 1752
1696 1764
1697void glBindTexture (int target, int name) 1765void glBindTexture (int target, int name)
1698 1766
1699void glConvolutionParameter (int target, int pname, float params) 1767void glConvolutionParameter (int target, int pname, float params)
1700 CODE: 1768 CODE:
1701 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1769 if (gl.ConvolutionParameterf)
1770 gl.ConvolutionParameterf (target, pname, params);
1702 1771
1703void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1772void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1704 CODE: 1773 CODE:
1705 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1774 if (gl.ConvolutionFilter2D)
1706 (target, internalformat, width, height, format, type, data)); 1775 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1707 1776
1708void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1777void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1709 CODE: 1778 CODE:
1710 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1779 if (gl.SeparableFilter2D)
1711 (target, internalformat, width, height, format, type, row, column)); 1780 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1712 1781
1713void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1782void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1714 1783
1715void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1784void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1716 1785
1717void glRasterPos (int x, int y) 1786void glDrawPixels (int width, int height, int format, int type, char *pixels)
1718 CODE:
1719 glRasterPos2i (x, y);
1720 1787
1721void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1788void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1722 1789
1723int glGenTexture () 1790int glGenTexture ()
1724 CODE: 1791 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines