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.108 by root, Wed Jun 7 23:28:12 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 FcPatternAddBool (pattern, FC_HINTSTYLE, FC_HINT_FULL);
89#ifdef _WIN32 92#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 93 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else 94#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 95 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif 96#endif
… …
416} 419}
417 420
418void 421void
419pango_init () 422pango_init ()
420 CODE: 423 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx 424 // delayed, so it can pick up new fonts added by AddFontResourceEx
425{
426 {
423 ft2_fontmap = pango_ft2_font_map_new (); 427 ft2_fontmap = pango_ft2_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 428 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); 429 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426 430 }
431 {
432 cairo_font_options_t *fopt = cairo_font_options_create ();
427 cairo_fontmap = pango_cairo_font_map_get_default (); 433 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 434 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
435#ifdef _WIN32
436 // cairo looks like shit eaten twice on windows
437 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
438#else
439 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
440#endif
441 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
442 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
443 pango_cairo_context_set_font_options (cairo_context, fopt);
444 cairo_font_options_destroy (fopt);
445 }
429} 446}
430 447
431int 448int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 449SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
433 450
… …
479SDL_SetVideoMode (int w, int h, int fullscreen) 496SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 497 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 498 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 499 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 500 );
501 if (RETVAL)
502 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 503 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
504# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
505# include "glfunc.h"
506# undef GL_FUNC
507 }
485 OUTPUT: 508 OUTPUT:
486 RETVAL 509 RETVAL
487 510
488void 511void
489SDL_GL_SwapBuffers () 512SDL_GL_SwapBuffers ()
… …
709MODULE = CFClient PACKAGE = CFClient::Layout 732MODULE = CFClient PACKAGE = CFClient::Layout
710 733
711CFClient::Layout 734CFClient::Layout
712new (SV *class, int rgba = 0) 735new (SV *class, int rgba = 0)
713 CODE: 736 CODE:
714#if _WIN32
715 //rgba = 0;//D make stext nicer, breaks TextView
716#endif
717 New (0, RETVAL, 1, struct cf_layout); 737 New (0, RETVAL, 1, struct cf_layout);
718 738
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 739 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720 RETVAL->rgba = rgba; 740 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 741 RETVAL->r = 1.;
… …
765 785
766SV * 786SV *
767get_text (CFClient::Layout self) 787get_text (CFClient::Layout self)
768 CODE: 788 CODE:
769 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 789 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770 SvUTF8_on (RETVAL); 790 sv_utf8_decode (RETVAL);
771 OUTPUT: 791 OUTPUT:
772 RETVAL 792 RETVAL
773 793
774void 794void
775set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 795set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
… …
977 } 997 }
978 998
979 if (ix) 999 if (ix)
980 { 1000 {
981 glEnable (GL_BLEND); 1001 glEnable (GL_BLEND);
1002
1003 if (ix == 2)
982 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1004 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1005 else
1006 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1007 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1008
983 glEnable (GL_ALPHA_TEST); 1009 glEnable (GL_ALPHA_TEST);
984 glAlphaFunc (GL_GREATER, 0.01f); 1010 glAlphaFunc (GL_GREATER, 0.01f);
985 } 1011 }
986 1012
987 glBindTexture (GL_TEXTURE_2D, name); 1013 glBindTexture (GL_TEXTURE_2D, name);
… …
1073 } 1099 }
1074 1100
1075 // somewhat hackish, but for textures that require it, it really 1101 // somewhat hackish, but for textures that require it, it really
1076 // improves the look, and most others don't suffer. 1102 // improves the look, and most others don't suffer.
1077 glBindTexture (GL_TEXTURE_2D, name); 1103 glBindTexture (GL_TEXTURE_2D, name);
1078 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1104 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1079 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1105 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1106 // use uglier nearest interpolation because linear suffers
1107 // from transparent color bleeding and ugly wrapping effects.
1108 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1080} 1109}
1081 1110
1082int 1111int
1083ox (CFClient::Map self) 1112ox (CFClient::Map self)
1084 ALIAS: 1113 ALIAS:
1085 oy = 1 1114 oy = 1
1115 x = 2
1116 y = 3
1117 w = 4
1118 h = 5
1086 CODE: 1119 CODE:
1087 switch (ix) 1120 switch (ix)
1088 { 1121 {
1089 case 0: RETVAL = self->ox; break; 1122 case 0: RETVAL = self->ox; break;
1090 case 1: RETVAL = self->oy; break; 1123 case 1: RETVAL = self->oy; break;
1124 case 2: RETVAL = self->x; break;
1125 case 3: RETVAL = self->y; break;
1126 case 4: RETVAL = self->w; break;
1127 case 5: RETVAL = self->h; break;
1091 } 1128 }
1092 OUTPUT: 1129 OUTPUT:
1093 RETVAL 1130 RETVAL
1094 1131
1095void 1132void
… …
1532 const_iv (GL_RESCALE_NORMAL), 1569 const_iv (GL_RESCALE_NORMAL),
1533 const_iv (GL_AND), 1570 const_iv (GL_AND),
1534 const_iv (GL_ONE), 1571 const_iv (GL_ONE),
1535 const_iv (GL_ZERO), 1572 const_iv (GL_ZERO),
1536 const_iv (GL_SRC_ALPHA), 1573 const_iv (GL_SRC_ALPHA),
1537 const_iv (GL_SRC_ALPHA_SATURATE), 1574 const_iv (GL_DST_ALPHA),
1538 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1575 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539 const_iv (GL_ONE_MINUS_DST_ALPHA), 1576 const_iv (GL_ONE_MINUS_DST_ALPHA),
1577 const_iv (GL_SRC_ALPHA_SATURATE),
1540 const_iv (GL_RGB), 1578 const_iv (GL_RGB),
1541 const_iv (GL_RGBA), 1579 const_iv (GL_RGBA),
1542 const_iv (GL_UNSIGNED_BYTE), 1580 const_iv (GL_UNSIGNED_BYTE),
1543 const_iv (GL_UNSIGNED_SHORT), 1581 const_iv (GL_UNSIGNED_SHORT),
1544 const_iv (GL_UNSIGNED_INT), 1582 const_iv (GL_UNSIGNED_INT),
… …
1635 1673
1636void glHint (int target, int mode) 1674void glHint (int target, int mode)
1637 1675
1638void glBlendFunc (int sfactor, int dfactor) 1676void glBlendFunc (int sfactor, int dfactor)
1639 1677
1678void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1679 CODE:
1680 gl_BlendFuncSeparate (sa, da, saa, daa);
1681
1640void glDepthMask (int flag) 1682void glDepthMask (int flag)
1641 1683
1642void glLogicOp (int opcode) 1684void glLogicOp (int opcode)
1643 1685
1644void glColorMask (int red, int green, int blue, int alpha) 1686void glColorMask (int red, int green, int blue, int alpha)
… …
1677 1719
1678void glEnd () 1720void glEnd ()
1679 1721
1680void glColor (float r, float g, float b, float a = 1.0) 1722void glColor (float r, float g, float b, float a = 1.0)
1681 PROTOTYPE: @ 1723 PROTOTYPE: @
1724 ALIAS:
1725 glColor_premultiply = 1
1682 CODE: 1726 CODE:
1727 if (ix)
1728 {
1729 r *= a;
1730 g *= a;
1731 b *= a;
1732 }
1683 // microsoft visual "c" rounds instead of truncating... 1733 // microsoft visual "c" rounds instead of truncating...
1684 glColor4ub (MIN ((int)(r * 255.f), 255), 1734 glColor4ub (MIN ((int)(r * 256.f), 255),
1685 MIN ((int)(g * 255.f), 255), 1735 MIN ((int)(g * 256.f), 255),
1686 MIN ((int)(b * 255.f), 255), 1736 MIN ((int)(b * 256.f), 255),
1687 MIN ((int)(a * 255.f), 255)); 1737 MIN ((int)(a * 256.f), 255));
1688 1738
1689void glInterleavedArrays (int format, int stride, char *data) 1739void glInterleavedArrays (int format, int stride, char *data)
1690 1740
1691void glDrawElements (int mode, int count, int type, char *indices) 1741void glDrawElements (int mode, int count, int type, char *indices)
1692 1742
… …
1715 1765
1716void glBindTexture (int target, int name) 1766void glBindTexture (int target, int name)
1717 1767
1718void glConvolutionParameter (int target, int pname, float params) 1768void glConvolutionParameter (int target, int pname, float params)
1719 CODE: 1769 CODE:
1720 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1770 if (gl.ConvolutionParameterf)
1771 gl.ConvolutionParameterf (target, pname, params);
1721 1772
1722void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1773void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723 CODE: 1774 CODE:
1724 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1775 if (gl.ConvolutionFilter2D)
1725 (target, internalformat, width, height, format, type, data)); 1776 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726 1777
1727void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1778void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1728 CODE: 1779 CODE:
1729 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1780 if (gl.SeparableFilter2D)
1730 (target, internalformat, width, height, format, type, row, column)); 1781 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731 1782
1732void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1783void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733 1784
1734void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1785void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735 1786

Diff Legend

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