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.60 by root, Sun Apr 23 04:47:02 2006 UTC vs.
Revision 1.87 by root, Fri May 19 18:39:06 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>
40#define FOW_DARKNESS 32 46#define FOW_DARKNESS 32
41 47
42#define MAP_EXTEND_X 32 48#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 49#define MAP_EXTEND_Y 512
44 50
45#define MIN_FONT_HEIGHT 8 * PANGO_SCALE 51#define MIN_FONT_HEIGHT 10
52
53#define GL_CALL(type,func,args) \
54 { \
55 static int init_; \
56 static type fptr_; \
57 \
58 if (!init_) \
59 { \
60 init_ = 1; \
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62 } \
63 \
64 if (fptr_) \
65 fptr_ args; \
66 }
46 67
47typedef Mix_Chunk *CFClient__MixChunk; 68typedef Mix_Chunk *CFClient__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 69typedef Mix_Music *CFClient__MixMusic;
49 70
50static PangoContext *context; 71typedef PangoFontDescription *CFClient__Font;
51static PangoFontMap *fontmap;
52 72
53typedef struct cf_layout { 73typedef struct cf_layout {
54 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
55 int base_height; 77 int base_height;
78 CFClient__Font font;
56} *CFClient__Layout; 79} *CFClient__Layout;
80
81static CFClient__Font default_font;
82static PangoContext *ft2_context, *cairo_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap;
57 84
58static void 85static void
59substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
60{ 87{
61 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
62 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
63} 94}
64 95
65static void 96static void
66layout_update (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
67{ 98{
68 /* use a random scale factor to account for unknown descenders, 0.8 works 99 /* use a random scale factor to account for unknown descenders, 0.8 works
69 * reasonably well with bitstream vera 100 * reasonably well with bitstream vera
70 */ 101 */
71 PangoFontDescription *font = (PangoFontDescription *) 102 PangoFontDescription *font = self->font ? self->font : default_font;
72 pango_layout_get_font_description (self->pl);
73 103
74 int height = self->base_height * (PANGO_SCALE * 8 / 10);
75
76 if (height < MIN_FONT_HEIGHT)
77 height = MIN_FONT_HEIGHT;
78
79 if (pango_font_description_get_size (font) != height)
80 {
81 font = pango_font_description_copy (font);
82 pango_font_description_set_absolute_size (font, height); 104 pango_font_description_set_absolute_size (font,
105 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
106
83 pango_layout_set_font_description (self->pl, font); 107 pango_layout_set_font_description (self->pl, font);
84 }
85} 108}
86 109
87static void 110static void
88layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 111layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
89{ 112{
90 layout_update (self);
91
92 pango_layout_get_pixel_size (self->pl, w, h); 113 pango_layout_get_pixel_size (self->pl, w, h);
93 114
94 *w = (*w + 3) & ~3;
95 if (!*w) *w = 1; 115 if (!*w) *w = 1;
96 if (!*h) *h = 1; 116 if (!*h) *h = 1;
117
118 *w = (*w + 3) & ~3;
97} 119}
98 120
99typedef uint16_t mapface; 121typedef uint16_t mapface;
100 122
101typedef struct { 123typedef struct {
249 } 271 }
250 } 272 }
251} 273}
252 274
253static void 275static void
254music_finished () 276music_finished (void)
255{ 277{
256 SDL_UserEvent ev; 278 SDL_UserEvent ev;
257 279
258 ev.type = SDL_USEREVENT; 280 ev.type = SDL_USEREVENT;
259 ev.code = 0; 281 ev.code = 0;
260 ev.data1 = 0; 282 ev.data1 = 0;
283 ev.data2 = 0;
284
285 SDL_PushEvent ((SDL_Event *)&ev);
286}
287
288static void
289channel_finished (int channel)
290{
291 SDL_UserEvent ev;
292
293 ev.type = SDL_USEREVENT;
294 ev.code = 1;
295 ev.data1 = (void *)(long)channel;
261 ev.data2 = 0; 296 ev.data2 = 0;
262 297
263 SDL_PushEvent ((SDL_Event *)&ev); 298 SDL_PushEvent ((SDL_Event *)&ev);
264} 299}
265 300
376# undef const_iv 411# undef const_iv
377 }; 412 };
378 413
379 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
380 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416}
381 417
418void
419pango_init ()
420 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
382 fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
383 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
384 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap); 425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426
427 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
385} 429}
386 430
387int 431int
388SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
389 433
397 SDL_Rect **m; 441 SDL_Rect **m;
398 442
399 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
400 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
401 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
402 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);
447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
403 450
404 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
405 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
406 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
407 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
408 455
409 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
410 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
411 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
412 457
413 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
414 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
415 460
416 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
448 493
449 while (SDL_PollEvent (&ev)) 494 while (SDL_PollEvent (&ev))
450 { 495 {
451 HV *hv = newHV (); 496 HV *hv = newHV ();
452 hv_store (hv, "type", 4, newSViv (ev.type), 0); 497 hv_store (hv, "type", 4, newSViv (ev.type), 0);
498
453 switch (ev.type) 499 switch (ev.type)
454 { 500 {
455 case SDL_KEYDOWN: 501 case SDL_KEYDOWN:
456 case SDL_KEYUP: 502 case SDL_KEYUP:
457 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 503 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
477 case SDL_MOUSEBUTTONUP: 523 case SDL_MOUSEBUTTONUP:
478 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
479 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
480 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
481 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break;
529
530 case SDL_USEREVENT:
531 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
532 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534 break;
482 } 535 }
483 536
484 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 537 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
485 } 538 }
486} 539}
487 540
488int 541int
489Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 542Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
490 POSTCALL: 543 POSTCALL:
491 Mix_HookMusicFinished (music_finished); 544 Mix_HookMusicFinished (music_finished);
545 Mix_ChannelFinished (channel_finished);
492 546
493void 547void
494Mix_CloseAudio () 548Mix_CloseAudio ()
495 549
496int 550int
519 573
520void 574void
521add_font (char *file) 575add_font (char *file)
522 CODE: 576 CODE:
523 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
524 578#ifdef _WIN32
525void 579 // cairo... sigh... requires win2000
526set_font (char *file) 580 AddFontResourceEx (file, FR_PRIVATE, 0);
527 CODE: 581#endif
528{
529 int count;
530 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
531 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
532 FcPatternDestroy (pattern);
533 pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
534 pango_context_set_font_description (context, font);
535}
536 582
537void 583void
538load_image_inline (SV *image_) 584load_image_inline (SV *image_)
539 ALIAS: 585 ALIAS:
540 load_image_file = 1 586 load_image_file = 1
622 PUSHs (sv_2mortal (newSViv (b / y))); 668 PUSHs (sv_2mortal (newSViv (b / y)));
623 PUSHs (sv_2mortal (newSViv (a / y))); 669 PUSHs (sv_2mortal (newSViv (a / y)));
624} 670}
625 671
626void 672void
673error (char *message)
674 CODE:
675 fprintf (stderr, "ERROR: %s\n", message);
676#ifdef _WIN32
677 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
678#endif
679
680void
627fatal (char *message) 681fatal (char *message)
628 CODE: 682 CODE:
683 fprintf (stderr, "FATAL: %s\n", message);
629#ifdef _WIN32 684#ifdef _WIN32
630 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
631#else
632 fprintf (stderr, "FATAL: %s\n", message);
633#endif 686#endif
634 exit (1); 687 exit (1);
635 688
689MODULE = CFClient PACKAGE = CFClient::Font
690
691CFClient::Font
692new_from_file (SV *class, char *path, int id = 0)
693 CODE:
694{
695 int count;
696 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
697 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
698 FcPatternDestroy (pattern);
699}
700 OUTPUT:
701 RETVAL
702
703void
704DESTROY (CFClient::Font self)
705 CODE:
706 pango_font_description_free (self);
707
708void
709make_default (CFClient::Font self)
710 CODE:
711 default_font = self;
712
636MODULE = CFClient PACKAGE = CFClient::Layout 713MODULE = CFClient PACKAGE = CFClient::Layout
637 714
638CFClient::Layout 715CFClient::Layout
639new (SV *class, int base_height = 10) 716new (SV *class, int rgba = 0)
640 CODE: 717 CODE:
718#if _WIN32
719 rgba = 0;//D
720#endif
641 New (0, RETVAL, 1, struct cf_layout); 721 New (0, RETVAL, 1, struct cf_layout);
642 RETVAL->base_height = base_height; 722
643 RETVAL->pl = pango_layout_new (context); 723 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
724 RETVAL->rgba = rgba;
725 RETVAL->r = 1.;
726 RETVAL->g = 1.;
727 RETVAL->b = 1.;
728 RETVAL->a = 1.;
729 RETVAL->base_height = MIN_FONT_HEIGHT;
730 RETVAL->font = 0;
731
644 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 732 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
645 pango_layout_set_font_description (RETVAL->pl, 733 layout_update_font (RETVAL);
646 pango_font_description_copy (
647 pango_context_get_font_description (context)));
648 OUTPUT: 734 OUTPUT:
649 RETVAL 735 RETVAL
650 736
651void 737void
652DESTROY (CFClient::Layout self) 738DESTROY (CFClient::Layout self)
653 CODE: 739 CODE:
654 g_object_unref (self->pl); 740 g_object_unref (self->pl);
655 Safefree (self); 741 Safefree (self);
656 742
743int
744is_rgba (CFClient::Layout self)
745 CODE:
746 RETVAL = self->rgba;
747 OUTPUT:
748 RETVAL
749
657void 750void
658set_text (CFClient::Layout self, SV *text_) 751set_text (CFClient::Layout self, SV *text_)
659 CODE: 752 CODE:
660{ 753{
661 STRLEN textlen; 754 STRLEN textlen;
681 SvUTF8_on (RETVAL); 774 SvUTF8_on (RETVAL);
682 OUTPUT: 775 OUTPUT:
683 RETVAL 776 RETVAL
684 777
685void 778void
779set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
780 CODE:
781 self->r = r;
782 self->g = g;
783 self->b = b;
784 self->a = a;
785
786void
787set_font (CFClient::Layout self, CFClient::Font font = 0)
788 CODE:
789 if (self->font != font)
790 {
791 self->font = font;
792 layout_update_font (self);
793 }
794
795void
686set_height (CFClient::Layout self, int base_height) 796set_height (CFClient::Layout self, int base_height)
687 CODE: 797 CODE:
798 if (self->base_height != base_height)
799 {
688 self->base_height = base_height; 800 self->base_height = base_height;
801 layout_update_font (self);
802 }
689 803
690void 804void
691set_width (CFClient::Layout self, int max_width = -1) 805set_width (CFClient::Layout self, int max_width = -1)
692 CODE: 806 CODE:
693 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 807 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
808
809void
810set_indent (CFClient::Layout self, int indent)
811 CODE:
812 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
813
814void
815set_spacing (CFClient::Layout self, int spacing)
816 CODE:
817 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
818
819void
820set_ellipsise (CFClient::Layout self, int ellipsise)
821 CODE:
822 pango_layout_set_ellipsize (self->pl,
823 ellipsise == 1 ? PANGO_ELLIPSIZE_START
824 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
825 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
826 : PANGO_ELLIPSIZE_NONE
827 );
828
829void
830set_single_paragraph_mode (CFClient::Layout self, int spm)
831 CODE:
832 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
694 833
695void 834void
696size (CFClient::Layout self) 835size (CFClient::Layout self)
697 PPCODE: 836 PPCODE:
698{ 837{
699 int w, h; 838 int w, h;
700 839
701 layout_update (self);
702 layout_get_pixel_size (self, &w, &h); 840 layout_get_pixel_size (self, &w, &h);
703 841
704 EXTEND (SP, 2); 842 EXTEND (SP, 2);
705 PUSHs (sv_2mortal (newSViv (w))); 843 PUSHs (sv_2mortal (newSViv (w)));
706 PUSHs (sv_2mortal (newSViv (h))); 844 PUSHs (sv_2mortal (newSViv (h)));
709int 847int
710xy_to_index (CFClient::Layout self, int x, int y) 848xy_to_index (CFClient::Layout self, int x, int y)
711 CODE: 849 CODE:
712{ 850{
713 int index, trailing; 851 int index, trailing;
714
715 layout_update (self);
716 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 852 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
717
718 RETVAL = index; 853 RETVAL = index;
719} 854}
720 OUTPUT: 855 OUTPUT:
721 RETVAL 856 RETVAL
722 857
723void 858void
724cursor_pos (CFClient::Layout self, int index) 859cursor_pos (CFClient::Layout self, int index)
725 PPCODE: 860 PPCODE:
726{ 861{
727 PangoRectangle strong_pos; 862 PangoRectangle strong_pos;
728 layout_update (self);
729 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 863 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
730 864
731 EXTEND (SP, 3); 865 EXTEND (SP, 3);
732 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 866 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
733 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 867 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
738render (CFClient::Layout self) 872render (CFClient::Layout self)
739 PPCODE: 873 PPCODE:
740{ 874{
741 SV *retval; 875 SV *retval;
742 int w, h; 876 int w, h;
743 FT_Bitmap bitmap;
744 877
745 layout_update (self);
746 layout_get_pixel_size (self, &w, &h); 878 layout_get_pixel_size (self, &w, &h);
747 879
880 if (self->rgba)
881 {
882 cairo_surface_t *surface;
883 cairo_t *cairo;
884
885 retval = newSV (w * h * 4);
886 SvPOK_only (retval);
887 SvCUR_set (retval, w * h * 4);
888
889 memset (SvPVX (retval), 0, w * h * 4);
890
891 surface = cairo_image_surface_create_for_data (
892 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
893 cairo = cairo_create (surface);
894 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
895
896 pango_cairo_show_layout (cairo, self->pl);
897
898 cairo_destroy (cairo);
899 cairo_surface_destroy (surface);
900
901 // what a mess, and its premultiplied, too :(
902 {
903 uint32_t *p = (uint32_t *)SvPVX (retval);
904 uint32_t *e = p + w * h;
905
906 while (p < e)
907 {
908 uint32_t rgba = *p;
909 rgba = (rgba >> 24) | (rgba << 8);
910#if 0
911#ifdef _WIN32
912 {//D
913 uint8_t r = rgba >> 24;
914 uint8_t g = rgba >> 16;
915 uint8_t b = rgba >> 8;
916 uint8_t a = rgba >> 0;
917
918 rgba = (rgba & 0xffffff00) | a;
919 }
920#endif
921#endif
922 rgba = SDL_SwapBE32 (rgba);
923 *p++ = rgba;
924 }
925 }
926
927 EXTEND (SP, 5);
928 PUSHs (sv_2mortal (newSViv (w)));
929 PUSHs (sv_2mortal (newSViv (h)));
930 PUSHs (sv_2mortal (retval));
931 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
932 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
933 }
934 else
935 {
936 FT_Bitmap bitmap;
937
748 retval = newSV (w * h); 938 retval = newSV (w * h);
749 SvPOK_only (retval); 939 SvPOK_only (retval);
750 SvCUR_set (retval, w * h); 940 SvCUR_set (retval, w * h);
751 941
752 bitmap.rows = h; 942 bitmap.rows = h;
753 bitmap.width = w; 943 bitmap.width = w;
754 bitmap.pitch = w; 944 bitmap.pitch = w;
755 bitmap.buffer = (unsigned char*)SvPVX (retval); 945 bitmap.buffer = (unsigned char*)SvPVX (retval);
756 bitmap.num_grays = 256; 946 bitmap.num_grays = 256;
757 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 947 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
758 948
759 memset (bitmap.buffer, 0, w * h); 949 memset (bitmap.buffer, 0, w * h);
760 950
761 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 951 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
762 952
763 EXTEND (SP, 3); 953 EXTEND (SP, 5);
764 PUSHs (sv_2mortal (newSViv (w))); 954 PUSHs (sv_2mortal (newSViv (w)));
765 PUSHs (sv_2mortal (newSViv (h))); 955 PUSHs (sv_2mortal (newSViv (h)));
766 PUSHs (sv_2mortal (retval)); 956 PUSHs (sv_2mortal (retval));
957 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
958 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
959 }
767} 960}
768 961
769MODULE = CFClient PACKAGE = CFClient::Texture 962MODULE = CFClient PACKAGE = CFClient::Texture
770 963
771void 964void
772draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 965draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
773 PROTOTYPE: $$$;$$ 966 PROTOTYPE: $$$;$$
967 ALIAS:
968 draw_quad_alpha = 1
969 draw_quad_alpha_premultiplied = 2
774 CODE: 970 CODE:
775{ 971{
776 HV *hv = (HV *)SvRV (self); 972 HV *hv = (HV *)SvRV (self);
777 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 973 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
778 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 974 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
783 { 979 {
784 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 980 w = SvNV (*hv_fetch (hv, "w", 1, 1));
785 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 981 h = SvNV (*hv_fetch (hv, "h", 1, 1));
786 } 982 }
787 983
984 if (ix)
985 {
986 glEnable (GL_BLEND);
987 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
988 glEnable (GL_ALPHA_TEST);
989 glAlphaFunc (GL_GREATER, 0.01f);
990 }
991
788 glBindTexture (GL_TEXTURE_2D, name); 992 glBindTexture (GL_TEXTURE_2D, name);
993
789 if (wrap_mode) { 994 if (wrap_mode)
995 {
790 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 996 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
791 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 997 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
792 } 998 }
999
793 glBegin (GL_QUADS); 1000 glBegin (GL_QUADS);
794 glTexCoord2f (0, 0); glVertex2f (x , y ); 1001 glTexCoord2f (0, 0); glVertex2f (x , y );
795 glTexCoord2f (0, t); glVertex2f (x , y + h); 1002 glTexCoord2f (0, t); glVertex2f (x , y + h);
796 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1003 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
797 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1004 glTexCoord2f (s, 0); glVertex2f (x + w, y );
798 glEnd (); 1005 glEnd ();
1006
1007 if (ix)
1008 {
1009 glDisable (GL_ALPHA_TEST);
1010 glDisable (GL_BLEND);
1011 }
799} 1012}
800 1013
801MODULE = CFClient PACKAGE = CFClient::Map 1014MODULE = CFClient PACKAGE = CFClient::Map
802 1015
803CFClient::Map 1016CFClient::Map
1312 } *civ, const_iv[] = { 1525 } *civ, const_iv[] = {
1313# define const_iv(name) { # name, (IV)name } 1526# define const_iv(name) { # name, (IV)name }
1314 const_iv (GL_COLOR_MATERIAL), 1527 const_iv (GL_COLOR_MATERIAL),
1315 const_iv (GL_SMOOTH), 1528 const_iv (GL_SMOOTH),
1316 const_iv (GL_FLAT), 1529 const_iv (GL_FLAT),
1530 const_iv (GL_DITHER),
1317 const_iv (GL_BLEND), 1531 const_iv (GL_BLEND),
1532 const_iv (GL_SCISSOR_TEST),
1318 const_iv (GL_AND), 1533 const_iv (GL_AND),
1534 const_iv (GL_ONE),
1535 const_iv (GL_ZERO),
1319 const_iv (GL_SRC_ALPHA), 1536 const_iv (GL_SRC_ALPHA),
1537 const_iv (GL_SRC_ALPHA_SATURATE),
1320 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1538 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539 const_iv (GL_ONE_MINUS_DST_ALPHA),
1321 const_iv (GL_RGB), 1540 const_iv (GL_RGB),
1322 const_iv (GL_RGBA), 1541 const_iv (GL_RGBA),
1323 const_iv (GL_UNSIGNED_BYTE), 1542 const_iv (GL_UNSIGNED_BYTE),
1324 const_iv (GL_ALPHA4),
1325 const_iv (GL_ALPHA), 1543 const_iv (GL_ALPHA),
1544 const_iv (GL_INTENSITY),
1545 const_iv (GL_LUMINANCE),
1546 const_iv (GL_LUMINANCE_ALPHA),
1326 const_iv (GL_FLOAT), 1547 const_iv (GL_FLOAT),
1327 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1548 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1328 const_iv (GL_COMPILE), 1549 const_iv (GL_COMPILE),
1329 const_iv (GL_TEXTURE_1D), 1550 const_iv (GL_TEXTURE_1D),
1330 const_iv (GL_TEXTURE_2D), 1551 const_iv (GL_TEXTURE_2D),
1341 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1562 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1342 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1563 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1343 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1564 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1344 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1565 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1345 const_iv (GL_GENERATE_MIPMAP), 1566 const_iv (GL_GENERATE_MIPMAP),
1346 const_iv (GL_LINEAR),
1347 const_iv (GL_MODULATE), 1567 const_iv (GL_MODULATE),
1568 const_iv (GL_DECAL),
1348 const_iv (GL_REPLACE), 1569 const_iv (GL_REPLACE),
1349 const_iv (GL_COLOR_BUFFER_BIT), 1570 const_iv (GL_COLOR_BUFFER_BIT),
1350 const_iv (GL_PROJECTION), 1571 const_iv (GL_PROJECTION),
1351 const_iv (GL_MODELVIEW), 1572 const_iv (GL_MODELVIEW),
1352 const_iv (GL_COLOR_LOGIC_OP), 1573 const_iv (GL_COLOR_LOGIC_OP),
1574 const_iv (GL_SEPARABLE_2D),
1353 const_iv (GL_CONVOLUTION_2D), 1575 const_iv (GL_CONVOLUTION_2D),
1354 const_iv (GL_CONVOLUTION_BORDER_MODE), 1576 const_iv (GL_CONVOLUTION_BORDER_MODE),
1355 const_iv (GL_CONSTANT_BORDER), 1577 const_iv (GL_CONSTANT_BORDER),
1356 const_iv (GL_LINES), 1578 const_iv (GL_LINES),
1357 const_iv (GL_QUADS), 1579 const_iv (GL_QUADS),
1382 1604
1383void glBlendFunc (int sfactor, int dfactor) 1605void glBlendFunc (int sfactor, int dfactor)
1384 1606
1385void glLogicOp (int opcode) 1607void glLogicOp (int opcode)
1386 1608
1609void glColorMask (int red, int green, int blue, int alpha)
1610
1387void glMatrixMode (int mode) 1611void glMatrixMode (int mode)
1388 1612
1389void glPushMatrix () 1613void glPushMatrix ()
1390 1614
1391void glPopMatrix () 1615void glPopMatrix ()
1392 1616
1393void glLoadIdentity () 1617void glLoadIdentity ()
1394 1618
1619# near and far are due to microsofts buggy c compiler
1395void glOrtho (double left, double right, double bottom, double top, double near, double far) 1620void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1396 1621
1397void glViewport (int x, int y, int width, int height) 1622void glViewport (int x, int y, int width, int height)
1623
1624void glScissor (int x, int y, int width, int height)
1398 1625
1399void glTranslate (float x, float y, float z = 0.) 1626void glTranslate (float x, float y, float z = 0.)
1400 CODE: 1627 CODE:
1401 glTranslatef (x, y, z); 1628 glTranslatef (x, y, z);
1402 1629
1403void glScale (float x, float y, float z) 1630void glScale (float x, float y, float z = 1.)
1404 CODE: 1631 CODE:
1405 glScalef (x, y, z); 1632 glScalef (x, y, z);
1406 1633
1407void glRotate (float angle, float x, float y, float z) 1634void glRotate (float angle, float x, float y, float z)
1408 CODE: 1635 CODE:
1413void glEnd () 1640void glEnd ()
1414 1641
1415void glColor (float r, float g, float b, float a = 1.0) 1642void glColor (float r, float g, float b, float a = 1.0)
1416 PROTOTYPE: @ 1643 PROTOTYPE: @
1417 CODE: 1644 CODE:
1418 glColor4f (r, g, b, a); 1645 glColor4ub (MIN ((int)(r * 255.f), 255),
1646 MIN ((int)(g * 255.f), 255),
1647 MIN ((int)(b * 255.f), 255),
1648 MIN ((int)(a * 255.f), 255));
1419 1649
1420void glVertex (float x, float y, float z = 0.) 1650void glVertex (float x, float y, float z = 0.)
1421 CODE: 1651 CODE:
1422 glVertex3f (x, y, z); 1652 glVertex3f (x, y, z);
1423 1653
1435 1665
1436void glBindTexture (int target, int name) 1666void glBindTexture (int target, int name)
1437 1667
1438void glConvolutionParameter (int target, int pname, float params) 1668void glConvolutionParameter (int target, int pname, float params)
1439 CODE: 1669 CODE:
1440 glConvolutionParameterf (target, pname, params); 1670 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1441 1671
1442void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1672void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1673 CODE:
1674 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1675 (target, internalformat, width, height, format, type, data));
1676
1677void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1678 CODE:
1679 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1680 (target, internalformat, width, height, format, type, row, column));
1443 1681
1444void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1682void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1445 1683
1446void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1684void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1685
1686void glRasterPos (int x, int y)
1687 CODE:
1688 glRasterPos2i (x, y);
1689
1690void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1447 1691
1448int glGenTexture () 1692int glGenTexture ()
1449 CODE: 1693 CODE:
1450{ 1694{
1451 GLuint name; 1695 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines