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.102 by root, Sat Jun 3 23:47:46 2006 UTC vs.
Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC

… …
10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h> 12#include <math.h>
13#include <string.h> 13#include <string.h>
14#include <stdio.h> 14#include <stdio.h>
15#include <stdlib.h>
15 16
16#include <SDL.h> 17#include <SDL.h>
17#include <SDL_endian.h> 18#include <SDL_endian.h>
18#include <SDL_image.h> 19#include <SDL_image.h>
19#include <SDL_mixer.h> 20#include <SDL_mixer.h>
… …
48#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
50 51
51#define MIN_FONT_HEIGHT 10 52#define MIN_FONT_HEIGHT 10
52 53
53#define GL_CALL(type,func,args) \ 54static struct
54 { \ 55{
55 static int init_; \ 56#define GL_FUNC(ptr,name) ptr name;
56 static type fptr_; \ 57#include "glfunc.h"
57 \ 58#undef GL_FUNC
58 if (!init_) \ 59} gl;
59 { \ 60
60 init_ = 1; \ 61static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 62{
62 } \ 63 if (gl.BlendFuncSeparate)
63 \ 64 gl.BlendFuncSeparate (sa, da, saa, daa);
64 if (fptr_) \ 65 else if (gl.BlendFuncSeparateEXT)
65 fptr_ args; \ 66 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 } 67 else
68 glBlendFunc (sa, da);
69}
67 70
68typedef Mix_Chunk *CFClient__MixChunk; 71typedef Mix_Chunk *CFClient__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 72typedef Mix_Music *CFClient__MixMusic;
70 73
71typedef PangoFontDescription *CFClient__Font; 74typedef PangoFontDescription *CFClient__Font;
… …
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 86static PangoFontMap *ft2_fontmap, *cairo_fontmap;
84 87
85static void 88static void
86substitute_func (FcPattern *pattern, gpointer data) 89substitute_func (FcPattern *pattern, gpointer data)
87{ 90{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 91 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif
89#ifdef _WIN32 95#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else 97#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 98 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif 99#endif
… …
416} 422}
417 423
418void 424void
419pango_init () 425pango_init ()
420 CODE: 426 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx 427 // delayed, so it can pick up new fonts added by AddFontResourceEx
428{
429 {
423 ft2_fontmap = pango_ft2_font_map_new (); 430 ft2_fontmap = pango_ft2_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 431 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); 432 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426 433 }
434 {
435 cairo_font_options_t *fopt = cairo_font_options_create ();
427 cairo_fontmap = pango_cairo_font_map_get_default (); 436 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 437 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438#ifdef _WIN32
439 // cairo looks like shit eaten twice on windows
440 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441#else
442 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443#endif
444 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446 pango_cairo_context_set_font_options (cairo_context, fopt);
447 cairo_font_options_destroy (fopt);
448 }
429} 449}
430 450
431int 451int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 452SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
433 453
… …
479SDL_SetVideoMode (int w, int h, int fullscreen) 499SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 500 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 501 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 502 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 503 );
504 if (RETVAL)
505 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 506 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
507# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
508# include "glfunc.h"
509# undef GL_FUNC
510 }
485 OUTPUT: 511 OUTPUT:
486 RETVAL 512 RETVAL
487 513
488void 514void
489SDL_GL_SwapBuffers () 515SDL_GL_SwapBuffers ()
… …
678 CODE: 704 CODE:
679 fprintf (stderr, "FATAL: %s\n", message); 705 fprintf (stderr, "FATAL: %s\n", message);
680#ifdef _WIN32 706#ifdef _WIN32
681 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 707 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
682#endif 708#endif
683 exit (1); 709 _exit (1);
710
711void
712_exit (int retval)
713 CODE:
714 _exit (retval);
684 715
685MODULE = CFClient PACKAGE = CFClient::Font 716MODULE = CFClient PACKAGE = CFClient::Font
686 717
687CFClient::Font 718CFClient::Font
688new_from_file (SV *class, char *path, int id = 0) 719new_from_file (SV *class, char *path, int id = 0)
… …
709MODULE = CFClient PACKAGE = CFClient::Layout 740MODULE = CFClient PACKAGE = CFClient::Layout
710 741
711CFClient::Layout 742CFClient::Layout
712new (SV *class, int rgba = 0) 743new (SV *class, int rgba = 0)
713 CODE: 744 CODE:
714#if _WIN32
715 //rgba = 0;//D make stext nicer, breaks TextView
716#endif
717 New (0, RETVAL, 1, struct cf_layout); 745 New (0, RETVAL, 1, struct cf_layout);
718 746
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 747 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720 RETVAL->rgba = rgba; 748 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 749 RETVAL->r = 1.;
… …
765 793
766SV * 794SV *
767get_text (CFClient::Layout self) 795get_text (CFClient::Layout self)
768 CODE: 796 CODE:
769 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 797 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770 SvUTF8_on (RETVAL); 798 sv_utf8_decode (RETVAL);
771 OUTPUT: 799 OUTPUT:
772 RETVAL 800 RETVAL
773 801
774void 802void
775set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 803set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
… …
977 } 1005 }
978 1006
979 if (ix) 1007 if (ix)
980 { 1008 {
981 glEnable (GL_BLEND); 1009 glEnable (GL_BLEND);
1010
1011 if (ix == 2)
982 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1012 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1013 else
1014 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1015 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1016
983 glEnable (GL_ALPHA_TEST); 1017 glEnable (GL_ALPHA_TEST);
984 glAlphaFunc (GL_GREATER, 0.01f); 1018 glAlphaFunc (GL_GREATER, 0.01f);
985 } 1019 }
986 1020
987 glBindTexture (GL_TEXTURE_2D, name); 1021 glBindTexture (GL_TEXTURE_2D, name);
… …
1025DESTROY (CFClient::Map self) 1059DESTROY (CFClient::Map self)
1026 CODE: 1060 CODE:
1027{ 1061{
1028 map_clear (self); 1062 map_clear (self);
1029 Safefree (self->face); 1063 Safefree (self->face);
1064 Safefree (self->tex);
1030 Safefree (self); 1065 Safefree (self);
1031} 1066}
1032 1067
1033void 1068void
1034clear (CFClient::Map self) 1069clear (CFClient::Map self)
… …
1543 const_iv (GL_RESCALE_NORMAL), 1578 const_iv (GL_RESCALE_NORMAL),
1544 const_iv (GL_AND), 1579 const_iv (GL_AND),
1545 const_iv (GL_ONE), 1580 const_iv (GL_ONE),
1546 const_iv (GL_ZERO), 1581 const_iv (GL_ZERO),
1547 const_iv (GL_SRC_ALPHA), 1582 const_iv (GL_SRC_ALPHA),
1548 const_iv (GL_SRC_ALPHA_SATURATE), 1583 const_iv (GL_DST_ALPHA),
1549 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1584 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1550 const_iv (GL_ONE_MINUS_DST_ALPHA), 1585 const_iv (GL_ONE_MINUS_DST_ALPHA),
1586 const_iv (GL_SRC_ALPHA_SATURATE),
1551 const_iv (GL_RGB), 1587 const_iv (GL_RGB),
1552 const_iv (GL_RGBA), 1588 const_iv (GL_RGBA),
1553 const_iv (GL_UNSIGNED_BYTE), 1589 const_iv (GL_UNSIGNED_BYTE),
1554 const_iv (GL_UNSIGNED_SHORT), 1590 const_iv (GL_UNSIGNED_SHORT),
1555 const_iv (GL_UNSIGNED_INT), 1591 const_iv (GL_UNSIGNED_INT),
… …
1646 1682
1647void glHint (int target, int mode) 1683void glHint (int target, int mode)
1648 1684
1649void glBlendFunc (int sfactor, int dfactor) 1685void glBlendFunc (int sfactor, int dfactor)
1650 1686
1687void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1688 CODE:
1689 gl_BlendFuncSeparate (sa, da, saa, daa);
1690
1651void glDepthMask (int flag) 1691void glDepthMask (int flag)
1652 1692
1653void glLogicOp (int opcode) 1693void glLogicOp (int opcode)
1654 1694
1655void glColorMask (int red, int green, int blue, int alpha) 1695void glColorMask (int red, int green, int blue, int alpha)
… …
1688 1728
1689void glEnd () 1729void glEnd ()
1690 1730
1691void glColor (float r, float g, float b, float a = 1.0) 1731void glColor (float r, float g, float b, float a = 1.0)
1692 PROTOTYPE: @ 1732 PROTOTYPE: @
1733 ALIAS:
1734 glColor_premultiply = 1
1693 CODE: 1735 CODE:
1736 if (ix)
1737 {
1738 r *= a;
1739 g *= a;
1740 b *= a;
1741 }
1694 // microsoft visual "c" rounds instead of truncating... 1742 // microsoft visual "c" rounds instead of truncating...
1695 glColor4ub (MIN ((int)(r * 256.f), 255), 1743 glColor4ub (MIN ((int)(r * 256.f), 255),
1696 MIN ((int)(g * 256.f), 255), 1744 MIN ((int)(g * 256.f), 255),
1697 MIN ((int)(b * 256.f), 255), 1745 MIN ((int)(b * 256.f), 255),
1698 MIN ((int)(a * 256.f), 255)); 1746 MIN ((int)(a * 256.f), 255));
… …
1726 1774
1727void glBindTexture (int target, int name) 1775void glBindTexture (int target, int name)
1728 1776
1729void glConvolutionParameter (int target, int pname, float params) 1777void glConvolutionParameter (int target, int pname, float params)
1730 CODE: 1778 CODE:
1731 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1779 if (gl.ConvolutionParameterf)
1780 gl.ConvolutionParameterf (target, pname, params);
1732 1781
1733void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1782void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1734 CODE: 1783 CODE:
1735 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1784 if (gl.ConvolutionFilter2D)
1736 (target, internalformat, width, height, format, type, data)); 1785 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1737 1786
1738void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1787void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1739 CODE: 1788 CODE:
1740 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1789 if (gl.SeparableFilter2D)
1741 (target, internalformat, width, height, format, type, row, column)); 1790 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1742 1791
1743void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1792void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1744 1793
1745void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1794void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1746 1795

Diff Legend

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