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.98 by root, Mon May 29 02:01:56 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
… …
479SDL_SetVideoMode (int w, int h, int fullscreen) 498SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 499 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 500 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 501 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 502 );
503 if (RETVAL)
504 {
484 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 }
485 OUTPUT: 510 OUTPUT:
486 RETVAL 511 RETVAL
487 512
488void 513void
489SDL_GL_SwapBuffers () 514SDL_GL_SwapBuffers ()
… …
709MODULE = CFClient PACKAGE = CFClient::Layout 734MODULE = CFClient PACKAGE = CFClient::Layout
710 735
711CFClient::Layout 736CFClient::Layout
712new (SV *class, int rgba = 0) 737new (SV *class, int rgba = 0)
713 CODE: 738 CODE:
714#if _WIN32
715 //rgba = 0;//D make stext nicer, breaks TextView
716#endif
717 New (0, RETVAL, 1, struct cf_layout); 739 New (0, RETVAL, 1, struct cf_layout);
718 740
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 741 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720 RETVAL->rgba = rgba; 742 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 743 RETVAL->r = 1.;
… …
765 787
766SV * 788SV *
767get_text (CFClient::Layout self) 789get_text (CFClient::Layout self)
768 CODE: 790 CODE:
769 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 791 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770 SvUTF8_on (RETVAL); 792 sv_utf8_decode (RETVAL);
771 OUTPUT: 793 OUTPUT:
772 RETVAL 794 RETVAL
773 795
774void 796void
775set_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.)
… …
977 } 999 }
978 1000
979 if (ix) 1001 if (ix)
980 { 1002 {
981 glEnable (GL_BLEND); 1003 glEnable (GL_BLEND);
1004
1005 if (ix == 2)
982 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
983 glEnable (GL_ALPHA_TEST); 1011 glEnable (GL_ALPHA_TEST);
984 glAlphaFunc (GL_GREATER, 0.01f); 1012 glAlphaFunc (GL_GREATER, 0.01f);
985 } 1013 }
986 1014
987 glBindTexture (GL_TEXTURE_2D, name); 1015 glBindTexture (GL_TEXTURE_2D, name);
… …
1073 } 1101 }
1074 1102
1075 // somewhat hackish, but for textures that require it, it really 1103 // somewhat hackish, but for textures that require it, it really
1076 // improves the look, and most others don't suffer. 1104 // improves the look, and most others don't suffer.
1077 glBindTexture (GL_TEXTURE_2D, name); 1105 glBindTexture (GL_TEXTURE_2D, name);
1078 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1106 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1079 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 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);
1080} 1111}
1081 1112
1082int 1113int
1083ox (CFClient::Map self) 1114ox (CFClient::Map self)
1084 ALIAS: 1115 ALIAS:
1085 oy = 1 1116 oy = 1
1117 x = 2
1118 y = 3
1119 w = 4
1120 h = 5
1086 CODE: 1121 CODE:
1087 switch (ix) 1122 switch (ix)
1088 { 1123 {
1089 case 0: RETVAL = self->ox; break; 1124 case 0: RETVAL = self->ox; break;
1090 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;
1091 } 1130 }
1092 OUTPUT: 1131 OUTPUT:
1093 RETVAL 1132 RETVAL
1094 1133
1095void 1134void
… …
1532 const_iv (GL_RESCALE_NORMAL), 1571 const_iv (GL_RESCALE_NORMAL),
1533 const_iv (GL_AND), 1572 const_iv (GL_AND),
1534 const_iv (GL_ONE), 1573 const_iv (GL_ONE),
1535 const_iv (GL_ZERO), 1574 const_iv (GL_ZERO),
1536 const_iv (GL_SRC_ALPHA), 1575 const_iv (GL_SRC_ALPHA),
1537 const_iv (GL_SRC_ALPHA_SATURATE), 1576 const_iv (GL_DST_ALPHA),
1538 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1577 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539 const_iv (GL_ONE_MINUS_DST_ALPHA), 1578 const_iv (GL_ONE_MINUS_DST_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE),
1540 const_iv (GL_RGB), 1580 const_iv (GL_RGB),
1541 const_iv (GL_RGBA), 1581 const_iv (GL_RGBA),
1542 const_iv (GL_UNSIGNED_BYTE), 1582 const_iv (GL_UNSIGNED_BYTE),
1543 const_iv (GL_UNSIGNED_SHORT), 1583 const_iv (GL_UNSIGNED_SHORT),
1544 const_iv (GL_UNSIGNED_INT), 1584 const_iv (GL_UNSIGNED_INT),
… …
1635 1675
1636void glHint (int target, int mode) 1676void glHint (int target, int mode)
1637 1677
1638void glBlendFunc (int sfactor, int dfactor) 1678void glBlendFunc (int sfactor, int dfactor)
1639 1679
1680void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1681 CODE:
1682 gl_BlendFuncSeparate (sa, da, saa, daa);
1683
1640void glDepthMask (int flag) 1684void glDepthMask (int flag)
1641 1685
1642void glLogicOp (int opcode) 1686void glLogicOp (int opcode)
1643 1687
1644void glColorMask (int red, int green, int blue, int alpha) 1688void glColorMask (int red, int green, int blue, int alpha)
… …
1677 1721
1678void glEnd () 1722void glEnd ()
1679 1723
1680void glColor (float r, float g, float b, float a = 1.0) 1724void glColor (float r, float g, float b, float a = 1.0)
1681 PROTOTYPE: @ 1725 PROTOTYPE: @
1726 ALIAS:
1727 glColor_premultiply = 1
1682 CODE: 1728 CODE:
1729 if (ix)
1730 {
1731 r *= a;
1732 g *= a;
1733 b *= a;
1734 }
1683 // microsoft visual "c" rounds instead of truncating... 1735 // microsoft visual "c" rounds instead of truncating...
1684 glColor4ub (MIN ((int)(r * 255.f), 255), 1736 glColor4ub (MIN ((int)(r * 256.f), 255),
1685 MIN ((int)(g * 255.f), 255), 1737 MIN ((int)(g * 256.f), 255),
1686 MIN ((int)(b * 255.f), 255), 1738 MIN ((int)(b * 256.f), 255),
1687 MIN ((int)(a * 255.f), 255)); 1739 MIN ((int)(a * 256.f), 255));
1688 1740
1689void glInterleavedArrays (int format, int stride, char *data) 1741void glInterleavedArrays (int format, int stride, char *data)
1690 1742
1691void glDrawElements (int mode, int count, int type, char *indices) 1743void glDrawElements (int mode, int count, int type, char *indices)
1692 1744
… …
1715 1767
1716void glBindTexture (int target, int name) 1768void glBindTexture (int target, int name)
1717 1769
1718void glConvolutionParameter (int target, int pname, float params) 1770void glConvolutionParameter (int target, int pname, float params)
1719 CODE: 1771 CODE:
1720 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1772 if (gl.ConvolutionParameterf)
1773 gl.ConvolutionParameterf (target, pname, params);
1721 1774
1722void 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)
1723 CODE: 1776 CODE:
1724 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1777 if (gl.ConvolutionFilter2D)
1725 (target, internalformat, width, height, format, type, data)); 1778 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726 1779
1727void 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)
1728 CODE: 1781 CODE:
1729 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1782 if (gl.SeparableFilter2D)
1730 (target, internalformat, width, height, format, type, row, column)); 1783 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731 1784
1732void 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)
1733 1786
1734void 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)
1735 1788

Diff Legend

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