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.105 by root, Mon Jun 5 03:33:09 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;
… …
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);
89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 91 //FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 93}
95 94
96static void 95static void
97layout_update_font (CFClient__Layout self) 96layout_update_font (CFClient__Layout self)
98{ 97{
… …
416} 415}
417 416
418void 417void
419pango_init () 418pango_init ()
420 CODE: 419 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx 420 // delayed, so it can pick up new fonts added by AddFontResourceEx
421{
422 {
423 ft2_fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 424 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); 425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426 }
426 427
428 {
429 cairo_font_options_t *fopt = cairo_font_options_create ();
427 cairo_fontmap = pango_cairo_font_map_get_default (); 430 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 431 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
432 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
433 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435 pango_cairo_context_set_font_options (cairo_context, fopt);
436 cairo_font_options_destroy (fopt);
437 }
429} 438}
430 439
431int 440int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 441SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
433 442
… …
479SDL_SetVideoMode (int w, int h, int fullscreen) 488SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 489 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 490 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 491 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 492 );
493 if (RETVAL)
494 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 495 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
496# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
497# include "glfunc.h"
498# undef GL_FUNC
499 }
485 OUTPUT: 500 OUTPUT:
486 RETVAL 501 RETVAL
487 502
488void 503void
489SDL_GL_SwapBuffers () 504SDL_GL_SwapBuffers ()
… …
710 725
711CFClient::Layout 726CFClient::Layout
712new (SV *class, int rgba = 0) 727new (SV *class, int rgba = 0)
713 CODE: 728 CODE:
714#if _WIN32 729#if _WIN32
715 //rgba = 0;//D make stext nicer, breaks TextView 730 //rgba = 0;//D makes text nicer, breaks TextView
716#endif 731#endif
732 rgba=1;//D
717 New (0, RETVAL, 1, struct cf_layout); 733 New (0, RETVAL, 1, struct cf_layout);
718 734
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 735 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720 RETVAL->rgba = rgba; 736 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 737 RETVAL->r = 1.;
… …
977 } 993 }
978 994
979 if (ix) 995 if (ix)
980 { 996 {
981 glEnable (GL_BLEND); 997 glEnable (GL_BLEND);
998
999 if (ix == 2)
982 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1000 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1001 else
1002 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1003 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1004
983 glEnable (GL_ALPHA_TEST); 1005 glEnable (GL_ALPHA_TEST);
984 glAlphaFunc (GL_GREATER, 0.01f); 1006 glAlphaFunc (GL_GREATER, 0.01f);
985 } 1007 }
986 1008
987 glBindTexture (GL_TEXTURE_2D, name); 1009 glBindTexture (GL_TEXTURE_2D, name);
… …
1073 } 1095 }
1074 1096
1075 // somewhat hackish, but for textures that require it, it really 1097 // somewhat hackish, but for textures that require it, it really
1076 // improves the look, and most others don't suffer. 1098 // improves the look, and most others don't suffer.
1077 glBindTexture (GL_TEXTURE_2D, name); 1099 glBindTexture (GL_TEXTURE_2D, name);
1078 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1100 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1079 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1101 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1102 // use uglier nearest interpolation because linear suffers
1103 // from transparent color bleeding and ugly wrapping effects.
1104 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1080} 1105}
1081 1106
1082int 1107int
1083ox (CFClient::Map self) 1108ox (CFClient::Map self)
1084 ALIAS: 1109 ALIAS:
1085 oy = 1 1110 oy = 1
1111 x = 2
1112 y = 3
1113 w = 4
1114 h = 5
1086 CODE: 1115 CODE:
1087 switch (ix) 1116 switch (ix)
1088 { 1117 {
1089 case 0: RETVAL = self->ox; break; 1118 case 0: RETVAL = self->ox; break;
1090 case 1: RETVAL = self->oy; break; 1119 case 1: RETVAL = self->oy; break;
1120 case 2: RETVAL = self->x; break;
1121 case 3: RETVAL = self->y; break;
1122 case 4: RETVAL = self->w; break;
1123 case 5: RETVAL = self->h; break;
1091 } 1124 }
1092 OUTPUT: 1125 OUTPUT:
1093 RETVAL 1126 RETVAL
1094 1127
1095void 1128void
… …
1532 const_iv (GL_RESCALE_NORMAL), 1565 const_iv (GL_RESCALE_NORMAL),
1533 const_iv (GL_AND), 1566 const_iv (GL_AND),
1534 const_iv (GL_ONE), 1567 const_iv (GL_ONE),
1535 const_iv (GL_ZERO), 1568 const_iv (GL_ZERO),
1536 const_iv (GL_SRC_ALPHA), 1569 const_iv (GL_SRC_ALPHA),
1537 const_iv (GL_SRC_ALPHA_SATURATE), 1570 const_iv (GL_DST_ALPHA),
1538 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1571 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539 const_iv (GL_ONE_MINUS_DST_ALPHA), 1572 const_iv (GL_ONE_MINUS_DST_ALPHA),
1573 const_iv (GL_SRC_ALPHA_SATURATE),
1540 const_iv (GL_RGB), 1574 const_iv (GL_RGB),
1541 const_iv (GL_RGBA), 1575 const_iv (GL_RGBA),
1542 const_iv (GL_UNSIGNED_BYTE), 1576 const_iv (GL_UNSIGNED_BYTE),
1543 const_iv (GL_UNSIGNED_SHORT), 1577 const_iv (GL_UNSIGNED_SHORT),
1544 const_iv (GL_UNSIGNED_INT), 1578 const_iv (GL_UNSIGNED_INT),
… …
1635 1669
1636void glHint (int target, int mode) 1670void glHint (int target, int mode)
1637 1671
1638void glBlendFunc (int sfactor, int dfactor) 1672void glBlendFunc (int sfactor, int dfactor)
1639 1673
1674void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1675 CODE:
1676 gl_BlendFuncSeparate (sa, da, saa, daa);
1677
1640void glDepthMask (int flag) 1678void glDepthMask (int flag)
1641 1679
1642void glLogicOp (int opcode) 1680void glLogicOp (int opcode)
1643 1681
1644void glColorMask (int red, int green, int blue, int alpha) 1682void glColorMask (int red, int green, int blue, int alpha)
… …
1677 1715
1678void glEnd () 1716void glEnd ()
1679 1717
1680void glColor (float r, float g, float b, float a = 1.0) 1718void glColor (float r, float g, float b, float a = 1.0)
1681 PROTOTYPE: @ 1719 PROTOTYPE: @
1720 ALIAS:
1721 glColor_premultiply = 1
1682 CODE: 1722 CODE:
1723 if (ix)
1724 {
1725 r *= a;
1726 g *= a;
1727 b *= a;
1728 }
1683 // microsoft visual "c" rounds instead of truncating... 1729 // microsoft visual "c" rounds instead of truncating...
1684 glColor4ub (MIN ((int)(r * 255.f), 255), 1730 glColor4ub (MIN ((int)(r * 256.f), 255),
1685 MIN ((int)(g * 255.f), 255), 1731 MIN ((int)(g * 256.f), 255),
1686 MIN ((int)(b * 255.f), 255), 1732 MIN ((int)(b * 256.f), 255),
1687 MIN ((int)(a * 255.f), 255)); 1733 MIN ((int)(a * 256.f), 255));
1688 1734
1689void glInterleavedArrays (int format, int stride, char *data) 1735void glInterleavedArrays (int format, int stride, char *data)
1690 1736
1691void glDrawElements (int mode, int count, int type, char *indices) 1737void glDrawElements (int mode, int count, int type, char *indices)
1692 1738
… …
1715 1761
1716void glBindTexture (int target, int name) 1762void glBindTexture (int target, int name)
1717 1763
1718void glConvolutionParameter (int target, int pname, float params) 1764void glConvolutionParameter (int target, int pname, float params)
1719 CODE: 1765 CODE:
1720 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1766 if (gl.ConvolutionParameterf)
1767 gl.ConvolutionParameterf (target, pname, params);
1721 1768
1722void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1769void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723 CODE: 1770 CODE:
1724 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1771 if (gl.ConvolutionFilter2D)
1725 (target, internalformat, width, height, format, type, data)); 1772 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726 1773
1727void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1774void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1728 CODE: 1775 CODE:
1729 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1776 if (gl.SeparableFilter2D)
1730 (target, internalformat, width, height, format, type, row, column)); 1777 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731 1778
1732void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1779void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733 1780
1734void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1781void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735 1782

Diff Legend

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