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.83 by root, Mon May 15 00:25: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>
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
426 492
427 while (SDL_PollEvent (&ev)) 493 while (SDL_PollEvent (&ev))
428 { 494 {
429 HV *hv = newHV (); 495 HV *hv = newHV ();
430 hv_store (hv, "type", 4, newSViv (ev.type), 0); 496 hv_store (hv, "type", 4, newSViv (ev.type), 0);
497
431 switch (ev.type) 498 switch (ev.type)
432 { 499 {
433 case SDL_KEYDOWN: 500 case SDL_KEYDOWN:
434 case SDL_KEYUP: 501 case SDL_KEYUP:
435 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 502 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
455 case SDL_MOUSEBUTTONUP: 522 case SDL_MOUSEBUTTONUP:
456 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 523 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 524 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 525 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 526 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527 break;
528
529 case SDL_USEREVENT:
530 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
531 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
532 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
533 break;
460 } 534 }
461 535
462 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 536 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
463 } 537 }
464} 538}
465 539
466int 540int
467Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 541Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
542 POSTCALL:
543 Mix_HookMusicFinished (music_finished);
544 Mix_ChannelFinished (channel_finished);
468 545
469void 546void
470Mix_CloseAudio () 547Mix_CloseAudio ()
471 548
472int 549int
495 572
496void 573void
497add_font (char *file) 574add_font (char *file)
498 CODE: 575 CODE:
499 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 576 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
500 577#ifdef _WIN32
501void 578 // cairo... sigh... requires win2000
502set_font (char *file) 579 AddFontResourceEx (file, FR_PRIVATE, 0);
503 CODE: 580#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 581
512void 582void
513load_image_inline (SV *image_) 583load_image_inline (SV *image_)
514 ALIAS: 584 ALIAS:
515 load_image_file = 1 585 load_image_file = 1
597 PUSHs (sv_2mortal (newSViv (b / y))); 667 PUSHs (sv_2mortal (newSViv (b / y)));
598 PUSHs (sv_2mortal (newSViv (a / y))); 668 PUSHs (sv_2mortal (newSViv (a / y)));
599} 669}
600 670
601void 671void
672error (char *message)
673 CODE:
674#ifdef _WIN32
675 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
676#else
677 fprintf (stderr, "ERROR: %s\n", message);
678#endif
679
680void
602fatal (char *message) 681fatal (char *message)
603 CODE: 682 CODE:
604#ifdef _WIN32 683#ifdef _WIN32
605 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 684 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
606#else 685#else
607 fprintf (stderr, "FATAL: %s\n", message); 686 fprintf (stderr, "FATAL: %s\n", message);
608#endif 687#endif
609 exit (1); 688 exit (1);
610 689
690MODULE = CFClient PACKAGE = CFClient::Font
691
692CFClient::Font
693new_from_file (SV *class, char *path, int id = 0)
694 CODE:
695{
696 int count;
697 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
698 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
699 FcPatternDestroy (pattern);
700}
701 OUTPUT:
702 RETVAL
703
704void
705DESTROY (CFClient::Font self)
706 CODE:
707 pango_font_description_free (self);
708
709void
710make_default (CFClient::Font self)
711 CODE:
712 default_font = self;
713
611MODULE = CFClient PACKAGE = CFClient::Layout 714MODULE = CFClient PACKAGE = CFClient::Layout
612 715
613CFClient::Layout 716CFClient::Layout
614new (SV *class, int base_height = 10) 717new (SV *class, int rgba = 0)
615 CODE: 718 CODE:
616 New (0, RETVAL, 1, struct cf_layout); 719 New (0, RETVAL, 1, struct cf_layout);
617 RETVAL->base_height = base_height; 720
618 RETVAL->pl = pango_layout_new (context); 721 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
722 RETVAL->rgba = rgba;
723 RETVAL->r = 1.;
724 RETVAL->g = 1.;
725 RETVAL->b = 1.;
726 RETVAL->a = 1.;
727 RETVAL->base_height = MIN_FONT_HEIGHT;
728 RETVAL->font = 0;
729
619 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 730 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
731 layout_update_font (RETVAL);
620 OUTPUT: 732 OUTPUT:
621 RETVAL 733 RETVAL
622 734
623void 735void
624DESTROY (CFClient::Layout self) 736DESTROY (CFClient::Layout self)
625 CODE: 737 CODE:
626 g_object_unref (self->pl); 738 g_object_unref (self->pl);
627 Safefree (self); 739 Safefree (self);
628 740
741int
742is_rgba (CFClient::Layout self)
743 CODE:
744 RETVAL = self->rgba;
745 OUTPUT:
746 RETVAL
747
629void 748void
630set_text (CFClient::Layout self, SV *text_) 749set_text (CFClient::Layout self, SV *text_)
631 CODE: 750 CODE:
632{ 751{
633 STRLEN textlen; 752 STRLEN textlen;
653 SvUTF8_on (RETVAL); 772 SvUTF8_on (RETVAL);
654 OUTPUT: 773 OUTPUT:
655 RETVAL 774 RETVAL
656 775
657void 776void
777set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
778 CODE:
779 self->r = r;
780 self->g = g;
781 self->b = b;
782 self->a = a;
783
784void
785set_font (CFClient::Layout self, CFClient::Font font = 0)
786 CODE:
787 if (self->font != font)
788 {
789 self->font = font;
790 layout_update_font (self);
791 }
792
793void
658set_height (CFClient::Layout self, int base_height) 794set_height (CFClient::Layout self, int base_height)
659 CODE: 795 CODE:
796 if (self->base_height != base_height)
797 {
660 self->base_height = base_height; 798 self->base_height = base_height;
799 layout_update_font (self);
800 }
661 801
662void 802void
663set_width (CFClient::Layout self, int max_width = -1) 803set_width (CFClient::Layout self, int max_width = -1)
664 CODE: 804 CODE:
665 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 805 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
668size (CFClient::Layout self) 808size (CFClient::Layout self)
669 PPCODE: 809 PPCODE:
670{ 810{
671 int w, h; 811 int w, h;
672 812
673 layout_update (self);
674 layout_get_pixel_size (self, &w, &h); 813 layout_get_pixel_size (self, &w, &h);
675 814
676 EXTEND (SP, 2); 815 EXTEND (SP, 2);
677 PUSHs (sv_2mortal (newSViv (w))); 816 PUSHs (sv_2mortal (newSViv (w)));
678 PUSHs (sv_2mortal (newSViv (h))); 817 PUSHs (sv_2mortal (newSViv (h)));
681int 820int
682xy_to_index (CFClient::Layout self, int x, int y) 821xy_to_index (CFClient::Layout self, int x, int y)
683 CODE: 822 CODE:
684{ 823{
685 int index, trailing; 824 int index, trailing;
686
687 layout_update (self);
688 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 825 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
689
690 RETVAL = index; 826 RETVAL = index;
691} 827}
692 OUTPUT: 828 OUTPUT:
693 RETVAL 829 RETVAL
694 830
695void 831void
696cursor_pos (CFClient::Layout self, int index) 832cursor_pos (CFClient::Layout self, int index)
697 PPCODE: 833 PPCODE:
698{ 834{
699 PangoRectangle strong_pos; 835 PangoRectangle strong_pos;
700 layout_update (self);
701 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 836 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702 837
703 EXTEND (SP, 3); 838 EXTEND (SP, 3);
704 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 839 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 840 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
710render (CFClient::Layout self) 845render (CFClient::Layout self)
711 PPCODE: 846 PPCODE:
712{ 847{
713 SV *retval; 848 SV *retval;
714 int w, h; 849 int w, h;
715 FT_Bitmap bitmap;
716 850
717 layout_update (self);
718 layout_get_pixel_size (self, &w, &h); 851 layout_get_pixel_size (self, &w, &h);
719 852
853 if (self->rgba)
854 {
855 cairo_surface_t *surface;
856 cairo_t *cairo;
857
858 retval = newSV (w * h * 4);
859 SvPOK_only (retval);
860 SvCUR_set (retval, w * h * 4);
861
862 memset (SvPVX (retval), 0, w * h * 4);
863
864 surface = cairo_image_surface_create_for_data (
865 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
866 cairo = cairo_create (surface);
867 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
868
869 pango_cairo_show_layout (cairo, self->pl);
870
871 cairo_destroy (cairo);
872 cairo_surface_destroy (surface);
873
874 // what a mess, and its premultiplied, too :(
875 {
876 uint32_t *p = (uint32_t *)SvPVX (retval);
877 uint32_t *e = p + w * h;
878
879 while (p < e)
880 {
881 uint32_t rgba = *p;
882 rgba = (rgba >> 24) | (rgba << 8);
883 rgba = SDL_SwapBE32 (rgba);
884 *p++ = rgba;
885 }
886 }
887
888 EXTEND (SP, 5);
889 PUSHs (sv_2mortal (newSViv (w)));
890 PUSHs (sv_2mortal (newSViv (h)));
891 PUSHs (sv_2mortal (retval));
892 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
893 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
894 }
895 else
896 {
897 FT_Bitmap bitmap;
898
720 retval = newSV (w * h); 899 retval = newSV (w * h);
721 SvPOK_only (retval); 900 SvPOK_only (retval);
722 SvCUR_set (retval, w * h); 901 SvCUR_set (retval, w * h);
723 902
724 bitmap.rows = h; 903 bitmap.rows = h;
725 bitmap.width = w; 904 bitmap.width = w;
726 bitmap.pitch = w; 905 bitmap.pitch = w;
727 bitmap.buffer = (unsigned char*)SvPVX (retval); 906 bitmap.buffer = (unsigned char*)SvPVX (retval);
728 bitmap.num_grays = 256; 907 bitmap.num_grays = 256;
729 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 908 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
730 909
731 memset (bitmap.buffer, 0, w * h); 910 memset (bitmap.buffer, 0, w * h);
732 911
733 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 912 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
734 913
735 EXTEND (SP, 3); 914 EXTEND (SP, 5);
736 PUSHs (sv_2mortal (newSViv (w))); 915 PUSHs (sv_2mortal (newSViv (w)));
737 PUSHs (sv_2mortal (newSViv (h))); 916 PUSHs (sv_2mortal (newSViv (h)));
738 PUSHs (sv_2mortal (retval)); 917 PUSHs (sv_2mortal (retval));
918 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
919 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
920 }
739} 921}
740 922
741MODULE = CFClient PACKAGE = CFClient::Texture 923MODULE = CFClient PACKAGE = CFClient::Texture
742 924
743void 925void
744draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 926draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
745 PROTOTYPE: $$$;$$ 927 PROTOTYPE: $$$;$$
928 ALIAS:
929 draw_quad_alpha = 1
930 draw_quad_alpha_premultiplied = 2
746 CODE: 931 CODE:
747{ 932{
748 HV *hv = (HV *)SvRV (self); 933 HV *hv = (HV *)SvRV (self);
749 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 934 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
750 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 935 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
755 { 940 {
756 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 941 w = SvNV (*hv_fetch (hv, "w", 1, 1));
757 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 942 h = SvNV (*hv_fetch (hv, "h", 1, 1));
758 } 943 }
759 944
945 if (ix)
946 {
947 glEnable (GL_BLEND);
948 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
949 }
950
760 glBindTexture (GL_TEXTURE_2D, name); 951 glBindTexture (GL_TEXTURE_2D, name);
952
761 if (wrap_mode) { 953 if (wrap_mode)
954 {
762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 955 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
763 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 956 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
764 } 957 }
958
765 glBegin (GL_QUADS); 959 glBegin (GL_QUADS);
766 glTexCoord2f (0, 0); glVertex2f (x , y ); 960 glTexCoord2f (0, 0); glVertex2f (x , y );
767 glTexCoord2f (0, t); glVertex2f (x , y + h); 961 glTexCoord2f (0, t); glVertex2f (x , y + h);
768 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 962 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
769 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 963 glTexCoord2f (s, 0); glVertex2f (x + w, y );
770 glEnd (); 964 glEnd ();
965
966 if (ix)
967 glDisable (GL_BLEND);
771} 968}
772 969
773MODULE = CFClient PACKAGE = CFClient::Map 970MODULE = CFClient PACKAGE = CFClient::Map
774 971
775CFClient::Map 972CFClient::Map
933 cell->darkness = -1; 1130 cell->darkness = -1;
934 } 1131 }
935} 1132}
936 1133
937SV * 1134SV *
938mapmap (CFClient::Map self, int w, int h) 1135mapmap (CFClient::Map self, int x0, int y0, int w, int h)
939 CODE: 1136 CODE:
940{ 1137{
941 int x0, x1, x; 1138 int x1, x;
942 int y0, y1, y; 1139 int y1, y;
943 int z; 1140 int z;
944 SV *map_sv = newSV (w * h * sizeof (uint32_t)); 1141 SV *map_sv = newSV (w * h * sizeof (uint32_t));
945 uint32_t *map = (uint32_t *)SvPVX (map_sv); 1142 uint32_t *map = (uint32_t *)SvPVX (map_sv);
946 1143
947 SvPOK_only (map_sv); 1144 SvPOK_only (map_sv);
948 SvCUR_set (map_sv, w * h * sizeof (uint32_t)); 1145 SvCUR_set (map_sv, w * h * sizeof (uint32_t));
949 1146
950 x0 = self->x - w / 2; x1 = x0 + w; 1147 x0 += self->x; x1 = x0 + w;
951 y0 = self->y - h / 2; y1 = y0 + h; 1148 y0 += self->y; y1 = y0 + h;
952 1149
953 for (y = y0; y < y1; y++) 1150 for (y = y0; y < y1; y++)
954 { 1151 {
955 maprow *row = 0 <= y && y < self->rows 1152 maprow *row = 0 <= y && y < self->rows
956 ? self->row + y 1153 ? self->row + y
1096 *data++ = 0; /* version 0 format */ 1293 *data++ = 0; /* version 0 format */
1097 *data++ = w >> 8; *data++ = w; 1294 *data++ = w >> 8; *data++ = w;
1098 *data++ = h >> 8; *data++ = h; 1295 *data++ = h >> 8; *data++ = h;
1099 1296
1100 // we need to do this 'cause we don't keep an absolute coord system for rows 1297 // we need to do this 'cause we don't keep an absolute coord system for rows
1101 // TODO: treat rows as we treat 1298 // TODO: treat rows as we treat columns
1102 map_get_row (self, y0 + self->y - self->oy);//D 1299 map_get_row (self, y0 + self->y - self->oy);//D
1103 map_get_row (self, y0 + self->y - self->oy + h - 1);//D 1300 map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1104 1301
1105 x0 += self->x - self->ox; 1302 x0 += self->x - self->ox;
1106 y0 += self->y - self->oy; 1303 y0 += self->y - self->oy;
1170 1367
1171 w = *data++ << 8; w |= *data++; 1368 w = *data++ << 8; w |= *data++;
1172 h = *data++ << 8; h |= *data++; 1369 h = *data++ << 8; h |= *data++;
1173 1370
1174 // we need to do this 'cause we don't keep an absolute coord system for rows 1371 // we need to do this 'cause we don't keep an absolute coord system for rows
1175 // TODO: treat rows as we treat 1372 // TODO: treat rows as we treat columns
1176 map_get_row (self, y0 + self->y - self->oy);//D 1373 map_get_row (self, y0 + self->y - self->oy);//D
1177 map_get_row (self, y0 + self->y - self->oy + h - 1);//D 1374 map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1178 1375
1179 x0 += self->x - self->ox; 1376 x0 += self->x - self->ox;
1180 y0 += self->y - self->oy; 1377 y0 += self->y - self->oy;
1284 } *civ, const_iv[] = { 1481 } *civ, const_iv[] = {
1285# define const_iv(name) { # name, (IV)name } 1482# define const_iv(name) { # name, (IV)name }
1286 const_iv (GL_COLOR_MATERIAL), 1483 const_iv (GL_COLOR_MATERIAL),
1287 const_iv (GL_SMOOTH), 1484 const_iv (GL_SMOOTH),
1288 const_iv (GL_FLAT), 1485 const_iv (GL_FLAT),
1486 const_iv (GL_DITHER),
1289 const_iv (GL_BLEND), 1487 const_iv (GL_BLEND),
1488 const_iv (GL_SCISSOR_TEST),
1290 const_iv (GL_AND), 1489 const_iv (GL_AND),
1490 const_iv (GL_ONE),
1491 const_iv (GL_ZERO),
1291 const_iv (GL_SRC_ALPHA), 1492 const_iv (GL_SRC_ALPHA),
1493 const_iv (GL_SRC_ALPHA_SATURATE),
1292 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1494 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1495 const_iv (GL_ONE_MINUS_DST_ALPHA),
1293 const_iv (GL_RGB), 1496 const_iv (GL_RGB),
1294 const_iv (GL_RGBA), 1497 const_iv (GL_RGBA),
1295 const_iv (GL_UNSIGNED_BYTE), 1498 const_iv (GL_UNSIGNED_BYTE),
1296 const_iv (GL_ALPHA4),
1297 const_iv (GL_ALPHA), 1499 const_iv (GL_ALPHA),
1500 const_iv (GL_LUMINANCE),
1298 const_iv (GL_FLOAT), 1501 const_iv (GL_FLOAT),
1299 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1502 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300 const_iv (GL_COMPILE), 1503 const_iv (GL_COMPILE),
1301 const_iv (GL_TEXTURE_1D), 1504 const_iv (GL_TEXTURE_1D),
1302 const_iv (GL_TEXTURE_2D), 1505 const_iv (GL_TEXTURE_2D),
1308 const_iv (GL_TEXTURE_WRAP_T), 1511 const_iv (GL_TEXTURE_WRAP_T),
1309 const_iv (GL_CLAMP), 1512 const_iv (GL_CLAMP),
1310 const_iv (GL_REPEAT), 1513 const_iv (GL_REPEAT),
1311 const_iv (GL_NEAREST), 1514 const_iv (GL_NEAREST),
1312 const_iv (GL_LINEAR), 1515 const_iv (GL_LINEAR),
1516 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1517 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1518 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1519 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1520 const_iv (GL_GENERATE_MIPMAP),
1313 const_iv (GL_MODULATE), 1521 const_iv (GL_MODULATE),
1522 const_iv (GL_DECAL),
1314 const_iv (GL_REPLACE), 1523 const_iv (GL_REPLACE),
1315 const_iv (GL_COLOR_BUFFER_BIT), 1524 const_iv (GL_COLOR_BUFFER_BIT),
1316 const_iv (GL_PROJECTION), 1525 const_iv (GL_PROJECTION),
1317 const_iv (GL_MODELVIEW), 1526 const_iv (GL_MODELVIEW),
1318 const_iv (GL_COLOR_LOGIC_OP), 1527 const_iv (GL_COLOR_LOGIC_OP),
1528 const_iv (GL_SEPARABLE_2D),
1319 const_iv (GL_CONVOLUTION_2D), 1529 const_iv (GL_CONVOLUTION_2D),
1320 const_iv (GL_CONVOLUTION_BORDER_MODE), 1530 const_iv (GL_CONVOLUTION_BORDER_MODE),
1321 const_iv (GL_CONSTANT_BORDER), 1531 const_iv (GL_CONSTANT_BORDER),
1322 const_iv (GL_LINES), 1532 const_iv (GL_LINES),
1323 const_iv (GL_QUADS), 1533 const_iv (GL_QUADS),
1534 const_iv (GL_LINE_LOOP),
1324 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1535 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1325 const_iv (GL_FASTEST), 1536 const_iv (GL_FASTEST),
1326# undef const_iv 1537# undef const_iv
1327 }; 1538 };
1328 1539
1347 1558
1348void glBlendFunc (int sfactor, int dfactor) 1559void glBlendFunc (int sfactor, int dfactor)
1349 1560
1350void glLogicOp (int opcode) 1561void glLogicOp (int opcode)
1351 1562
1563void glColorMask (int red, int green, int blue, int alpha)
1564
1352void glMatrixMode (int mode) 1565void glMatrixMode (int mode)
1353 1566
1354void glPushMatrix () 1567void glPushMatrix ()
1355 1568
1356void glPopMatrix () 1569void glPopMatrix ()
1357 1570
1358void glLoadIdentity () 1571void glLoadIdentity ()
1359 1572
1573# near and far are due to microsofts buggy c compiler
1360void glOrtho (double left, double right, double bottom, double top, double near, double far) 1574void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1361 1575
1362void glViewport (int x, int y, int width, int height) 1576void glViewport (int x, int y, int width, int height)
1577
1578void glScissor (int x, int y, int width, int height)
1363 1579
1364void glTranslate (float x, float y, float z = 0.) 1580void glTranslate (float x, float y, float z = 0.)
1365 CODE: 1581 CODE:
1366 glTranslatef (x, y, z); 1582 glTranslatef (x, y, z);
1367 1583
1368void glScale (float x, float y, float z) 1584void glScale (float x, float y, float z = 1.)
1369 CODE: 1585 CODE:
1370 glScalef (x, y, z); 1586 glScalef (x, y, z);
1371 1587
1372void glRotate (float angle, float x, float y, float z) 1588void glRotate (float angle, float x, float y, float z)
1373 CODE: 1589 CODE:
1378void glEnd () 1594void glEnd ()
1379 1595
1380void glColor (float r, float g, float b, float a = 1.0) 1596void glColor (float r, float g, float b, float a = 1.0)
1381 PROTOTYPE: @ 1597 PROTOTYPE: @
1382 CODE: 1598 CODE:
1383 glColor4f (r, g, b, a); 1599 glColor4ub (MIN ((int)(r * 255.f), 255),
1600 MIN ((int)(g * 255.f), 255),
1601 MIN ((int)(b * 255.f), 255),
1602 MIN ((int)(a * 255.f), 255));
1384 1603
1385void glVertex (float x, float y, float z = 0.) 1604void glVertex (float x, float y, float z = 0.)
1386 CODE: 1605 CODE:
1387 glVertex3f (x, y, z); 1606 glVertex3f (x, y, z);
1388 1607
1400 1619
1401void glBindTexture (int target, int name) 1620void glBindTexture (int target, int name)
1402 1621
1403void glConvolutionParameter (int target, int pname, float params) 1622void glConvolutionParameter (int target, int pname, float params)
1404 CODE: 1623 CODE:
1405 glConvolutionParameterf (target, pname, params); 1624 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1406 1625
1407void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1626void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1627 CODE:
1628 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1629 (target, internalformat, width, height, format, type, data));
1630
1631void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1632 CODE:
1633 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1634 (target, internalformat, width, height, format, type, row, column));
1408 1635
1409void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1636void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1410 1637
1411void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1638void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1639
1640void glRasterPos (int x, int y)
1641 CODE:
1642 glRasterPos2i (x, y);
1643
1644void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1412 1645
1413int glGenTexture () 1646int glGenTexture ()
1414 CODE: 1647 CODE:
1415{ 1648{
1416 GLuint name; 1649 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines