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.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.103 by root, Sun Jun 4 23:05:05 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;
… …
479SDL_SetVideoMode (int w, int h, int fullscreen) 481SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 482 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 483 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 484 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 485 );
486 if (RETVAL)
487 {
484 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 }
485 OUTPUT: 493 OUTPUT:
486 RETVAL 494 RETVAL
487 495
488void 496void
489SDL_GL_SwapBuffers () 497SDL_GL_SwapBuffers ()
498
499char *
500SDL_GetKeyName (int sym)
490 501
491void 502void
492SDL_PollEvent () 503SDL_PollEvent ()
493 PPCODE: 504 PPCODE:
494{ 505{
495 SDL_Event ev; 506 SDL_Event ev;
496 int i;
497 static int modifier;
498 static int modkey[] = {
499 SDLK_RSHIFT, KMOD_RSHIFT,
500 SDLK_LSHIFT, KMOD_LSHIFT,
501 SDLK_RCTRL, KMOD_RCTRL,
502 SDLK_LCTRL, KMOD_LCTRL,
503 SDLK_RALT, KMOD_RALT,
504 SDLK_LALT, KMOD_LALT,
505 SDLK_RMETA, KMOD_RMETA,
506 SDLK_LMETA, KMOD_LMETA,
507 };
508 507
509 while (SDL_PollEvent (&ev)) 508 while (SDL_PollEvent (&ev))
510 { 509 {
511 HV *hv = newHV (); 510 HV *hv = newHV ();
512 hv_store (hv, "type", 4, newSViv (ev.type), 0); 511 hv_store (hv, "type", 4, newSViv (ev.type), 0);
513 512
514 switch (ev.type) 513 switch (ev.type)
515 { 514 {
516 case SDL_KEYDOWN: 515 case SDL_KEYDOWN:
517 case SDL_KEYUP: 516 case SDL_KEYUP:
518
519 for (i = 0; i < sizeof (modkey) / (sizeof (int) * 2); i++)
520 if (modkey [i * 2] == ev.key.keysym.sym)
521 {
522 if (ev.type == SDL_KEYDOWN)
523 modifier |= modkey [i * 2 + 1];
524 else
525 modifier &= ~modkey [i * 2 + 1];
526 break;
527 }
528
529 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
530 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 518 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
531 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 519 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
532 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 520 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
533 break; 521 break;
… …
536 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 524 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
537 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 525 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
538 break; 526 break;
539 527
540 case SDL_MOUSEMOTION: 528 case SDL_MOUSEMOTION:
541 hv_store (hv, "mod", 3, newSViv (modifier), 0); 529 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
542 530
543 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 531 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
544 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 532 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
545 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 533 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
546 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 534 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
547 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 535 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
548 break; 536 break;
549 537
550 case SDL_MOUSEBUTTONDOWN: 538 case SDL_MOUSEBUTTONDOWN:
551 case SDL_MOUSEBUTTONUP: 539 case SDL_MOUSEBUTTONUP:
552 hv_store (hv, "mod", 3, newSViv (modifier), 0); 540 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
553 541
554 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 542 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
555 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 543 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
556 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 544 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
557 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 545 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
584lowdelay (int fd, int val = 1) 572lowdelay (int fd, int val = 1)
585 CODE: 573 CODE:
586#ifndef _WIN32 574#ifndef _WIN32
587 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 575 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
588#endif 576#endif
589
590char *
591gl_vendor ()
592 CODE:
593 RETVAL = (char *)glGetString (GL_VENDOR);
594 OUTPUT:
595 RETVAL
596
597char *
598gl_version ()
599 CODE:
600 RETVAL = (char *)glGetString (GL_VERSION);
601 OUTPUT:
602 RETVAL
603
604char *
605gl_extensions ()
606 CODE:
607 RETVAL = (char *)glGetString (GL_EXTENSIONS);
608 OUTPUT:
609 RETVAL
610 577
611void 578void
612add_font (char *file) 579add_font (char *file)
613 CODE: 580 CODE:
614 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 581 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
… …
751 718
752CFClient::Layout 719CFClient::Layout
753new (SV *class, int rgba = 0) 720new (SV *class, int rgba = 0)
754 CODE: 721 CODE:
755#if _WIN32 722#if _WIN32
756 rgba = 0;//D 723 //rgba = 0;//D makes text nicer, breaks TextView
757#endif 724#endif
758 New (0, RETVAL, 1, struct cf_layout); 725 New (0, RETVAL, 1, struct cf_layout);
759 726
760 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 727 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
761 RETVAL->rgba = rgba; 728 RETVAL->rgba = rgba;
… …
1008{ 975{
1009 HV *hv = (HV *)SvRV (self); 976 HV *hv = (HV *)SvRV (self);
1010 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 977 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1011 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 978 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1012 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 979 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1013 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
1014 980
1015 if (items < 5) 981 if (items < 5)
1016 { 982 {
1017 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 983 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1018 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 984 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1019 } 985 }
1020 986
1021 if (ix) 987 if (ix)
1022 { 988 {
1023 glEnable (GL_BLEND); 989 glEnable (GL_BLEND);
990
991 if (ix == 2)
1024 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
1025 glEnable (GL_ALPHA_TEST); 997 glEnable (GL_ALPHA_TEST);
1026 glAlphaFunc (GL_GREATER, 0.01f); 998 glAlphaFunc (GL_GREATER, 0.01f);
1027 } 999 }
1028 1000
1029 glBindTexture (GL_TEXTURE_2D, name); 1001 glBindTexture (GL_TEXTURE_2D, name);
1030
1031 if (wrap_mode)
1032 {
1033 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1034 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1035 }
1036 1002
1037 glBegin (GL_QUADS); 1003 glBegin (GL_QUADS);
1038 glTexCoord2f (0, 0); glVertex2f (x , y ); 1004 glTexCoord2f (0, 0); glVertex2f (x , y );
1039 glTexCoord2f (0, t); glVertex2f (x , y + h); 1005 glTexCoord2f (0, t); glVertex2f (x , y + h);
1040 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
… …
1117 tex->r = r; 1083 tex->r = r;
1118 tex->g = g; 1084 tex->g = g;
1119 tex->b = b; 1085 tex->b = b;
1120 tex->a = a; 1086 tex->a = a;
1121 } 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);
1122} 1097}
1123 1098
1124int 1099int
1125ox (CFClient::Map self) 1100ox (CFClient::Map self)
1126 ALIAS: 1101 ALIAS:
1127 oy = 1 1102 oy = 1
1103 x = 2
1104 y = 3
1105 w = 4
1106 h = 5
1128 CODE: 1107 CODE:
1129 switch (ix) 1108 switch (ix)
1130 { 1109 {
1131 case 0: RETVAL = self->ox; break; 1110 case 0: RETVAL = self->ox; break;
1132 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;
1133 } 1116 }
1134 OUTPUT: 1117 OUTPUT:
1135 RETVAL 1118 RETVAL
1136 1119
1137void 1120void
… …
1597 const_iv (GL_TEXTURE_MAG_FILTER), 1580 const_iv (GL_TEXTURE_MAG_FILTER),
1598 const_iv (GL_TEXTURE_MIN_FILTER), 1581 const_iv (GL_TEXTURE_MIN_FILTER),
1599 const_iv (GL_TEXTURE_ENV_MODE), 1582 const_iv (GL_TEXTURE_ENV_MODE),
1600 const_iv (GL_TEXTURE_WRAP_S), 1583 const_iv (GL_TEXTURE_WRAP_S),
1601 const_iv (GL_TEXTURE_WRAP_T), 1584 const_iv (GL_TEXTURE_WRAP_T),
1585 const_iv (GL_REPEAT),
1602 const_iv (GL_CLAMP), 1586 const_iv (GL_CLAMP),
1603 const_iv (GL_REPEAT), 1587 const_iv (GL_CLAMP_TO_EDGE),
1604 const_iv (GL_NEAREST), 1588 const_iv (GL_NEAREST),
1605 const_iv (GL_LINEAR), 1589 const_iv (GL_LINEAR),
1606 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1590 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1607 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1591 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1608 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1592 const_iv (GL_NEAREST_MIPMAP_LINEAR),
… …
1638 1622
1639 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; )
1640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1624 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1641} 1625}
1642 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
1643int glGetError () 1648int glGetError ()
1644 1649
1645void glClear (int mask) 1650void glClear (int mask)
1646 1651
1647void glClearColor (float r, float g, float b, float a = 1.0) 1652void glClearColor (float r, float g, float b, float a = 1.0)
… …
1654void glShadeModel (int mode) 1659void glShadeModel (int mode)
1655 1660
1656void glHint (int target, int mode) 1661void glHint (int target, int mode)
1657 1662
1658void glBlendFunc (int sfactor, int dfactor) 1663void glBlendFunc (int sfactor, int dfactor)
1664
1665void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1666 CODE:
1667 gl_BlendFuncSeparate (sa, da, saa, daa);
1659 1668
1660void glDepthMask (int flag) 1669void glDepthMask (int flag)
1661 1670
1662void glLogicOp (int opcode) 1671void glLogicOp (int opcode)
1663 1672
… …
1697 1706
1698void glEnd () 1707void glEnd ()
1699 1708
1700void glColor (float r, float g, float b, float a = 1.0) 1709void glColor (float r, float g, float b, float a = 1.0)
1701 PROTOTYPE: @ 1710 PROTOTYPE: @
1711 ALIAS:
1712 glColor_premultiply = 1
1702 CODE: 1713 CODE:
1714 if (ix)
1715 {
1716 r *= a;
1717 g *= a;
1718 b *= a;
1719 }
1703 // microsoft visual "c" rounds instead of truncating... 1720 // microsoft visual "c" rounds instead of truncating...
1704 glColor4ub (MIN ((int)(r * 255.f), 255), 1721 glColor4ub (MIN ((int)(r * 256.f), 255),
1705 MIN ((int)(g * 255.f), 255), 1722 MIN ((int)(g * 256.f), 255),
1706 MIN ((int)(b * 255.f), 255), 1723 MIN ((int)(b * 256.f), 255),
1707 MIN ((int)(a * 255.f), 255)); 1724 MIN ((int)(a * 256.f), 255));
1708 1725
1709void glInterleavedArrays (int format, int stride, char *data) 1726void glInterleavedArrays (int format, int stride, char *data)
1710 1727
1711void glDrawElements (int mode, int count, int type, char *indices) 1728void glDrawElements (int mode, int count, int type, char *indices)
1712 1729
… …
1735 1752
1736void glBindTexture (int target, int name) 1753void glBindTexture (int target, int name)
1737 1754
1738void glConvolutionParameter (int target, int pname, float params) 1755void glConvolutionParameter (int target, int pname, float params)
1739 CODE: 1756 CODE:
1740 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1757 if (gl.ConvolutionParameterf)
1758 gl.ConvolutionParameterf (target, pname, params);
1741 1759
1742void 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)
1743 CODE: 1761 CODE:
1744 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1762 if (gl.ConvolutionFilter2D)
1745 (target, internalformat, width, height, format, type, data)); 1763 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1746 1764
1747void 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)
1748 CODE: 1766 CODE:
1749 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1767 if (gl.SeparableFilter2D)
1750 (target, internalformat, width, height, format, type, row, column)); 1768 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1751 1769
1752void 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)
1753 1771
1754void 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)
1755 1773

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines