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.134 by root, Fri Aug 4 16:49:58 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
788new (SV *class)
789 CODE:
725 New (0, RETVAL, 1, struct cf_layout); 790 New (0, RETVAL, 1, struct cf_layout);
726 791
727 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 792 RETVAL->pl = pango_layout_new (opengl_context);
728 RETVAL->rgba = rgba;
729 RETVAL->r = 1.; 793 RETVAL->r = 1.;
730 RETVAL->g = 1.; 794 RETVAL->g = 1.;
731 RETVAL->b = 1.; 795 RETVAL->b = 1.;
732 RETVAL->a = 1.; 796 RETVAL->a = 1.;
733 RETVAL->base_height = MIN_FONT_HEIGHT; 797 RETVAL->base_height = MIN_FONT_HEIGHT;
737 layout_update_font (RETVAL); 801 layout_update_font (RETVAL);
738 OUTPUT: 802 OUTPUT:
739 RETVAL 803 RETVAL
740 804
741void 805void
742DESTROY (CFClient::Layout self) 806DESTROY (CFPlus::Layout self)
743 CODE: 807 CODE:
744 g_object_unref (self->pl); 808 g_object_unref (self->pl);
745 Safefree (self); 809 Safefree (self);
746 810
747int
748is_rgba (CFClient::Layout self)
749 CODE:
750 RETVAL = self->rgba;
751 OUTPUT:
752 RETVAL
753
754void 811void
755set_text (CFClient::Layout self, SV *text_) 812set_text (CFPlus::Layout self, SV *text_)
756 CODE: 813 CODE:
757{ 814{
758 STRLEN textlen; 815 STRLEN textlen;
759 char *text = SvPVutf8 (text_, textlen); 816 char *text = SvPVutf8 (text_, textlen);
760 817
761 pango_layout_set_text (self->pl, text, textlen); 818 pango_layout_set_text (self->pl, text, textlen);
762} 819}
763 820
764void 821void
765set_markup (CFClient::Layout self, SV *text_) 822set_markup (CFPlus::Layout self, SV *text_)
766 CODE: 823 CODE:
767{ 824{
768 STRLEN textlen; 825 STRLEN textlen;
769 char *text = SvPVutf8 (text_, textlen); 826 char *text = SvPVutf8 (text_, textlen);
770 827
771 pango_layout_set_markup (self->pl, text, textlen); 828 pango_layout_set_markup (self->pl, text, textlen);
772} 829}
773 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
774SV * 916SV *
775get_text (CFClient::Layout self) 917get_text (CFPlus::Layout self)
776 CODE: 918 CODE:
777 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 919 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778 SvUTF8_on (RETVAL); 920 sv_utf8_decode (RETVAL);
779 OUTPUT: 921 OUTPUT:
780 RETVAL 922 RETVAL
781 923
782void 924void
783set_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.)
784 CODE: 926 CODE:
785 self->r = r; 927 self->r = r;
786 self->g = g; 928 self->g = g;
787 self->b = b; 929 self->b = b;
788 self->a = a; 930 self->a = a;
789 931
790void 932void
791set_font (CFClient::Layout self, CFClient::Font font = 0) 933set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792 CODE: 934 CODE:
793 if (self->font != font) 935 if (self->font != font)
794 { 936 {
795 self->font = font; 937 self->font = font;
796 layout_update_font (self); 938 layout_update_font (self);
797 } 939 }
798 940
799void 941void
800set_height (CFClient::Layout self, int base_height) 942set_height (CFPlus::Layout self, int base_height)
801 CODE: 943 CODE:
802 if (self->base_height != base_height) 944 if (self->base_height != base_height)
803 { 945 {
804 self->base_height = base_height; 946 self->base_height = base_height;
805 layout_update_font (self); 947 layout_update_font (self);
806 } 948 }
807 949
808void 950void
809set_width (CFClient::Layout self, int max_width = -1) 951set_width (CFPlus::Layout self, int max_width = -1)
810 CODE: 952 CODE:
811 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);
812 954
813void 955void
814set_indent (CFClient::Layout self, int indent) 956set_indent (CFPlus::Layout self, int indent)
815 CODE: 957 CODE:
816 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 958 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817 959
818void 960void
819set_spacing (CFClient::Layout self, int spacing) 961set_spacing (CFPlus::Layout self, int spacing)
820 CODE: 962 CODE:
821 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 963 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822 964
823void 965void
824set_ellipsise (CFClient::Layout self, int ellipsise) 966set_ellipsise (CFPlus::Layout self, int ellipsise)
825 CODE: 967 CODE:
826 pango_layout_set_ellipsize (self->pl, 968 pango_layout_set_ellipsize (self->pl,
827 ellipsise == 1 ? PANGO_ELLIPSIZE_START 969 ellipsise == 1 ? PANGO_ELLIPSIZE_START
828 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 970 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 971 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
830 : PANGO_ELLIPSIZE_NONE 972 : PANGO_ELLIPSIZE_NONE
831 ); 973 );
832 974
833void 975void
834set_single_paragraph_mode (CFClient::Layout self, int spm) 976set_single_paragraph_mode (CFPlus::Layout self, int spm)
835 CODE: 977 CODE:
836 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 978 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837 979
838void 980void
839size (CFClient::Layout self) 981size (CFPlus::Layout self)
840 PPCODE: 982 PPCODE:
841{ 983{
842 int w, h; 984 int w, h;
843 985
844 layout_get_pixel_size (self, &w, &h); 986 layout_get_pixel_size (self, &w, &h);
847 PUSHs (sv_2mortal (newSViv (w))); 989 PUSHs (sv_2mortal (newSViv (w)));
848 PUSHs (sv_2mortal (newSViv (h))); 990 PUSHs (sv_2mortal (newSViv (h)));
849} 991}
850 992
851int 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
852xy_to_index (CFClient::Layout self, int x, int y) 1006xy_to_index (CFPlus::Layout self, int x, int y)
853 CODE: 1007 CODE:
854{ 1008{
855 int index, trailing; 1009 int index, trailing;
856 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);
857 RETVAL = index; 1011 RETVAL = index;
858} 1012}
859 OUTPUT: 1013 OUTPUT:
860 RETVAL 1014 RETVAL
861 1015
862void 1016void
863cursor_pos (CFClient::Layout self, int index) 1017cursor_pos (CFPlus::Layout self, int index)
864 PPCODE: 1018 PPCODE:
865{ 1019{
866 PangoRectangle strong_pos; 1020 PangoRectangle strong_pos;
867 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1021 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868 1022
871 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873} 1027}
874 1028
875void 1029void
876render (CFClient::Layout self) 1030render (CFPlus::Layout self, float x, float y)
877 PPCODE: 1031 PPCODE:
878{ 1032 pango_opengl_render_layout_subpixel (
879 SV *retval; 1033 self->pl,
880 int w, h; 1034 x * PANGO_SCALE, y * PANGO_SCALE,
1035 self->r, self->g, self->b, self->a
1036 );
881 1037
882 layout_get_pixel_size (self, &w, &h); 1038MODULE = CFPlus PACKAGE = CFPlus::Texture
883 1039
884 if (self->rgba) 1040void
1041pad2pot (SV *data_, SV *w_, SV *h_)
1042 CODE:
1043{
1044 int ow = SvIV (w_);
1045 int oh = SvIV (h_);
1046
1047 if (ow && oh)
885 { 1048 {
886 cairo_surface_t *surface; 1049 int nw = minpot (ow);
887 cairo_t *cairo; 1050 int nh = minpot (oh);
888 1051
889 retval = newSV (w * h * 4); 1052 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 { 1053 {
907 uint32_t *p = (uint32_t *)SvPVX (retval); 1054 if (SvOK (data_))
908 uint32_t *e = p + w * h;
909
910 while (p < e)
911 { 1055 {
912 uint32_t rgba = *p; 1056 STRLEN datalen;
913 rgba = (rgba >> 24) | (rgba << 8); 1057 char *data = SvPVbyte (data_, datalen);
914#if 0 1058 int bpp = datalen / (ow * oh);
915#ifdef _WIN32 1059 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 1060
922 rgba = (rgba & 0xffffff00) | a; 1061 SvPOK_only (result_);
1062 SvCUR_set (result_, nw * nh * bpp);
1063
1064 memset (SvPVX (result_), 0, nw * nh * bpp);
1065 while (oh--)
1066 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1067
1068 sv_setsv (data_, result_);
923 } 1069 }
924#endif 1070
925#endif 1071 sv_setiv (w_, nw);
926 rgba = SDL_SwapBE32 (rgba); 1072 sv_setiv (h_, nh);
927 *p++ = rgba;
928 } 1073 }
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 } 1074 }
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} 1075}
965 1076
966MODULE = CFClient PACKAGE = CFClient::Texture
967
968void 1077void
969draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1078draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
970 PROTOTYPE: $$$;$$ 1079 PROTOTYPE: $$$;$$
971 ALIAS: 1080 ALIAS:
972 draw_quad_alpha = 1 1081 draw_quad_alpha = 1
973 draw_quad_alpha_premultiplied = 2 1082 draw_quad_alpha_premultiplied = 2
974 CODE: 1083 CODE:
990 1099
991 if (ix == 2) 1100 if (ix == 2)
992 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1101 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993 else 1102 else
994 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1103 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995 GL_ONE_MINUS_DST_ALPHA, GL_ONE); 1104 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996 1105
997 glEnable (GL_ALPHA_TEST); 1106 glEnable (GL_ALPHA_TEST);
998 glAlphaFunc (GL_GREATER, 0.01f); 1107 glAlphaFunc (GL_GREATER, 0.01f);
999 } 1108 }
1000 1109
1012 glDisable (GL_ALPHA_TEST); 1121 glDisable (GL_ALPHA_TEST);
1013 glDisable (GL_BLEND); 1122 glDisable (GL_BLEND);
1014 } 1123 }
1015} 1124}
1016 1125
1017MODULE = CFClient PACKAGE = CFClient::Map 1126MODULE = CFPlus PACKAGE = CFPlus::Map
1018 1127
1019CFClient::Map 1128CFPlus::Map
1020new (SV *class, int map_width, int map_height) 1129new (SV *class, int map_width, int map_height)
1021 CODE: 1130 CODE:
1022 New (0, RETVAL, 1, struct map); 1131 New (0, RETVAL, 1, struct map);
1023 RETVAL->x = 0; 1132 RETVAL->x = 0;
1024 RETVAL->y = 0; 1133 RETVAL->y = 0;
1034 RETVAL->row = 0; 1143 RETVAL->row = 0;
1035 OUTPUT: 1144 OUTPUT:
1036 RETVAL 1145 RETVAL
1037 1146
1038void 1147void
1039DESTROY (CFClient::Map self) 1148DESTROY (CFPlus::Map self)
1040 CODE: 1149 CODE:
1041{ 1150{
1042 map_clear (self); 1151 map_clear (self);
1043 Safefree (self->face); 1152 Safefree (self->face);
1153 Safefree (self->tex);
1044 Safefree (self); 1154 Safefree (self);
1045} 1155}
1046 1156
1047void 1157void
1048clear (CFClient::Map self) 1158clear (CFPlus::Map self)
1049 CODE: 1159 CODE:
1050 map_clear (self); 1160 map_clear (self);
1051 1161
1052void 1162void
1053set_face (CFClient::Map self, int face, int texid) 1163set_face (CFPlus::Map self, int face, int texid)
1054 CODE: 1164 CODE:
1055{ 1165{
1056 while (self->faces <= face) 1166 while (self->faces <= face)
1057 { 1167 {
1058 Append (mapface, self->face, self->faces, self->faces); 1168 Append (mapface, self->face, self->faces, self->faces);
1061 1171
1062 self->face [face] = texid; 1172 self->face [face] = texid;
1063} 1173}
1064 1174
1065void 1175void
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) 1176set_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: 1177 CODE:
1068{ 1178{
1069 while (self->texs <= texid) 1179 while (self->texs <= texid)
1070 { 1180 {
1071 Append (maptex, self->tex, self->texs, self->texs); 1181 Append (maptex, self->tex, self->texs, self->texs);
1095 // from transparent color bleeding and ugly wrapping effects. 1205 // from transparent color bleeding and ugly wrapping effects.
1096 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1206 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097} 1207}
1098 1208
1099int 1209int
1100ox (CFClient::Map self) 1210ox (CFPlus::Map self)
1101 ALIAS: 1211 ALIAS:
1102 oy = 1 1212 oy = 1
1103 x = 2 1213 x = 2
1104 y = 3 1214 y = 3
1105 w = 4 1215 w = 4
1116 } 1226 }
1117 OUTPUT: 1227 OUTPUT:
1118 RETVAL 1228 RETVAL
1119 1229
1120void 1230void
1121scroll (CFClient::Map self, int dx, int dy) 1231scroll (CFPlus::Map self, int dx, int dy)
1122 CODE: 1232 CODE:
1123{ 1233{
1124 if (dx > 0) 1234 if (dx > 0)
1125 map_blank (self, self->x, self->y, dx - 1, self->h); 1235 map_blank (self, self->x, self->y, dx - 1, self->h);
1126 else if (dx < 0) 1236 else if (dx < 0)
1142 self->y += MAP_EXTEND_Y; 1252 self->y += MAP_EXTEND_Y;
1143 } 1253 }
1144} 1254}
1145 1255
1146void 1256void
1147map1a_update (CFClient::Map self, SV *data_) 1257map1a_update (CFPlus::Map self, SV *data_)
1148 CODE: 1258 CODE:
1149{ 1259{
1150 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1260 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1151 uint8_t *data_end = (uint8_t *)SvEND (data_); 1261 uint8_t *data_end = (uint8_t *)SvEND (data_);
1152 mapcell *cell; 1262 mapcell *cell;
1154 1264
1155 while (data < data_end) 1265 while (data < data_end)
1156 { 1266 {
1157 flags = (data [0] << 8) + data [1]; data += 2; 1267 flags = (data [0] << 8) + data [1]; data += 2;
1158 1268
1159 x = ((flags >> 10) & 63) + self->x; 1269 x = self->x + ((flags >> 10) & 63);
1160 y = ((flags >> 4) & 63) + self->y; 1270 y = self->y + ((flags >> 4) & 63);
1161 1271
1162 cell = map_get_cell (self, x, y); 1272 cell = map_get_cell (self, x, y);
1163 1273
1164 if (flags & 15) 1274 if (flags & 15)
1165 { 1275 {
1194 cell->darkness = -1; 1304 cell->darkness = -1;
1195 } 1305 }
1196} 1306}
1197 1307
1198SV * 1308SV *
1199mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1309mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1200 CODE: 1310 CODE:
1201{ 1311{
1202 int x1, x; 1312 int x1, x;
1203 int y1, y; 1313 int y1, y;
1204 int z; 1314 int z;
1254} 1364}
1255 OUTPUT: 1365 OUTPUT:
1256 RETVAL 1366 RETVAL
1257 1367
1258void 1368void
1259draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1369draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1260 PPCODE: 1370 CODE:
1261{ 1371{
1262 int vx, vy; 1372 int vx, vy;
1263 int x, y, z; 1373 int x, y, z;
1264 int last_name; 1374 int last_name;
1265 mapface face; 1375 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 1376
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; 1377 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1275 vy = self->y + (self->h - sh) / 2 - shift_y; 1378 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1276 1379
1277 /* 1380 /*
1278 int vx = self->vx = self->w >= sw 1381 int vx = self->vx = self->w >= sw
1279 ? self->x + (self->w - sw) / 2 1382 ? self->x + (self->w - sw) / 2
1280 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1383 : 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)); 1387 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1285 */ 1388 */
1286 1389
1287 glColor4ub (255, 255, 255, 255); 1390 glColor4ub (255, 255, 255, 255);
1288 1391
1392 glEnable (GL_BLEND);
1289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1393 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290 glEnable (GL_BLEND);
1291 glEnable (GL_TEXTURE_2D); 1394 glEnable (GL_TEXTURE_2D);
1292 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1395 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293 1396
1294 glBegin (GL_QUADS); 1397 glBegin (GL_QUADS);
1295 1398
1303 1406
1304 for (x = 0; x < sw; x++) 1407 for (x = 0; x < sw; x++)
1305 if (row->c0 <= x + vx && x + vx < row->c1) 1408 if (row->c0 <= x + vx && x + vx < row->c1)
1306 { 1409 {
1307 mapcell *cell = row->col + (x + vx - row->c0); 1410 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 1411
1313 face = cell->face [z]; 1412 face = cell->face [z];
1314 1413
1315 if (face) 1414 if (face)
1316 { 1415 {
1337 1436
1338 glEnd (); 1437 glEnd ();
1339 1438
1340 glDisable (GL_TEXTURE_2D); 1439 glDisable (GL_TEXTURE_2D);
1341 glDisable (GL_BLEND); 1440 glDisable (GL_BLEND);
1441}
1442
1443void
1444draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1445 CODE:
1446{
1447 static float color[16][3] = {
1448 { 0.00F, 0.00F, 0.00F },
1449 { 1.00F, 1.00F, 1.00F },
1450 { 0.00F, 0.00F, 0.55F },
1451 { 1.00F, 0.00F, 0.00F },
1452
1453 { 1.00F, 0.54F, 0.00F },
1454 { 0.11F, 0.56F, 1.00F },
1455 { 0.93F, 0.46F, 0.00F },
1456 { 0.18F, 0.54F, 0.34F },
1457
1458 { 0.56F, 0.73F, 0.56F },
1459 { 0.80F, 0.80F, 0.80F },
1460 { 0.55F, 0.41F, 0.13F },
1461 { 0.99F, 0.77F, 0.26F },
1462
1463 { 0.74F, 0.65F, 0.41F },
1464
1465 { 0.00F, 1.00F, 1.00F },
1466 { 1.00F, 0.00F, 1.00F },
1467 { 1.00F, 1.00F, 0.00F },
1468 };
1469
1470 int x, y;
1471
1472 glEnable (GL_TEXTURE_2D);
1473 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1474 glEnable (GL_BLEND);
1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1476 glBegin (GL_QUADS);
1477
1478 for (y = 0; y < h; y++)
1479 for (x = 0; x < w; x++)
1480 {
1481 unsigned char m = data [x + y * w];
1482
1483 if (m)
1484 {
1485 float *c = color [m & 15];
1486
1487 float tx1 = m & 0x40 ? 0.5 : 0.;
1488 float tx2 = tx1 + 0.5;
1489
1490 glColor4f (c[0], c[1], c[2], 0.75);
1491 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1492 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1493 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1494 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1495 }
1496 }
1497
1498 glEnd ();
1499 glDisable (GL_BLEND);
1500 glDisable (GL_TEXTURE_2D);
1501}
1502
1503void
1504fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1505 PPCODE:
1506{
1507 int vx, vy;
1508 int x, y;
1509 int sw4 = (sw + 3) & ~3;
1510 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1511 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1512
1513 memset (darkness, 255, sw4 * sh);
1514 SvPOK_only (darkness_sv);
1515 SvCUR_set (darkness_sv, sw4 * sh);
1516
1517 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1518 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1519
1520 for (y = 0; y < sh; y++)
1521 if (0 <= y + vy && y + vy < self->rows)
1522 {
1523 maprow *row = self->row + (y + vy);
1524
1525 for (x = 0; x < sw; x++)
1526 if (row->c0 <= x + vx && x + vx < row->c1)
1527 {
1528 mapcell *cell = row->col + (x + vx - row->c0);
1529
1530 darkness[y * sw4 + x] = cell->darkness < 0
1531 ? 255 - FOW_DARKNESS
1532 : 255 - cell->darkness;
1533 }
1534 }
1342 1535
1343 EXTEND (SP, 3); 1536 EXTEND (SP, 3);
1344 PUSHs (sv_2mortal (newSViv (sw4))); 1537 PUSHs (sv_2mortal (newSViv (sw4)));
1345 PUSHs (sv_2mortal (newSViv (sh))); 1538 PUSHs (sv_2mortal (newSViv (sh)));
1346 PUSHs (darkness_sv); 1539 PUSHs (darkness_sv);
1347} 1540}
1348 1541
1349SV * 1542SV *
1350get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1543get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1351 CODE: 1544 CODE:
1352{ 1545{
1353 int x, y, x1, y1; 1546 int x, y, x1, y1;
1354 SV *data_sv = newSV (w * h * 7 + 5); 1547 SV *data_sv = newSV (w * h * 7 + 5);
1355 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1548 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1417} 1610}
1418 OUTPUT: 1611 OUTPUT:
1419 RETVAL 1612 RETVAL
1420 1613
1421void 1614void
1422set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1615set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1423 PPCODE: 1616 PPCODE:
1424{ 1617{
1425 int x, y, z; 1618 int x, y, z;
1426 int w, h; 1619 int w, h;
1427 int x1, y1; 1620 int x1, y1;
1476 } 1669 }
1477 } 1670 }
1478 } 1671 }
1479} 1672}
1480 1673
1481MODULE = CFClient PACKAGE = CFClient::MixChunk 1674MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482 1675
1483CFClient::MixChunk 1676CFPlus::MixChunk
1484new_from_file (SV *class, char *path) 1677new_from_file (SV *class, char *path)
1485 CODE: 1678 CODE:
1486 RETVAL = Mix_LoadWAV (path); 1679 RETVAL = Mix_LoadWAV (path);
1487 OUTPUT: 1680 OUTPUT:
1488 RETVAL 1681 RETVAL
1489 1682
1490void 1683void
1491DESTROY (CFClient::MixChunk self) 1684DESTROY (CFPlus::MixChunk self)
1492 CODE: 1685 CODE:
1493 Mix_FreeChunk (self); 1686 Mix_FreeChunk (self);
1494 1687
1495int 1688int
1496volume (CFClient::MixChunk self, int volume = -1) 1689volume (CFPlus::MixChunk self, int volume = -1)
1497 CODE: 1690 CODE:
1498 RETVAL = Mix_VolumeChunk (self, volume); 1691 RETVAL = Mix_VolumeChunk (self, volume);
1499 OUTPUT: 1692 OUTPUT:
1500 RETVAL 1693 RETVAL
1501 1694
1502int 1695int
1503play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1696play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1504 CODE: 1697 CODE:
1505 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506 OUTPUT: 1699 OUTPUT:
1507 RETVAL 1700 RETVAL
1508 1701
1509MODULE = CFClient PACKAGE = CFClient::MixMusic 1702MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510 1703
1511int 1704int
1512volume (int volume = -1) 1705volume (int volume = -1)
1513 CODE: 1706 CODE:
1514 RETVAL = Mix_VolumeMusic (volume); 1707 RETVAL = Mix_VolumeMusic (volume);
1515 OUTPUT: 1708 OUTPUT:
1516 RETVAL 1709 RETVAL
1517 1710
1518CFClient::MixMusic 1711CFPlus::MixMusic
1519new_from_file (SV *class, char *path) 1712new_from_file (SV *class, char *path)
1520 CODE: 1713 CODE:
1521 RETVAL = Mix_LoadMUS (path); 1714 RETVAL = Mix_LoadMUS (path);
1522 OUTPUT: 1715 OUTPUT:
1523 RETVAL 1716 RETVAL
1524 1717
1525void 1718void
1526DESTROY (CFClient::MixMusic self) 1719DESTROY (CFPlus::MixMusic self)
1527 CODE: 1720 CODE:
1528 Mix_FreeMusic (self); 1721 Mix_FreeMusic (self);
1529 1722
1530int 1723int
1531play (CFClient::MixMusic self, int loops = -1) 1724play (CFPlus::MixMusic self, int loops = -1)
1532 CODE: 1725 CODE:
1533 RETVAL = Mix_PlayMusic (self, loops); 1726 RETVAL = Mix_PlayMusic (self, loops);
1534 OUTPUT: 1727 OUTPUT:
1535 RETVAL 1728 RETVAL
1536 1729
1537MODULE = CFClient PACKAGE = CFClient::OpenGL 1730MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538 1731
1539BOOT: 1732BOOT:
1540{ 1733{
1541 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1734 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542 static const struct { 1735 static const struct {
1543 const char *name; 1736 const char *name;
1544 IV iv; 1737 IV iv;
1545 } *civ, const_iv[] = { 1738 } *civ, const_iv[] = {
1546# define const_iv(name) { # name, (IV)name } 1739# define const_iv(name) { # name, (IV)name }
1553 const_iv (GL_SCISSOR_TEST), 1746 const_iv (GL_SCISSOR_TEST),
1554 const_iv (GL_DEPTH_TEST), 1747 const_iv (GL_DEPTH_TEST),
1555 const_iv (GL_ALPHA_TEST), 1748 const_iv (GL_ALPHA_TEST),
1556 const_iv (GL_NORMALIZE), 1749 const_iv (GL_NORMALIZE),
1557 const_iv (GL_RESCALE_NORMAL), 1750 const_iv (GL_RESCALE_NORMAL),
1751 const_iv (GL_FRONT),
1752 const_iv (GL_BACK),
1558 const_iv (GL_AND), 1753 const_iv (GL_AND),
1559 const_iv (GL_ONE), 1754 const_iv (GL_ONE),
1560 const_iv (GL_ZERO), 1755 const_iv (GL_ZERO),
1561 const_iv (GL_SRC_ALPHA), 1756 const_iv (GL_SRC_ALPHA),
1562 const_iv (GL_SRC_ALPHA_SATURATE), 1757 const_iv (GL_DST_ALPHA),
1563 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1758 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564 const_iv (GL_ONE_MINUS_DST_ALPHA), 1759 const_iv (GL_ONE_MINUS_DST_ALPHA),
1760 const_iv (GL_SRC_ALPHA_SATURATE),
1565 const_iv (GL_RGB), 1761 const_iv (GL_RGB),
1566 const_iv (GL_RGBA), 1762 const_iv (GL_RGBA),
1763 const_iv (GL_RGBA4),
1764 const_iv (GL_RGBA8),
1765 const_iv (GL_RGB5_A1),
1567 const_iv (GL_UNSIGNED_BYTE), 1766 const_iv (GL_UNSIGNED_BYTE),
1568 const_iv (GL_UNSIGNED_SHORT), 1767 const_iv (GL_UNSIGNED_SHORT),
1569 const_iv (GL_UNSIGNED_INT), 1768 const_iv (GL_UNSIGNED_INT),
1570 const_iv (GL_ALPHA), 1769 const_iv (GL_ALPHA),
1571 const_iv (GL_INTENSITY), 1770 const_iv (GL_INTENSITY),
1645 OUTPUT: 1844 OUTPUT:
1646 RETVAL 1845 RETVAL
1647 1846
1648int glGetError () 1847int glGetError ()
1649 1848
1849void glFinish ()
1850
1650void glClear (int mask) 1851void glClear (int mask)
1651 1852
1652void glClearColor (float r, float g, float b, float a = 1.0) 1853void glClearColor (float r, float g, float b, float a = 1.0)
1653 PROTOTYPE: @ 1854 PROTOTYPE: @
1654 1855
1677void glPushMatrix () 1878void glPushMatrix ()
1678 1879
1679void glPopMatrix () 1880void glPopMatrix ()
1680 1881
1681void glLoadIdentity () 1882void glLoadIdentity ()
1883
1884void glDrawBuffer (int buffer)
1885
1886void glReadBuffer (int buffer)
1682 1887
1683# near_ and far_ are due to microsofts buggy "c" compiler 1888# near_ and far_ are due to microsofts buggy "c" compiler
1684void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1889void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685 1890
1686# near_ and far_ are due to microsofts buggy "c" compiler 1891# near_ and far_ are due to microsofts buggy "c" compiler
1716 r *= a; 1921 r *= a;
1717 g *= a; 1922 g *= a;
1718 b *= a; 1923 b *= a;
1719 } 1924 }
1720 // microsoft visual "c" rounds instead of truncating... 1925 // microsoft visual "c" rounds instead of truncating...
1721 glColor4ub (MIN ((int)(r * 256.f), 255), 1926 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 1927
1726void glInterleavedArrays (int format, int stride, char *data) 1928void glInterleavedArrays (int format, int stride, char *data)
1727 1929
1728void glDrawElements (int mode, int count, int type, char *indices) 1930void glDrawElements (int mode, int count, int type, char *indices)
1729 1931

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines