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.54 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.86 by root, Fri May 19 16:43:56 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>
33 typedef signed char int8_t; 39 typedef signed char int8_t;
34 typedef signed short int16_t; 40 typedef signed short int16_t;
35 typedef signed int int32_t; 41 typedef signed int int32_t;
36#endif 42#endif
37 43
44#include "glext.h"
45
38#define FOW_DARKNESS 32 46#define FOW_DARKNESS 32
39 47
40#define MAP_EXTEND_X 32 48#define MAP_EXTEND_X 32
41#define MAP_EXTEND_Y 512 49#define MAP_EXTEND_Y 512
42 50
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 }
67
43typedef Mix_Chunk *CFClient__MixChunk; 68typedef Mix_Chunk *CFClient__MixChunk;
44typedef Mix_Music *CFClient__MixMusic; 69typedef Mix_Music *CFClient__MixMusic;
45 70
46static PangoContext *context; 71typedef PangoFontDescription *CFClient__Font;
47static PangoFontMap *fontmap;
48 72
49typedef struct cf_layout { 73typedef struct cf_layout {
50 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
51 int base_height; 77 int base_height;
78 CFClient__Font font;
52} *CFClient__Layout; 79} *CFClient__Layout;
80
81static CFClient__Font default_font;
82static PangoContext *ft2_context, *cairo_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap;
53 84
54static void 85static void
55substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
56{ 87{
57 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
58 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
59} 94}
60 95
61static void 96static void
62layout_update (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
63{ 98{
64 /* 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
65 * reasonably well with bitstream vera 100 * reasonably well with bitstream vera
66 */ 101 */
67 PangoFontDescription *font = pango_context_get_font_description (context); 102 PangoFontDescription *font = self->font ? self->font : default_font;
68 103
69 int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71 if (pango_font_description_get_size (font) != height)
72 {
73 pango_font_description_set_absolute_size (font, height); 104 pango_font_description_set_absolute_size (font,
74 pango_layout_context_changed (self->pl); 105 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75 } 106
107 pango_layout_set_font_description (self->pl, font);
76} 108}
77 109
78static void 110static void
79layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 111layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
80{ 112{
81 layout_update (self);
82
83 pango_layout_get_pixel_size (self->pl, w, h); 113 pango_layout_get_pixel_size (self->pl, w, h);
84 114
85 *w = (*w + 3) & ~3;
86 if (!*w) *w = 1; 115 if (!*w) *w = 1;
87 if (!*h) *h = 1; 116 if (!*h) *h = 1;
117
118 *w = (*w + 3) & ~3;
88} 119}
89 120
90typedef uint16_t mapface; 121typedef uint16_t mapface;
91 122
92typedef struct { 123typedef struct {
237 break; 268 break;
238 269
239 row->col[x - row->c0].darkness = -1; 270 row->col[x - row->c0].darkness = -1;
240 } 271 }
241 } 272 }
273}
274
275static void
276music_finished (void)
277{
278 SDL_UserEvent ev;
279
280 ev.type = SDL_USEREVENT;
281 ev.code = 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;
296 ev.data2 = 0;
297
298 SDL_PushEvent ((SDL_Event *)&ev);
242} 299}
243 300
244MODULE = CFClient PACKAGE = CFClient 301MODULE = CFClient PACKAGE = CFClient
245 302
246PROTOTYPES: ENABLE 303PROTOTYPES: ENABLE
354# undef const_iv 411# undef const_iv
355 }; 412 };
356 413
357 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; )
358 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416}
359 417
418void
419pango_init ()
420 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
360 fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
361 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);
362 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);
363} 429}
364 430
365int 431int
366SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
367 433
375 SDL_Rect **m; 441 SDL_Rect **m;
376 442
377 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
378 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
379 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
380 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);
381 450
382 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
383 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
384 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
385 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
386 455
387 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
388 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
389 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
390 457
391 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
392 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
393 460
394 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
426 493
427 while (SDL_PollEvent (&ev)) 494 while (SDL_PollEvent (&ev))
428 { 495 {
429 HV *hv = newHV (); 496 HV *hv = newHV ();
430 hv_store (hv, "type", 4, newSViv (ev.type), 0); 497 hv_store (hv, "type", 4, newSViv (ev.type), 0);
498
431 switch (ev.type) 499 switch (ev.type)
432 { 500 {
433 case SDL_KEYDOWN: 501 case SDL_KEYDOWN:
434 case SDL_KEYUP: 502 case SDL_KEYUP:
435 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 503 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
455 case SDL_MOUSEBUTTONUP: 523 case SDL_MOUSEBUTTONUP:
456 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459 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;
460 } 535 }
461 536
462 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 537 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
463 } 538 }
464} 539}
465 540
466int 541int
467Mix_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)
543 POSTCALL:
544 Mix_HookMusicFinished (music_finished);
545 Mix_ChannelFinished (channel_finished);
468 546
469void 547void
470Mix_CloseAudio () 548Mix_CloseAudio ()
471 549
472int 550int
495 573
496void 574void
497add_font (char *file) 575add_font (char *file)
498 CODE: 576 CODE:
499 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
500 578#ifdef _WIN32
501void 579 // cairo... sigh... requires win2000
502set_font (char *file) 580 AddFontResourceEx (file, FR_PRIVATE, 0);
503 CODE: 581#endif
504{
505 int count;
506 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
507 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
508 FcPatternDestroy (pattern);
509 pango_context_set_font_description (context, font);
510}
511 582
512void 583void
513load_image_inline (SV *image_) 584load_image_inline (SV *image_)
514 ALIAS: 585 ALIAS:
515 load_image_file = 1 586 load_image_file = 1
597 PUSHs (sv_2mortal (newSViv (b / y))); 668 PUSHs (sv_2mortal (newSViv (b / y)));
598 PUSHs (sv_2mortal (newSViv (a / y))); 669 PUSHs (sv_2mortal (newSViv (a / y)));
599} 670}
600 671
601void 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
602fatal (char *message) 681fatal (char *message)
603 CODE: 682 CODE:
683 fprintf (stderr, "FATAL: %s\n", message);
604#ifdef _WIN32 684#ifdef _WIN32
605 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
606#else
607 fprintf (stderr, "FATAL: %s\n", message);
608#endif 686#endif
609 exit (1); 687 exit (1);
610 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
611MODULE = CFClient PACKAGE = CFClient::Layout 713MODULE = CFClient PACKAGE = CFClient::Layout
612 714
613CFClient::Layout 715CFClient::Layout
614new (SV *class, int base_height = 10) 716new (SV *class, int rgba = 0)
615 CODE: 717 CODE:
616 New (0, RETVAL, 1, struct cf_layout); 718 New (0, RETVAL, 1, struct cf_layout);
617 RETVAL->base_height = base_height; 719
618 RETVAL->pl = pango_layout_new (context); 720 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
721 RETVAL->rgba = rgba;
722 RETVAL->r = 1.;
723 RETVAL->g = 1.;
724 RETVAL->b = 1.;
725 RETVAL->a = 1.;
726 RETVAL->base_height = MIN_FONT_HEIGHT;
727 RETVAL->font = 0;
728
619 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 729 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
730 layout_update_font (RETVAL);
620 OUTPUT: 731 OUTPUT:
621 RETVAL 732 RETVAL
622 733
623void 734void
624DESTROY (CFClient::Layout self) 735DESTROY (CFClient::Layout self)
625 CODE: 736 CODE:
626 g_object_unref (self->pl); 737 g_object_unref (self->pl);
627 Safefree (self); 738 Safefree (self);
628 739
740int
741is_rgba (CFClient::Layout self)
742 CODE:
743 RETVAL = self->rgba;
744 OUTPUT:
745 RETVAL
746
629void 747void
630set_text (CFClient::Layout self, SV *text_) 748set_text (CFClient::Layout self, SV *text_)
631 CODE: 749 CODE:
632{ 750{
633 STRLEN textlen; 751 STRLEN textlen;
653 SvUTF8_on (RETVAL); 771 SvUTF8_on (RETVAL);
654 OUTPUT: 772 OUTPUT:
655 RETVAL 773 RETVAL
656 774
657void 775void
776set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
777 CODE:
778 self->r = r;
779 self->g = g;
780 self->b = b;
781 self->a = a;
782
783void
784set_font (CFClient::Layout self, CFClient::Font font = 0)
785 CODE:
786 if (self->font != font)
787 {
788 self->font = font;
789 layout_update_font (self);
790 }
791
792void
658set_height (CFClient::Layout self, int base_height) 793set_height (CFClient::Layout self, int base_height)
659 CODE: 794 CODE:
795 if (self->base_height != base_height)
796 {
660 self->base_height = base_height; 797 self->base_height = base_height;
798 layout_update_font (self);
799 }
661 800
662void 801void
663set_width (CFClient::Layout self, int max_width = -1) 802set_width (CFClient::Layout self, int max_width = -1)
664 CODE: 803 CODE:
665 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 804 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
805
806void
807set_indent (CFClient::Layout self, int indent)
808 CODE:
809 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
810
811void
812set_spacing (CFClient::Layout self, int spacing)
813 CODE:
814 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
815
816void
817set_ellipsise (CFClient::Layout self, int ellipsise)
818 CODE:
819 pango_layout_set_ellipsize (self->pl,
820 ellipsise == 1 ? PANGO_ELLIPSIZE_START
821 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
822 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
823 : PANGO_ELLIPSIZE_NONE
824 );
825
826void
827set_single_paragraph_mode (CFClient::Layout self, int spm)
828 CODE:
829 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
666 830
667void 831void
668size (CFClient::Layout self) 832size (CFClient::Layout self)
669 PPCODE: 833 PPCODE:
670{ 834{
671 int w, h; 835 int w, h;
672 836
673 layout_update (self);
674 layout_get_pixel_size (self, &w, &h); 837 layout_get_pixel_size (self, &w, &h);
675 838
676 EXTEND (SP, 2); 839 EXTEND (SP, 2);
677 PUSHs (sv_2mortal (newSViv (w))); 840 PUSHs (sv_2mortal (newSViv (w)));
678 PUSHs (sv_2mortal (newSViv (h))); 841 PUSHs (sv_2mortal (newSViv (h)));
681int 844int
682xy_to_index (CFClient::Layout self, int x, int y) 845xy_to_index (CFClient::Layout self, int x, int y)
683 CODE: 846 CODE:
684{ 847{
685 int index, trailing; 848 int index, trailing;
686
687 layout_update (self);
688 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 849 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
689
690 RETVAL = index; 850 RETVAL = index;
691} 851}
692 OUTPUT: 852 OUTPUT:
693 RETVAL 853 RETVAL
694 854
695void 855void
696cursor_pos (CFClient::Layout self, int index) 856cursor_pos (CFClient::Layout self, int index)
697 PPCODE: 857 PPCODE:
698{ 858{
699 PangoRectangle strong_pos; 859 PangoRectangle strong_pos;
700 layout_update (self);
701 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 860 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702 861
703 EXTEND (SP, 3); 862 EXTEND (SP, 3);
704 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 863 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 864 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
710render (CFClient::Layout self) 869render (CFClient::Layout self)
711 PPCODE: 870 PPCODE:
712{ 871{
713 SV *retval; 872 SV *retval;
714 int w, h; 873 int w, h;
715 FT_Bitmap bitmap;
716 874
717 layout_update (self);
718 layout_get_pixel_size (self, &w, &h); 875 layout_get_pixel_size (self, &w, &h);
719 876
877 if (self->rgba)
878 {
879 cairo_surface_t *surface;
880 cairo_t *cairo;
881
882 retval = newSV (w * h * 4);
883 SvPOK_only (retval);
884 SvCUR_set (retval, w * h * 4);
885
886 memset (SvPVX (retval), 0, w * h * 4);
887
888 surface = cairo_image_surface_create_for_data (
889 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
890 cairo = cairo_create (surface);
891 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
892
893 pango_cairo_show_layout (cairo, self->pl);
894
895 cairo_destroy (cairo);
896 cairo_surface_destroy (surface);
897
898 // what a mess, and its premultiplied, too :(
899 {
900 uint32_t *p = (uint32_t *)SvPVX (retval);
901 uint32_t *e = p + w * h;
902
903 while (p < e)
904 {
905 uint32_t rgba = *p;
906 rgba = (rgba >> 24) | (rgba << 8);
907 rgba = SDL_SwapBE32 (rgba);
908 *p++ = rgba;
909 }
910 }
911
912 EXTEND (SP, 5);
913 PUSHs (sv_2mortal (newSViv (w)));
914 PUSHs (sv_2mortal (newSViv (h)));
915 PUSHs (sv_2mortal (retval));
916 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
917 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
918 }
919 else
920 {
921 FT_Bitmap bitmap;
922
720 retval = newSV (w * h); 923 retval = newSV (w * h);
721 SvPOK_only (retval); 924 SvPOK_only (retval);
722 SvCUR_set (retval, w * h); 925 SvCUR_set (retval, w * h);
723 926
724 bitmap.rows = h; 927 bitmap.rows = h;
725 bitmap.width = w; 928 bitmap.width = w;
726 bitmap.pitch = w; 929 bitmap.pitch = w;
727 bitmap.buffer = (unsigned char*)SvPVX (retval); 930 bitmap.buffer = (unsigned char*)SvPVX (retval);
728 bitmap.num_grays = 256; 931 bitmap.num_grays = 256;
729 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 932 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
730 933
731 memset (bitmap.buffer, 0, w * h); 934 memset (bitmap.buffer, 0, w * h);
732 935
733 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 936 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
734 937
735 EXTEND (SP, 3); 938 EXTEND (SP, 5);
736 PUSHs (sv_2mortal (newSViv (w))); 939 PUSHs (sv_2mortal (newSViv (w)));
737 PUSHs (sv_2mortal (newSViv (h))); 940 PUSHs (sv_2mortal (newSViv (h)));
738 PUSHs (sv_2mortal (retval)); 941 PUSHs (sv_2mortal (retval));
942 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
943 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
944 }
739} 945}
740 946
741MODULE = CFClient PACKAGE = CFClient::Texture 947MODULE = CFClient PACKAGE = CFClient::Texture
742 948
743void 949void
744draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 950draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
745 PROTOTYPE: $$$;$$ 951 PROTOTYPE: $$$;$$
952 ALIAS:
953 draw_quad_alpha = 1
954 draw_quad_alpha_premultiplied = 2
746 CODE: 955 CODE:
747{ 956{
748 HV *hv = (HV *)SvRV (self); 957 HV *hv = (HV *)SvRV (self);
749 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 958 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
750 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 959 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
755 { 964 {
756 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 965 w = SvNV (*hv_fetch (hv, "w", 1, 1));
757 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 966 h = SvNV (*hv_fetch (hv, "h", 1, 1));
758 } 967 }
759 968
969 if (ix)
970 {
971 glEnable (GL_BLEND);
972 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
973 glEnable (GL_ALPHA_TEST);
974 glAlphaFunc (GL_GREATER, 0.01f);
975 }
976
760 glBindTexture (GL_TEXTURE_2D, name); 977 glBindTexture (GL_TEXTURE_2D, name);
978
761 if (wrap_mode) { 979 if (wrap_mode)
980 {
762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
763 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 982 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
764 } 983 }
984
765 glBegin (GL_QUADS); 985 glBegin (GL_QUADS);
766 glTexCoord2f (0, 0); glVertex2f (x , y ); 986 glTexCoord2f (0, 0); glVertex2f (x , y );
767 glTexCoord2f (0, t); glVertex2f (x , y + h); 987 glTexCoord2f (0, t); glVertex2f (x , y + h);
768 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 988 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
769 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 989 glTexCoord2f (s, 0); glVertex2f (x + w, y );
770 glEnd (); 990 glEnd ();
991
992 if (ix)
993 {
994 glDisable (GL_ALPHA_TEST);
995 glDisable (GL_BLEND);
996 }
771} 997}
772 998
773MODULE = CFClient PACKAGE = CFClient::Map 999MODULE = CFClient PACKAGE = CFClient::Map
774 1000
775CFClient::Map 1001CFClient::Map
933 cell->darkness = -1; 1159 cell->darkness = -1;
934 } 1160 }
935} 1161}
936 1162
937SV * 1163SV *
938mapmap (CFClient::Map self, int w, int h) 1164mapmap (CFClient::Map self, int x0, int y0, int w, int h)
939 CODE: 1165 CODE:
940{ 1166{
941 int x0, x1, x; 1167 int x1, x;
942 int y0, y1, y; 1168 int y1, y;
943 int z; 1169 int z;
944 SV *map_sv = newSV (w * h * sizeof (uint32_t)); 1170 SV *map_sv = newSV (w * h * sizeof (uint32_t));
945 uint32_t *map = (uint32_t *)SvPVX (map_sv); 1171 uint32_t *map = (uint32_t *)SvPVX (map_sv);
946 1172
947 SvPOK_only (map_sv); 1173 SvPOK_only (map_sv);
948 SvCUR_set (map_sv, w * h * sizeof (uint32_t)); 1174 SvCUR_set (map_sv, w * h * sizeof (uint32_t));
949 1175
950 x0 = self->x - w / 2; x1 = x0 + w; 1176 x0 += self->x; x1 = x0 + w;
951 y0 = self->y - h / 2; y1 = y0 + h; 1177 y0 += self->y; y1 = y0 + h;
952 1178
953 for (y = y0; y < y1; y++) 1179 for (y = y0; y < y1; y++)
954 { 1180 {
955 maprow *row = 0 <= y && y < self->rows 1181 maprow *row = 0 <= y && y < self->rows
956 ? self->row + y 1182 ? self->row + y
1096 *data++ = 0; /* version 0 format */ 1322 *data++ = 0; /* version 0 format */
1097 *data++ = w >> 8; *data++ = w; 1323 *data++ = w >> 8; *data++ = w;
1098 *data++ = h >> 8; *data++ = h; 1324 *data++ = h >> 8; *data++ = h;
1099 1325
1100 // we need to do this 'cause we don't keep an absolute coord system for rows 1326 // we need to do this 'cause we don't keep an absolute coord system for rows
1101 // TODO: treat rows as we treat 1327 // TODO: treat rows as we treat columns
1102 map_get_row (self, y0 + self->y - self->oy);//D 1328 map_get_row (self, y0 + self->y - self->oy);//D
1103 map_get_row (self, y0 + self->y - self->oy + h - 1);//D 1329 map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1104 1330
1105 x0 += self->x - self->ox; 1331 x0 += self->x - self->ox;
1106 y0 += self->y - self->oy; 1332 y0 += self->y - self->oy;
1170 1396
1171 w = *data++ << 8; w |= *data++; 1397 w = *data++ << 8; w |= *data++;
1172 h = *data++ << 8; h |= *data++; 1398 h = *data++ << 8; h |= *data++;
1173 1399
1174 // we need to do this 'cause we don't keep an absolute coord system for rows 1400 // we need to do this 'cause we don't keep an absolute coord system for rows
1175 // TODO: treat rows as we treat 1401 // TODO: treat rows as we treat columns
1176 map_get_row (self, y0 + self->y - self->oy);//D 1402 map_get_row (self, y0 + self->y - self->oy);//D
1177 map_get_row (self, y0 + self->y - self->oy + h - 1);//D 1403 map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1178 1404
1179 x0 += self->x - self->ox; 1405 x0 += self->x - self->ox;
1180 y0 += self->y - self->oy; 1406 y0 += self->y - self->oy;
1284 } *civ, const_iv[] = { 1510 } *civ, const_iv[] = {
1285# define const_iv(name) { # name, (IV)name } 1511# define const_iv(name) { # name, (IV)name }
1286 const_iv (GL_COLOR_MATERIAL), 1512 const_iv (GL_COLOR_MATERIAL),
1287 const_iv (GL_SMOOTH), 1513 const_iv (GL_SMOOTH),
1288 const_iv (GL_FLAT), 1514 const_iv (GL_FLAT),
1515 const_iv (GL_DITHER),
1289 const_iv (GL_BLEND), 1516 const_iv (GL_BLEND),
1517 const_iv (GL_SCISSOR_TEST),
1290 const_iv (GL_AND), 1518 const_iv (GL_AND),
1519 const_iv (GL_ONE),
1520 const_iv (GL_ZERO),
1291 const_iv (GL_SRC_ALPHA), 1521 const_iv (GL_SRC_ALPHA),
1522 const_iv (GL_SRC_ALPHA_SATURATE),
1292 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1523 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524 const_iv (GL_ONE_MINUS_DST_ALPHA),
1293 const_iv (GL_RGB), 1525 const_iv (GL_RGB),
1294 const_iv (GL_RGBA), 1526 const_iv (GL_RGBA),
1295 const_iv (GL_UNSIGNED_BYTE), 1527 const_iv (GL_UNSIGNED_BYTE),
1296 const_iv (GL_ALPHA4),
1297 const_iv (GL_ALPHA), 1528 const_iv (GL_ALPHA),
1529 const_iv (GL_INTENSITY),
1530 const_iv (GL_LUMINANCE),
1531 const_iv (GL_LUMINANCE_ALPHA),
1298 const_iv (GL_FLOAT), 1532 const_iv (GL_FLOAT),
1299 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1533 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300 const_iv (GL_COMPILE), 1534 const_iv (GL_COMPILE),
1301 const_iv (GL_TEXTURE_1D), 1535 const_iv (GL_TEXTURE_1D),
1302 const_iv (GL_TEXTURE_2D), 1536 const_iv (GL_TEXTURE_2D),
1308 const_iv (GL_TEXTURE_WRAP_T), 1542 const_iv (GL_TEXTURE_WRAP_T),
1309 const_iv (GL_CLAMP), 1543 const_iv (GL_CLAMP),
1310 const_iv (GL_REPEAT), 1544 const_iv (GL_REPEAT),
1311 const_iv (GL_NEAREST), 1545 const_iv (GL_NEAREST),
1312 const_iv (GL_LINEAR), 1546 const_iv (GL_LINEAR),
1547 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1548 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1549 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1550 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551 const_iv (GL_GENERATE_MIPMAP),
1313 const_iv (GL_MODULATE), 1552 const_iv (GL_MODULATE),
1553 const_iv (GL_DECAL),
1314 const_iv (GL_REPLACE), 1554 const_iv (GL_REPLACE),
1315 const_iv (GL_COLOR_BUFFER_BIT), 1555 const_iv (GL_COLOR_BUFFER_BIT),
1316 const_iv (GL_PROJECTION), 1556 const_iv (GL_PROJECTION),
1317 const_iv (GL_MODELVIEW), 1557 const_iv (GL_MODELVIEW),
1318 const_iv (GL_COLOR_LOGIC_OP), 1558 const_iv (GL_COLOR_LOGIC_OP),
1559 const_iv (GL_SEPARABLE_2D),
1319 const_iv (GL_CONVOLUTION_2D), 1560 const_iv (GL_CONVOLUTION_2D),
1320 const_iv (GL_CONVOLUTION_BORDER_MODE), 1561 const_iv (GL_CONVOLUTION_BORDER_MODE),
1321 const_iv (GL_CONSTANT_BORDER), 1562 const_iv (GL_CONSTANT_BORDER),
1322 const_iv (GL_LINES), 1563 const_iv (GL_LINES),
1323 const_iv (GL_QUADS), 1564 const_iv (GL_QUADS),
1565 const_iv (GL_LINE_LOOP),
1324 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1566 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1325 const_iv (GL_FASTEST), 1567 const_iv (GL_FASTEST),
1326# undef const_iv 1568# undef const_iv
1327 }; 1569 };
1328 1570
1347 1589
1348void glBlendFunc (int sfactor, int dfactor) 1590void glBlendFunc (int sfactor, int dfactor)
1349 1591
1350void glLogicOp (int opcode) 1592void glLogicOp (int opcode)
1351 1593
1594void glColorMask (int red, int green, int blue, int alpha)
1595
1352void glMatrixMode (int mode) 1596void glMatrixMode (int mode)
1353 1597
1354void glPushMatrix () 1598void glPushMatrix ()
1355 1599
1356void glPopMatrix () 1600void glPopMatrix ()
1357 1601
1358void glLoadIdentity () 1602void glLoadIdentity ()
1359 1603
1604# near and far are due to microsofts buggy c compiler
1360void glOrtho (double left, double right, double bottom, double top, double near, double far) 1605void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1361 1606
1362void glViewport (int x, int y, int width, int height) 1607void glViewport (int x, int y, int width, int height)
1608
1609void glScissor (int x, int y, int width, int height)
1363 1610
1364void glTranslate (float x, float y, float z = 0.) 1611void glTranslate (float x, float y, float z = 0.)
1365 CODE: 1612 CODE:
1366 glTranslatef (x, y, z); 1613 glTranslatef (x, y, z);
1367 1614
1368void glScale (float x, float y, float z) 1615void glScale (float x, float y, float z = 1.)
1369 CODE: 1616 CODE:
1370 glScalef (x, y, z); 1617 glScalef (x, y, z);
1371 1618
1372void glRotate (float angle, float x, float y, float z) 1619void glRotate (float angle, float x, float y, float z)
1373 CODE: 1620 CODE:
1378void glEnd () 1625void glEnd ()
1379 1626
1380void glColor (float r, float g, float b, float a = 1.0) 1627void glColor (float r, float g, float b, float a = 1.0)
1381 PROTOTYPE: @ 1628 PROTOTYPE: @
1382 CODE: 1629 CODE:
1383 glColor4f (r, g, b, a); 1630 glColor4ub (MIN ((int)(r * 255.f), 255),
1631 MIN ((int)(g * 255.f), 255),
1632 MIN ((int)(b * 255.f), 255),
1633 MIN ((int)(a * 255.f), 255));
1384 1634
1385void glVertex (float x, float y, float z = 0.) 1635void glVertex (float x, float y, float z = 0.)
1386 CODE: 1636 CODE:
1387 glVertex3f (x, y, z); 1637 glVertex3f (x, y, z);
1388 1638
1400 1650
1401void glBindTexture (int target, int name) 1651void glBindTexture (int target, int name)
1402 1652
1403void glConvolutionParameter (int target, int pname, float params) 1653void glConvolutionParameter (int target, int pname, float params)
1404 CODE: 1654 CODE:
1405 glConvolutionParameterf (target, pname, params); 1655 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1406 1656
1407void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1657void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1658 CODE:
1659 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1660 (target, internalformat, width, height, format, type, data));
1661
1662void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1663 CODE:
1664 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1665 (target, internalformat, width, height, format, type, row, column));
1408 1666
1409void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1667void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1410 1668
1411void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1669void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1670
1671void glRasterPos (int x, int y)
1672 CODE:
1673 glRasterPos2i (x, y);
1674
1675void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1412 1676
1413int glGenTexture () 1677int glGenTexture ()
1414 CODE: 1678 CODE:
1415{ 1679{
1416 GLuint name; 1680 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines