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.104 by root, Mon Jun 5 00:17:47 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>
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{
115 pango_layout_get_pixel_size (self->pl, w, h); 149 pango_layout_get_pixel_size (self->pl, w, h);
116 150
117 if (!*w) *w = 1; 151 if (!*w) *w = 1;
118 if (!*h) *h = 1; 152 if (!*h) *h = 1;
148 int texs; 182 int texs;
149 maptex *tex; 183 maptex *tex;
150 184
151 int32_t rows; 185 int32_t rows;
152 maprow *row; 186 maprow *row;
153} *CFClient__Map; 187} *CFPlus__Map;
154 188
155static char * 189static char *
156prepend (char *ptr, int sze, int inc) 190prepend (char *ptr, int sze, int inc)
157{ 191{
158 char *p; 192 char *p;
176 210
177#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))
178#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))
179 213
180static maprow * 214static maprow *
181map_get_row (CFClient__Map self, int y) 215map_get_row (CFPlus__Map self, int y)
182{ 216{
183 if (0 > y) 217 if (0 > y)
184 { 218 {
185 int extend = - y + MAP_EXTEND_Y; 219 int extend = - y + MAP_EXTEND_Y;
186 Prepend (maprow, self->row, self->rows, extend); 220 Prepend (maprow, self->row, self->rows, extend);
224 258
225 return row->col + (x - row->c0); 259 return row->col + (x - row->c0);
226} 260}
227 261
228static mapcell * 262static mapcell *
229map_get_cell (CFClient__Map self, int x, int y) 263map_get_cell (CFPlus__Map self, int x, int y)
230{ 264{
231 return row_get_cell (map_get_row (self, y), x); 265 return row_get_cell (map_get_row (self, y), x);
232} 266}
233 267
234static void 268static void
235map_clear (CFClient__Map self) 269map_clear (CFPlus__Map self)
236{ 270{
237 int r; 271 int r;
238 272
239 for (r = 0; r < self->rows; r++) 273 for (r = 0; r < self->rows; r++)
240 Safefree (self->row[r].col); 274 Safefree (self->row[r].col);
248 self->row = 0; 282 self->row = 0;
249 self->rows = 0; 283 self->rows = 0;
250} 284}
251 285
252static void 286static void
253map_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)
254{ 288{
255 int x, y; 289 int x, y;
256 maprow *row; 290 maprow *row;
257 291
258 for (y = y0; y < y0 + h; y++) 292 for (y = y0; y < y0 + h; y++)
298 ev.data2 = 0; 332 ev.data2 = 0;
299 333
300 SDL_PushEvent ((SDL_Event *)&ev); 334 SDL_PushEvent ((SDL_Event *)&ev);
301} 335}
302 336
337static unsigned int
338minpot (unsigned int n)
339{
340 if (!n)
341 return 0;
342
343 --n;
344
345 n |= n >> 1;
346 n |= n >> 2;
347 n |= n >> 4;
348 n |= n >> 8;
349 n |= n >> 16;
350
351 return n + 1;
352}
353
303MODULE = CFClient PACKAGE = CFClient 354MODULE = CFPlus PACKAGE = CFPlus
304 355
305PROTOTYPES: ENABLE 356PROTOTYPES: ENABLE
306 357
307BOOT: 358BOOT:
308{ 359{
309 HV *stash = gv_stashpv ("CFClient", 1); 360 HV *stash = gv_stashpv ("CFPlus", 1);
310 static const struct { 361 static const struct {
311 const char *name; 362 const char *name;
312 IV iv; 363 IV iv;
313 } *civ, const_iv[] = { 364 } *civ, const_iv[] = {
314# define const_iv(name) { # name, (IV)name } 365# define const_iv(name) { # name, (IV)name }
415 466
416 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; )
417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 468 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418} 469}
419 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
420void 482void
421pango_init () 483pango_init ()
422 CODE: 484 CODE:
423{ 485{
424 // delayed, so it can pick up new fonts added by AddFontResourceEx
425 ft2_fontmap = pango_ft2_font_map_new (); 486 opengl_fontmap = pango_opengl_font_map_new ();
426 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);
427 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 488 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} 489}
432 490
433int 491int
434SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 492SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
435 493
436void 494void
437SDL_Quit () 495SDL_Quit ()
438 496
439void 497void
446 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 504 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 505 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 506 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449 507
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 508 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 509 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452 510
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 511 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457 515
458 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
459 521
460 SDL_EnableUNICODE (1); 522 SDL_EnableUNICODE (1);
461 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 523 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462 524
463 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 525 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
550 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 612 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 613 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552 break; 614 break;
553 } 615 }
554 616
555 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 617 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556 } 618 }
557} 619}
558 620
559int 621int
560Mix_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)
576#endif 638#endif
577 639
578void 640void
579add_font (char *file) 641add_font (char *file)
580 CODE: 642 CODE:
581 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 643 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582#ifdef _WIN32
583 // cairo... sigh... requires win2000
584 AddFontResourceEx (file, FR_PRIVATE, 0);
585#endif
586 644
587void 645void
588load_image_inline (SV *image_) 646load_image_inline (SV *image_)
589 ALIAS: 647 ALIAS:
590 load_image_file = 1 648 load_image_file = 1
632 690
633 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 691 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634 692
635 assert (surface2->pitch == surface2->w * 4); 693 assert (surface2->pitch == surface2->w * 4);
636 694
695 SDL_LockSurface (surface2);
637 EXTEND (SP, 5); 696 EXTEND (SP, 6);
638 PUSHs (sv_2mortal (newSViv (surface2->w))); 697 PUSHs (sv_2mortal (newSViv (surface2->w)));
639 PUSHs (sv_2mortal (newSViv (surface2->h))); 698 PUSHs (sv_2mortal (newSViv (surface2->h)));
640 SDL_LockSurface (surface2);
641 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 699 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))); 700 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
644 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 701 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 702 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
703 SDL_UnlockSurface (surface2);
646 704
647 SDL_FreeSurface (surface); 705 SDL_FreeSurface (surface);
648 SDL_FreeSurface (surface2); 706 SDL_FreeSurface (surface2);
649} 707}
650 708
686 CODE: 744 CODE:
687 fprintf (stderr, "FATAL: %s\n", message); 745 fprintf (stderr, "FATAL: %s\n", message);
688#ifdef _WIN32 746#ifdef _WIN32
689 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
690#endif 748#endif
691 exit (1); 749 _exit (1);
692 750
751void
752_exit (int retval)
753 CODE:
754 _exit (retval);
755
693MODULE = CFClient PACKAGE = CFClient::Font 756MODULE = CFPlus PACKAGE = CFPlus::Font
694 757
695CFClient::Font 758CFPlus::Font
696new_from_file (SV *class, char *path, int id = 0) 759new_from_file (SV *class, char *path, int id = 0)
697 CODE: 760 CODE:
698{ 761{
699 int count; 762 int count;
700 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 763 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
703} 766}
704 OUTPUT: 767 OUTPUT:
705 RETVAL 768 RETVAL
706 769
707void 770void
708DESTROY (CFClient::Font self) 771DESTROY (CFPlus::Font self)
709 CODE: 772 CODE:
710 pango_font_description_free (self); 773 pango_font_description_free (self);
711 774
712void 775void
713make_default (CFClient::Font self) 776make_default (CFPlus::Font self)
714 CODE: 777 CODE:
715 default_font = self; 778 default_font = self;
716 779
717MODULE = CFClient PACKAGE = CFClient::Layout 780MODULE = CFPlus PACKAGE = CFPlus::Layout
718 781
719CFClient::Layout 782void
720new (SV *class, int rgba = 0) 783reset_glyph_cache ()
721 CODE: 784 CODE:
722#if _WIN32 785 tc_clear ();
723 //rgba = 0;//D makes text nicer, breaks TextView 786
724#endif 787CFPlus::Layout
725 rgba=1;//D 788new (SV *class)
789 CODE:
726 New (0, RETVAL, 1, struct cf_layout); 790 New (0, RETVAL, 1, struct cf_layout);
727 791
728 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 792 RETVAL->pl = pango_layout_new (opengl_context);
729 RETVAL->rgba = rgba;
730 RETVAL->r = 1.; 793 RETVAL->r = 1.;
731 RETVAL->g = 1.; 794 RETVAL->g = 1.;
732 RETVAL->b = 1.; 795 RETVAL->b = 1.;
733 RETVAL->a = 1.; 796 RETVAL->a = 1.;
734 RETVAL->base_height = MIN_FONT_HEIGHT; 797 RETVAL->base_height = MIN_FONT_HEIGHT;
738 layout_update_font (RETVAL); 801 layout_update_font (RETVAL);
739 OUTPUT: 802 OUTPUT:
740 RETVAL 803 RETVAL
741 804
742void 805void
743DESTROY (CFClient::Layout self) 806DESTROY (CFPlus::Layout self)
744 CODE: 807 CODE:
745 g_object_unref (self->pl); 808 g_object_unref (self->pl);
746 Safefree (self); 809 Safefree (self);
747 810
748int
749is_rgba (CFClient::Layout self)
750 CODE:
751 RETVAL = self->rgba;
752 OUTPUT:
753 RETVAL
754
755void 811void
756set_text (CFClient::Layout self, SV *text_) 812set_text (CFPlus::Layout self, SV *text_)
757 CODE: 813 CODE:
758{ 814{
759 STRLEN textlen; 815 STRLEN textlen;
760 char *text = SvPVutf8 (text_, textlen); 816 char *text = SvPVutf8 (text_, textlen);
761 817
762 pango_layout_set_text (self->pl, text, textlen); 818 pango_layout_set_text (self->pl, text, textlen);
763} 819}
764 820
765void 821void
766set_markup (CFClient::Layout self, SV *text_) 822set_markup (CFPlus::Layout self, SV *text_)
767 CODE: 823 CODE:
768{ 824{
769 STRLEN textlen; 825 STRLEN textlen;
770 char *text = SvPVutf8 (text_, textlen); 826 char *text = SvPVutf8 (text_, textlen);
771 827
772 pango_layout_set_markup (self->pl, text, textlen); 828 pango_layout_set_markup (self->pl, text, textlen);
773} 829}
774 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
775SV * 916SV *
776get_text (CFClient::Layout self) 917get_text (CFPlus::Layout self)
777 CODE: 918 CODE:
778 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 919 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
779 SvUTF8_on (RETVAL); 920 sv_utf8_decode (RETVAL);
780 OUTPUT: 921 OUTPUT:
781 RETVAL 922 RETVAL
782 923
783void 924void
784set_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.)
785 CODE: 926 CODE:
786 self->r = r; 927 self->r = r;
787 self->g = g; 928 self->g = g;
788 self->b = b; 929 self->b = b;
789 self->a = a; 930 self->a = a;
790 931
791void 932void
792set_font (CFClient::Layout self, CFClient::Font font = 0) 933set_font (CFPlus::Layout self, CFPlus::Font font = 0)
793 CODE: 934 CODE:
794 if (self->font != font) 935 if (self->font != font)
795 { 936 {
796 self->font = font; 937 self->font = font;
797 layout_update_font (self); 938 layout_update_font (self);
798 } 939 }
799 940
800void 941void
801set_height (CFClient::Layout self, int base_height) 942set_height (CFPlus::Layout self, int base_height)
802 CODE: 943 CODE:
803 if (self->base_height != base_height) 944 if (self->base_height != base_height)
804 { 945 {
805 self->base_height = base_height; 946 self->base_height = base_height;
806 layout_update_font (self); 947 layout_update_font (self);
807 } 948 }
808 949
809void 950void
810set_width (CFClient::Layout self, int max_width = -1) 951set_width (CFPlus::Layout self, int max_width = -1)
811 CODE: 952 CODE:
812 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);
813 954
814void 955void
815set_indent (CFClient::Layout self, int indent) 956set_indent (CFPlus::Layout self, int indent)
816 CODE: 957 CODE:
817 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 958 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
818 959
819void 960void
820set_spacing (CFClient::Layout self, int spacing) 961set_spacing (CFPlus::Layout self, int spacing)
821 CODE: 962 CODE:
822 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 963 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
823 964
824void 965void
825set_ellipsise (CFClient::Layout self, int ellipsise) 966set_ellipsise (CFPlus::Layout self, int ellipsise)
826 CODE: 967 CODE:
827 pango_layout_set_ellipsize (self->pl, 968 pango_layout_set_ellipsize (self->pl,
828 ellipsise == 1 ? PANGO_ELLIPSIZE_START 969 ellipsise == 1 ? PANGO_ELLIPSIZE_START
829 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 970 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
830 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 971 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
831 : PANGO_ELLIPSIZE_NONE 972 : PANGO_ELLIPSIZE_NONE
832 ); 973 );
833 974
834void 975void
835set_single_paragraph_mode (CFClient::Layout self, int spm) 976set_single_paragraph_mode (CFPlus::Layout self, int spm)
836 CODE: 977 CODE:
837 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 978 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
838 979
839void 980void
840size (CFClient::Layout self) 981size (CFPlus::Layout self)
841 PPCODE: 982 PPCODE:
842{ 983{
843 int w, h; 984 int w, h;
844 985
845 layout_get_pixel_size (self, &w, &h); 986 layout_get_pixel_size (self, &w, &h);
848 PUSHs (sv_2mortal (newSViv (w))); 989 PUSHs (sv_2mortal (newSViv (w)));
849 PUSHs (sv_2mortal (newSViv (h))); 990 PUSHs (sv_2mortal (newSViv (h)));
850} 991}
851 992
852int 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
853xy_to_index (CFClient::Layout self, int x, int y) 1006xy_to_index (CFPlus::Layout self, int x, int y)
854 CODE: 1007 CODE:
855{ 1008{
856 int index, trailing; 1009 int index, trailing;
857 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);
858 RETVAL = index; 1011 RETVAL = index;
859} 1012}
860 OUTPUT: 1013 OUTPUT:
861 RETVAL 1014 RETVAL
862 1015
863void 1016void
864cursor_pos (CFClient::Layout self, int index) 1017cursor_pos (CFPlus::Layout self, int index)
865 PPCODE: 1018 PPCODE:
866{ 1019{
867 PangoRectangle strong_pos; 1020 PangoRectangle strong_pos;
868 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1021 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
869 1022
872 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
873 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
874} 1027}
875 1028
876void 1029void
877render (CFClient::Layout self) 1030render (CFPlus::Layout self, float x, float y, int flags = 0)
878 PPCODE: 1031 PPCODE:
879{ 1032 pango_opengl_render_layout_subpixel (
880 SV *retval; 1033 self->pl,
881 int w, h; 1034 x * PANGO_SCALE, y * PANGO_SCALE,
1035 self->r, self->g, self->b, self->a,
1036 flags
1037 );
882 1038
883 layout_get_pixel_size (self, &w, &h); 1039MODULE = CFPlus PACKAGE = CFPlus::Texture
884 1040
885 if (self->rgba) 1041void
1042pad2pot (SV *data_, SV *w_, SV *h_)
1043 CODE:
1044{
1045 int ow = SvIV (w_);
1046 int oh = SvIV (h_);
1047
1048 if (ow && oh)
886 { 1049 {
887 cairo_surface_t *surface; 1050 int nw = minpot (ow);
888 cairo_t *cairo; 1051 int nh = minpot (oh);
889 1052
890 retval = newSV (w * h * 4); 1053 if (nw != ow || nh != oh)
891 SvPOK_only (retval);
892 SvCUR_set (retval, w * h * 4);
893
894 memset (SvPVX (retval), 0, w * h * 4);
895
896 surface = cairo_image_surface_create_for_data (
897 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
898 cairo = cairo_create (surface);
899 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
900
901 pango_cairo_show_layout (cairo, self->pl);
902
903 cairo_destroy (cairo);
904 cairo_surface_destroy (surface);
905
906 // what a mess, and its premultiplied, too :(
907 { 1054 {
908 uint32_t *p = (uint32_t *)SvPVX (retval); 1055 if (SvOK (data_))
909 uint32_t *e = p + w * h;
910
911 while (p < e)
912 { 1056 {
913 uint32_t rgba = *p; 1057 STRLEN datalen;
914 rgba = (rgba >> 24) | (rgba << 8); 1058 char *data = SvPVbyte (data_, datalen);
915#if 0 1059 int bpp = datalen / (ow * oh);
916#ifdef _WIN32 1060 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
917 {//D
918 uint8_t r = rgba >> 24;
919 uint8_t g = rgba >> 16;
920 uint8_t b = rgba >> 8;
921 uint8_t a = rgba >> 0;
922 1061
923 rgba = (rgba & 0xffffff00) | a; 1062 SvPOK_only (result_);
1063 SvCUR_set (result_, nw * nh * bpp);
1064
1065 memset (SvPVX (result_), 0, nw * nh * bpp);
1066 while (oh--)
1067 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1068
1069 sv_setsv (data_, result_);
924 } 1070 }
925#endif 1071
926#endif 1072 sv_setiv (w_, nw);
927 rgba = SDL_SwapBE32 (rgba); 1073 sv_setiv (h_, nh);
928 *p++ = rgba;
929 } 1074 }
930 }
931
932 EXTEND (SP, 5);
933 PUSHs (sv_2mortal (newSViv (w)));
934 PUSHs (sv_2mortal (newSViv (h)));
935 PUSHs (sv_2mortal (retval));
936 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
938 } 1075 }
939 else
940 {
941 FT_Bitmap bitmap;
942
943 retval = newSV (w * h);
944 SvPOK_only (retval);
945 SvCUR_set (retval, w * h);
946
947 bitmap.rows = h;
948 bitmap.width = w;
949 bitmap.pitch = w;
950 bitmap.buffer = (unsigned char*)SvPVX (retval);
951 bitmap.num_grays = 256;
952 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
953
954 memset (bitmap.buffer, 0, w * h);
955
956 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
957
958 EXTEND (SP, 5);
959 PUSHs (sv_2mortal (newSViv (w)));
960 PUSHs (sv_2mortal (newSViv (h)));
961 PUSHs (sv_2mortal (retval));
962 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
964 }
965} 1076}
966 1077
967MODULE = CFClient PACKAGE = CFClient::Texture
968
969void 1078void
970draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1079draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
971 PROTOTYPE: $$$;$$ 1080 PROTOTYPE: $$$;$$
972 ALIAS: 1081 ALIAS:
973 draw_quad_alpha = 1 1082 draw_quad_alpha = 1
974 draw_quad_alpha_premultiplied = 2 1083 draw_quad_alpha_premultiplied = 2
975 CODE: 1084 CODE:
1013 glDisable (GL_ALPHA_TEST); 1122 glDisable (GL_ALPHA_TEST);
1014 glDisable (GL_BLEND); 1123 glDisable (GL_BLEND);
1015 } 1124 }
1016} 1125}
1017 1126
1018MODULE = CFClient PACKAGE = CFClient::Map 1127MODULE = CFPlus PACKAGE = CFPlus::Map
1019 1128
1020CFClient::Map 1129CFPlus::Map
1021new (SV *class, int map_width, int map_height) 1130new (SV *class, int map_width, int map_height)
1022 CODE: 1131 CODE:
1023 New (0, RETVAL, 1, struct map); 1132 New (0, RETVAL, 1, struct map);
1024 RETVAL->x = 0; 1133 RETVAL->x = 0;
1025 RETVAL->y = 0; 1134 RETVAL->y = 0;
1035 RETVAL->row = 0; 1144 RETVAL->row = 0;
1036 OUTPUT: 1145 OUTPUT:
1037 RETVAL 1146 RETVAL
1038 1147
1039void 1148void
1040DESTROY (CFClient::Map self) 1149DESTROY (CFPlus::Map self)
1041 CODE: 1150 CODE:
1042{ 1151{
1043 map_clear (self); 1152 map_clear (self);
1044 Safefree (self->face); 1153 Safefree (self->face);
1154 Safefree (self->tex);
1045 Safefree (self); 1155 Safefree (self);
1046} 1156}
1047 1157
1048void 1158void
1049clear (CFClient::Map self) 1159clear (CFPlus::Map self)
1050 CODE: 1160 CODE:
1051 map_clear (self); 1161 map_clear (self);
1052 1162
1053void 1163void
1054set_face (CFClient::Map self, int face, int texid) 1164set_face (CFPlus::Map self, int face, int texid)
1055 CODE: 1165 CODE:
1056{ 1166{
1057 while (self->faces <= face) 1167 while (self->faces <= face)
1058 { 1168 {
1059 Append (mapface, self->face, self->faces, self->faces); 1169 Append (mapface, self->face, self->faces, self->faces);
1062 1172
1063 self->face [face] = texid; 1173 self->face [face] = texid;
1064} 1174}
1065 1175
1066void 1176void
1067set_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)
1068 CODE: 1178 CODE:
1069{ 1179{
1070 while (self->texs <= texid) 1180 while (self->texs <= texid)
1071 { 1181 {
1072 Append (maptex, self->tex, self->texs, self->texs); 1182 Append (maptex, self->tex, self->texs, self->texs);
1096 // from transparent color bleeding and ugly wrapping effects. 1206 // from transparent color bleeding and ugly wrapping effects.
1097 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1207 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1098} 1208}
1099 1209
1100int 1210int
1101ox (CFClient::Map self) 1211ox (CFPlus::Map self)
1102 ALIAS: 1212 ALIAS:
1103 oy = 1 1213 oy = 1
1104 x = 2 1214 x = 2
1105 y = 3 1215 y = 3
1106 w = 4 1216 w = 4
1117 } 1227 }
1118 OUTPUT: 1228 OUTPUT:
1119 RETVAL 1229 RETVAL
1120 1230
1121void 1231void
1122scroll (CFClient::Map self, int dx, int dy) 1232scroll (CFPlus::Map self, int dx, int dy)
1123 CODE: 1233 CODE:
1124{ 1234{
1125 if (dx > 0) 1235 if (dx > 0)
1126 map_blank (self, self->x, self->y, dx - 1, self->h); 1236 map_blank (self, self->x, self->y, dx - 1, self->h);
1127 else if (dx < 0) 1237 else if (dx < 0)
1143 self->y += MAP_EXTEND_Y; 1253 self->y += MAP_EXTEND_Y;
1144 } 1254 }
1145} 1255}
1146 1256
1147void 1257void
1148map1a_update (CFClient::Map self, SV *data_) 1258map1a_update (CFPlus::Map self, SV *data_)
1149 CODE: 1259 CODE:
1150{ 1260{
1151 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1261 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1152 uint8_t *data_end = (uint8_t *)SvEND (data_); 1262 uint8_t *data_end = (uint8_t *)SvEND (data_);
1153 mapcell *cell; 1263 mapcell *cell;
1155 1265
1156 while (data < data_end) 1266 while (data < data_end)
1157 { 1267 {
1158 flags = (data [0] << 8) + data [1]; data += 2; 1268 flags = (data [0] << 8) + data [1]; data += 2;
1159 1269
1160 x = ((flags >> 10) & 63) + self->x; 1270 x = self->x + ((flags >> 10) & 63);
1161 y = ((flags >> 4) & 63) + self->y; 1271 y = self->y + ((flags >> 4) & 63);
1162 1272
1163 cell = map_get_cell (self, x, y); 1273 cell = map_get_cell (self, x, y);
1164 1274
1165 if (flags & 15) 1275 if (flags & 15)
1166 { 1276 {
1195 cell->darkness = -1; 1305 cell->darkness = -1;
1196 } 1306 }
1197} 1307}
1198 1308
1199SV * 1309SV *
1200mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1201 CODE: 1311 CODE:
1202{ 1312{
1203 int x1, x; 1313 int x1, x;
1204 int y1, y; 1314 int y1, y;
1205 int z; 1315 int z;
1255} 1365}
1256 OUTPUT: 1366 OUTPUT:
1257 RETVAL 1367 RETVAL
1258 1368
1259void 1369void
1260draw (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)
1261 PPCODE: 1371 CODE:
1262{ 1372{
1263 int vx, vy; 1373 int vx, vy;
1264 int x, y, z; 1374 int x, y, z;
1265 int last_name; 1375 int last_name;
1266 mapface face; 1376 mapface face;
1267 int sw4 = (sw + 3) & ~3;
1268 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1269 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1270 1377
1271 memset (darkness, 255, sw4 * sh);
1272 SvPOK_only (darkness_sv);
1273 SvCUR_set (darkness_sv, sw4 * sh);
1274
1275 vx = self->x + (self->w - sw) / 2 - shift_x; 1378 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1276 vy = self->y + (self->h - sh) / 2 - shift_y; 1379 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1277 1380
1278 /* 1381 /*
1279 int vx = self->vx = self->w >= sw 1382 int vx = self->vx = self->w >= sw
1280 ? self->x + (self->w - sw) / 2 1383 ? self->x + (self->w - sw) / 2
1281 : 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));
1285 : 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));
1286 */ 1389 */
1287 1390
1288 glColor4ub (255, 255, 255, 255); 1391 glColor4ub (255, 255, 255, 255);
1289 1392
1393 glEnable (GL_BLEND);
1290 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1394 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1291 glEnable (GL_BLEND);
1292 glEnable (GL_TEXTURE_2D); 1395 glEnable (GL_TEXTURE_2D);
1293 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1396 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1294 1397
1295 glBegin (GL_QUADS); 1398 glBegin (GL_QUADS);
1296 1399
1304 1407
1305 for (x = 0; x < sw; x++) 1408 for (x = 0; x < sw; x++)
1306 if (row->c0 <= x + vx && x + vx < row->c1) 1409 if (row->c0 <= x + vx && x + vx < row->c1)
1307 { 1410 {
1308 mapcell *cell = row->col + (x + vx - row->c0); 1411 mapcell *cell = row->col + (x + vx - row->c0);
1309
1310 darkness[y * sw4 + x] = cell->darkness < 0
1311 ? 255 - FOW_DARKNESS
1312 : 255 - cell->darkness;
1313 1412
1314 face = cell->face [z]; 1413 face = cell->face [z];
1315 1414
1316 if (face) 1415 if (face)
1317 { 1416 {
1338 1437
1339 glEnd (); 1438 glEnd ();
1340 1439
1341 glDisable (GL_TEXTURE_2D); 1440 glDisable (GL_TEXTURE_2D);
1342 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 }
1343 1536
1344 EXTEND (SP, 3); 1537 EXTEND (SP, 3);
1345 PUSHs (sv_2mortal (newSViv (sw4))); 1538 PUSHs (sv_2mortal (newSViv (sw4)));
1346 PUSHs (sv_2mortal (newSViv (sh))); 1539 PUSHs (sv_2mortal (newSViv (sh)));
1347 PUSHs (darkness_sv); 1540 PUSHs (darkness_sv);
1348} 1541}
1349 1542
1350SV * 1543SV *
1351get_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)
1352 CODE: 1545 CODE:
1353{ 1546{
1354 int x, y, x1, y1; 1547 int x, y, x1, y1;
1355 SV *data_sv = newSV (w * h * 7 + 5); 1548 SV *data_sv = newSV (w * h * 7 + 5);
1356 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1549 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1418} 1611}
1419 OUTPUT: 1612 OUTPUT:
1420 RETVAL 1613 RETVAL
1421 1614
1422void 1615void
1423set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1616set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1424 PPCODE: 1617 PPCODE:
1425{ 1618{
1426 int x, y, z; 1619 int x, y, z;
1427 int w, h; 1620 int w, h;
1428 int x1, y1; 1621 int x1, y1;
1477 } 1670 }
1478 } 1671 }
1479 } 1672 }
1480} 1673}
1481 1674
1482MODULE = CFClient PACKAGE = CFClient::MixChunk 1675MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1483 1676
1484CFClient::MixChunk 1677CFPlus::MixChunk
1485new_from_file (SV *class, char *path) 1678new_from_file (SV *class, char *path)
1486 CODE: 1679 CODE:
1487 RETVAL = Mix_LoadWAV (path); 1680 RETVAL = Mix_LoadWAV (path);
1488 OUTPUT: 1681 OUTPUT:
1489 RETVAL 1682 RETVAL
1490 1683
1491void 1684void
1492DESTROY (CFClient::MixChunk self) 1685DESTROY (CFPlus::MixChunk self)
1493 CODE: 1686 CODE:
1494 Mix_FreeChunk (self); 1687 Mix_FreeChunk (self);
1495 1688
1496int 1689int
1497volume (CFClient::MixChunk self, int volume = -1) 1690volume (CFPlus::MixChunk self, int volume = -1)
1498 CODE: 1691 CODE:
1499 RETVAL = Mix_VolumeChunk (self, volume); 1692 RETVAL = Mix_VolumeChunk (self, volume);
1500 OUTPUT: 1693 OUTPUT:
1501 RETVAL 1694 RETVAL
1502 1695
1503int 1696int
1504play (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)
1505 CODE: 1698 CODE:
1506 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1699 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1507 OUTPUT: 1700 OUTPUT:
1508 RETVAL 1701 RETVAL
1509 1702
1510MODULE = CFClient PACKAGE = CFClient::MixMusic 1703MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1511 1704
1512int 1705int
1513volume (int volume = -1) 1706volume (int volume = -1)
1514 CODE: 1707 CODE:
1515 RETVAL = Mix_VolumeMusic (volume); 1708 RETVAL = Mix_VolumeMusic (volume);
1516 OUTPUT: 1709 OUTPUT:
1517 RETVAL 1710 RETVAL
1518 1711
1519CFClient::MixMusic 1712CFPlus::MixMusic
1520new_from_file (SV *class, char *path) 1713new_from_file (SV *class, char *path)
1521 CODE: 1714 CODE:
1522 RETVAL = Mix_LoadMUS (path); 1715 RETVAL = Mix_LoadMUS (path);
1523 OUTPUT: 1716 OUTPUT:
1524 RETVAL 1717 RETVAL
1525 1718
1526void 1719void
1527DESTROY (CFClient::MixMusic self) 1720DESTROY (CFPlus::MixMusic self)
1528 CODE: 1721 CODE:
1529 Mix_FreeMusic (self); 1722 Mix_FreeMusic (self);
1530 1723
1531int 1724int
1532play (CFClient::MixMusic self, int loops = -1) 1725play (CFPlus::MixMusic self, int loops = -1)
1533 CODE: 1726 CODE:
1534 RETVAL = Mix_PlayMusic (self, loops); 1727 RETVAL = Mix_PlayMusic (self, loops);
1535 OUTPUT: 1728 OUTPUT:
1536 RETVAL 1729 RETVAL
1537 1730
1538MODULE = CFClient PACKAGE = CFClient::OpenGL 1731MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1539 1732
1540BOOT: 1733BOOT:
1541{ 1734{
1542 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1735 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1543 static const struct { 1736 static const struct {
1544 const char *name; 1737 const char *name;
1545 IV iv; 1738 IV iv;
1546 } *civ, const_iv[] = { 1739 } *civ, const_iv[] = {
1547# define const_iv(name) { # name, (IV)name } 1740# define const_iv(name) { # name, (IV)name }
1554 const_iv (GL_SCISSOR_TEST), 1747 const_iv (GL_SCISSOR_TEST),
1555 const_iv (GL_DEPTH_TEST), 1748 const_iv (GL_DEPTH_TEST),
1556 const_iv (GL_ALPHA_TEST), 1749 const_iv (GL_ALPHA_TEST),
1557 const_iv (GL_NORMALIZE), 1750 const_iv (GL_NORMALIZE),
1558 const_iv (GL_RESCALE_NORMAL), 1751 const_iv (GL_RESCALE_NORMAL),
1752 const_iv (GL_FRONT),
1753 const_iv (GL_BACK),
1559 const_iv (GL_AND), 1754 const_iv (GL_AND),
1560 const_iv (GL_ONE), 1755 const_iv (GL_ONE),
1561 const_iv (GL_ZERO), 1756 const_iv (GL_ZERO),
1562 const_iv (GL_SRC_ALPHA), 1757 const_iv (GL_SRC_ALPHA),
1563 const_iv (GL_DST_ALPHA), 1758 const_iv (GL_DST_ALPHA),
1564 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1759 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1565 const_iv (GL_ONE_MINUS_DST_ALPHA), 1760 const_iv (GL_ONE_MINUS_DST_ALPHA),
1566 const_iv (GL_SRC_ALPHA_SATURATE), 1761 const_iv (GL_SRC_ALPHA_SATURATE),
1567 const_iv (GL_RGB), 1762 const_iv (GL_RGB),
1568 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),
1569 const_iv (GL_UNSIGNED_BYTE), 1767 const_iv (GL_UNSIGNED_BYTE),
1570 const_iv (GL_UNSIGNED_SHORT), 1768 const_iv (GL_UNSIGNED_SHORT),
1571 const_iv (GL_UNSIGNED_INT), 1769 const_iv (GL_UNSIGNED_INT),
1572 const_iv (GL_ALPHA), 1770 const_iv (GL_ALPHA),
1573 const_iv (GL_INTENSITY), 1771 const_iv (GL_INTENSITY),
1605 const_iv (GL_SEPARABLE_2D), 1803 const_iv (GL_SEPARABLE_2D),
1606 const_iv (GL_CONVOLUTION_2D), 1804 const_iv (GL_CONVOLUTION_2D),
1607 const_iv (GL_CONVOLUTION_BORDER_MODE), 1805 const_iv (GL_CONVOLUTION_BORDER_MODE),
1608 const_iv (GL_CONSTANT_BORDER), 1806 const_iv (GL_CONSTANT_BORDER),
1609 const_iv (GL_LINES), 1807 const_iv (GL_LINES),
1808 const_iv (GL_LINE_STRIP),
1610 const_iv (GL_LINE_LOOP), 1809 const_iv (GL_LINE_LOOP),
1611 const_iv (GL_QUADS), 1810 const_iv (GL_QUADS),
1612 const_iv (GL_QUAD_STRIP), 1811 const_iv (GL_QUAD_STRIP),
1613 const_iv (GL_TRIANGLES), 1812 const_iv (GL_TRIANGLES),
1614 const_iv (GL_TRIANGLE_STRIP), 1813 const_iv (GL_TRIANGLE_STRIP),
1647 OUTPUT: 1846 OUTPUT:
1648 RETVAL 1847 RETVAL
1649 1848
1650int glGetError () 1849int glGetError ()
1651 1850
1851void glFinish ()
1852
1652void glClear (int mask) 1853void glClear (int mask)
1653 1854
1654void glClearColor (float r, float g, float b, float a = 1.0) 1855void glClearColor (float r, float g, float b, float a = 1.0)
1655 PROTOTYPE: @ 1856 PROTOTYPE: @
1656 1857
1679void glPushMatrix () 1880void glPushMatrix ()
1680 1881
1681void glPopMatrix () 1882void glPopMatrix ()
1682 1883
1683void glLoadIdentity () 1884void glLoadIdentity ()
1885
1886void glDrawBuffer (int buffer)
1887
1888void glReadBuffer (int buffer)
1684 1889
1685# near_ and far_ are due to microsofts buggy "c" compiler 1890# near_ and far_ are due to microsofts buggy "c" compiler
1686void 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_)
1687 1892
1688# near_ and far_ are due to microsofts buggy "c" compiler 1893# near_ and far_ are due to microsofts buggy "c" compiler
1718 r *= a; 1923 r *= a;
1719 g *= a; 1924 g *= a;
1720 b *= a; 1925 b *= a;
1721 } 1926 }
1722 // microsoft visual "c" rounds instead of truncating... 1927 // microsoft visual "c" rounds instead of truncating...
1723 glColor4ub (MIN ((int)(r * 256.f), 255), 1928 glColor4f (r, g, b, a);
1724 MIN ((int)(g * 256.f), 255),
1725 MIN ((int)(b * 256.f), 255),
1726 MIN ((int)(a * 256.f), 255));
1727 1929
1728void glInterleavedArrays (int format, int stride, char *data) 1930void glInterleavedArrays (int format, int stride, char *data)
1729 1931
1730void glDrawElements (int mode, int count, int type, char *indices) 1932void glDrawElements (int mode, int count, int type, char *indices)
1731 1933
1808 2010
1809void glEndList () 2011void glEndList ()
1810 2012
1811void glCallList (int list) 2013void glCallList (int list)
1812 2014
1813

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines