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.107 by root, Mon Jun 5 05:23:19 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 ()
… …
709MODULE = CFClient PACKAGE = CFClient::Layout 731MODULE = CFClient PACKAGE = CFClient::Layout
710 732
711CFClient::Layout 733CFClient::Layout
712new (SV *class, int rgba = 0) 734new (SV *class, int rgba = 0)
713 CODE: 735 CODE:
714#if _WIN32
715 //rgba = 0;//D make stext nicer, breaks TextView
716#endif
717 New (0, RETVAL, 1, struct cf_layout); 736 New (0, RETVAL, 1, struct cf_layout);
718 737
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 738 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720 RETVAL->rgba = rgba; 739 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 740 RETVAL->r = 1.;
… …
765 784
766SV * 785SV *
767get_text (CFClient::Layout self) 786get_text (CFClient::Layout self)
768 CODE: 787 CODE:
769 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 788 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770 SvUTF8_on (RETVAL); 789 sv_utf8_decode (RETVAL);
771 OUTPUT: 790 OUTPUT:
772 RETVAL 791 RETVAL
773 792
774void 793void
775set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 794set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
… …
977 } 996 }
978 997
979 if (ix) 998 if (ix)
980 { 999 {
981 glEnable (GL_BLEND); 1000 glEnable (GL_BLEND);
1001
1002 if (ix == 2)
982 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
983 glEnable (GL_ALPHA_TEST); 1008 glEnable (GL_ALPHA_TEST);
984 glAlphaFunc (GL_GREATER, 0.01f); 1009 glAlphaFunc (GL_GREATER, 0.01f);
985 } 1010 }
986 1011
987 glBindTexture (GL_TEXTURE_2D, name); 1012 glBindTexture (GL_TEXTURE_2D, name);
… …
1073 } 1098 }
1074 1099
1075 // somewhat hackish, but for textures that require it, it really 1100 // somewhat hackish, but for textures that require it, it really
1076 // improves the look, and most others don't suffer. 1101 // improves the look, and most others don't suffer.
1077 glBindTexture (GL_TEXTURE_2D, name); 1102 glBindTexture (GL_TEXTURE_2D, name);
1078 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1103 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1079 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 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);
1080} 1108}
1081 1109
1082int 1110int
1083ox (CFClient::Map self) 1111ox (CFClient::Map self)
1084 ALIAS: 1112 ALIAS:
1085 oy = 1 1113 oy = 1
1114 x = 2
1115 y = 3
1116 w = 4
1117 h = 5
1086 CODE: 1118 CODE:
1087 switch (ix) 1119 switch (ix)
1088 { 1120 {
1089 case 0: RETVAL = self->ox; break; 1121 case 0: RETVAL = self->ox; break;
1090 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;
1091 } 1127 }
1092 OUTPUT: 1128 OUTPUT:
1093 RETVAL 1129 RETVAL
1094 1130
1095void 1131void
… …
1532 const_iv (GL_RESCALE_NORMAL), 1568 const_iv (GL_RESCALE_NORMAL),
1533 const_iv (GL_AND), 1569 const_iv (GL_AND),
1534 const_iv (GL_ONE), 1570 const_iv (GL_ONE),
1535 const_iv (GL_ZERO), 1571 const_iv (GL_ZERO),
1536 const_iv (GL_SRC_ALPHA), 1572 const_iv (GL_SRC_ALPHA),
1537 const_iv (GL_SRC_ALPHA_SATURATE), 1573 const_iv (GL_DST_ALPHA),
1538 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1574 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539 const_iv (GL_ONE_MINUS_DST_ALPHA), 1575 const_iv (GL_ONE_MINUS_DST_ALPHA),
1576 const_iv (GL_SRC_ALPHA_SATURATE),
1540 const_iv (GL_RGB), 1577 const_iv (GL_RGB),
1541 const_iv (GL_RGBA), 1578 const_iv (GL_RGBA),
1542 const_iv (GL_UNSIGNED_BYTE), 1579 const_iv (GL_UNSIGNED_BYTE),
1543 const_iv (GL_UNSIGNED_SHORT), 1580 const_iv (GL_UNSIGNED_SHORT),
1544 const_iv (GL_UNSIGNED_INT), 1581 const_iv (GL_UNSIGNED_INT),
… …
1635 1672
1636void glHint (int target, int mode) 1673void glHint (int target, int mode)
1637 1674
1638void glBlendFunc (int sfactor, int dfactor) 1675void glBlendFunc (int sfactor, int dfactor)
1639 1676
1677void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1678 CODE:
1679 gl_BlendFuncSeparate (sa, da, saa, daa);
1680
1640void glDepthMask (int flag) 1681void glDepthMask (int flag)
1641 1682
1642void glLogicOp (int opcode) 1683void glLogicOp (int opcode)
1643 1684
1644void glColorMask (int red, int green, int blue, int alpha) 1685void glColorMask (int red, int green, int blue, int alpha)
… …
1677 1718
1678void glEnd () 1719void glEnd ()
1679 1720
1680void glColor (float r, float g, float b, float a = 1.0) 1721void glColor (float r, float g, float b, float a = 1.0)
1681 PROTOTYPE: @ 1722 PROTOTYPE: @
1723 ALIAS:
1724 glColor_premultiply = 1
1682 CODE: 1725 CODE:
1726 if (ix)
1727 {
1728 r *= a;
1729 g *= a;
1730 b *= a;
1731 }
1683 // microsoft visual "c" rounds instead of truncating... 1732 // microsoft visual "c" rounds instead of truncating...
1684 glColor4ub (MIN ((int)(r * 255.f), 255), 1733 glColor4ub (MIN ((int)(r * 256.f), 255),
1685 MIN ((int)(g * 255.f), 255), 1734 MIN ((int)(g * 256.f), 255),
1686 MIN ((int)(b * 255.f), 255), 1735 MIN ((int)(b * 256.f), 255),
1687 MIN ((int)(a * 255.f), 255)); 1736 MIN ((int)(a * 256.f), 255));
1688 1737
1689void glInterleavedArrays (int format, int stride, char *data) 1738void glInterleavedArrays (int format, int stride, char *data)
1690 1739
1691void glDrawElements (int mode, int count, int type, char *indices) 1740void glDrawElements (int mode, int count, int type, char *indices)
1692 1741
… …
1715 1764
1716void glBindTexture (int target, int name) 1765void glBindTexture (int target, int name)
1717 1766
1718void glConvolutionParameter (int target, int pname, float params) 1767void glConvolutionParameter (int target, int pname, float params)
1719 CODE: 1768 CODE:
1720 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1769 if (gl.ConvolutionParameterf)
1770 gl.ConvolutionParameterf (target, pname, params);
1721 1771
1722void 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)
1723 CODE: 1773 CODE:
1724 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1774 if (gl.ConvolutionFilter2D)
1725 (target, internalformat, width, height, format, type, data)); 1775 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726 1776
1727void 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)
1728 CODE: 1778 CODE:
1729 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1779 if (gl.SeparableFilter2D)
1730 (target, internalformat, width, height, format, type, row, column)); 1780 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731 1781
1732void 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)
1733 1783
1734void 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)
1735 1785

Diff Legend

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