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.73 by root, Fri May 5 19:30:14 2006 UTC vs.
Revision 1.81 by root, Sun May 14 23:19:14 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 3# include <malloc.h>
4# include <windows.h>
5# pragma warning(disable:4244)
3#endif 6#endif
4 7
5#include "EXTERN.h" 8#include "EXTERN.h"
6#include "perl.h" 9#include "perl.h"
7#include "XSUB.h" 10#include "XSUB.h"
8 11
12#include <math.h>
9#include <string.h> 13#include <string.h>
10#include <stdio.h> 14#include <stdio.h>
11 15
12#include <SDL.h> 16#include <SDL.h>
17#include <SDL_endian.h>
13#include <SDL_image.h> 18#include <SDL_image.h>
14#include <SDL_mixer.h> 19#include <SDL_mixer.h>
15#include <SDL_opengl.h> 20#include <SDL_opengl.h>
16 21
17#include <glib/gmacros.h> 22#include <glib/gmacros.h>
18 23
19#include <pango/pango.h> 24#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h> 25#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h> 26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
22 28
23#ifndef _WIN32 29#ifndef _WIN32
24# include <sys/types.h> 30# include <sys/types.h>
25# include <sys/socket.h> 31# include <sys/socket.h>
26# include <netinet/in.h> 32# include <netinet/in.h>
… …
63typedef Mix_Music *CFClient__MixMusic; 69typedef Mix_Music *CFClient__MixMusic;
64 70
65typedef PangoFontDescription *CFClient__Font; 71typedef PangoFontDescription *CFClient__Font;
66 72
67typedef struct cf_layout { 73typedef struct cf_layout {
68 PangoLayout *pl; 74 PangoLayout *pl; // either derived from a cairo or ft2 context
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode
69 int base_height; 77 int base_height;
70 CFClient__Font font; 78 CFClient__Font font;
71} *CFClient__Layout; 79} *CFClient__Layout;
72 80
73static CFClient__Font default_font; 81static CFClient__Font default_font;
74static PangoContext *context; 82static PangoContext *ft2_context, *cairo_context;
75static PangoFontMap *fontmap; 83static PangoFontMap *ft2_fontmap, *cairo_fontmap;
76 84
77static void 85static void
78substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
79{ 87{
80 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
81 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 89 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
82} 90}
83 91
84static void 92static void
85layout_update_font (CFClient__Layout self) 93layout_update_font (CFClient__Layout self)
86{ 94{
… …
98static void 106static void
99layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 107layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
100{ 108{
101 pango_layout_get_pixel_size (self->pl, w, h); 109 pango_layout_get_pixel_size (self->pl, w, h);
102 110
103 *w = (*w + 3) & ~3;
104 if (!*w) *w = 1; 111 if (!*w) *w = 1;
105 if (!*h) *h = 1; 112 if (!*h) *h = 1;
113
114 *w = (*w + 3) & ~3;
106} 115}
107 116
108typedef uint16_t mapface; 117typedef uint16_t mapface;
109 118
110typedef struct { 119typedef struct {
… …
258 } 267 }
259 } 268 }
260} 269}
261 270
262static void 271static void
263music_finished () 272music_finished (void)
264{ 273{
265 SDL_UserEvent ev; 274 SDL_UserEvent ev;
266 275
267 ev.type = SDL_USEREVENT; 276 ev.type = SDL_USEREVENT;
268 ev.code = 0; 277 ev.code = 0;
… …
277{ 286{
278 SDL_UserEvent ev; 287 SDL_UserEvent ev;
279 288
280 ev.type = SDL_USEREVENT; 289 ev.type = SDL_USEREVENT;
281 ev.code = 1; 290 ev.code = 1;
282 ev.data1 = (void *)channel; 291 ev.data1 = (void *)(long)channel;
283 ev.data2 = 0; 292 ev.data2 = 0;
284 293
285 SDL_PushEvent ((SDL_Event *)&ev); 294 SDL_PushEvent ((SDL_Event *)&ev);
286} 295}
287 296
… …
398# undef const_iv 407# undef const_iv
399 }; 408 };
400 409
401 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 410 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
402 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 411 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
412}
403 413
414void
415pango_init ()
416 CODE:
417{
418 // delayed, so it can pick up new fonts added by AddFontResourceEx
404 fontmap = pango_ft2_font_map_new (); 419 ft2_fontmap = pango_ft2_font_map_new ();
405 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 420 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
406 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap); 421 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
422
423 cairo_fontmap = pango_cairo_font_map_get_default ();
424 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
407} 425}
408 426
409int 427int
410SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 428SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
411 429
… …
550 568
551void 569void
552add_font (char *file) 570add_font (char *file)
553 CODE: 571 CODE:
554 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 572 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
573#ifdef _WIN32
574 // cairo... sigh... requires win2000
575 AddFontResourceEx (file, FR_PRIVATE, 0);
576#endif
555 577
556void 578void
557load_image_inline (SV *image_) 579load_image_inline (SV *image_)
558 ALIAS: 580 ALIAS:
559 load_image_file = 1 581 load_image_file = 1
… …
686 default_font = self; 708 default_font = self;
687 709
688MODULE = CFClient PACKAGE = CFClient::Layout 710MODULE = CFClient PACKAGE = CFClient::Layout
689 711
690CFClient::Layout 712CFClient::Layout
691new (SV *class, int base_height = MIN_FONT_HEIGHT) 713new (SV *class, int rgba = 0)
692 CODE: 714 CODE:
693 New (0, RETVAL, 1, struct cf_layout); 715 New (0, RETVAL, 1, struct cf_layout);
694 RETVAL->pl = pango_layout_new (context); 716
695 RETVAL->base_height = base_height; 717 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
718 RETVAL->rgba = rgba;
719 RETVAL->r = 1.;
720 RETVAL->g = 1.;
721 RETVAL->b = 1.;
722 RETVAL->a = 1.;
723 RETVAL->base_height = MIN_FONT_HEIGHT;
696 RETVAL->font = 0; 724 RETVAL->font = 0;
725
697 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 726 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
698 pango_layout_set_font_description (RETVAL->pl, default_font); 727 layout_update_font (RETVAL);
699 OUTPUT: 728 OUTPUT:
700 RETVAL 729 RETVAL
701 730
702void 731void
703DESTROY (CFClient::Layout self) 732DESTROY (CFClient::Layout self)
704 CODE: 733 CODE:
705 g_object_unref (self->pl); 734 g_object_unref (self->pl);
706 Safefree (self); 735 Safefree (self);
707 736
737int
738is_rgba (CFClient::Layout self)
739 CODE:
740 RETVAL = self->rgba;
741 OUTPUT:
742 RETVAL
743
708void 744void
709set_text (CFClient::Layout self, SV *text_) 745set_text (CFClient::Layout self, SV *text_)
710 CODE: 746 CODE:
711{ 747{
712 STRLEN textlen; 748 STRLEN textlen;
… …
730 CODE: 766 CODE:
731 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 767 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
732 SvUTF8_on (RETVAL); 768 SvUTF8_on (RETVAL);
733 OUTPUT: 769 OUTPUT:
734 RETVAL 770 RETVAL
771
772void
773set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
774 CODE:
775 self->r = r;
776 self->g = g;
777 self->b = b;
778 self->a = a;
735 779
736void 780void
737set_font (CFClient::Layout self, CFClient::Font font = 0) 781set_font (CFClient::Layout self, CFClient::Font font = 0)
738 CODE: 782 CODE:
739 if (self->font != font) 783 if (self->font != font)
… …
797render (CFClient::Layout self) 841render (CFClient::Layout self)
798 PPCODE: 842 PPCODE:
799{ 843{
800 SV *retval; 844 SV *retval;
801 int w, h; 845 int w, h;
802 FT_Bitmap bitmap;
803 846
804 layout_get_pixel_size (self, &w, &h); 847 layout_get_pixel_size (self, &w, &h);
805 848
849 if (self->rgba)
850 {
851 cairo_surface_t *surface;
852 cairo_t *cairo;
853
854 retval = newSV (w * h * 4);
855 SvPOK_only (retval);
856 SvCUR_set (retval, w * h * 4);
857
858 memset (SvPVX (retval), 0, w * h * 4);
859
860 surface = cairo_image_surface_create_for_data (
861 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
862 cairo = cairo_create (surface);
863 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
864
865 pango_cairo_show_layout (cairo, self->pl);
866
867 cairo_destroy (cairo);
868 cairo_surface_destroy (surface);
869
870 // what a mess, and its premultiplied, too :(
871 {
872 uint32_t *p = (uint32_t *)SvPVX (retval);
873 uint32_t *e = p + w * h;
874
875 while (p < e)
876 {
877 uint32_t rgba = *p;
878 rgba = (rgba >> 24) | (rgba << 8);
879 rgba = SDL_SwapBE32 (rgba);
880 *p++ = rgba;
881 }
882 }
883
884 EXTEND (SP, 5);
885 PUSHs (sv_2mortal (newSViv (w)));
886 PUSHs (sv_2mortal (newSViv (h)));
887 PUSHs (sv_2mortal (retval));
888 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
889 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
890 }
891 else
892 {
893 FT_Bitmap bitmap;
894
806 retval = newSV (w * h); 895 retval = newSV (w * h);
807 SvPOK_only (retval); 896 SvPOK_only (retval);
808 SvCUR_set (retval, w * h); 897 SvCUR_set (retval, w * h);
809 898
810 bitmap.rows = h; 899 bitmap.rows = h;
811 bitmap.width = w; 900 bitmap.width = w;
812 bitmap.pitch = w; 901 bitmap.pitch = w;
813 bitmap.buffer = (unsigned char*)SvPVX (retval); 902 bitmap.buffer = (unsigned char*)SvPVX (retval);
814 bitmap.num_grays = 256; 903 bitmap.num_grays = 256;
815 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 904 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
816 905
817 memset (bitmap.buffer, 0, w * h); 906 memset (bitmap.buffer, 0, w * h);
818 907
819 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 908 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
820 909
821 EXTEND (SP, 3); 910 EXTEND (SP, 5);
822 PUSHs (sv_2mortal (newSViv (w))); 911 PUSHs (sv_2mortal (newSViv (w)));
823 PUSHs (sv_2mortal (newSViv (h))); 912 PUSHs (sv_2mortal (newSViv (h)));
824 PUSHs (sv_2mortal (retval)); 913 PUSHs (sv_2mortal (retval));
914 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
915 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
916 }
825} 917}
826 918
827MODULE = CFClient PACKAGE = CFClient::Texture 919MODULE = CFClient PACKAGE = CFClient::Texture
828 920
829void 921void
830draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 922draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
831 PROTOTYPE: $$$;$$ 923 PROTOTYPE: $$$;$$
924 ALIAS:
925 draw_quad_alpha = 1
926 draw_quad_alpha_premultiplied = 2
832 CODE: 927 CODE:
833{ 928{
834 HV *hv = (HV *)SvRV (self); 929 HV *hv = (HV *)SvRV (self);
835 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 930 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
836 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 931 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
… …
841 { 936 {
842 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 937 w = SvNV (*hv_fetch (hv, "w", 1, 1));
843 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 938 h = SvNV (*hv_fetch (hv, "h", 1, 1));
844 } 939 }
845 940
941 if (ix)
942 {
943 glEnable (GL_BLEND);
944 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
945 }
946
846 glBindTexture (GL_TEXTURE_2D, name); 947 glBindTexture (GL_TEXTURE_2D, name);
948
847 if (wrap_mode) { 949 if (wrap_mode)
950 {
848 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
849 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 952 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
850 } 953 }
954
851 glBegin (GL_QUADS); 955 glBegin (GL_QUADS);
852 glTexCoord2f (0, 0); glVertex2f (x , y ); 956 glTexCoord2f (0, 0); glVertex2f (x , y );
853 glTexCoord2f (0, t); glVertex2f (x , y + h); 957 glTexCoord2f (0, t); glVertex2f (x , y + h);
854 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 958 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
855 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 959 glTexCoord2f (s, 0); glVertex2f (x + w, y );
856 glEnd (); 960 glEnd ();
961
962 if (ix)
963 glDisable (GL_BLEND);
857} 964}
858 965
859MODULE = CFClient PACKAGE = CFClient::Map 966MODULE = CFClient PACKAGE = CFClient::Map
860 967
861CFClient::Map 968CFClient::Map
… …
1384 const_iv (GL_ONE_MINUS_DST_ALPHA), 1491 const_iv (GL_ONE_MINUS_DST_ALPHA),
1385 const_iv (GL_RGB), 1492 const_iv (GL_RGB),
1386 const_iv (GL_RGBA), 1493 const_iv (GL_RGBA),
1387 const_iv (GL_UNSIGNED_BYTE), 1494 const_iv (GL_UNSIGNED_BYTE),
1388 const_iv (GL_ALPHA), 1495 const_iv (GL_ALPHA),
1496 const_iv (GL_LUMINANCE),
1389 const_iv (GL_FLOAT), 1497 const_iv (GL_FLOAT),
1390 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1498 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1391 const_iv (GL_COMPILE), 1499 const_iv (GL_COMPILE),
1392 const_iv (GL_TEXTURE_1D), 1500 const_iv (GL_TEXTURE_1D),
1393 const_iv (GL_TEXTURE_2D), 1501 const_iv (GL_TEXTURE_2D),
… …
1482void glEnd () 1590void glEnd ()
1483 1591
1484void glColor (float r, float g, float b, float a = 1.0) 1592void glColor (float r, float g, float b, float a = 1.0)
1485 PROTOTYPE: @ 1593 PROTOTYPE: @
1486 CODE: 1594 CODE:
1487 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1595 glColor4ub (MIN ((int)(r * 255.f), 255),
1596 MIN ((int)(g * 255.f), 255),
1597 MIN ((int)(b * 255.f), 255),
1598 MIN ((int)(a * 255.f), 255));
1488 1599
1489void glVertex (float x, float y, float z = 0.) 1600void glVertex (float x, float y, float z = 0.)
1490 CODE: 1601 CODE:
1491 glVertex3f (x, y, z); 1602 glVertex3f (x, y, z);
1492 1603

Diff Legend

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