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.114 by root, Wed Jun 14 18:02:00 2006 UTC vs.
Revision 1.138 by root, Mon Aug 14 01:21:01 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
5# pragma warning(disable:4244) 6# pragma warning(disable:4244)
6#endif 7#endif
7 8
8#include "EXTERN.h" 9#include "EXTERN.h"
9#include "perl.h" 10#include "perl.h"
10#include "XSUB.h" 11#include "XSUB.h"
11 12
13#ifdef _WIN32
14# undef pipe
15#endif
16
12#include <math.h> 17#include <math.h>
13#include <string.h> 18#include <string.h>
14#include <stdio.h> 19#include <stdio.h>
15#include <stdlib.h> 20#include <stdlib.h>
16 21
18#include <SDL_endian.h> 23#include <SDL_endian.h>
19#include <SDL_image.h> 24#include <SDL_image.h>
20#include <SDL_mixer.h> 25#include <SDL_mixer.h>
21#include <SDL_opengl.h> 26#include <SDL_opengl.h>
22 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
23#include <glib/gmacros.h> 31#include <glib/gmacros.h>
24 32
25#include <pango/pango.h> 33#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 34
30#ifndef _WIN32 35#ifndef _WIN32
31# include <sys/types.h> 36# include <sys/types.h>
32# include <sys/socket.h> 37# include <sys/socket.h>
33# include <netinet/in.h> 38# include <netinet/in.h>
40 typedef signed char int8_t; 45 typedef signed char int8_t;
41 typedef signed short int16_t; 46 typedef signed short int16_t;
42 typedef signed int int32_t; 47 typedef signed int int32_t;
43#endif 48#endif
44 49
45#include "glext.h" 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
46 51
47#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
48 53
49#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
51 56
52#define MIN_FONT_HEIGHT 10 57#define MIN_FONT_HEIGHT 10
58
59#if 0
60# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else
62# define PARACHUTE 0
63#endif
53 64
54static struct 65static struct
55{ 66{
56#define GL_FUNC(ptr,name) ptr name; 67#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 68#include "glfunc.h"
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 77 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 78 else
68 glBlendFunc (sa, da); 79 glBlendFunc (sa, da);
69} 80}
70 81
82#include "texcache.c"
83
84#include "pango-font.c"
85#include "pango-fontmap.c"
86#include "pango-render.c"
87
71typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
73 90
74typedef PangoFontDescription *CFClient__Font; 91typedef PangoFontDescription *CFPlus__Font;
92
93static int
94shape_attr_p (PangoLayoutRun *run)
95{
96 GSList *attrs = run->item->analysis.extra_attrs;
97
98 while (attrs)
99 {
100 PangoAttribute *attr = attrs->data;
101
102 if (attr->klass->type == PANGO_ATTR_SHAPE)
103 return 1;
104
105 attrs = attrs->next;
106 }
107
108 return 0;
109}
75 110
76typedef struct cf_layout { 111typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 112 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 113 float r, g, b, a; // default color for rgba mode
80 int base_height; 114 int base_height;
81 CFClient__Font font; 115 CFPlus__Font font;
82} *CFClient__Layout; 116} *CFPlus__Layout;
83 117
84static CFClient__Font default_font; 118static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 119static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 120static PangoFontMap *opengl_fontmap;
87 121
88static void 122static void
89substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
90{ 124{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 126#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 128#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 130}
101 131
102static void 132static void
103layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
104{ 134{
105 /* use a random scale factor to account for unknown descenders, 0.8 works 135 /* use a random scale factor to account for unknown descenders, 0.8 works
106 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
107 */ 137 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
112 142
113 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
114} 144}
115 145
116static void 146static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 148{
119 pango_layout_get_pixel_size (self->pl, w, h); 149 pango_layout_get_pixel_size (self->pl, w, h);
120 150
121 if (!*w) *w = 1; 151 if (!*w) *w = 1;
122 if (!*h) *h = 1; 152 if (!*h) *h = 1;
152 int texs; 182 int texs;
153 maptex *tex; 183 maptex *tex;
154 184
155 int32_t rows; 185 int32_t rows;
156 maprow *row; 186 maprow *row;
157} *CFClient__Map; 187} *CFPlus__Map;
158 188
159static char * 189static char *
160prepend (char *ptr, int sze, int inc) 190prepend (char *ptr, int sze, int inc)
161{ 191{
162 char *p; 192 char *p;
180 210
181#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 211#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 212#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183 213
184static maprow * 214static maprow *
185map_get_row (CFClient__Map self, int y) 215map_get_row (CFPlus__Map self, int y)
186{ 216{
187 if (0 > y) 217 if (0 > y)
188 { 218 {
189 int extend = - y + MAP_EXTEND_Y; 219 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 220 Prepend (maprow, self->row, self->rows, extend);
228 258
229 return row->col + (x - row->c0); 259 return row->col + (x - row->c0);
230} 260}
231 261
232static mapcell * 262static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 263map_get_cell (CFPlus__Map self, int x, int y)
234{ 264{
235 return row_get_cell (map_get_row (self, y), x); 265 return row_get_cell (map_get_row (self, y), x);
236} 266}
237 267
238static void 268static void
239map_clear (CFClient__Map self) 269map_clear (CFPlus__Map self)
240{ 270{
241 int r; 271 int r;
242 272
243 for (r = 0; r < self->rows; r++) 273 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 274 Safefree (self->row[r].col);
252 self->row = 0; 282 self->row = 0;
253 self->rows = 0; 283 self->rows = 0;
254} 284}
255 285
256static void 286static void
257map_blank (CFClient__Map self, int x0, int y0, int w, int h) 287map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258{ 288{
259 int x, y; 289 int x, y;
260 maprow *row; 290 maprow *row;
261 291
262 for (y = y0; y < y0 + h; y++) 292 for (y = y0; y < y0 + h; y++)
319 n |= n >> 16; 349 n |= n >> 16;
320 350
321 return n + 1; 351 return n + 1;
322} 352}
323 353
324MODULE = CFClient PACKAGE = CFClient 354MODULE = CFPlus PACKAGE = CFPlus
325 355
326PROTOTYPES: ENABLE 356PROTOTYPES: ENABLE
327 357
328BOOT: 358BOOT:
329{ 359{
330 HV *stash = gv_stashpv ("CFClient", 1); 360 HV *stash = gv_stashpv ("CFPlus", 1);
331 static const struct { 361 static const struct {
332 const char *name; 362 const char *name;
333 IV iv; 363 IV iv;
334 } *civ, const_iv[] = { 364 } *civ, const_iv[] = {
335# define const_iv(name) { # name, (IV)name } 365# define const_iv(name) { # name, (IV)name }
436 466
437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 467 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 468 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439} 469}
440 470
471int
472in_destruct ()
473 CODE:
474 RETVAL = PL_main_cv == Nullcv;
475 OUTPUT:
476 RETVAL
477
478NV floor (NV x)
479
480NV ceil (NV x)
481
441void 482void
442pango_init () 483pango_init ()
443 CODE: 484 CODE:
444 // delayed, so it can pick up new fonts added by AddFontResourceEx
445{ 485{
446 {
447 ft2_fontmap = pango_ft2_font_map_new (); 486 opengl_fontmap = pango_opengl_font_map_new ();
448 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 487 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
449 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 488 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
450 }
451 {
452 cairo_font_options_t *fopt = cairo_font_options_create ();
453 cairo_fontmap = pango_cairo_font_map_get_default ();
454 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455#ifdef _WIN32
456 // cairo looks like shit eaten twice on windows
457 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458#else
459 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460#endif
461 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463 pango_cairo_context_set_font_options (cairo_context, fopt);
464 cairo_font_options_destroy (fopt);
465 }
466} 489}
467 490
468int 491int
469SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 492SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
470 493
471void 494void
472SDL_Quit () 495SDL_Quit ()
473 496
474void 497void
481 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 504 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
482 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 505 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
483 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 506 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
484 507
485 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 508 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 509 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
487 510
488 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 511 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
489 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
492 515
493 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
517#if SDL_VERSION_ATLEAST(1,2,10)
518 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
519 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
520#endif
494 521
495 SDL_EnableUNICODE (1); 522 SDL_EnableUNICODE (1);
496 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 523 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
497 524
498 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 525 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
585 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 612 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 613 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587 break; 614 break;
588 } 615 }
589 616
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 617 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591 } 618 }
592} 619}
593 620
594int 621int
595Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 622Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
611#endif 638#endif
612 639
613void 640void
614add_font (char *file) 641add_font (char *file)
615 CODE: 642 CODE:
616 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 643 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617#ifdef _WIN32
618 // cairo... sigh... requires win2000
619 AddFontResourceEx (file, FR_PRIVATE, 0);
620#endif
621 644
622void 645void
623load_image_inline (SV *image_) 646load_image_inline (SV *image_)
624 ALIAS: 647 ALIAS:
625 load_image_file = 1 648 load_image_file = 1
667 690
668 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 691 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669 692
670 assert (surface2->pitch == surface2->w * 4); 693 assert (surface2->pitch == surface2->w * 4);
671 694
695 SDL_LockSurface (surface2);
672 EXTEND (SP, 5); 696 EXTEND (SP, 6);
673 PUSHs (sv_2mortal (newSViv (surface2->w))); 697 PUSHs (sv_2mortal (newSViv (surface2->w)));
674 PUSHs (sv_2mortal (newSViv (surface2->h))); 698 PUSHs (sv_2mortal (newSViv (surface2->h)));
675 SDL_LockSurface (surface2);
676 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 699 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677 SDL_UnlockSurface (surface2);
678 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 700 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
679 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 701 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 702 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
703 SDL_UnlockSurface (surface2);
681 704
682 SDL_FreeSurface (surface); 705 SDL_FreeSurface (surface);
683 SDL_FreeSurface (surface2); 706 SDL_FreeSurface (surface2);
684} 707}
685 708
728void 751void
729_exit (int retval) 752_exit (int retval)
730 CODE: 753 CODE:
731 _exit (retval); 754 _exit (retval);
732 755
733MODULE = CFClient PACKAGE = CFClient::Font 756MODULE = CFPlus PACKAGE = CFPlus::Font
734 757
735CFClient::Font 758CFPlus::Font
736new_from_file (SV *class, char *path, int id = 0) 759new_from_file (SV *class, char *path, int id = 0)
737 CODE: 760 CODE:
738{ 761{
739 int count; 762 int count;
740 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 763 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
743} 766}
744 OUTPUT: 767 OUTPUT:
745 RETVAL 768 RETVAL
746 769
747void 770void
748DESTROY (CFClient::Font self) 771DESTROY (CFPlus::Font self)
749 CODE: 772 CODE:
750 pango_font_description_free (self); 773 pango_font_description_free (self);
751 774
752void 775void
753make_default (CFClient::Font self) 776make_default (CFPlus::Font self)
754 CODE: 777 CODE:
755 default_font = self; 778 default_font = self;
756 779
757MODULE = CFClient PACKAGE = CFClient::Layout 780MODULE = CFPlus PACKAGE = CFPlus::Layout
758 781
759CFClient::Layout 782void
760new (SV *class, int rgba = 0) 783reset_glyph_cache ()
784 CODE:
785 tc_clear ();
786
787CFPlus::Layout
788new (SV *class)
761 CODE: 789 CODE:
762 New (0, RETVAL, 1, struct cf_layout); 790 New (0, RETVAL, 1, struct cf_layout);
763 791
764 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 792 RETVAL->pl = pango_layout_new (opengl_context);
765 RETVAL->rgba = rgba;
766 RETVAL->r = 1.; 793 RETVAL->r = 1.;
767 RETVAL->g = 1.; 794 RETVAL->g = 1.;
768 RETVAL->b = 1.; 795 RETVAL->b = 1.;
769 RETVAL->a = 1.; 796 RETVAL->a = 1.;
770 RETVAL->base_height = MIN_FONT_HEIGHT; 797 RETVAL->base_height = MIN_FONT_HEIGHT;
774 layout_update_font (RETVAL); 801 layout_update_font (RETVAL);
775 OUTPUT: 802 OUTPUT:
776 RETVAL 803 RETVAL
777 804
778void 805void
779DESTROY (CFClient::Layout self) 806DESTROY (CFPlus::Layout self)
780 CODE: 807 CODE:
781 g_object_unref (self->pl); 808 g_object_unref (self->pl);
782 Safefree (self); 809 Safefree (self);
783 810
784int
785is_rgba (CFClient::Layout self)
786 CODE:
787 RETVAL = self->rgba;
788 OUTPUT:
789 RETVAL
790
791void 811void
792set_text (CFClient::Layout self, SV *text_) 812set_text (CFPlus::Layout self, SV *text_)
793 CODE: 813 CODE:
794{ 814{
795 STRLEN textlen; 815 STRLEN textlen;
796 char *text = SvPVutf8 (text_, textlen); 816 char *text = SvPVutf8 (text_, textlen);
797 817
798 pango_layout_set_text (self->pl, text, textlen); 818 pango_layout_set_text (self->pl, text, textlen);
799} 819}
800 820
801void 821void
802set_markup (CFClient::Layout self, SV *text_) 822set_markup (CFPlus::Layout self, SV *text_)
803 CODE: 823 CODE:
804{ 824{
805 STRLEN textlen; 825 STRLEN textlen;
806 char *text = SvPVutf8 (text_, textlen); 826 char *text = SvPVutf8 (text_, textlen);
807 827
808 pango_layout_set_markup (self->pl, text, textlen); 828 pango_layout_set_markup (self->pl, text, textlen);
809} 829}
810 830
831void
832set_shapes (CFPlus::Layout self, ...)
833 CODE:
834{
835 PangoAttrList *attrs = 0;
836 const char *text = pango_layout_get_text (self->pl);
837 const char *pos = text;
838 int arg = 4;
839
840 while (arg < items && (pos = strstr (pos, OBJ_STR)))
841 {
842 PangoRectangle inkrect, rect;
843 PangoAttribute *attr;
844
845 int x = SvIV (ST (arg - 3));
846 int y = SvIV (ST (arg - 2));
847 int w = SvIV (ST (arg - 1));
848 int h = SvIV (ST (arg ));
849
850 inkrect.x = 0;
851 inkrect.y = 0;
852 inkrect.width = 0;
853 inkrect.height = 0;
854
855 rect.x = x * PANGO_SCALE;
856 rect.y = y * PANGO_SCALE;
857 rect.width = w * PANGO_SCALE;
858 rect.height = h * PANGO_SCALE;
859
860 if (!attrs)
861 attrs = pango_layout_get_attributes (self->pl);
862
863 attr = pango_attr_shape_new (&inkrect, &rect);
864 attr->start_index = pos - text;
865 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
866 pango_attr_list_insert (attrs, attr);
867
868 arg += 4;
869 pos += sizeof (OBJ_STR) - 1;
870 }
871
872 if (attrs)
873 pango_layout_set_attributes (self->pl, attrs);
874}
875
876void
877get_shapes (CFPlus::Layout self)
878 PPCODE:
879{
880 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
881
882 do
883 {
884 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
885
886 if (run && shape_attr_p (run))
887 {
888 PangoRectangle extents;
889 pango_layout_iter_get_run_extents (iter, 0, &extents);
890
891 EXTEND (SP, 2);
892 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
893 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
894 }
895 }
896 while (pango_layout_iter_next_run (iter));
897
898 pango_layout_iter_free (iter);
899}
900
901int
902has_wrapped (CFPlus::Layout self)
903 CODE:
904{
905 int lines = 1;
906 const char *text = pango_layout_get_text (self->pl);
907
908 while (*text)
909 lines += *text++ == '\n';
910
911 RETVAL = lines < pango_layout_get_line_count (self->pl);
912}
913 OUTPUT:
914 RETVAL
915
811SV * 916SV *
812get_text (CFClient::Layout self) 917get_text (CFPlus::Layout self)
813 CODE: 918 CODE:
814 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 919 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815 sv_utf8_decode (RETVAL); 920 sv_utf8_decode (RETVAL);
816 OUTPUT: 921 OUTPUT:
817 RETVAL 922 RETVAL
818 923
819void 924void
820set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 925set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
821 CODE: 926 CODE:
822 self->r = r; 927 self->r = r;
823 self->g = g; 928 self->g = g;
824 self->b = b; 929 self->b = b;
825 self->a = a; 930 self->a = a;
826 931
827void 932void
828set_font (CFClient::Layout self, CFClient::Font font = 0) 933set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829 CODE: 934 CODE:
830 if (self->font != font) 935 if (self->font != font)
831 { 936 {
832 self->font = font; 937 self->font = font;
833 layout_update_font (self); 938 layout_update_font (self);
834 } 939 }
835 940
836void 941void
837set_height (CFClient::Layout self, int base_height) 942set_height (CFPlus::Layout self, int base_height)
838 CODE: 943 CODE:
839 if (self->base_height != base_height) 944 if (self->base_height != base_height)
840 { 945 {
841 self->base_height = base_height; 946 self->base_height = base_height;
842 layout_update_font (self); 947 layout_update_font (self);
843 } 948 }
844 949
845void 950void
846set_width (CFClient::Layout self, int max_width = -1) 951set_width (CFPlus::Layout self, int max_width = -1)
847 CODE: 952 CODE:
848 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 953 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
849 954
850void 955void
851set_indent (CFClient::Layout self, int indent) 956set_indent (CFPlus::Layout self, int indent)
852 CODE: 957 CODE:
853 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 958 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854 959
855void 960void
856set_spacing (CFClient::Layout self, int spacing) 961set_spacing (CFPlus::Layout self, int spacing)
857 CODE: 962 CODE:
858 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 963 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859 964
860void 965void
861set_ellipsise (CFClient::Layout self, int ellipsise) 966set_ellipsise (CFPlus::Layout self, int ellipsise)
862 CODE: 967 CODE:
863 pango_layout_set_ellipsize (self->pl, 968 pango_layout_set_ellipsize (self->pl,
864 ellipsise == 1 ? PANGO_ELLIPSIZE_START 969 ellipsise == 1 ? PANGO_ELLIPSIZE_START
865 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 970 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 971 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
867 : PANGO_ELLIPSIZE_NONE 972 : PANGO_ELLIPSIZE_NONE
868 ); 973 );
869 974
870void 975void
871set_single_paragraph_mode (CFClient::Layout self, int spm) 976set_single_paragraph_mode (CFPlus::Layout self, int spm)
872 CODE: 977 CODE:
873 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 978 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874 979
875void 980void
876size (CFClient::Layout self) 981size (CFPlus::Layout self)
877 PPCODE: 982 PPCODE:
878{ 983{
879 int w, h; 984 int w, h;
880 985
881 layout_get_pixel_size (self, &w, &h); 986 layout_get_pixel_size (self, &w, &h);
884 PUSHs (sv_2mortal (newSViv (w))); 989 PUSHs (sv_2mortal (newSViv (w)));
885 PUSHs (sv_2mortal (newSViv (h))); 990 PUSHs (sv_2mortal (newSViv (h)));
886} 991}
887 992
888int 993int
994descent (CFPlus::Layout self)
995 CODE:
996{
997 PangoRectangle rect;
998 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
999 pango_layout_line_get_pixel_extents (line, 0, &rect);
1000 RETVAL = PANGO_DESCENT (rect);
1001}
1002 OUTPUT:
1003 RETVAL
1004
1005int
889xy_to_index (CFClient::Layout self, int x, int y) 1006xy_to_index (CFPlus::Layout self, int x, int y)
890 CODE: 1007 CODE:
891{ 1008{
892 int index, trailing; 1009 int index, trailing;
893 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1010 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
894 RETVAL = index; 1011 RETVAL = index;
895} 1012}
896 OUTPUT: 1013 OUTPUT:
897 RETVAL 1014 RETVAL
898 1015
899void 1016void
900cursor_pos (CFClient::Layout self, int index) 1017cursor_pos (CFPlus::Layout self, int index)
901 PPCODE: 1018 PPCODE:
902{ 1019{
903 PangoRectangle strong_pos; 1020 PangoRectangle strong_pos;
904 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1021 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905 1022
908 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910} 1027}
911 1028
912void 1029void
913render (CFClient::Layout self) 1030render (CFPlus::Layout self, float x, float y, int flags = 0)
914 PPCODE: 1031 PPCODE:
915{ 1032 pango_opengl_render_layout_subpixel (
916 SV *retval; 1033 self->pl,
917 int w, h; 1034 x * PANGO_SCALE, y * PANGO_SCALE,
918 1035 self->r, self->g, self->b, self->a,
919 layout_get_pixel_size (self, &w, &h);
920
921 if (self->rgba)
922 { 1036 flags
923 cairo_surface_t *surface;
924 cairo_t *cairo;
925
926 retval = newSV (w * h * 4);
927 SvPOK_only (retval);
928 SvCUR_set (retval, w * h * 4);
929
930 memset (SvPVX (retval), 0, w * h * 4);
931
932 surface = cairo_image_surface_create_for_data (
933 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
934 cairo = cairo_create (surface);
935 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937 pango_cairo_show_layout (cairo, self->pl);
938
939 cairo_destroy (cairo);
940 cairo_surface_destroy (surface);
941
942 // what a mess, and its premultiplied, too :(
943 {
944 uint32_t *p = (uint32_t *)SvPVX (retval);
945 uint32_t *e = p + w * h;
946
947 while (p < e)
948 {
949 uint32_t rgba = *p;
950 rgba = (rgba >> 24) | (rgba << 8);
951#if 0
952#ifdef _WIN32
953 {//D
954 uint8_t r = rgba >> 24;
955 uint8_t g = rgba >> 16;
956 uint8_t b = rgba >> 8;
957 uint8_t a = rgba >> 0;
958
959 rgba = (rgba & 0xffffff00) | a;
960 }
961#endif
962#endif
963 rgba = SDL_SwapBE32 (rgba);
964 *p++ = rgba;
965 }
966 }
967
968 EXTEND (SP, 5);
969 PUSHs (sv_2mortal (newSViv (w)));
970 PUSHs (sv_2mortal (newSViv (h)));
971 PUSHs (sv_2mortal (retval));
972 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
973 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974 } 1037 );
975 else
976 {
977 FT_Bitmap bitmap;
978 1038
979 retval = newSV (w * h);
980 SvPOK_only (retval);
981 SvCUR_set (retval, w * h);
982
983 bitmap.rows = h;
984 bitmap.width = w;
985 bitmap.pitch = w;
986 bitmap.buffer = (unsigned char*)SvPVX (retval);
987 bitmap.num_grays = 256;
988 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
989
990 memset (bitmap.buffer, 0, w * h);
991
992 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
993
994 EXTEND (SP, 5);
995 PUSHs (sv_2mortal (newSViv (w)));
996 PUSHs (sv_2mortal (newSViv (h)));
997 PUSHs (sv_2mortal (retval));
998 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000 }
1001}
1002
1003MODULE = CFClient PACKAGE = CFClient::Texture 1039MODULE = CFPlus PACKAGE = CFPlus::Texture
1004 1040
1005void 1041void
1006pad2pot (SV *data_, SV *w_, SV *h_) 1042pad2pot (SV *data_, SV *w_, SV *h_)
1007 CODE: 1043 CODE:
1008{ 1044{
1086 glDisable (GL_ALPHA_TEST); 1122 glDisable (GL_ALPHA_TEST);
1087 glDisable (GL_BLEND); 1123 glDisable (GL_BLEND);
1088 } 1124 }
1089} 1125}
1090 1126
1091MODULE = CFClient PACKAGE = CFClient::Map 1127MODULE = CFPlus PACKAGE = CFPlus::Map
1092 1128
1093CFClient::Map 1129CFPlus::Map
1094new (SV *class, int map_width, int map_height) 1130new (SV *class, int map_width, int map_height)
1095 CODE: 1131 CODE:
1096 New (0, RETVAL, 1, struct map); 1132 New (0, RETVAL, 1, struct map);
1097 RETVAL->x = 0; 1133 RETVAL->x = 0;
1098 RETVAL->y = 0; 1134 RETVAL->y = 0;
1108 RETVAL->row = 0; 1144 RETVAL->row = 0;
1109 OUTPUT: 1145 OUTPUT:
1110 RETVAL 1146 RETVAL
1111 1147
1112void 1148void
1113DESTROY (CFClient::Map self) 1149DESTROY (CFPlus::Map self)
1114 CODE: 1150 CODE:
1115{ 1151{
1116 map_clear (self); 1152 map_clear (self);
1117 Safefree (self->face); 1153 Safefree (self->face);
1118 Safefree (self->tex); 1154 Safefree (self->tex);
1119 Safefree (self); 1155 Safefree (self);
1120} 1156}
1121 1157
1122void 1158void
1123clear (CFClient::Map self) 1159clear (CFPlus::Map self)
1124 CODE: 1160 CODE:
1125 map_clear (self); 1161 map_clear (self);
1126 1162
1127void 1163void
1128set_face (CFClient::Map self, int face, int texid) 1164set_face (CFPlus::Map self, int face, int texid)
1129 CODE: 1165 CODE:
1130{ 1166{
1131 while (self->faces <= face) 1167 while (self->faces <= face)
1132 { 1168 {
1133 Append (mapface, self->face, self->faces, self->faces); 1169 Append (mapface, self->face, self->faces, self->faces);
1136 1172
1137 self->face [face] = texid; 1173 self->face [face] = texid;
1138} 1174}
1139 1175
1140void 1176void
1141set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1177set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1142 CODE: 1178 CODE:
1143{ 1179{
1144 while (self->texs <= texid) 1180 while (self->texs <= texid)
1145 { 1181 {
1146 Append (maptex, self->tex, self->texs, self->texs); 1182 Append (maptex, self->tex, self->texs, self->texs);
1170 // from transparent color bleeding and ugly wrapping effects. 1206 // from transparent color bleeding and ugly wrapping effects.
1171 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1207 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172} 1208}
1173 1209
1174int 1210int
1175ox (CFClient::Map self) 1211ox (CFPlus::Map self)
1176 ALIAS: 1212 ALIAS:
1177 oy = 1 1213 oy = 1
1178 x = 2 1214 x = 2
1179 y = 3 1215 y = 3
1180 w = 4 1216 w = 4
1191 } 1227 }
1192 OUTPUT: 1228 OUTPUT:
1193 RETVAL 1229 RETVAL
1194 1230
1195void 1231void
1196scroll (CFClient::Map self, int dx, int dy) 1232scroll (CFPlus::Map self, int dx, int dy)
1197 CODE: 1233 CODE:
1198{ 1234{
1199 if (dx > 0) 1235 if (dx > 0)
1200 map_blank (self, self->x, self->y, dx - 1, self->h); 1236 map_blank (self, self->x, self->y, dx - 1, self->h);
1201 else if (dx < 0) 1237 else if (dx < 0)
1217 self->y += MAP_EXTEND_Y; 1253 self->y += MAP_EXTEND_Y;
1218 } 1254 }
1219} 1255}
1220 1256
1221void 1257void
1222map1a_update (CFClient::Map self, SV *data_) 1258map1a_update (CFPlus::Map self, SV *data_)
1223 CODE: 1259 CODE:
1224{ 1260{
1225 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1261 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1226 uint8_t *data_end = (uint8_t *)SvEND (data_); 1262 uint8_t *data_end = (uint8_t *)SvEND (data_);
1227 mapcell *cell; 1263 mapcell *cell;
1229 1265
1230 while (data < data_end) 1266 while (data < data_end)
1231 { 1267 {
1232 flags = (data [0] << 8) + data [1]; data += 2; 1268 flags = (data [0] << 8) + data [1]; data += 2;
1233 1269
1234 x = ((flags >> 10) & 63) + self->x; 1270 x = self->x + ((flags >> 10) & 63);
1235 y = ((flags >> 4) & 63) + self->y; 1271 y = self->y + ((flags >> 4) & 63);
1236 1272
1237 cell = map_get_cell (self, x, y); 1273 cell = map_get_cell (self, x, y);
1238 1274
1239 if (flags & 15) 1275 if (flags & 15)
1240 { 1276 {
1269 cell->darkness = -1; 1305 cell->darkness = -1;
1270 } 1306 }
1271} 1307}
1272 1308
1273SV * 1309SV *
1274mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1275 CODE: 1311 CODE:
1276{ 1312{
1277 int x1, x; 1313 int x1, x;
1278 int y1, y; 1314 int y1, y;
1279 int z; 1315 int z;
1329} 1365}
1330 OUTPUT: 1366 OUTPUT:
1331 RETVAL 1367 RETVAL
1332 1368
1333void 1369void
1334draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1370draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1335 PPCODE: 1371 CODE:
1336{ 1372{
1337 int vx, vy; 1373 int vx, vy;
1338 int x, y, z; 1374 int x, y, z;
1339 int last_name; 1375 int last_name;
1340 mapface face; 1376 mapface face;
1341 int sw4 = (sw + 3) & ~3;
1342 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1343 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1344 1377
1345 memset (darkness, 255, sw4 * sh);
1346 SvPOK_only (darkness_sv);
1347 SvCUR_set (darkness_sv, sw4 * sh);
1348
1349 vx = self->x + (self->w - sw) / 2 - shift_x; 1378 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1350 vy = self->y + (self->h - sh) / 2 - shift_y; 1379 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1351 1380
1352 /* 1381 /*
1353 int vx = self->vx = self->w >= sw 1382 int vx = self->vx = self->w >= sw
1354 ? self->x + (self->w - sw) / 2 1383 ? self->x + (self->w - sw) / 2
1355 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1384 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1359 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1388 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360 */ 1389 */
1361 1390
1362 glColor4ub (255, 255, 255, 255); 1391 glColor4ub (255, 255, 255, 255);
1363 1392
1393 glEnable (GL_BLEND);
1364 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1394 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365 glEnable (GL_BLEND);
1366 glEnable (GL_TEXTURE_2D); 1395 glEnable (GL_TEXTURE_2D);
1367 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1396 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368 1397
1369 glBegin (GL_QUADS); 1398 glBegin (GL_QUADS);
1370 1399
1378 1407
1379 for (x = 0; x < sw; x++) 1408 for (x = 0; x < sw; x++)
1380 if (row->c0 <= x + vx && x + vx < row->c1) 1409 if (row->c0 <= x + vx && x + vx < row->c1)
1381 { 1410 {
1382 mapcell *cell = row->col + (x + vx - row->c0); 1411 mapcell *cell = row->col + (x + vx - row->c0);
1383
1384 darkness[y * sw4 + x] = cell->darkness < 0
1385 ? 255 - FOW_DARKNESS
1386 : 255 - cell->darkness;
1387 1412
1388 face = cell->face [z]; 1413 face = cell->face [z];
1389 1414
1390 if (face) 1415 if (face)
1391 { 1416 {
1412 1437
1413 glEnd (); 1438 glEnd ();
1414 1439
1415 glDisable (GL_TEXTURE_2D); 1440 glDisable (GL_TEXTURE_2D);
1416 glDisable (GL_BLEND); 1441 glDisable (GL_BLEND);
1442}
1443
1444void
1445draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1446 CODE:
1447{
1448 static float color[16][3] = {
1449 { 0.00F, 0.00F, 0.00F },
1450 { 1.00F, 1.00F, 1.00F },
1451 { 0.00F, 0.00F, 0.55F },
1452 { 1.00F, 0.00F, 0.00F },
1453
1454 { 1.00F, 0.54F, 0.00F },
1455 { 0.11F, 0.56F, 1.00F },
1456 { 0.93F, 0.46F, 0.00F },
1457 { 0.18F, 0.54F, 0.34F },
1458
1459 { 0.56F, 0.73F, 0.56F },
1460 { 0.80F, 0.80F, 0.80F },
1461 { 0.55F, 0.41F, 0.13F },
1462 { 0.99F, 0.77F, 0.26F },
1463
1464 { 0.74F, 0.65F, 0.41F },
1465
1466 { 0.00F, 1.00F, 1.00F },
1467 { 1.00F, 0.00F, 1.00F },
1468 { 1.00F, 1.00F, 0.00F },
1469 };
1470
1471 int x, y;
1472
1473 glEnable (GL_TEXTURE_2D);
1474 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1475 glEnable (GL_BLEND);
1476 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1477 glBegin (GL_QUADS);
1478
1479 for (y = 0; y < h; y++)
1480 for (x = 0; x < w; x++)
1481 {
1482 unsigned char m = data [x + y * w];
1483
1484 if (m)
1485 {
1486 float *c = color [m & 15];
1487
1488 float tx1 = m & 0x40 ? 0.5 : 0.;
1489 float tx2 = tx1 + 0.5;
1490
1491 glColor4f (c[0], c[1], c[2], 0.75);
1492 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1493 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1494 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1495 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1496 }
1497 }
1498
1499 glEnd ();
1500 glDisable (GL_BLEND);
1501 glDisable (GL_TEXTURE_2D);
1502}
1503
1504void
1505fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1506 PPCODE:
1507{
1508 int vx, vy;
1509 int x, y;
1510 int sw4 = (sw + 3) & ~3;
1511 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1512 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1513
1514 memset (darkness, 255, sw4 * sh);
1515 SvPOK_only (darkness_sv);
1516 SvCUR_set (darkness_sv, sw4 * sh);
1517
1518 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1519 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1520
1521 for (y = 0; y < sh; y++)
1522 if (0 <= y + vy && y + vy < self->rows)
1523 {
1524 maprow *row = self->row + (y + vy);
1525
1526 for (x = 0; x < sw; x++)
1527 if (row->c0 <= x + vx && x + vx < row->c1)
1528 {
1529 mapcell *cell = row->col + (x + vx - row->c0);
1530
1531 darkness[y * sw4 + x] = cell->darkness < 0
1532 ? 255 - FOW_DARKNESS
1533 : 255 - cell->darkness;
1534 }
1535 }
1417 1536
1418 EXTEND (SP, 3); 1537 EXTEND (SP, 3);
1419 PUSHs (sv_2mortal (newSViv (sw4))); 1538 PUSHs (sv_2mortal (newSViv (sw4)));
1420 PUSHs (sv_2mortal (newSViv (sh))); 1539 PUSHs (sv_2mortal (newSViv (sh)));
1421 PUSHs (darkness_sv); 1540 PUSHs (darkness_sv);
1422} 1541}
1423 1542
1424SV * 1543SV *
1425get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1544get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1426 CODE: 1545 CODE:
1427{ 1546{
1428 int x, y, x1, y1; 1547 int x, y, x1, y1;
1429 SV *data_sv = newSV (w * h * 7 + 5); 1548 SV *data_sv = newSV (w * h * 7 + 5);
1430 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1549 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1492} 1611}
1493 OUTPUT: 1612 OUTPUT:
1494 RETVAL 1613 RETVAL
1495 1614
1496void 1615void
1497set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1616set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1498 PPCODE: 1617 PPCODE:
1499{ 1618{
1500 int x, y, z; 1619 int x, y, z;
1501 int w, h; 1620 int w, h;
1502 int x1, y1; 1621 int x1, y1;
1551 } 1670 }
1552 } 1671 }
1553 } 1672 }
1554} 1673}
1555 1674
1556MODULE = CFClient PACKAGE = CFClient::MixChunk 1675MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557 1676
1558CFClient::MixChunk 1677CFPlus::MixChunk
1559new_from_file (SV *class, char *path) 1678new_from_file (SV *class, char *path)
1560 CODE: 1679 CODE:
1561 RETVAL = Mix_LoadWAV (path); 1680 RETVAL = Mix_LoadWAV (path);
1562 OUTPUT: 1681 OUTPUT:
1563 RETVAL 1682 RETVAL
1564 1683
1565void 1684void
1566DESTROY (CFClient::MixChunk self) 1685DESTROY (CFPlus::MixChunk self)
1567 CODE: 1686 CODE:
1568 Mix_FreeChunk (self); 1687 Mix_FreeChunk (self);
1569 1688
1570int 1689int
1571volume (CFClient::MixChunk self, int volume = -1) 1690volume (CFPlus::MixChunk self, int volume = -1)
1572 CODE: 1691 CODE:
1573 RETVAL = Mix_VolumeChunk (self, volume); 1692 RETVAL = Mix_VolumeChunk (self, volume);
1574 OUTPUT: 1693 OUTPUT:
1575 RETVAL 1694 RETVAL
1576 1695
1577int 1696int
1578play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1697play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1579 CODE: 1698 CODE:
1580 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1699 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581 OUTPUT: 1700 OUTPUT:
1582 RETVAL 1701 RETVAL
1583 1702
1584MODULE = CFClient PACKAGE = CFClient::MixMusic 1703MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585 1704
1586int 1705int
1587volume (int volume = -1) 1706volume (int volume = -1)
1588 CODE: 1707 CODE:
1589 RETVAL = Mix_VolumeMusic (volume); 1708 RETVAL = Mix_VolumeMusic (volume);
1590 OUTPUT: 1709 OUTPUT:
1591 RETVAL 1710 RETVAL
1592 1711
1593CFClient::MixMusic 1712CFPlus::MixMusic
1594new_from_file (SV *class, char *path) 1713new_from_file (SV *class, char *path)
1595 CODE: 1714 CODE:
1596 RETVAL = Mix_LoadMUS (path); 1715 RETVAL = Mix_LoadMUS (path);
1597 OUTPUT: 1716 OUTPUT:
1598 RETVAL 1717 RETVAL
1599 1718
1600void 1719void
1601DESTROY (CFClient::MixMusic self) 1720DESTROY (CFPlus::MixMusic self)
1602 CODE: 1721 CODE:
1603 Mix_FreeMusic (self); 1722 Mix_FreeMusic (self);
1604 1723
1605int 1724int
1606play (CFClient::MixMusic self, int loops = -1) 1725play (CFPlus::MixMusic self, int loops = -1)
1607 CODE: 1726 CODE:
1608 RETVAL = Mix_PlayMusic (self, loops); 1727 RETVAL = Mix_PlayMusic (self, loops);
1609 OUTPUT: 1728 OUTPUT:
1610 RETVAL 1729 RETVAL
1611 1730
1612MODULE = CFClient PACKAGE = CFClient::OpenGL 1731MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1613 1732
1614BOOT: 1733BOOT:
1615{ 1734{
1616 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1735 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617 static const struct { 1736 static const struct {
1618 const char *name; 1737 const char *name;
1619 IV iv; 1738 IV iv;
1620 } *civ, const_iv[] = { 1739 } *civ, const_iv[] = {
1621# define const_iv(name) { # name, (IV)name } 1740# define const_iv(name) { # name, (IV)name }
1628 const_iv (GL_SCISSOR_TEST), 1747 const_iv (GL_SCISSOR_TEST),
1629 const_iv (GL_DEPTH_TEST), 1748 const_iv (GL_DEPTH_TEST),
1630 const_iv (GL_ALPHA_TEST), 1749 const_iv (GL_ALPHA_TEST),
1631 const_iv (GL_NORMALIZE), 1750 const_iv (GL_NORMALIZE),
1632 const_iv (GL_RESCALE_NORMAL), 1751 const_iv (GL_RESCALE_NORMAL),
1752 const_iv (GL_FRONT),
1753 const_iv (GL_BACK),
1633 const_iv (GL_AND), 1754 const_iv (GL_AND),
1634 const_iv (GL_ONE), 1755 const_iv (GL_ONE),
1635 const_iv (GL_ZERO), 1756 const_iv (GL_ZERO),
1636 const_iv (GL_SRC_ALPHA), 1757 const_iv (GL_SRC_ALPHA),
1637 const_iv (GL_DST_ALPHA), 1758 const_iv (GL_DST_ALPHA),
1638 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1759 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639 const_iv (GL_ONE_MINUS_DST_ALPHA), 1760 const_iv (GL_ONE_MINUS_DST_ALPHA),
1640 const_iv (GL_SRC_ALPHA_SATURATE), 1761 const_iv (GL_SRC_ALPHA_SATURATE),
1641 const_iv (GL_RGB), 1762 const_iv (GL_RGB),
1642 const_iv (GL_RGBA), 1763 const_iv (GL_RGBA),
1764 const_iv (GL_RGBA4),
1765 const_iv (GL_RGBA8),
1766 const_iv (GL_RGB5_A1),
1643 const_iv (GL_UNSIGNED_BYTE), 1767 const_iv (GL_UNSIGNED_BYTE),
1644 const_iv (GL_UNSIGNED_SHORT), 1768 const_iv (GL_UNSIGNED_SHORT),
1645 const_iv (GL_UNSIGNED_INT), 1769 const_iv (GL_UNSIGNED_INT),
1646 const_iv (GL_ALPHA), 1770 const_iv (GL_ALPHA),
1647 const_iv (GL_INTENSITY), 1771 const_iv (GL_INTENSITY),
1679 const_iv (GL_SEPARABLE_2D), 1803 const_iv (GL_SEPARABLE_2D),
1680 const_iv (GL_CONVOLUTION_2D), 1804 const_iv (GL_CONVOLUTION_2D),
1681 const_iv (GL_CONVOLUTION_BORDER_MODE), 1805 const_iv (GL_CONVOLUTION_BORDER_MODE),
1682 const_iv (GL_CONSTANT_BORDER), 1806 const_iv (GL_CONSTANT_BORDER),
1683 const_iv (GL_LINES), 1807 const_iv (GL_LINES),
1808 const_iv (GL_LINE_STRIP),
1684 const_iv (GL_LINE_LOOP), 1809 const_iv (GL_LINE_LOOP),
1685 const_iv (GL_QUADS), 1810 const_iv (GL_QUADS),
1686 const_iv (GL_QUAD_STRIP), 1811 const_iv (GL_QUAD_STRIP),
1687 const_iv (GL_TRIANGLES), 1812 const_iv (GL_TRIANGLES),
1688 const_iv (GL_TRIANGLE_STRIP), 1813 const_iv (GL_TRIANGLE_STRIP),
1756 1881
1757void glPopMatrix () 1882void glPopMatrix ()
1758 1883
1759void glLoadIdentity () 1884void glLoadIdentity ()
1760 1885
1886void glDrawBuffer (int buffer)
1887
1888void glReadBuffer (int buffer)
1889
1761# near_ and far_ are due to microsofts buggy "c" compiler 1890# near_ and far_ are due to microsofts buggy "c" compiler
1762void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1891void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1763 1892
1764# near_ and far_ are due to microsofts buggy "c" compiler 1893# near_ and far_ are due to microsofts buggy "c" compiler
1765void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1894void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1794 r *= a; 1923 r *= a;
1795 g *= a; 1924 g *= a;
1796 b *= a; 1925 b *= a;
1797 } 1926 }
1798 // microsoft visual "c" rounds instead of truncating... 1927 // microsoft visual "c" rounds instead of truncating...
1799 glColor4ub (MIN ((int)(r * 256.f), 255), 1928 glColor4f (r, g, b, a);
1800 MIN ((int)(g * 256.f), 255),
1801 MIN ((int)(b * 256.f), 255),
1802 MIN ((int)(a * 256.f), 255));
1803 1929
1804void glInterleavedArrays (int format, int stride, char *data) 1930void glInterleavedArrays (int format, int stride, char *data)
1805 1931
1806void glDrawElements (int mode, int count, int type, char *indices) 1932void glDrawElements (int mode, int count, int type, char *indices)
1807 1933
1884 2010
1885void glEndList () 2011void glEndList ()
1886 2012
1887void glCallList (int list) 2013void glCallList (int list)
1888 2014
1889

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines