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.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.140 by root, Mon Aug 14 03:41:25 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>
20#include <stdlib.h>
15 21
16#include <SDL.h> 22#include <SDL.h>
17#include <SDL_endian.h> 23#include <SDL_endian.h>
18#include <SDL_image.h> 24#include <SDL_image.h>
19#include <SDL_mixer.h> 25#include <SDL_mixer.h>
20#include <SDL_opengl.h> 26#include <SDL_opengl.h>
21 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
22#include <glib/gmacros.h> 31#include <glib/gmacros.h>
23 32
24#include <pango/pango.h> 33#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 34
29#ifndef _WIN32 35#ifndef _WIN32
30# include <sys/types.h> 36# include <sys/types.h>
31# include <sys/socket.h> 37# include <sys/socket.h>
32# include <netinet/in.h> 38# include <netinet/in.h>
39 typedef signed char int8_t; 45 typedef signed char int8_t;
40 typedef signed short int16_t; 46 typedef signed short int16_t;
41 typedef signed int int32_t; 47 typedef signed int int32_t;
42#endif 48#endif
43 49
44#include "glext.h" 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45 51
46#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
47 53
48#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
50 56
51#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
52 64
53static struct 65static struct
54{ 66{
55#define GL_FUNC(ptr,name) ptr name; 67#define GL_FUNC(ptr,name) ptr name;
56#include "glfunc.h" 68#include "glfunc.h"
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 77 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else 78 else
67 glBlendFunc (sa, da); 79 glBlendFunc (sa, da);
68} 80}
69 81
82#include "texcache.c"
83
84#include "pango-font.c"
85#include "pango-fontmap.c"
86#include "pango-render.c"
87
70typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
71typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
72 90
73typedef 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}
74 110
75typedef struct cf_layout { 111typedef struct cf_layout {
76 PangoLayout *pl; // either derived from a cairo or ft2 context 112 PangoLayout *pl;
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode 113 float r, g, b, a; // default color for rgba mode
79 int base_height; 114 int base_height;
80 CFClient__Font font; 115 CFPlus__Font font;
81} *CFClient__Layout; 116} *CFPlus__Layout;
82 117
83static CFClient__Font default_font; 118static CFPlus__Font default_font;
84static PangoContext *ft2_context, *cairo_context; 119static PangoContext *opengl_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 120static PangoFontMap *opengl_fontmap;
86 121
87static void 122static void
88substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
89{ 124{
90 FcPatternAddBool (pattern, FC_HINTING , 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
91#ifdef _WIN32 126#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#else 128#endif
94 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif
96} 130}
97 131
98static void 132static void
99layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
100{ 134{
101 /* 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
102 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
103 */ 137 */
104 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
108 142
109 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
110} 144}
111 145
112static void 146static void
113layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
114{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
115 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
116 153
117 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119 156
120 *w = (*w + 3) & ~3; 157 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1;
159
160 *w = rect.width;
161 *h = rect.height;
121} 162}
122 163
123typedef uint16_t mapface; 164typedef uint16_t mapface;
124 165
125typedef struct { 166typedef struct {
148 int texs; 189 int texs;
149 maptex *tex; 190 maptex *tex;
150 191
151 int32_t rows; 192 int32_t rows;
152 maprow *row; 193 maprow *row;
153} *CFClient__Map; 194} *CFPlus__Map;
154 195
155static char * 196static char *
156prepend (char *ptr, int sze, int inc) 197prepend (char *ptr, int sze, int inc)
157{ 198{
158 char *p; 199 char *p;
176 217
177#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 218#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
178#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 219#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
179 220
180static maprow * 221static maprow *
181map_get_row (CFClient__Map self, int y) 222map_get_row (CFPlus__Map self, int y)
182{ 223{
183 if (0 > y) 224 if (0 > y)
184 { 225 {
185 int extend = - y + MAP_EXTEND_Y; 226 int extend = - y + MAP_EXTEND_Y;
186 Prepend (maprow, self->row, self->rows, extend); 227 Prepend (maprow, self->row, self->rows, extend);
224 265
225 return row->col + (x - row->c0); 266 return row->col + (x - row->c0);
226} 267}
227 268
228static mapcell * 269static mapcell *
229map_get_cell (CFClient__Map self, int x, int y) 270map_get_cell (CFPlus__Map self, int x, int y)
230{ 271{
231 return row_get_cell (map_get_row (self, y), x); 272 return row_get_cell (map_get_row (self, y), x);
232} 273}
233 274
234static void 275static void
235map_clear (CFClient__Map self) 276map_clear (CFPlus__Map self)
236{ 277{
237 int r; 278 int r;
238 279
239 for (r = 0; r < self->rows; r++) 280 for (r = 0; r < self->rows; r++)
240 Safefree (self->row[r].col); 281 Safefree (self->row[r].col);
248 self->row = 0; 289 self->row = 0;
249 self->rows = 0; 290 self->rows = 0;
250} 291}
251 292
252static void 293static void
253map_blank (CFClient__Map self, int x0, int y0, int w, int h) 294map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
254{ 295{
255 int x, y; 296 int x, y;
256 maprow *row; 297 maprow *row;
257 298
258 for (y = y0; y < y0 + h; y++) 299 for (y = y0; y < y0 + h; y++)
298 ev.data2 = 0; 339 ev.data2 = 0;
299 340
300 SDL_PushEvent ((SDL_Event *)&ev); 341 SDL_PushEvent ((SDL_Event *)&ev);
301} 342}
302 343
344static unsigned int
345minpot (unsigned int n)
346{
347 if (!n)
348 return 0;
349
350 --n;
351
352 n |= n >> 1;
353 n |= n >> 2;
354 n |= n >> 4;
355 n |= n >> 8;
356 n |= n >> 16;
357
358 return n + 1;
359}
360
303MODULE = CFClient PACKAGE = CFClient 361MODULE = CFPlus PACKAGE = CFPlus
304 362
305PROTOTYPES: ENABLE 363PROTOTYPES: ENABLE
306 364
307BOOT: 365BOOT:
308{ 366{
309 HV *stash = gv_stashpv ("CFClient", 1); 367 HV *stash = gv_stashpv ("CFPlus", 1);
310 static const struct { 368 static const struct {
311 const char *name; 369 const char *name;
312 IV iv; 370 IV iv;
313 } *civ, const_iv[] = { 371 } *civ, const_iv[] = {
314# define const_iv(name) { # name, (IV)name } 372# define const_iv(name) { # name, (IV)name }
415 473
416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 474 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 475 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418} 476}
419 477
478int
479in_destruct ()
480 CODE:
481 RETVAL = PL_main_cv == Nullcv;
482 OUTPUT:
483 RETVAL
484
485NV floor (NV x)
486
487NV ceil (NV x)
488
420void 489void
421pango_init () 490pango_init ()
422 CODE: 491 CODE:
423{ 492{
424 // delayed, so it can pick up new fonts added by AddFontResourceEx
425 ft2_fontmap = pango_ft2_font_map_new (); 493 opengl_fontmap = pango_opengl_font_map_new ();
426 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 494 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
427 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 495 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429 cairo_fontmap = pango_cairo_font_map_get_default ();
430 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431} 496}
432 497
433int 498int
434SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 499SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
435 500
436void 501void
437SDL_Quit () 502SDL_Quit ()
438 503
439void 504void
446 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 511 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 512 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 513 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449 514
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 515 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 516 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452 517
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 518 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457 522
458 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 523 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
524#if SDL_VERSION_ATLEAST(1,2,10)
525 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
526 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
527#endif
459 528
460 SDL_EnableUNICODE (1); 529 SDL_EnableUNICODE (1);
461 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 530 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462 531
463 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 532 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
550 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 619 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 620 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552 break; 621 break;
553 } 622 }
554 623
555 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 624 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556 } 625 }
557} 626}
558 627
559int 628int
560Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 629Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
576#endif 645#endif
577 646
578void 647void
579add_font (char *file) 648add_font (char *file)
580 CODE: 649 CODE:
581 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 650 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582#ifdef _WIN32
583 // cairo... sigh... requires win2000
584 AddFontResourceEx (file, FR_PRIVATE, 0);
585#endif
586 651
587void 652void
588load_image_inline (SV *image_) 653load_image_inline (SV *image_)
589 ALIAS: 654 ALIAS:
590 load_image_file = 1 655 load_image_file = 1
632 697
633 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 698 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634 699
635 assert (surface2->pitch == surface2->w * 4); 700 assert (surface2->pitch == surface2->w * 4);
636 701
702 SDL_LockSurface (surface2);
637 EXTEND (SP, 5); 703 EXTEND (SP, 6);
638 PUSHs (sv_2mortal (newSViv (surface2->w))); 704 PUSHs (sv_2mortal (newSViv (surface2->w)));
639 PUSHs (sv_2mortal (newSViv (surface2->h))); 705 PUSHs (sv_2mortal (newSViv (surface2->h)));
640 SDL_LockSurface (surface2);
641 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 706 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
642 SDL_UnlockSurface (surface2);
643 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 707 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
644 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 708 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 709 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
710 SDL_UnlockSurface (surface2);
646 711
647 SDL_FreeSurface (surface); 712 SDL_FreeSurface (surface);
648 SDL_FreeSurface (surface2); 713 SDL_FreeSurface (surface2);
649} 714}
650 715
686 CODE: 751 CODE:
687 fprintf (stderr, "FATAL: %s\n", message); 752 fprintf (stderr, "FATAL: %s\n", message);
688#ifdef _WIN32 753#ifdef _WIN32
689 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 754 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
690#endif 755#endif
691 exit (1); 756 _exit (1);
692 757
758void
759_exit (int retval)
760 CODE:
761 _exit (retval);
762
693MODULE = CFClient PACKAGE = CFClient::Font 763MODULE = CFPlus PACKAGE = CFPlus::Font
694 764
695CFClient::Font 765CFPlus::Font
696new_from_file (SV *class, char *path, int id = 0) 766new_from_file (SV *class, char *path, int id = 0)
697 CODE: 767 CODE:
698{ 768{
699 int count; 769 int count;
700 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 770 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
703} 773}
704 OUTPUT: 774 OUTPUT:
705 RETVAL 775 RETVAL
706 776
707void 777void
708DESTROY (CFClient::Font self) 778DESTROY (CFPlus::Font self)
709 CODE: 779 CODE:
710 pango_font_description_free (self); 780 pango_font_description_free (self);
711 781
712void 782void
713make_default (CFClient::Font self) 783make_default (CFPlus::Font self)
714 CODE: 784 CODE:
715 default_font = self; 785 default_font = self;
716 786
717MODULE = CFClient PACKAGE = CFClient::Layout 787MODULE = CFPlus PACKAGE = CFPlus::Layout
718 788
719CFClient::Layout 789void
720new (SV *class, int rgba = 0) 790reset_glyph_cache ()
721 CODE: 791 CODE:
722#if _WIN32 792 tc_clear ();
723 //rgba = 0;//D makes text nicer, breaks TextView 793
724#endif 794CFPlus::Layout
795new (SV *class)
796 CODE:
725 New (0, RETVAL, 1, struct cf_layout); 797 New (0, RETVAL, 1, struct cf_layout);
726 798
727 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 799 RETVAL->pl = pango_layout_new (opengl_context);
728 RETVAL->rgba = rgba;
729 RETVAL->r = 1.; 800 RETVAL->r = 1.;
730 RETVAL->g = 1.; 801 RETVAL->g = 1.;
731 RETVAL->b = 1.; 802 RETVAL->b = 1.;
732 RETVAL->a = 1.; 803 RETVAL->a = 1.;
733 RETVAL->base_height = MIN_FONT_HEIGHT; 804 RETVAL->base_height = MIN_FONT_HEIGHT;
737 layout_update_font (RETVAL); 808 layout_update_font (RETVAL);
738 OUTPUT: 809 OUTPUT:
739 RETVAL 810 RETVAL
740 811
741void 812void
742DESTROY (CFClient::Layout self) 813DESTROY (CFPlus::Layout self)
743 CODE: 814 CODE:
744 g_object_unref (self->pl); 815 g_object_unref (self->pl);
745 Safefree (self); 816 Safefree (self);
746 817
747int
748is_rgba (CFClient::Layout self)
749 CODE:
750 RETVAL = self->rgba;
751 OUTPUT:
752 RETVAL
753
754void 818void
755set_text (CFClient::Layout self, SV *text_) 819set_text (CFPlus::Layout self, SV *text_)
756 CODE: 820 CODE:
757{ 821{
758 STRLEN textlen; 822 STRLEN textlen;
759 char *text = SvPVutf8 (text_, textlen); 823 char *text = SvPVutf8 (text_, textlen);
760 824
761 pango_layout_set_text (self->pl, text, textlen); 825 pango_layout_set_text (self->pl, text, textlen);
762} 826}
763 827
764void 828void
765set_markup (CFClient::Layout self, SV *text_) 829set_markup (CFPlus::Layout self, SV *text_)
766 CODE: 830 CODE:
767{ 831{
768 STRLEN textlen; 832 STRLEN textlen;
769 char *text = SvPVutf8 (text_, textlen); 833 char *text = SvPVutf8 (text_, textlen);
770 834
771 pango_layout_set_markup (self->pl, text, textlen); 835 pango_layout_set_markup (self->pl, text, textlen);
772} 836}
773 837
838void
839set_shapes (CFPlus::Layout self, ...)
840 CODE:
841{
842 PangoAttrList *attrs = 0;
843 const char *text = pango_layout_get_text (self->pl);
844 const char *pos = text;
845 int arg = 4;
846
847 while (arg < items && (pos = strstr (pos, OBJ_STR)))
848 {
849 PangoRectangle inkrect, rect;
850 PangoAttribute *attr;
851
852 int x = SvIV (ST (arg - 3));
853 int y = SvIV (ST (arg - 2));
854 int w = SvIV (ST (arg - 1));
855 int h = SvIV (ST (arg ));
856
857 inkrect.x = 0;
858 inkrect.y = 0;
859 inkrect.width = 0;
860 inkrect.height = 0;
861
862 rect.x = x * PANGO_SCALE;
863 rect.y = y * PANGO_SCALE;
864 rect.width = w * PANGO_SCALE;
865 rect.height = h * PANGO_SCALE;
866
867 if (!attrs)
868 attrs = pango_layout_get_attributes (self->pl);
869
870 attr = pango_attr_shape_new (&inkrect, &rect);
871 attr->start_index = pos - text;
872 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
873 pango_attr_list_insert (attrs, attr);
874
875 arg += 4;
876 pos += sizeof (OBJ_STR) - 1;
877 }
878
879 if (attrs)
880 pango_layout_set_attributes (self->pl, attrs);
881}
882
883void
884get_shapes (CFPlus::Layout self)
885 PPCODE:
886{
887 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
888
889 do
890 {
891 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
892
893 if (run && shape_attr_p (run))
894 {
895 PangoRectangle extents;
896 pango_layout_iter_get_run_extents (iter, 0, &extents);
897
898 EXTEND (SP, 2);
899 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
900 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
901 }
902 }
903 while (pango_layout_iter_next_run (iter));
904
905 pango_layout_iter_free (iter);
906}
907
908int
909has_wrapped (CFPlus::Layout self)
910 CODE:
911{
912 int lines = 1;
913 const char *text = pango_layout_get_text (self->pl);
914
915 while (*text)
916 lines += *text++ == '\n';
917
918 RETVAL = lines < pango_layout_get_line_count (self->pl);
919}
920 OUTPUT:
921 RETVAL
922
774SV * 923SV *
775get_text (CFClient::Layout self) 924get_text (CFPlus::Layout self)
776 CODE: 925 CODE:
777 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 926 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778 SvUTF8_on (RETVAL); 927 sv_utf8_decode (RETVAL);
779 OUTPUT: 928 OUTPUT:
780 RETVAL 929 RETVAL
781 930
782void 931void
783set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 932set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
784 CODE: 933 CODE:
785 self->r = r; 934 self->r = r;
786 self->g = g; 935 self->g = g;
787 self->b = b; 936 self->b = b;
788 self->a = a; 937 self->a = a;
789 938
790void 939void
791set_font (CFClient::Layout self, CFClient::Font font = 0) 940set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792 CODE: 941 CODE:
793 if (self->font != font) 942 if (self->font != font)
794 { 943 {
795 self->font = font; 944 self->font = font;
796 layout_update_font (self); 945 layout_update_font (self);
797 } 946 }
798 947
799void 948void
800set_height (CFClient::Layout self, int base_height) 949set_height (CFPlus::Layout self, int base_height)
801 CODE: 950 CODE:
802 if (self->base_height != base_height) 951 if (self->base_height != base_height)
803 { 952 {
804 self->base_height = base_height; 953 self->base_height = base_height;
805 layout_update_font (self); 954 layout_update_font (self);
806 } 955 }
807 956
808void 957void
809set_width (CFClient::Layout self, int max_width = -1) 958set_width (CFPlus::Layout self, int max_width = -1)
810 CODE: 959 CODE:
811 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 960 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
812 961
813void 962void
814set_indent (CFClient::Layout self, int indent) 963set_indent (CFPlus::Layout self, int indent)
815 CODE: 964 CODE:
816 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 965 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817 966
818void 967void
819set_spacing (CFClient::Layout self, int spacing) 968set_spacing (CFPlus::Layout self, int spacing)
820 CODE: 969 CODE:
821 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 970 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822 971
823void 972void
824set_ellipsise (CFClient::Layout self, int ellipsise) 973set_ellipsise (CFPlus::Layout self, int ellipsise)
825 CODE: 974 CODE:
826 pango_layout_set_ellipsize (self->pl, 975 pango_layout_set_ellipsize (self->pl,
827 ellipsise == 1 ? PANGO_ELLIPSIZE_START 976 ellipsise == 1 ? PANGO_ELLIPSIZE_START
828 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 977 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 978 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
830 : PANGO_ELLIPSIZE_NONE 979 : PANGO_ELLIPSIZE_NONE
831 ); 980 );
832 981
833void 982void
834set_single_paragraph_mode (CFClient::Layout self, int spm) 983set_single_paragraph_mode (CFPlus::Layout self, int spm)
835 CODE: 984 CODE:
836 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 985 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837 986
838void 987void
839size (CFClient::Layout self) 988size (CFPlus::Layout self)
840 PPCODE: 989 PPCODE:
841{ 990{
842 int w, h; 991 int w, h;
843 992
844 layout_get_pixel_size (self, &w, &h); 993 layout_get_pixel_size (self, &w, &h);
847 PUSHs (sv_2mortal (newSViv (w))); 996 PUSHs (sv_2mortal (newSViv (w)));
848 PUSHs (sv_2mortal (newSViv (h))); 997 PUSHs (sv_2mortal (newSViv (h)));
849} 998}
850 999
851int 1000int
1001descent (CFPlus::Layout self)
1002 CODE:
1003{
1004 PangoRectangle rect;
1005 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1006 pango_layout_line_get_pixel_extents (line, 0, &rect);
1007 RETVAL = PANGO_DESCENT (rect);
1008}
1009 OUTPUT:
1010 RETVAL
1011
1012int
852xy_to_index (CFClient::Layout self, int x, int y) 1013xy_to_index (CFPlus::Layout self, int x, int y)
853 CODE: 1014 CODE:
854{ 1015{
855 int index, trailing; 1016 int index, trailing;
856 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1017 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
857 RETVAL = index; 1018 RETVAL = index;
858} 1019}
859 OUTPUT: 1020 OUTPUT:
860 RETVAL 1021 RETVAL
861 1022
862void 1023void
863cursor_pos (CFClient::Layout self, int index) 1024cursor_pos (CFPlus::Layout self, int index)
864 PPCODE: 1025 PPCODE:
865{ 1026{
866 PangoRectangle strong_pos; 1027 PangoRectangle strong_pos;
867 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1028 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868 1029
871 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1032 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873} 1034}
874 1035
875void 1036void
876render (CFClient::Layout self) 1037render (CFPlus::Layout self, float x, float y, int flags = 0)
877 PPCODE: 1038 PPCODE:
878{ 1039 pango_opengl_render_layout_subpixel (
879 SV *retval; 1040 self->pl,
880 int w, h; 1041 x * PANGO_SCALE, y * PANGO_SCALE,
1042 self->r, self->g, self->b, self->a,
1043 flags
1044 );
881 1045
882 layout_get_pixel_size (self, &w, &h); 1046MODULE = CFPlus PACKAGE = CFPlus::Texture
883 1047
884 if (self->rgba) 1048void
1049pad2pot (SV *data_, SV *w_, SV *h_)
1050 CODE:
1051{
1052 int ow = SvIV (w_);
1053 int oh = SvIV (h_);
1054
1055 if (ow && oh)
885 { 1056 {
886 cairo_surface_t *surface; 1057 int nw = minpot (ow);
887 cairo_t *cairo; 1058 int nh = minpot (oh);
888 1059
889 retval = newSV (w * h * 4); 1060 if (nw != ow || nh != oh)
890 SvPOK_only (retval);
891 SvCUR_set (retval, w * h * 4);
892
893 memset (SvPVX (retval), 0, w * h * 4);
894
895 surface = cairo_image_surface_create_for_data (
896 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
897 cairo = cairo_create (surface);
898 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900 pango_cairo_show_layout (cairo, self->pl);
901
902 cairo_destroy (cairo);
903 cairo_surface_destroy (surface);
904
905 // what a mess, and its premultiplied, too :(
906 { 1061 {
907 uint32_t *p = (uint32_t *)SvPVX (retval); 1062 if (SvOK (data_))
908 uint32_t *e = p + w * h;
909
910 while (p < e)
911 { 1063 {
912 uint32_t rgba = *p; 1064 STRLEN datalen;
913 rgba = (rgba >> 24) | (rgba << 8); 1065 char *data = SvPVbyte (data_, datalen);
914#if 0 1066 int bpp = datalen / (ow * oh);
915#ifdef _WIN32 1067 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
916 {//D
917 uint8_t r = rgba >> 24;
918 uint8_t g = rgba >> 16;
919 uint8_t b = rgba >> 8;
920 uint8_t a = rgba >> 0;
921 1068
922 rgba = (rgba & 0xffffff00) | a; 1069 SvPOK_only (result_);
1070 SvCUR_set (result_, nw * nh * bpp);
1071
1072 memset (SvPVX (result_), 0, nw * nh * bpp);
1073 while (oh--)
1074 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1075
1076 sv_setsv (data_, result_);
923 } 1077 }
924#endif 1078
925#endif 1079 sv_setiv (w_, nw);
926 rgba = SDL_SwapBE32 (rgba); 1080 sv_setiv (h_, nh);
927 *p++ = rgba;
928 } 1081 }
929 }
930
931 EXTEND (SP, 5);
932 PUSHs (sv_2mortal (newSViv (w)));
933 PUSHs (sv_2mortal (newSViv (h)));
934 PUSHs (sv_2mortal (retval));
935 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937 } 1082 }
938 else
939 {
940 FT_Bitmap bitmap;
941
942 retval = newSV (w * h);
943 SvPOK_only (retval);
944 SvCUR_set (retval, w * h);
945
946 bitmap.rows = h;
947 bitmap.width = w;
948 bitmap.pitch = w;
949 bitmap.buffer = (unsigned char*)SvPVX (retval);
950 bitmap.num_grays = 256;
951 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
952
953 memset (bitmap.buffer, 0, w * h);
954
955 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
956
957 EXTEND (SP, 5);
958 PUSHs (sv_2mortal (newSViv (w)));
959 PUSHs (sv_2mortal (newSViv (h)));
960 PUSHs (sv_2mortal (retval));
961 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963 }
964} 1083}
965 1084
966MODULE = CFClient PACKAGE = CFClient::Texture
967
968void 1085void
969draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1086draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
970 PROTOTYPE: $$$;$$ 1087 PROTOTYPE: $$$;$$
971 ALIAS: 1088 ALIAS:
972 draw_quad_alpha = 1 1089 draw_quad_alpha = 1
973 draw_quad_alpha_premultiplied = 2 1090 draw_quad_alpha_premultiplied = 2
974 CODE: 1091 CODE:
990 1107
991 if (ix == 2) 1108 if (ix == 2)
992 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1109 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993 else 1110 else
994 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1111 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995 GL_ONE_MINUS_DST_ALPHA, GL_ONE); 1112 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996 1113
997 glEnable (GL_ALPHA_TEST); 1114 glEnable (GL_ALPHA_TEST);
998 glAlphaFunc (GL_GREATER, 0.01f); 1115 glAlphaFunc (GL_GREATER, 0.01f);
999 } 1116 }
1000 1117
1012 glDisable (GL_ALPHA_TEST); 1129 glDisable (GL_ALPHA_TEST);
1013 glDisable (GL_BLEND); 1130 glDisable (GL_BLEND);
1014 } 1131 }
1015} 1132}
1016 1133
1017MODULE = CFClient PACKAGE = CFClient::Map 1134MODULE = CFPlus PACKAGE = CFPlus::Map
1018 1135
1019CFClient::Map 1136CFPlus::Map
1020new (SV *class, int map_width, int map_height) 1137new (SV *class, int map_width, int map_height)
1021 CODE: 1138 CODE:
1022 New (0, RETVAL, 1, struct map); 1139 New (0, RETVAL, 1, struct map);
1023 RETVAL->x = 0; 1140 RETVAL->x = 0;
1024 RETVAL->y = 0; 1141 RETVAL->y = 0;
1034 RETVAL->row = 0; 1151 RETVAL->row = 0;
1035 OUTPUT: 1152 OUTPUT:
1036 RETVAL 1153 RETVAL
1037 1154
1038void 1155void
1039DESTROY (CFClient::Map self) 1156DESTROY (CFPlus::Map self)
1040 CODE: 1157 CODE:
1041{ 1158{
1042 map_clear (self); 1159 map_clear (self);
1043 Safefree (self->face); 1160 Safefree (self->face);
1161 Safefree (self->tex);
1044 Safefree (self); 1162 Safefree (self);
1045} 1163}
1046 1164
1047void 1165void
1048clear (CFClient::Map self) 1166clear (CFPlus::Map self)
1049 CODE: 1167 CODE:
1050 map_clear (self); 1168 map_clear (self);
1051 1169
1052void 1170void
1053set_face (CFClient::Map self, int face, int texid) 1171set_face (CFPlus::Map self, int face, int texid)
1054 CODE: 1172 CODE:
1055{ 1173{
1056 while (self->faces <= face) 1174 while (self->faces <= face)
1057 { 1175 {
1058 Append (mapface, self->face, self->faces, self->faces); 1176 Append (mapface, self->face, self->faces, self->faces);
1061 1179
1062 self->face [face] = texid; 1180 self->face [face] = texid;
1063} 1181}
1064 1182
1065void 1183void
1066set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1184set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1067 CODE: 1185 CODE:
1068{ 1186{
1069 while (self->texs <= texid) 1187 while (self->texs <= texid)
1070 { 1188 {
1071 Append (maptex, self->tex, self->texs, self->texs); 1189 Append (maptex, self->tex, self->texs, self->texs);
1095 // from transparent color bleeding and ugly wrapping effects. 1213 // from transparent color bleeding and ugly wrapping effects.
1096 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1214 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097} 1215}
1098 1216
1099int 1217int
1100ox (CFClient::Map self) 1218ox (CFPlus::Map self)
1101 ALIAS: 1219 ALIAS:
1102 oy = 1 1220 oy = 1
1103 x = 2 1221 x = 2
1104 y = 3 1222 y = 3
1105 w = 4 1223 w = 4
1116 } 1234 }
1117 OUTPUT: 1235 OUTPUT:
1118 RETVAL 1236 RETVAL
1119 1237
1120void 1238void
1121scroll (CFClient::Map self, int dx, int dy) 1239scroll (CFPlus::Map self, int dx, int dy)
1122 CODE: 1240 CODE:
1123{ 1241{
1124 if (dx > 0) 1242 if (dx > 0)
1125 map_blank (self, self->x, self->y, dx - 1, self->h); 1243 map_blank (self, self->x, self->y, dx - 1, self->h);
1126 else if (dx < 0) 1244 else if (dx < 0)
1142 self->y += MAP_EXTEND_Y; 1260 self->y += MAP_EXTEND_Y;
1143 } 1261 }
1144} 1262}
1145 1263
1146void 1264void
1147map1a_update (CFClient::Map self, SV *data_) 1265map1a_update (CFPlus::Map self, SV *data_)
1148 CODE: 1266 CODE:
1149{ 1267{
1150 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1268 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1151 uint8_t *data_end = (uint8_t *)SvEND (data_); 1269 uint8_t *data_end = (uint8_t *)SvEND (data_);
1152 mapcell *cell; 1270 mapcell *cell;
1154 1272
1155 while (data < data_end) 1273 while (data < data_end)
1156 { 1274 {
1157 flags = (data [0] << 8) + data [1]; data += 2; 1275 flags = (data [0] << 8) + data [1]; data += 2;
1158 1276
1159 x = ((flags >> 10) & 63) + self->x; 1277 x = self->x + ((flags >> 10) & 63);
1160 y = ((flags >> 4) & 63) + self->y; 1278 y = self->y + ((flags >> 4) & 63);
1161 1279
1162 cell = map_get_cell (self, x, y); 1280 cell = map_get_cell (self, x, y);
1163 1281
1164 if (flags & 15) 1282 if (flags & 15)
1165 { 1283 {
1194 cell->darkness = -1; 1312 cell->darkness = -1;
1195 } 1313 }
1196} 1314}
1197 1315
1198SV * 1316SV *
1199mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1317mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1200 CODE: 1318 CODE:
1201{ 1319{
1202 int x1, x; 1320 int x1, x;
1203 int y1, y; 1321 int y1, y;
1204 int z; 1322 int z;
1254} 1372}
1255 OUTPUT: 1373 OUTPUT:
1256 RETVAL 1374 RETVAL
1257 1375
1258void 1376void
1259draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1377draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1260 PPCODE: 1378 CODE:
1261{ 1379{
1262 int vx, vy; 1380 int vx, vy;
1263 int x, y, z; 1381 int x, y, z;
1264 int last_name; 1382 int last_name;
1265 mapface face; 1383 mapface face;
1266 int sw4 = (sw + 3) & ~3;
1267 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1268 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1269 1384
1270 memset (darkness, 255, sw4 * sh);
1271 SvPOK_only (darkness_sv);
1272 SvCUR_set (darkness_sv, sw4 * sh);
1273
1274 vx = self->x + (self->w - sw) / 2 - shift_x; 1385 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1275 vy = self->y + (self->h - sh) / 2 - shift_y; 1386 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1276 1387
1277 /* 1388 /*
1278 int vx = self->vx = self->w >= sw 1389 int vx = self->vx = self->w >= sw
1279 ? self->x + (self->w - sw) / 2 1390 ? self->x + (self->w - sw) / 2
1280 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1391 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1284 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1395 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1285 */ 1396 */
1286 1397
1287 glColor4ub (255, 255, 255, 255); 1398 glColor4ub (255, 255, 255, 255);
1288 1399
1400 glEnable (GL_BLEND);
1289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1401 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290 glEnable (GL_BLEND);
1291 glEnable (GL_TEXTURE_2D); 1402 glEnable (GL_TEXTURE_2D);
1292 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1403 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293 1404
1294 glBegin (GL_QUADS); 1405 glBegin (GL_QUADS);
1295 1406
1303 1414
1304 for (x = 0; x < sw; x++) 1415 for (x = 0; x < sw; x++)
1305 if (row->c0 <= x + vx && x + vx < row->c1) 1416 if (row->c0 <= x + vx && x + vx < row->c1)
1306 { 1417 {
1307 mapcell *cell = row->col + (x + vx - row->c0); 1418 mapcell *cell = row->col + (x + vx - row->c0);
1308
1309 darkness[y * sw4 + x] = cell->darkness < 0
1310 ? 255 - FOW_DARKNESS
1311 : 255 - cell->darkness;
1312 1419
1313 face = cell->face [z]; 1420 face = cell->face [z];
1314 1421
1315 if (face) 1422 if (face)
1316 { 1423 {
1337 1444
1338 glEnd (); 1445 glEnd ();
1339 1446
1340 glDisable (GL_TEXTURE_2D); 1447 glDisable (GL_TEXTURE_2D);
1341 glDisable (GL_BLEND); 1448 glDisable (GL_BLEND);
1449}
1450
1451void
1452draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1453 CODE:
1454{
1455 static float color[16][3] = {
1456 { 0.00F, 0.00F, 0.00F },
1457 { 1.00F, 1.00F, 1.00F },
1458 { 0.00F, 0.00F, 0.55F },
1459 { 1.00F, 0.00F, 0.00F },
1460
1461 { 1.00F, 0.54F, 0.00F },
1462 { 0.11F, 0.56F, 1.00F },
1463 { 0.93F, 0.46F, 0.00F },
1464 { 0.18F, 0.54F, 0.34F },
1465
1466 { 0.56F, 0.73F, 0.56F },
1467 { 0.80F, 0.80F, 0.80F },
1468 { 0.55F, 0.41F, 0.13F },
1469 { 0.99F, 0.77F, 0.26F },
1470
1471 { 0.74F, 0.65F, 0.41F },
1472
1473 { 0.00F, 1.00F, 1.00F },
1474 { 1.00F, 0.00F, 1.00F },
1475 { 1.00F, 1.00F, 0.00F },
1476 };
1477
1478 int x, y;
1479
1480 glEnable (GL_TEXTURE_2D);
1481 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1482 glEnable (GL_BLEND);
1483 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1484 glBegin (GL_QUADS);
1485
1486 for (y = 0; y < h; y++)
1487 for (x = 0; x < w; x++)
1488 {
1489 unsigned char m = data [x + y * w];
1490
1491 if (m)
1492 {
1493 float *c = color [m & 15];
1494
1495 float tx1 = m & 0x40 ? 0.5 : 0.;
1496 float tx2 = tx1 + 0.5;
1497
1498 glColor4f (c[0], c[1], c[2], 0.75);
1499 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1500 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1501 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1502 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1503 }
1504 }
1505
1506 glEnd ();
1507 glDisable (GL_BLEND);
1508 glDisable (GL_TEXTURE_2D);
1509}
1510
1511void
1512fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1513 PPCODE:
1514{
1515 int vx, vy;
1516 int x, y;
1517 int sw4 = (sw + 3) & ~3;
1518 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1519 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1520
1521 memset (darkness, 255, sw4 * sh);
1522 SvPOK_only (darkness_sv);
1523 SvCUR_set (darkness_sv, sw4 * sh);
1524
1525 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1526 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1527
1528 for (y = 0; y < sh; y++)
1529 if (0 <= y + vy && y + vy < self->rows)
1530 {
1531 maprow *row = self->row + (y + vy);
1532
1533 for (x = 0; x < sw; x++)
1534 if (row->c0 <= x + vx && x + vx < row->c1)
1535 {
1536 mapcell *cell = row->col + (x + vx - row->c0);
1537
1538 darkness[y * sw4 + x] = cell->darkness < 0
1539 ? 255 - FOW_DARKNESS
1540 : 255 - cell->darkness;
1541 }
1542 }
1342 1543
1343 EXTEND (SP, 3); 1544 EXTEND (SP, 3);
1344 PUSHs (sv_2mortal (newSViv (sw4))); 1545 PUSHs (sv_2mortal (newSViv (sw4)));
1345 PUSHs (sv_2mortal (newSViv (sh))); 1546 PUSHs (sv_2mortal (newSViv (sh)));
1346 PUSHs (darkness_sv); 1547 PUSHs (darkness_sv);
1347} 1548}
1348 1549
1349SV * 1550SV *
1350get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1551get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1351 CODE: 1552 CODE:
1352{ 1553{
1353 int x, y, x1, y1; 1554 int x, y, x1, y1;
1354 SV *data_sv = newSV (w * h * 7 + 5); 1555 SV *data_sv = newSV (w * h * 7 + 5);
1355 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1556 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1417} 1618}
1418 OUTPUT: 1619 OUTPUT:
1419 RETVAL 1620 RETVAL
1420 1621
1421void 1622void
1422set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1623set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1423 PPCODE: 1624 PPCODE:
1424{ 1625{
1425 int x, y, z; 1626 int x, y, z;
1426 int w, h; 1627 int w, h;
1427 int x1, y1; 1628 int x1, y1;
1476 } 1677 }
1477 } 1678 }
1478 } 1679 }
1479} 1680}
1480 1681
1481MODULE = CFClient PACKAGE = CFClient::MixChunk 1682MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482 1683
1483CFClient::MixChunk 1684CFPlus::MixChunk
1484new_from_file (SV *class, char *path) 1685new_from_file (SV *class, char *path)
1485 CODE: 1686 CODE:
1486 RETVAL = Mix_LoadWAV (path); 1687 RETVAL = Mix_LoadWAV (path);
1487 OUTPUT: 1688 OUTPUT:
1488 RETVAL 1689 RETVAL
1489 1690
1490void 1691void
1491DESTROY (CFClient::MixChunk self) 1692DESTROY (CFPlus::MixChunk self)
1492 CODE: 1693 CODE:
1493 Mix_FreeChunk (self); 1694 Mix_FreeChunk (self);
1494 1695
1495int 1696int
1496volume (CFClient::MixChunk self, int volume = -1) 1697volume (CFPlus::MixChunk self, int volume = -1)
1497 CODE: 1698 CODE:
1498 RETVAL = Mix_VolumeChunk (self, volume); 1699 RETVAL = Mix_VolumeChunk (self, volume);
1499 OUTPUT: 1700 OUTPUT:
1500 RETVAL 1701 RETVAL
1501 1702
1502int 1703int
1503play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1704play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1504 CODE: 1705 CODE:
1505 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1706 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506 OUTPUT: 1707 OUTPUT:
1507 RETVAL 1708 RETVAL
1508 1709
1509MODULE = CFClient PACKAGE = CFClient::MixMusic 1710MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510 1711
1511int 1712int
1512volume (int volume = -1) 1713volume (int volume = -1)
1513 CODE: 1714 CODE:
1514 RETVAL = Mix_VolumeMusic (volume); 1715 RETVAL = Mix_VolumeMusic (volume);
1515 OUTPUT: 1716 OUTPUT:
1516 RETVAL 1717 RETVAL
1517 1718
1518CFClient::MixMusic 1719CFPlus::MixMusic
1519new_from_file (SV *class, char *path) 1720new_from_file (SV *class, char *path)
1520 CODE: 1721 CODE:
1521 RETVAL = Mix_LoadMUS (path); 1722 RETVAL = Mix_LoadMUS (path);
1522 OUTPUT: 1723 OUTPUT:
1523 RETVAL 1724 RETVAL
1524 1725
1525void 1726void
1526DESTROY (CFClient::MixMusic self) 1727DESTROY (CFPlus::MixMusic self)
1527 CODE: 1728 CODE:
1528 Mix_FreeMusic (self); 1729 Mix_FreeMusic (self);
1529 1730
1530int 1731int
1531play (CFClient::MixMusic self, int loops = -1) 1732play (CFPlus::MixMusic self, int loops = -1)
1532 CODE: 1733 CODE:
1533 RETVAL = Mix_PlayMusic (self, loops); 1734 RETVAL = Mix_PlayMusic (self, loops);
1534 OUTPUT: 1735 OUTPUT:
1535 RETVAL 1736 RETVAL
1536 1737
1537MODULE = CFClient PACKAGE = CFClient::OpenGL 1738MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538 1739
1539BOOT: 1740BOOT:
1540{ 1741{
1541 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1742 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542 static const struct { 1743 static const struct {
1543 const char *name; 1744 const char *name;
1544 IV iv; 1745 IV iv;
1545 } *civ, const_iv[] = { 1746 } *civ, const_iv[] = {
1546# define const_iv(name) { # name, (IV)name } 1747# define const_iv(name) { # name, (IV)name }
1553 const_iv (GL_SCISSOR_TEST), 1754 const_iv (GL_SCISSOR_TEST),
1554 const_iv (GL_DEPTH_TEST), 1755 const_iv (GL_DEPTH_TEST),
1555 const_iv (GL_ALPHA_TEST), 1756 const_iv (GL_ALPHA_TEST),
1556 const_iv (GL_NORMALIZE), 1757 const_iv (GL_NORMALIZE),
1557 const_iv (GL_RESCALE_NORMAL), 1758 const_iv (GL_RESCALE_NORMAL),
1759 const_iv (GL_FRONT),
1760 const_iv (GL_BACK),
1558 const_iv (GL_AND), 1761 const_iv (GL_AND),
1559 const_iv (GL_ONE), 1762 const_iv (GL_ONE),
1560 const_iv (GL_ZERO), 1763 const_iv (GL_ZERO),
1561 const_iv (GL_SRC_ALPHA), 1764 const_iv (GL_SRC_ALPHA),
1562 const_iv (GL_SRC_ALPHA_SATURATE), 1765 const_iv (GL_DST_ALPHA),
1563 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1766 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564 const_iv (GL_ONE_MINUS_DST_ALPHA), 1767 const_iv (GL_ONE_MINUS_DST_ALPHA),
1768 const_iv (GL_SRC_ALPHA_SATURATE),
1565 const_iv (GL_RGB), 1769 const_iv (GL_RGB),
1566 const_iv (GL_RGBA), 1770 const_iv (GL_RGBA),
1771 const_iv (GL_RGBA4),
1772 const_iv (GL_RGBA8),
1773 const_iv (GL_RGB5_A1),
1567 const_iv (GL_UNSIGNED_BYTE), 1774 const_iv (GL_UNSIGNED_BYTE),
1568 const_iv (GL_UNSIGNED_SHORT), 1775 const_iv (GL_UNSIGNED_SHORT),
1569 const_iv (GL_UNSIGNED_INT), 1776 const_iv (GL_UNSIGNED_INT),
1570 const_iv (GL_ALPHA), 1777 const_iv (GL_ALPHA),
1571 const_iv (GL_INTENSITY), 1778 const_iv (GL_INTENSITY),
1603 const_iv (GL_SEPARABLE_2D), 1810 const_iv (GL_SEPARABLE_2D),
1604 const_iv (GL_CONVOLUTION_2D), 1811 const_iv (GL_CONVOLUTION_2D),
1605 const_iv (GL_CONVOLUTION_BORDER_MODE), 1812 const_iv (GL_CONVOLUTION_BORDER_MODE),
1606 const_iv (GL_CONSTANT_BORDER), 1813 const_iv (GL_CONSTANT_BORDER),
1607 const_iv (GL_LINES), 1814 const_iv (GL_LINES),
1815 const_iv (GL_LINE_STRIP),
1608 const_iv (GL_LINE_LOOP), 1816 const_iv (GL_LINE_LOOP),
1609 const_iv (GL_QUADS), 1817 const_iv (GL_QUADS),
1610 const_iv (GL_QUAD_STRIP), 1818 const_iv (GL_QUAD_STRIP),
1611 const_iv (GL_TRIANGLES), 1819 const_iv (GL_TRIANGLES),
1612 const_iv (GL_TRIANGLE_STRIP), 1820 const_iv (GL_TRIANGLE_STRIP),
1645 OUTPUT: 1853 OUTPUT:
1646 RETVAL 1854 RETVAL
1647 1855
1648int glGetError () 1856int glGetError ()
1649 1857
1858void glFinish ()
1859
1650void glClear (int mask) 1860void glClear (int mask)
1651 1861
1652void glClearColor (float r, float g, float b, float a = 1.0) 1862void glClearColor (float r, float g, float b, float a = 1.0)
1653 PROTOTYPE: @ 1863 PROTOTYPE: @
1654 1864
1677void glPushMatrix () 1887void glPushMatrix ()
1678 1888
1679void glPopMatrix () 1889void glPopMatrix ()
1680 1890
1681void glLoadIdentity () 1891void glLoadIdentity ()
1892
1893void glDrawBuffer (int buffer)
1894
1895void glReadBuffer (int buffer)
1682 1896
1683# near_ and far_ are due to microsofts buggy "c" compiler 1897# near_ and far_ are due to microsofts buggy "c" compiler
1684void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1898void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685 1899
1686# near_ and far_ are due to microsofts buggy "c" compiler 1900# near_ and far_ are due to microsofts buggy "c" compiler
1716 r *= a; 1930 r *= a;
1717 g *= a; 1931 g *= a;
1718 b *= a; 1932 b *= a;
1719 } 1933 }
1720 // microsoft visual "c" rounds instead of truncating... 1934 // microsoft visual "c" rounds instead of truncating...
1721 glColor4ub (MIN ((int)(r * 256.f), 255), 1935 glColor4f (r, g, b, a);
1722 MIN ((int)(g * 256.f), 255),
1723 MIN ((int)(b * 256.f), 255),
1724 MIN ((int)(a * 256.f), 255));
1725 1936
1726void glInterleavedArrays (int format, int stride, char *data) 1937void glInterleavedArrays (int format, int stride, char *data)
1727 1938
1728void glDrawElements (int mode, int count, int type, char *indices) 1939void glDrawElements (int mode, int count, int type, char *indices)
1729 1940
1806 2017
1807void glEndList () 2018void glEndList ()
1808 2019
1809void glCallList (int list) 2020void glCallList (int list)
1810 2021
1811

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines