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.115 by root, Wed Jun 14 18:59:30 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 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
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 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
518 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
494 519
495 SDL_EnableUNICODE (1); 520 SDL_EnableUNICODE (1);
496 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 521 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
497 522
498 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 523 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
585 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 610 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 611 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587 break; 612 break;
588 } 613 }
589 614
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 615 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591 } 616 }
592} 617}
593 618
594int 619int
595Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 620Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
611#endif 636#endif
612 637
613void 638void
614add_font (char *file) 639add_font (char *file)
615 CODE: 640 CODE:
616 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 641 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617#ifdef _WIN32
618 // cairo... sigh... requires win2000
619 AddFontResourceEx (file, FR_PRIVATE, 0);
620#endif
621 642
622void 643void
623load_image_inline (SV *image_) 644load_image_inline (SV *image_)
624 ALIAS: 645 ALIAS:
625 load_image_file = 1 646 load_image_file = 1
667 688
668 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 689 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669 690
670 assert (surface2->pitch == surface2->w * 4); 691 assert (surface2->pitch == surface2->w * 4);
671 692
693 SDL_LockSurface (surface2);
672 EXTEND (SP, 5); 694 EXTEND (SP, 6);
673 PUSHs (sv_2mortal (newSViv (surface2->w))); 695 PUSHs (sv_2mortal (newSViv (surface2->w)));
674 PUSHs (sv_2mortal (newSViv (surface2->h))); 696 PUSHs (sv_2mortal (newSViv (surface2->h)));
675 SDL_LockSurface (surface2);
676 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 697 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_RGBA8 : GL_RGB8))); 698 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
679 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 699 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 700 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
701 SDL_UnlockSurface (surface2);
681 702
682 SDL_FreeSurface (surface); 703 SDL_FreeSurface (surface);
683 SDL_FreeSurface (surface2); 704 SDL_FreeSurface (surface2);
684} 705}
685 706
728void 749void
729_exit (int retval) 750_exit (int retval)
730 CODE: 751 CODE:
731 _exit (retval); 752 _exit (retval);
732 753
733MODULE = CFClient PACKAGE = CFClient::Font 754MODULE = CFPlus PACKAGE = CFPlus::Font
734 755
735CFClient::Font 756CFPlus::Font
736new_from_file (SV *class, char *path, int id = 0) 757new_from_file (SV *class, char *path, int id = 0)
737 CODE: 758 CODE:
738{ 759{
739 int count; 760 int count;
740 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 761 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
743} 764}
744 OUTPUT: 765 OUTPUT:
745 RETVAL 766 RETVAL
746 767
747void 768void
748DESTROY (CFClient::Font self) 769DESTROY (CFPlus::Font self)
749 CODE: 770 CODE:
750 pango_font_description_free (self); 771 pango_font_description_free (self);
751 772
752void 773void
753make_default (CFClient::Font self) 774make_default (CFPlus::Font self)
754 CODE: 775 CODE:
755 default_font = self; 776 default_font = self;
756 777
757MODULE = CFClient PACKAGE = CFClient::Layout 778MODULE = CFPlus PACKAGE = CFPlus::Layout
758 779
759CFClient::Layout 780void
760new (SV *class, int rgba = 0) 781reset_glyph_cache ()
782 CODE:
783 tc_clear ();
784
785CFPlus::Layout
786new (SV *class)
761 CODE: 787 CODE:
762 New (0, RETVAL, 1, struct cf_layout); 788 New (0, RETVAL, 1, struct cf_layout);
763 789
764 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 790 RETVAL->pl = pango_layout_new (opengl_context);
765 RETVAL->rgba = rgba;
766 RETVAL->r = 1.; 791 RETVAL->r = 1.;
767 RETVAL->g = 1.; 792 RETVAL->g = 1.;
768 RETVAL->b = 1.; 793 RETVAL->b = 1.;
769 RETVAL->a = 1.; 794 RETVAL->a = 1.;
770 RETVAL->base_height = MIN_FONT_HEIGHT; 795 RETVAL->base_height = MIN_FONT_HEIGHT;
774 layout_update_font (RETVAL); 799 layout_update_font (RETVAL);
775 OUTPUT: 800 OUTPUT:
776 RETVAL 801 RETVAL
777 802
778void 803void
779DESTROY (CFClient::Layout self) 804DESTROY (CFPlus::Layout self)
780 CODE: 805 CODE:
781 g_object_unref (self->pl); 806 g_object_unref (self->pl);
782 Safefree (self); 807 Safefree (self);
783 808
784int
785is_rgba (CFClient::Layout self)
786 CODE:
787 RETVAL = self->rgba;
788 OUTPUT:
789 RETVAL
790
791void 809void
792set_text (CFClient::Layout self, SV *text_) 810set_text (CFPlus::Layout self, SV *text_)
793 CODE: 811 CODE:
794{ 812{
795 STRLEN textlen; 813 STRLEN textlen;
796 char *text = SvPVutf8 (text_, textlen); 814 char *text = SvPVutf8 (text_, textlen);
797 815
798 pango_layout_set_text (self->pl, text, textlen); 816 pango_layout_set_text (self->pl, text, textlen);
799} 817}
800 818
801void 819void
802set_markup (CFClient::Layout self, SV *text_) 820set_markup (CFPlus::Layout self, SV *text_)
803 CODE: 821 CODE:
804{ 822{
805 STRLEN textlen; 823 STRLEN textlen;
806 char *text = SvPVutf8 (text_, textlen); 824 char *text = SvPVutf8 (text_, textlen);
807 825
808 pango_layout_set_markup (self->pl, text, textlen); 826 pango_layout_set_markup (self->pl, text, textlen);
809} 827}
810 828
829void
830set_shapes (CFPlus::Layout self, ...)
831 CODE:
832{
833 PangoAttrList *attrs = 0;
834 const char *text = pango_layout_get_text (self->pl);
835 const char *pos = text;
836 int arg = 4;
837
838 while (arg < items && (pos = strstr (pos, OBJ_STR)))
839 {
840 PangoRectangle inkrect, rect;
841 PangoAttribute *attr;
842
843 int x = SvIV (ST (arg - 3));
844 int y = SvIV (ST (arg - 2));
845 int w = SvIV (ST (arg - 1));
846 int h = SvIV (ST (arg ));
847
848 inkrect.x = 0;
849 inkrect.y = 0;
850 inkrect.width = 0;
851 inkrect.height = 0;
852
853 rect.x = x * PANGO_SCALE;
854 rect.y = y * PANGO_SCALE;
855 rect.width = w * PANGO_SCALE;
856 rect.height = h * PANGO_SCALE;
857
858 if (!attrs)
859 attrs = pango_layout_get_attributes (self->pl);
860
861 attr = pango_attr_shape_new (&inkrect, &rect);
862 attr->start_index = pos - text;
863 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
864 pango_attr_list_insert (attrs, attr);
865
866 arg += 4;
867 pos += sizeof (OBJ_STR) - 1;
868 }
869
870 if (attrs)
871 pango_layout_set_attributes (self->pl, attrs);
872}
873
874void
875get_shapes (CFPlus::Layout self)
876 PPCODE:
877{
878 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879
880 do
881 {
882 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
883
884 if (run && shape_attr_p (run))
885 {
886 PangoRectangle extents;
887 pango_layout_iter_get_run_extents (iter, 0, &extents);
888
889 EXTEND (SP, 2);
890 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
891 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
892 }
893 }
894 while (pango_layout_iter_next_run (iter));
895
896 pango_layout_iter_free (iter);
897}
898
899int
900has_wrapped (CFPlus::Layout self)
901 CODE:
902{
903 int lines = 1;
904 const char *text = pango_layout_get_text (self->pl);
905
906 while (*text)
907 lines += *text++ == '\n';
908
909 RETVAL = lines < pango_layout_get_line_count (self->pl);
910}
911 OUTPUT:
912 RETVAL
913
811SV * 914SV *
812get_text (CFClient::Layout self) 915get_text (CFPlus::Layout self)
813 CODE: 916 CODE:
814 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 917 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815 sv_utf8_decode (RETVAL); 918 sv_utf8_decode (RETVAL);
816 OUTPUT: 919 OUTPUT:
817 RETVAL 920 RETVAL
818 921
819void 922void
820set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 923set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
821 CODE: 924 CODE:
822 self->r = r; 925 self->r = r;
823 self->g = g; 926 self->g = g;
824 self->b = b; 927 self->b = b;
825 self->a = a; 928 self->a = a;
826 929
827void 930void
828set_font (CFClient::Layout self, CFClient::Font font = 0) 931set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829 CODE: 932 CODE:
830 if (self->font != font) 933 if (self->font != font)
831 { 934 {
832 self->font = font; 935 self->font = font;
833 layout_update_font (self); 936 layout_update_font (self);
834 } 937 }
835 938
836void 939void
837set_height (CFClient::Layout self, int base_height) 940set_height (CFPlus::Layout self, int base_height)
838 CODE: 941 CODE:
839 if (self->base_height != base_height) 942 if (self->base_height != base_height)
840 { 943 {
841 self->base_height = base_height; 944 self->base_height = base_height;
842 layout_update_font (self); 945 layout_update_font (self);
843 } 946 }
844 947
845void 948void
846set_width (CFClient::Layout self, int max_width = -1) 949set_width (CFPlus::Layout self, int max_width = -1)
847 CODE: 950 CODE:
848 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 951 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
849 952
850void 953void
851set_indent (CFClient::Layout self, int indent) 954set_indent (CFPlus::Layout self, int indent)
852 CODE: 955 CODE:
853 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 956 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854 957
855void 958void
856set_spacing (CFClient::Layout self, int spacing) 959set_spacing (CFPlus::Layout self, int spacing)
857 CODE: 960 CODE:
858 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 961 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859 962
860void 963void
861set_ellipsise (CFClient::Layout self, int ellipsise) 964set_ellipsise (CFPlus::Layout self, int ellipsise)
862 CODE: 965 CODE:
863 pango_layout_set_ellipsize (self->pl, 966 pango_layout_set_ellipsize (self->pl,
864 ellipsise == 1 ? PANGO_ELLIPSIZE_START 967 ellipsise == 1 ? PANGO_ELLIPSIZE_START
865 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 968 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 969 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
867 : PANGO_ELLIPSIZE_NONE 970 : PANGO_ELLIPSIZE_NONE
868 ); 971 );
869 972
870void 973void
871set_single_paragraph_mode (CFClient::Layout self, int spm) 974set_single_paragraph_mode (CFPlus::Layout self, int spm)
872 CODE: 975 CODE:
873 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 976 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874 977
875void 978void
876size (CFClient::Layout self) 979size (CFPlus::Layout self)
877 PPCODE: 980 PPCODE:
878{ 981{
879 int w, h; 982 int w, h;
880 983
881 layout_get_pixel_size (self, &w, &h); 984 layout_get_pixel_size (self, &w, &h);
884 PUSHs (sv_2mortal (newSViv (w))); 987 PUSHs (sv_2mortal (newSViv (w)));
885 PUSHs (sv_2mortal (newSViv (h))); 988 PUSHs (sv_2mortal (newSViv (h)));
886} 989}
887 990
888int 991int
992descent (CFPlus::Layout self)
993 CODE:
994{
995 PangoRectangle rect;
996 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
997 pango_layout_line_get_pixel_extents (line, 0, &rect);
998 RETVAL = PANGO_DESCENT (rect);
999}
1000 OUTPUT:
1001 RETVAL
1002
1003int
889xy_to_index (CFClient::Layout self, int x, int y) 1004xy_to_index (CFPlus::Layout self, int x, int y)
890 CODE: 1005 CODE:
891{ 1006{
892 int index, trailing; 1007 int index, trailing;
893 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1008 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
894 RETVAL = index; 1009 RETVAL = index;
895} 1010}
896 OUTPUT: 1011 OUTPUT:
897 RETVAL 1012 RETVAL
898 1013
899void 1014void
900cursor_pos (CFClient::Layout self, int index) 1015cursor_pos (CFPlus::Layout self, int index)
901 PPCODE: 1016 PPCODE:
902{ 1017{
903 PangoRectangle strong_pos; 1018 PangoRectangle strong_pos;
904 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1019 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905 1020
908 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1023 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1024 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910} 1025}
911 1026
912void 1027void
913render (CFClient::Layout self) 1028render (CFPlus::Layout self, float x, float y)
914 PPCODE: 1029 PPCODE:
915{ 1030 pango_opengl_render_layout_subpixel (
916 SV *retval; 1031 self->pl,
917 int w, h; 1032 x * PANGO_SCALE, y * PANGO_SCALE,
918 1033 self->r, self->g, self->b, self->a
919 layout_get_pixel_size (self, &w, &h);
920
921 if (self->rgba)
922 { 1034 );
923 cairo_surface_t *surface;
924 cairo_t *cairo;
925 1035
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_RGBA8)));
973 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974 }
975 else
976 {
977 FT_Bitmap bitmap;
978
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 1036MODULE = CFPlus PACKAGE = CFPlus::Texture
1004 1037
1005void 1038void
1006pad2pot (SV *data_, SV *w_, SV *h_) 1039pad2pot (SV *data_, SV *w_, SV *h_)
1007 CODE: 1040 CODE:
1008{ 1041{
1086 glDisable (GL_ALPHA_TEST); 1119 glDisable (GL_ALPHA_TEST);
1087 glDisable (GL_BLEND); 1120 glDisable (GL_BLEND);
1088 } 1121 }
1089} 1122}
1090 1123
1091MODULE = CFClient PACKAGE = CFClient::Map 1124MODULE = CFPlus PACKAGE = CFPlus::Map
1092 1125
1093CFClient::Map 1126CFPlus::Map
1094new (SV *class, int map_width, int map_height) 1127new (SV *class, int map_width, int map_height)
1095 CODE: 1128 CODE:
1096 New (0, RETVAL, 1, struct map); 1129 New (0, RETVAL, 1, struct map);
1097 RETVAL->x = 0; 1130 RETVAL->x = 0;
1098 RETVAL->y = 0; 1131 RETVAL->y = 0;
1108 RETVAL->row = 0; 1141 RETVAL->row = 0;
1109 OUTPUT: 1142 OUTPUT:
1110 RETVAL 1143 RETVAL
1111 1144
1112void 1145void
1113DESTROY (CFClient::Map self) 1146DESTROY (CFPlus::Map self)
1114 CODE: 1147 CODE:
1115{ 1148{
1116 map_clear (self); 1149 map_clear (self);
1117 Safefree (self->face); 1150 Safefree (self->face);
1118 Safefree (self->tex); 1151 Safefree (self->tex);
1119 Safefree (self); 1152 Safefree (self);
1120} 1153}
1121 1154
1122void 1155void
1123clear (CFClient::Map self) 1156clear (CFPlus::Map self)
1124 CODE: 1157 CODE:
1125 map_clear (self); 1158 map_clear (self);
1126 1159
1127void 1160void
1128set_face (CFClient::Map self, int face, int texid) 1161set_face (CFPlus::Map self, int face, int texid)
1129 CODE: 1162 CODE:
1130{ 1163{
1131 while (self->faces <= face) 1164 while (self->faces <= face)
1132 { 1165 {
1133 Append (mapface, self->face, self->faces, self->faces); 1166 Append (mapface, self->face, self->faces, self->faces);
1136 1169
1137 self->face [face] = texid; 1170 self->face [face] = texid;
1138} 1171}
1139 1172
1140void 1173void
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) 1174set_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: 1175 CODE:
1143{ 1176{
1144 while (self->texs <= texid) 1177 while (self->texs <= texid)
1145 { 1178 {
1146 Append (maptex, self->tex, self->texs, self->texs); 1179 Append (maptex, self->tex, self->texs, self->texs);
1170 // from transparent color bleeding and ugly wrapping effects. 1203 // from transparent color bleeding and ugly wrapping effects.
1171 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1204 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172} 1205}
1173 1206
1174int 1207int
1175ox (CFClient::Map self) 1208ox (CFPlus::Map self)
1176 ALIAS: 1209 ALIAS:
1177 oy = 1 1210 oy = 1
1178 x = 2 1211 x = 2
1179 y = 3 1212 y = 3
1180 w = 4 1213 w = 4
1191 } 1224 }
1192 OUTPUT: 1225 OUTPUT:
1193 RETVAL 1226 RETVAL
1194 1227
1195void 1228void
1196scroll (CFClient::Map self, int dx, int dy) 1229scroll (CFPlus::Map self, int dx, int dy)
1197 CODE: 1230 CODE:
1198{ 1231{
1199 if (dx > 0) 1232 if (dx > 0)
1200 map_blank (self, self->x, self->y, dx - 1, self->h); 1233 map_blank (self, self->x, self->y, dx - 1, self->h);
1201 else if (dx < 0) 1234 else if (dx < 0)
1217 self->y += MAP_EXTEND_Y; 1250 self->y += MAP_EXTEND_Y;
1218 } 1251 }
1219} 1252}
1220 1253
1221void 1254void
1222map1a_update (CFClient::Map self, SV *data_) 1255map1a_update (CFPlus::Map self, SV *data_)
1223 CODE: 1256 CODE:
1224{ 1257{
1225 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1258 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1226 uint8_t *data_end = (uint8_t *)SvEND (data_); 1259 uint8_t *data_end = (uint8_t *)SvEND (data_);
1227 mapcell *cell; 1260 mapcell *cell;
1229 1262
1230 while (data < data_end) 1263 while (data < data_end)
1231 { 1264 {
1232 flags = (data [0] << 8) + data [1]; data += 2; 1265 flags = (data [0] << 8) + data [1]; data += 2;
1233 1266
1234 x = ((flags >> 10) & 63) + self->x; 1267 x = self->x + ((flags >> 10) & 63);
1235 y = ((flags >> 4) & 63) + self->y; 1268 y = self->y + ((flags >> 4) & 63);
1236 1269
1237 cell = map_get_cell (self, x, y); 1270 cell = map_get_cell (self, x, y);
1238 1271
1239 if (flags & 15) 1272 if (flags & 15)
1240 { 1273 {
1269 cell->darkness = -1; 1302 cell->darkness = -1;
1270 } 1303 }
1271} 1304}
1272 1305
1273SV * 1306SV *
1274mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1307mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1275 CODE: 1308 CODE:
1276{ 1309{
1277 int x1, x; 1310 int x1, x;
1278 int y1, y; 1311 int y1, y;
1279 int z; 1312 int z;
1329} 1362}
1330 OUTPUT: 1363 OUTPUT:
1331 RETVAL 1364 RETVAL
1332 1365
1333void 1366void
1334draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1367draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1335 PPCODE: 1368 CODE:
1336{ 1369{
1337 int vx, vy; 1370 int vx, vy;
1338 int x, y, z; 1371 int x, y, z;
1339 int last_name; 1372 int last_name;
1340 mapface face; 1373 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 1374
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; 1375 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1350 vy = self->y + (self->h - sh) / 2 - shift_y; 1376 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1351 1377
1352 /* 1378 /*
1353 int vx = self->vx = self->w >= sw 1379 int vx = self->vx = self->w >= sw
1354 ? self->x + (self->w - sw) / 2 1380 ? self->x + (self->w - sw) / 2
1355 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1381 : 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)); 1385 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360 */ 1386 */
1361 1387
1362 glColor4ub (255, 255, 255, 255); 1388 glColor4ub (255, 255, 255, 255);
1363 1389
1390 glEnable (GL_BLEND);
1364 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1391 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365 glEnable (GL_BLEND);
1366 glEnable (GL_TEXTURE_2D); 1392 glEnable (GL_TEXTURE_2D);
1367 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1393 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368 1394
1369 glBegin (GL_QUADS); 1395 glBegin (GL_QUADS);
1370 1396
1378 1404
1379 for (x = 0; x < sw; x++) 1405 for (x = 0; x < sw; x++)
1380 if (row->c0 <= x + vx && x + vx < row->c1) 1406 if (row->c0 <= x + vx && x + vx < row->c1)
1381 { 1407 {
1382 mapcell *cell = row->col + (x + vx - row->c0); 1408 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 1409
1388 face = cell->face [z]; 1410 face = cell->face [z];
1389 1411
1390 if (face) 1412 if (face)
1391 { 1413 {
1412 1434
1413 glEnd (); 1435 glEnd ();
1414 1436
1415 glDisable (GL_TEXTURE_2D); 1437 glDisable (GL_TEXTURE_2D);
1416 glDisable (GL_BLEND); 1438 glDisable (GL_BLEND);
1439}
1440
1441void
1442draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443 CODE:
1444{
1445 static float color[16][3] = {
1446 { 0.00F, 0.00F, 0.00F },
1447 { 1.00F, 1.00F, 1.00F },
1448 { 0.00F, 0.00F, 0.55F },
1449 { 1.00F, 0.00F, 0.00F },
1450
1451 { 1.00F, 0.54F, 0.00F },
1452 { 0.11F, 0.56F, 1.00F },
1453 { 0.93F, 0.46F, 0.00F },
1454 { 0.18F, 0.54F, 0.34F },
1455
1456 { 0.56F, 0.73F, 0.56F },
1457 { 0.80F, 0.80F, 0.80F },
1458 { 0.55F, 0.41F, 0.13F },
1459 { 0.99F, 0.77F, 0.26F },
1460
1461 { 0.74F, 0.65F, 0.41F },
1462
1463 { 0.00F, 1.00F, 1.00F },
1464 { 1.00F, 0.00F, 1.00F },
1465 { 1.00F, 1.00F, 0.00F },
1466 };
1467
1468 int x, y;
1469
1470 glEnable (GL_TEXTURE_2D);
1471 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1472 glEnable (GL_BLEND);
1473 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1474 glBegin (GL_QUADS);
1475
1476 for (y = 0; y < h; y++)
1477 for (x = 0; x < w; x++)
1478 {
1479 unsigned char m = data [x + y * w];
1480
1481 if (m)
1482 {
1483 float *c = color [m & 15];
1484
1485 float tx1 = m & 0x40 ? 0.5 : 0.;
1486 float tx2 = tx1 + 0.5;
1487
1488 glColor4f (c[0], c[1], c[2], 0.75);
1489 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1490 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1491 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1492 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1493 }
1494 }
1495
1496 glEnd ();
1497 glDisable (GL_BLEND);
1498 glDisable (GL_TEXTURE_2D);
1499}
1500
1501void
1502fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1503 PPCODE:
1504{
1505 int vx, vy;
1506 int x, y;
1507 int sw4 = (sw + 3) & ~3;
1508 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1509 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1510
1511 memset (darkness, 255, sw4 * sh);
1512 SvPOK_only (darkness_sv);
1513 SvCUR_set (darkness_sv, sw4 * sh);
1514
1515 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1516 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1517
1518 for (y = 0; y < sh; y++)
1519 if (0 <= y + vy && y + vy < self->rows)
1520 {
1521 maprow *row = self->row + (y + vy);
1522
1523 for (x = 0; x < sw; x++)
1524 if (row->c0 <= x + vx && x + vx < row->c1)
1525 {
1526 mapcell *cell = row->col + (x + vx - row->c0);
1527
1528 darkness[y * sw4 + x] = cell->darkness < 0
1529 ? 255 - FOW_DARKNESS
1530 : 255 - cell->darkness;
1531 }
1532 }
1417 1533
1418 EXTEND (SP, 3); 1534 EXTEND (SP, 3);
1419 PUSHs (sv_2mortal (newSViv (sw4))); 1535 PUSHs (sv_2mortal (newSViv (sw4)));
1420 PUSHs (sv_2mortal (newSViv (sh))); 1536 PUSHs (sv_2mortal (newSViv (sh)));
1421 PUSHs (darkness_sv); 1537 PUSHs (darkness_sv);
1422} 1538}
1423 1539
1424SV * 1540SV *
1425get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1541get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1426 CODE: 1542 CODE:
1427{ 1543{
1428 int x, y, x1, y1; 1544 int x, y, x1, y1;
1429 SV *data_sv = newSV (w * h * 7 + 5); 1545 SV *data_sv = newSV (w * h * 7 + 5);
1430 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1546 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1492} 1608}
1493 OUTPUT: 1609 OUTPUT:
1494 RETVAL 1610 RETVAL
1495 1611
1496void 1612void
1497set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1613set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1498 PPCODE: 1614 PPCODE:
1499{ 1615{
1500 int x, y, z; 1616 int x, y, z;
1501 int w, h; 1617 int w, h;
1502 int x1, y1; 1618 int x1, y1;
1551 } 1667 }
1552 } 1668 }
1553 } 1669 }
1554} 1670}
1555 1671
1556MODULE = CFClient PACKAGE = CFClient::MixChunk 1672MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557 1673
1558CFClient::MixChunk 1674CFPlus::MixChunk
1559new_from_file (SV *class, char *path) 1675new_from_file (SV *class, char *path)
1560 CODE: 1676 CODE:
1561 RETVAL = Mix_LoadWAV (path); 1677 RETVAL = Mix_LoadWAV (path);
1562 OUTPUT: 1678 OUTPUT:
1563 RETVAL 1679 RETVAL
1564 1680
1565void 1681void
1566DESTROY (CFClient::MixChunk self) 1682DESTROY (CFPlus::MixChunk self)
1567 CODE: 1683 CODE:
1568 Mix_FreeChunk (self); 1684 Mix_FreeChunk (self);
1569 1685
1570int 1686int
1571volume (CFClient::MixChunk self, int volume = -1) 1687volume (CFPlus::MixChunk self, int volume = -1)
1572 CODE: 1688 CODE:
1573 RETVAL = Mix_VolumeChunk (self, volume); 1689 RETVAL = Mix_VolumeChunk (self, volume);
1574 OUTPUT: 1690 OUTPUT:
1575 RETVAL 1691 RETVAL
1576 1692
1577int 1693int
1578play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1694play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1579 CODE: 1695 CODE:
1580 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1696 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581 OUTPUT: 1697 OUTPUT:
1582 RETVAL 1698 RETVAL
1583 1699
1584MODULE = CFClient PACKAGE = CFClient::MixMusic 1700MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585 1701
1586int 1702int
1587volume (int volume = -1) 1703volume (int volume = -1)
1588 CODE: 1704 CODE:
1589 RETVAL = Mix_VolumeMusic (volume); 1705 RETVAL = Mix_VolumeMusic (volume);
1590 OUTPUT: 1706 OUTPUT:
1591 RETVAL 1707 RETVAL
1592 1708
1593CFClient::MixMusic 1709CFPlus::MixMusic
1594new_from_file (SV *class, char *path) 1710new_from_file (SV *class, char *path)
1595 CODE: 1711 CODE:
1596 RETVAL = Mix_LoadMUS (path); 1712 RETVAL = Mix_LoadMUS (path);
1597 OUTPUT: 1713 OUTPUT:
1598 RETVAL 1714 RETVAL
1599 1715
1600void 1716void
1601DESTROY (CFClient::MixMusic self) 1717DESTROY (CFPlus::MixMusic self)
1602 CODE: 1718 CODE:
1603 Mix_FreeMusic (self); 1719 Mix_FreeMusic (self);
1604 1720
1605int 1721int
1606play (CFClient::MixMusic self, int loops = -1) 1722play (CFPlus::MixMusic self, int loops = -1)
1607 CODE: 1723 CODE:
1608 RETVAL = Mix_PlayMusic (self, loops); 1724 RETVAL = Mix_PlayMusic (self, loops);
1609 OUTPUT: 1725 OUTPUT:
1610 RETVAL 1726 RETVAL
1611 1727
1612MODULE = CFClient PACKAGE = CFClient::OpenGL 1728MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1613 1729
1614BOOT: 1730BOOT:
1615{ 1731{
1616 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1732 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617 static const struct { 1733 static const struct {
1618 const char *name; 1734 const char *name;
1619 IV iv; 1735 IV iv;
1620 } *civ, const_iv[] = { 1736 } *civ, const_iv[] = {
1621# define const_iv(name) { # name, (IV)name } 1737# define const_iv(name) { # name, (IV)name }
1628 const_iv (GL_SCISSOR_TEST), 1744 const_iv (GL_SCISSOR_TEST),
1629 const_iv (GL_DEPTH_TEST), 1745 const_iv (GL_DEPTH_TEST),
1630 const_iv (GL_ALPHA_TEST), 1746 const_iv (GL_ALPHA_TEST),
1631 const_iv (GL_NORMALIZE), 1747 const_iv (GL_NORMALIZE),
1632 const_iv (GL_RESCALE_NORMAL), 1748 const_iv (GL_RESCALE_NORMAL),
1749 const_iv (GL_FRONT),
1750 const_iv (GL_BACK),
1633 const_iv (GL_AND), 1751 const_iv (GL_AND),
1634 const_iv (GL_ONE), 1752 const_iv (GL_ONE),
1635 const_iv (GL_ZERO), 1753 const_iv (GL_ZERO),
1636 const_iv (GL_SRC_ALPHA), 1754 const_iv (GL_SRC_ALPHA),
1637 const_iv (GL_DST_ALPHA), 1755 const_iv (GL_DST_ALPHA),
1759 1877
1760void glPopMatrix () 1878void glPopMatrix ()
1761 1879
1762void glLoadIdentity () 1880void glLoadIdentity ()
1763 1881
1882void glDrawBuffer (int buffer)
1883
1884void glReadBuffer (int buffer)
1885
1764# near_ and far_ are due to microsofts buggy "c" compiler 1886# near_ and far_ are due to microsofts buggy "c" compiler
1765void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1887void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1766 1888
1767# near_ and far_ are due to microsofts buggy "c" compiler 1889# near_ and far_ are due to microsofts buggy "c" compiler
1768void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1890void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1797 r *= a; 1919 r *= a;
1798 g *= a; 1920 g *= a;
1799 b *= a; 1921 b *= a;
1800 } 1922 }
1801 // microsoft visual "c" rounds instead of truncating... 1923 // microsoft visual "c" rounds instead of truncating...
1802 glColor4ub (MIN ((int)(r * 256.f), 255), 1924 glColor4f (r, g, b, a);
1803 MIN ((int)(g * 256.f), 255),
1804 MIN ((int)(b * 256.f), 255),
1805 MIN ((int)(a * 256.f), 255));
1806 1925
1807void glInterleavedArrays (int format, int stride, char *data) 1926void glInterleavedArrays (int format, int stride, char *data)
1808 1927
1809void glDrawElements (int mode, int count, int type, char *indices) 1928void glDrawElements (int mode, int count, int type, char *indices)
1810 1929

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines