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.97 by root, Fri May 26 18:28:23 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 ()
… …
710 718
711CFClient::Layout 719CFClient::Layout
712new (SV *class, int rgba = 0) 720new (SV *class, int rgba = 0)
713 CODE: 721 CODE:
714#if _WIN32 722#if _WIN32
715 //rgba = 0;//D make stext nicer, breaks TextView 723 //rgba = 0;//D makes text nicer, breaks TextView
716#endif 724#endif
717 New (0, RETVAL, 1, struct cf_layout); 725 New (0, RETVAL, 1, struct cf_layout);
718 726
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 727 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720 RETVAL->rgba = rgba; 728 RETVAL->rgba = rgba;
… …
967{ 975{
968 HV *hv = (HV *)SvRV (self); 976 HV *hv = (HV *)SvRV (self);
969 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 977 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
970 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 978 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
971 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 979 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
972 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
973 980
974 if (items < 5) 981 if (items < 5)
975 { 982 {
976 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 983 w = SvNV (*hv_fetch (hv, "w", 1, 1));
977 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 984 h = SvNV (*hv_fetch (hv, "h", 1, 1));
978 } 985 }
979 986
980 if (ix) 987 if (ix)
981 { 988 {
982 glEnable (GL_BLEND); 989 glEnable (GL_BLEND);
990
991 if (ix == 2)
983 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
984 glEnable (GL_ALPHA_TEST); 997 glEnable (GL_ALPHA_TEST);
985 glAlphaFunc (GL_GREATER, 0.01f); 998 glAlphaFunc (GL_GREATER, 0.01f);
986 } 999 }
987 1000
988 glBindTexture (GL_TEXTURE_2D, name); 1001 glBindTexture (GL_TEXTURE_2D, name);
989
990 if (wrap_mode)
991 {
992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
993 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
994 }
995 1002
996 glBegin (GL_QUADS); 1003 glBegin (GL_QUADS);
997 glTexCoord2f (0, 0); glVertex2f (x , y ); 1004 glTexCoord2f (0, 0); glVertex2f (x , y );
998 glTexCoord2f (0, t); glVertex2f (x , y + h); 1005 glTexCoord2f (0, t); glVertex2f (x , y + h);
999 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
… …
1080 } 1087 }
1081 1088
1082 // somewhat hackish, but for textures that require it, it really 1089 // somewhat hackish, but for textures that require it, it really
1083 // improves the look, and most others don't suffer. 1090 // improves the look, and most others don't suffer.
1084 glBindTexture (GL_TEXTURE_2D, name); 1091 glBindTexture (GL_TEXTURE_2D, name);
1085 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1092 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1086 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 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);
1087} 1097}
1088 1098
1089int 1099int
1090ox (CFClient::Map self) 1100ox (CFClient::Map self)
1091 ALIAS: 1101 ALIAS:
1092 oy = 1 1102 oy = 1
1103 x = 2
1104 y = 3
1105 w = 4
1106 h = 5
1093 CODE: 1107 CODE:
1094 switch (ix) 1108 switch (ix)
1095 { 1109 {
1096 case 0: RETVAL = self->ox; break; 1110 case 0: RETVAL = self->ox; break;
1097 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;
1098 } 1116 }
1099 OUTPUT: 1117 OUTPUT:
1100 RETVAL 1118 RETVAL
1101 1119
1102void 1120void
… …
1562 const_iv (GL_TEXTURE_MAG_FILTER), 1580 const_iv (GL_TEXTURE_MAG_FILTER),
1563 const_iv (GL_TEXTURE_MIN_FILTER), 1581 const_iv (GL_TEXTURE_MIN_FILTER),
1564 const_iv (GL_TEXTURE_ENV_MODE), 1582 const_iv (GL_TEXTURE_ENV_MODE),
1565 const_iv (GL_TEXTURE_WRAP_S), 1583 const_iv (GL_TEXTURE_WRAP_S),
1566 const_iv (GL_TEXTURE_WRAP_T), 1584 const_iv (GL_TEXTURE_WRAP_T),
1585 const_iv (GL_REPEAT),
1567 const_iv (GL_CLAMP), 1586 const_iv (GL_CLAMP),
1568 const_iv (GL_REPEAT), 1587 const_iv (GL_CLAMP_TO_EDGE),
1569 const_iv (GL_NEAREST), 1588 const_iv (GL_NEAREST),
1570 const_iv (GL_LINEAR), 1589 const_iv (GL_LINEAR),
1571 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1590 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1572 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1591 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1573 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1592 const_iv (GL_NEAREST_MIPMAP_LINEAR),
… …
1641 1660
1642void glHint (int target, int mode) 1661void glHint (int target, int mode)
1643 1662
1644void glBlendFunc (int sfactor, int dfactor) 1663void glBlendFunc (int sfactor, int dfactor)
1645 1664
1665void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1666 CODE:
1667 gl_BlendFuncSeparate (sa, da, saa, daa);
1668
1646void glDepthMask (int flag) 1669void glDepthMask (int flag)
1647 1670
1648void glLogicOp (int opcode) 1671void glLogicOp (int opcode)
1649 1672
1650void glColorMask (int red, int green, int blue, int alpha) 1673void glColorMask (int red, int green, int blue, int alpha)
… …
1683 1706
1684void glEnd () 1707void glEnd ()
1685 1708
1686void glColor (float r, float g, float b, float a = 1.0) 1709void glColor (float r, float g, float b, float a = 1.0)
1687 PROTOTYPE: @ 1710 PROTOTYPE: @
1711 ALIAS:
1712 glColor_premultiply = 1
1688 CODE: 1713 CODE:
1714 if (ix)
1715 {
1716 r *= a;
1717 g *= a;
1718 b *= a;
1719 }
1689 // microsoft visual "c" rounds instead of truncating... 1720 // microsoft visual "c" rounds instead of truncating...
1690 glColor4ub (MIN ((int)(r * 255.f), 255), 1721 glColor4ub (MIN ((int)(r * 256.f), 255),
1691 MIN ((int)(g * 255.f), 255), 1722 MIN ((int)(g * 256.f), 255),
1692 MIN ((int)(b * 255.f), 255), 1723 MIN ((int)(b * 256.f), 255),
1693 MIN ((int)(a * 255.f), 255)); 1724 MIN ((int)(a * 256.f), 255));
1694 1725
1695void glInterleavedArrays (int format, int stride, char *data) 1726void glInterleavedArrays (int format, int stride, char *data)
1696 1727
1697void glDrawElements (int mode, int count, int type, char *indices) 1728void glDrawElements (int mode, int count, int type, char *indices)
1698 1729
… …
1721 1752
1722void glBindTexture (int target, int name) 1753void glBindTexture (int target, int name)
1723 1754
1724void glConvolutionParameter (int target, int pname, float params) 1755void glConvolutionParameter (int target, int pname, float params)
1725 CODE: 1756 CODE:
1726 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1757 if (gl.ConvolutionParameterf)
1758 gl.ConvolutionParameterf (target, pname, params);
1727 1759
1728void 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)
1729 CODE: 1761 CODE:
1730 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1762 if (gl.ConvolutionFilter2D)
1731 (target, internalformat, width, height, format, type, data)); 1763 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732 1764
1733void 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)
1734 CODE: 1766 CODE:
1735 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1767 if (gl.SeparableFilter2D)
1736 (target, internalformat, width, height, format, type, row, column)); 1768 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737 1769
1738void 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)
1739 1771
1740void 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)
1741 1773

Diff Legend

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