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.110 by root, Sat Jun 10 02:22:33 2006 UTC vs.
Revision 1.147 by root, Sat Aug 19 03:57:08 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 FC_HINT_STYLE 126#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#endif 128#endif
94#ifdef _WIN32
95 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
96#else
97 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
98#endif
99} 130}
100 131
101static void 132static void
102layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
103{ 134{
104 /* 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
105 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
106 */ 137 */
107 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
111 142
112 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
113} 144}
114 145
115static void 146static void
116layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
117{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
118 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
119 153
120 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
121 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
122 156
123 *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;
124} 162}
125 163
126typedef uint16_t mapface; 164typedef uint16_t mapface;
127 165
128typedef struct { 166typedef struct {
131 float s, t; 169 float s, t;
132 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
133} maptex; 171} maptex;
134 172
135typedef struct { 173typedef struct {
136 int16_t darkness; 174 uint16_t darkness;
137 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_width, stat_hp;
138} mapcell; 177} mapcell;
139 178
140typedef struct { 179typedef struct {
141 int32_t c0, c1; 180 int32_t c0, c1;
142 mapcell *col; 181 mapcell *col;
151 int texs; 190 int texs;
152 maptex *tex; 191 maptex *tex;
153 192
154 int32_t rows; 193 int32_t rows;
155 maprow *row; 194 maprow *row;
156} *CFClient__Map; 195} *CFPlus__Map;
157 196
158static char * 197static char *
159prepend (char *ptr, int sze, int inc) 198prepend (char *ptr, int sze, int inc)
160{ 199{
161 char *p; 200 char *p;
179 218
180#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 219#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
181#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 220#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182 221
183static maprow * 222static maprow *
184map_get_row (CFClient__Map self, int y) 223map_get_row (CFPlus__Map self, int y)
185{ 224{
186 if (0 > y) 225 if (0 > y)
187 { 226 {
188 int extend = - y + MAP_EXTEND_Y; 227 int extend = - y + MAP_EXTEND_Y;
189 Prepend (maprow, self->row, self->rows, extend); 228 Prepend (maprow, self->row, self->rows, extend);
227 266
228 return row->col + (x - row->c0); 267 return row->col + (x - row->c0);
229} 268}
230 269
231static mapcell * 270static mapcell *
232map_get_cell (CFClient__Map self, int x, int y) 271map_get_cell (CFPlus__Map self, int x, int y)
233{ 272{
234 return row_get_cell (map_get_row (self, y), x); 273 return row_get_cell (map_get_row (self, y), x);
235} 274}
236 275
237static void 276static void
238map_clear (CFClient__Map self) 277map_clear (CFPlus__Map self)
239{ 278{
240 int r; 279 int r;
241 280
242 for (r = 0; r < self->rows; r++) 281 for (r = 0; r < self->rows; r++)
243 Safefree (self->row[r].col); 282 Safefree (self->row[r].col);
251 self->row = 0; 290 self->row = 0;
252 self->rows = 0; 291 self->rows = 0;
253} 292}
254 293
255static void 294static void
256map_blank (CFClient__Map self, int x0, int y0, int w, int h) 295map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
257{ 296{
258 int x, y; 297 int x, y;
259 maprow *row; 298 maprow *row;
299 mapcell *cell;
260 300
261 for (y = y0; y < y0 + h; y++) 301 for (y = y0; y < y0 + h; y++)
262 if (y >= 0) 302 if (y >= 0)
263 { 303 {
264 if (y >= self->rows) 304 if (y >= self->rows)
270 if (x >= row->c0) 310 if (x >= row->c0)
271 { 311 {
272 if (x >= row->c1) 312 if (x >= row->c1)
273 break; 313 break;
274 314
275 row->col[x - row->c0].darkness = -1; 315 cell = row->col + x - row->c0;
316
317 cell->darkness = 0;
318 cell->stat_hp = 0;
276 } 319 }
277 } 320 }
278} 321}
279 322
280static void 323static void
301 ev.data2 = 0; 344 ev.data2 = 0;
302 345
303 SDL_PushEvent ((SDL_Event *)&ev); 346 SDL_PushEvent ((SDL_Event *)&ev);
304} 347}
305 348
349static unsigned int
350minpot (unsigned int n)
351{
352 if (!n)
353 return 0;
354
355 --n;
356
357 n |= n >> 1;
358 n |= n >> 2;
359 n |= n >> 4;
360 n |= n >> 8;
361 n |= n >> 16;
362
363 return n + 1;
364}
365
306MODULE = CFClient PACKAGE = CFClient 366MODULE = CFPlus PACKAGE = CFPlus
307 367
308PROTOTYPES: ENABLE 368PROTOTYPES: ENABLE
309 369
310BOOT: 370BOOT:
311{ 371{
312 HV *stash = gv_stashpv ("CFClient", 1); 372 HV *stash = gv_stashpv ("CFPlus", 1);
313 static const struct { 373 static const struct {
314 const char *name; 374 const char *name;
315 IV iv; 375 IV iv;
316 } *civ, const_iv[] = { 376 } *civ, const_iv[] = {
317# define const_iv(name) { # name, (IV)name } 377# define const_iv(name) { # name, (IV)name }
418 478
419 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 479 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 480 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
421} 481}
422 482
483int
484in_destruct ()
485 CODE:
486 RETVAL = PL_main_cv == Nullcv;
487 OUTPUT:
488 RETVAL
489
490NV floor (NV x)
491
492NV ceil (NV x)
493
423void 494void
424pango_init () 495pango_init ()
425 CODE: 496 CODE:
426 // delayed, so it can pick up new fonts added by AddFontResourceEx
427{ 497{
428 {
429 ft2_fontmap = pango_ft2_font_map_new (); 498 opengl_fontmap = pango_opengl_font_map_new ();
430 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 499 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
431 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 500 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
432 }
433 {
434 cairo_font_options_t *fopt = cairo_font_options_create ();
435 cairo_fontmap = pango_cairo_font_map_get_default ();
436 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
437#ifdef _WIN32
438 // cairo looks like shit eaten twice on windows
439 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
440#else
441 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
442#endif
443 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
444 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
445 pango_cairo_context_set_font_options (cairo_context, fopt);
446 cairo_font_options_destroy (fopt);
447 }
448} 501}
449 502
450int 503int
451SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 504SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
452 505
453void 506void
454SDL_Quit () 507SDL_Quit ()
455 508
456void 509void
463 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 516 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
464 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 517 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 518 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
466 519
467 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 520 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
468 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 521 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
469 522
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 525 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 526 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
474 527
475 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 528 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
529#if SDL_VERSION_ATLEAST(1,2,10)
530 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
531 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
532#endif
476 533
477 SDL_EnableUNICODE (1); 534 SDL_EnableUNICODE (1);
478 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 535 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
479 536
480 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 537 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
567 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 624 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
568 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 625 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
569 break; 626 break;
570 } 627 }
571 628
572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 629 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
573 } 630 }
574} 631}
575 632
576int 633int
577Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 634Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
593#endif 650#endif
594 651
595void 652void
596add_font (char *file) 653add_font (char *file)
597 CODE: 654 CODE:
598 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 655 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
599#ifdef _WIN32
600 // cairo... sigh... requires win2000
601 AddFontResourceEx (file, FR_PRIVATE, 0);
602#endif
603 656
604void 657void
605load_image_inline (SV *image_) 658load_image_inline (SV *image_)
606 ALIAS: 659 ALIAS:
607 load_image_file = 1 660 load_image_file = 1
649 702
650 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 703 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
651 704
652 assert (surface2->pitch == surface2->w * 4); 705 assert (surface2->pitch == surface2->w * 4);
653 706
707 SDL_LockSurface (surface2);
654 EXTEND (SP, 5); 708 EXTEND (SP, 6);
655 PUSHs (sv_2mortal (newSViv (surface2->w))); 709 PUSHs (sv_2mortal (newSViv (surface2->w)));
656 PUSHs (sv_2mortal (newSViv (surface2->h))); 710 PUSHs (sv_2mortal (newSViv (surface2->h)));
657 SDL_LockSurface (surface2);
658 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 711 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
659 SDL_UnlockSurface (surface2);
660 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 712 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
661 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 713 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
662 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 714 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
715 SDL_UnlockSurface (surface2);
663 716
664 SDL_FreeSurface (surface); 717 SDL_FreeSurface (surface);
665 SDL_FreeSurface (surface2); 718 SDL_FreeSurface (surface2);
666} 719}
667 720
703 CODE: 756 CODE:
704 fprintf (stderr, "FATAL: %s\n", message); 757 fprintf (stderr, "FATAL: %s\n", message);
705#ifdef _WIN32 758#ifdef _WIN32
706 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 759 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
707#endif 760#endif
708 exit (1); 761 _exit (1);
709 762
763void
764_exit (int retval)
765 CODE:
766 _exit (retval);
767
710MODULE = CFClient PACKAGE = CFClient::Font 768MODULE = CFPlus PACKAGE = CFPlus::Font
711 769
712CFClient::Font 770CFPlus::Font
713new_from_file (SV *class, char *path, int id = 0) 771new_from_file (SV *class, char *path, int id = 0)
714 CODE: 772 CODE:
715{ 773{
716 int count; 774 int count;
717 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 775 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
720} 778}
721 OUTPUT: 779 OUTPUT:
722 RETVAL 780 RETVAL
723 781
724void 782void
725DESTROY (CFClient::Font self) 783DESTROY (CFPlus::Font self)
726 CODE: 784 CODE:
727 pango_font_description_free (self); 785 pango_font_description_free (self);
728 786
729void 787void
730make_default (CFClient::Font self) 788make_default (CFPlus::Font self)
731 CODE: 789 CODE:
732 default_font = self; 790 default_font = self;
733 791
734MODULE = CFClient PACKAGE = CFClient::Layout 792MODULE = CFPlus PACKAGE = CFPlus::Layout
735 793
736CFClient::Layout 794void
737new (SV *class, int rgba = 0) 795reset_glyph_cache ()
796 CODE:
797 tc_clear ();
798
799CFPlus::Layout
800new (SV *class)
738 CODE: 801 CODE:
739 New (0, RETVAL, 1, struct cf_layout); 802 New (0, RETVAL, 1, struct cf_layout);
740 803
741 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 804 RETVAL->pl = pango_layout_new (opengl_context);
742 RETVAL->rgba = rgba;
743 RETVAL->r = 1.; 805 RETVAL->r = 1.;
744 RETVAL->g = 1.; 806 RETVAL->g = 1.;
745 RETVAL->b = 1.; 807 RETVAL->b = 1.;
746 RETVAL->a = 1.; 808 RETVAL->a = 1.;
747 RETVAL->base_height = MIN_FONT_HEIGHT; 809 RETVAL->base_height = MIN_FONT_HEIGHT;
751 layout_update_font (RETVAL); 813 layout_update_font (RETVAL);
752 OUTPUT: 814 OUTPUT:
753 RETVAL 815 RETVAL
754 816
755void 817void
756DESTROY (CFClient::Layout self) 818DESTROY (CFPlus::Layout self)
757 CODE: 819 CODE:
758 g_object_unref (self->pl); 820 g_object_unref (self->pl);
759 Safefree (self); 821 Safefree (self);
760 822
761int
762is_rgba (CFClient::Layout self)
763 CODE:
764 RETVAL = self->rgba;
765 OUTPUT:
766 RETVAL
767
768void 823void
769set_text (CFClient::Layout self, SV *text_) 824set_text (CFPlus::Layout self, SV *text_)
770 CODE: 825 CODE:
771{ 826{
772 STRLEN textlen; 827 STRLEN textlen;
773 char *text = SvPVutf8 (text_, textlen); 828 char *text = SvPVutf8 (text_, textlen);
774 829
775 pango_layout_set_text (self->pl, text, textlen); 830 pango_layout_set_text (self->pl, text, textlen);
776} 831}
777 832
778void 833void
779set_markup (CFClient::Layout self, SV *text_) 834set_markup (CFPlus::Layout self, SV *text_)
780 CODE: 835 CODE:
781{ 836{
782 STRLEN textlen; 837 STRLEN textlen;
783 char *text = SvPVutf8 (text_, textlen); 838 char *text = SvPVutf8 (text_, textlen);
784 839
785 pango_layout_set_markup (self->pl, text, textlen); 840 pango_layout_set_markup (self->pl, text, textlen);
786} 841}
787 842
843void
844set_shapes (CFPlus::Layout self, ...)
845 CODE:
846{
847 PangoAttrList *attrs = 0;
848 const char *text = pango_layout_get_text (self->pl);
849 const char *pos = text;
850 int arg = 4;
851
852 while (arg < items && (pos = strstr (pos, OBJ_STR)))
853 {
854 PangoRectangle inkrect, rect;
855 PangoAttribute *attr;
856
857 int x = SvIV (ST (arg - 3));
858 int y = SvIV (ST (arg - 2));
859 int w = SvIV (ST (arg - 1));
860 int h = SvIV (ST (arg ));
861
862 inkrect.x = 0;
863 inkrect.y = 0;
864 inkrect.width = 0;
865 inkrect.height = 0;
866
867 rect.x = x * PANGO_SCALE;
868 rect.y = y * PANGO_SCALE;
869 rect.width = w * PANGO_SCALE;
870 rect.height = h * PANGO_SCALE;
871
872 if (!attrs)
873 attrs = pango_layout_get_attributes (self->pl);
874
875 attr = pango_attr_shape_new (&inkrect, &rect);
876 attr->start_index = pos - text;
877 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
878 pango_attr_list_insert (attrs, attr);
879
880 arg += 4;
881 pos += sizeof (OBJ_STR) - 1;
882 }
883
884 if (attrs)
885 pango_layout_set_attributes (self->pl, attrs);
886}
887
888void
889get_shapes (CFPlus::Layout self)
890 PPCODE:
891{
892 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
893
894 do
895 {
896 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
897
898 if (run && shape_attr_p (run))
899 {
900 PangoRectangle extents;
901 pango_layout_iter_get_run_extents (iter, 0, &extents);
902
903 EXTEND (SP, 2);
904 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
905 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
906 }
907 }
908 while (pango_layout_iter_next_run (iter));
909
910 pango_layout_iter_free (iter);
911}
912
913int
914has_wrapped (CFPlus::Layout self)
915 CODE:
916{
917 int lines = 1;
918 const char *text = pango_layout_get_text (self->pl);
919
920 while (*text)
921 lines += *text++ == '\n';
922
923 RETVAL = lines < pango_layout_get_line_count (self->pl);
924}
925 OUTPUT:
926 RETVAL
927
788SV * 928SV *
789get_text (CFClient::Layout self) 929get_text (CFPlus::Layout self)
790 CODE: 930 CODE:
791 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 931 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
792 sv_utf8_decode (RETVAL); 932 sv_utf8_decode (RETVAL);
793 OUTPUT: 933 OUTPUT:
794 RETVAL 934 RETVAL
795 935
796void 936void
797set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 937set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
798 CODE: 938 CODE:
799 self->r = r; 939 self->r = r;
800 self->g = g; 940 self->g = g;
801 self->b = b; 941 self->b = b;
802 self->a = a; 942 self->a = a;
803 943
804void 944void
805set_font (CFClient::Layout self, CFClient::Font font = 0) 945set_font (CFPlus::Layout self, CFPlus::Font font = 0)
806 CODE: 946 CODE:
807 if (self->font != font) 947 if (self->font != font)
808 { 948 {
809 self->font = font; 949 self->font = font;
810 layout_update_font (self); 950 layout_update_font (self);
811 } 951 }
812 952
813void 953void
814set_height (CFClient::Layout self, int base_height) 954set_height (CFPlus::Layout self, int base_height)
815 CODE: 955 CODE:
816 if (self->base_height != base_height) 956 if (self->base_height != base_height)
817 { 957 {
818 self->base_height = base_height; 958 self->base_height = base_height;
819 layout_update_font (self); 959 layout_update_font (self);
820 } 960 }
821 961
822void 962void
823set_width (CFClient::Layout self, int max_width = -1) 963set_width (CFPlus::Layout self, int max_width = -1)
824 CODE: 964 CODE:
825 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 965 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
826 966
827void 967void
828set_indent (CFClient::Layout self, int indent) 968set_indent (CFPlus::Layout self, int indent)
829 CODE: 969 CODE:
830 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 970 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
831 971
832void 972void
833set_spacing (CFClient::Layout self, int spacing) 973set_spacing (CFPlus::Layout self, int spacing)
834 CODE: 974 CODE:
835 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 975 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
836 976
837void 977void
838set_ellipsise (CFClient::Layout self, int ellipsise) 978set_ellipsise (CFPlus::Layout self, int ellipsise)
839 CODE: 979 CODE:
840 pango_layout_set_ellipsize (self->pl, 980 pango_layout_set_ellipsize (self->pl,
841 ellipsise == 1 ? PANGO_ELLIPSIZE_START 981 ellipsise == 1 ? PANGO_ELLIPSIZE_START
842 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 982 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
843 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 983 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
844 : PANGO_ELLIPSIZE_NONE 984 : PANGO_ELLIPSIZE_NONE
845 ); 985 );
846 986
847void 987void
848set_single_paragraph_mode (CFClient::Layout self, int spm) 988set_single_paragraph_mode (CFPlus::Layout self, int spm)
849 CODE: 989 CODE:
850 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 990 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
851 991
852void 992void
853size (CFClient::Layout self) 993size (CFPlus::Layout self)
854 PPCODE: 994 PPCODE:
855{ 995{
856 int w, h; 996 int w, h;
857 997
858 layout_get_pixel_size (self, &w, &h); 998 layout_get_pixel_size (self, &w, &h);
861 PUSHs (sv_2mortal (newSViv (w))); 1001 PUSHs (sv_2mortal (newSViv (w)));
862 PUSHs (sv_2mortal (newSViv (h))); 1002 PUSHs (sv_2mortal (newSViv (h)));
863} 1003}
864 1004
865int 1005int
1006descent (CFPlus::Layout self)
1007 CODE:
1008{
1009 PangoRectangle rect;
1010 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1011 pango_layout_line_get_pixel_extents (line, 0, &rect);
1012 RETVAL = PANGO_DESCENT (rect);
1013}
1014 OUTPUT:
1015 RETVAL
1016
1017int
866xy_to_index (CFClient::Layout self, int x, int y) 1018xy_to_index (CFPlus::Layout self, int x, int y)
867 CODE: 1019 CODE:
868{ 1020{
869 int index, trailing; 1021 int index, trailing;
870 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1022 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
871 RETVAL = index; 1023 RETVAL = index;
872} 1024}
873 OUTPUT: 1025 OUTPUT:
874 RETVAL 1026 RETVAL
875 1027
876void 1028void
877cursor_pos (CFClient::Layout self, int index) 1029cursor_pos (CFPlus::Layout self, int index)
878 PPCODE: 1030 PPCODE:
879{ 1031{
880 PangoRectangle strong_pos; 1032 PangoRectangle strong_pos;
881 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1033 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
882 1034
885 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1037 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
886 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1038 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
887} 1039}
888 1040
889void 1041void
890render (CFClient::Layout self) 1042render (CFPlus::Layout self, float x, float y, int flags = 0)
891 PPCODE: 1043 PPCODE:
892{ 1044 pango_opengl_render_layout_subpixel (
893 SV *retval; 1045 self->pl,
894 int w, h; 1046 x * PANGO_SCALE, y * PANGO_SCALE,
1047 self->r, self->g, self->b, self->a,
1048 flags
1049 );
895 1050
896 layout_get_pixel_size (self, &w, &h); 1051MODULE = CFPlus PACKAGE = CFPlus::Texture
897 1052
898 if (self->rgba) 1053void
1054pad2pot (SV *data_, SV *w_, SV *h_)
1055 CODE:
1056{
1057 int ow = SvIV (w_);
1058 int oh = SvIV (h_);
1059
1060 if (ow && oh)
899 { 1061 {
900 cairo_surface_t *surface; 1062 int nw = minpot (ow);
901 cairo_t *cairo; 1063 int nh = minpot (oh);
902 1064
903 retval = newSV (w * h * 4); 1065 if (nw != ow || nh != oh)
904 SvPOK_only (retval);
905 SvCUR_set (retval, w * h * 4);
906
907 memset (SvPVX (retval), 0, w * h * 4);
908
909 surface = cairo_image_surface_create_for_data (
910 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
911 cairo = cairo_create (surface);
912 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
913
914 pango_cairo_show_layout (cairo, self->pl);
915
916 cairo_destroy (cairo);
917 cairo_surface_destroy (surface);
918
919 // what a mess, and its premultiplied, too :(
920 { 1066 {
921 uint32_t *p = (uint32_t *)SvPVX (retval); 1067 if (SvOK (data_))
922 uint32_t *e = p + w * h;
923
924 while (p < e)
925 { 1068 {
926 uint32_t rgba = *p; 1069 STRLEN datalen;
927 rgba = (rgba >> 24) | (rgba << 8); 1070 char *data = SvPVbyte (data_, datalen);
928#if 0 1071 int bpp = datalen / (ow * oh);
929#ifdef _WIN32 1072 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
930 {//D
931 uint8_t r = rgba >> 24;
932 uint8_t g = rgba >> 16;
933 uint8_t b = rgba >> 8;
934 uint8_t a = rgba >> 0;
935 1073
936 rgba = (rgba & 0xffffff00) | a; 1074 SvPOK_only (result_);
1075 SvCUR_set (result_, nw * nh * bpp);
1076
1077 memset (SvPVX (result_), 0, nw * nh * bpp);
1078 while (oh--)
1079 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1080
1081 sv_setsv (data_, result_);
937 } 1082 }
938#endif 1083
939#endif 1084 sv_setiv (w_, nw);
940 rgba = SDL_SwapBE32 (rgba); 1085 sv_setiv (h_, nh);
941 *p++ = rgba;
942 } 1086 }
943 }
944
945 EXTEND (SP, 5);
946 PUSHs (sv_2mortal (newSViv (w)));
947 PUSHs (sv_2mortal (newSViv (h)));
948 PUSHs (sv_2mortal (retval));
949 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
951 } 1087 }
952 else
953 {
954 FT_Bitmap bitmap;
955
956 retval = newSV (w * h);
957 SvPOK_only (retval);
958 SvCUR_set (retval, w * h);
959
960 bitmap.rows = h;
961 bitmap.width = w;
962 bitmap.pitch = w;
963 bitmap.buffer = (unsigned char*)SvPVX (retval);
964 bitmap.num_grays = 256;
965 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
966
967 memset (bitmap.buffer, 0, w * h);
968
969 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
970
971 EXTEND (SP, 5);
972 PUSHs (sv_2mortal (newSViv (w)));
973 PUSHs (sv_2mortal (newSViv (h)));
974 PUSHs (sv_2mortal (retval));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
977 }
978} 1088}
979 1089
980MODULE = CFClient PACKAGE = CFClient::Texture
981
982void 1090void
983draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1091draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
984 PROTOTYPE: $$$;$$ 1092 PROTOTYPE: $$$;$$
985 ALIAS: 1093 ALIAS:
986 draw_quad_alpha = 1 1094 draw_quad_alpha = 1
987 draw_quad_alpha_premultiplied = 2 1095 draw_quad_alpha_premultiplied = 2
988 CODE: 1096 CODE:
1026 glDisable (GL_ALPHA_TEST); 1134 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND); 1135 glDisable (GL_BLEND);
1028 } 1136 }
1029} 1137}
1030 1138
1031MODULE = CFClient PACKAGE = CFClient::Map 1139MODULE = CFPlus PACKAGE = CFPlus::Map
1032 1140
1033CFClient::Map 1141CFPlus::Map
1034new (SV *class, int map_width, int map_height) 1142new (SV *class, int map_width, int map_height)
1035 CODE: 1143 CODE:
1036 New (0, RETVAL, 1, struct map); 1144 New (0, RETVAL, 1, struct map);
1037 RETVAL->x = 0; 1145 RETVAL->x = 0;
1038 RETVAL->y = 0; 1146 RETVAL->y = 0;
1048 RETVAL->row = 0; 1156 RETVAL->row = 0;
1049 OUTPUT: 1157 OUTPUT:
1050 RETVAL 1158 RETVAL
1051 1159
1052void 1160void
1053DESTROY (CFClient::Map self) 1161DESTROY (CFPlus::Map self)
1054 CODE: 1162 CODE:
1055{ 1163{
1056 map_clear (self); 1164 map_clear (self);
1057 Safefree (self->face); 1165 Safefree (self->face);
1166 Safefree (self->tex);
1058 Safefree (self); 1167 Safefree (self);
1059} 1168}
1060 1169
1061void 1170void
1062clear (CFClient::Map self) 1171clear (CFPlus::Map self)
1063 CODE: 1172 CODE:
1064 map_clear (self); 1173 map_clear (self);
1065 1174
1066void 1175void
1067set_face (CFClient::Map self, int face, int texid) 1176set_face (CFPlus::Map self, int face, int texid)
1068 CODE: 1177 CODE:
1069{ 1178{
1070 while (self->faces <= face) 1179 while (self->faces <= face)
1071 { 1180 {
1072 Append (mapface, self->face, self->faces, self->faces); 1181 Append (mapface, self->face, self->faces, self->faces);
1075 1184
1076 self->face [face] = texid; 1185 self->face [face] = texid;
1077} 1186}
1078 1187
1079void 1188void
1080set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1189set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1081 CODE: 1190 CODE:
1082{ 1191{
1083 while (self->texs <= texid) 1192 while (self->texs <= texid)
1084 { 1193 {
1085 Append (maptex, self->tex, self->texs, self->texs); 1194 Append (maptex, self->tex, self->texs, self->texs);
1109 // from transparent color bleeding and ugly wrapping effects. 1218 // from transparent color bleeding and ugly wrapping effects.
1110 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1219 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1111} 1220}
1112 1221
1113int 1222int
1114ox (CFClient::Map self) 1223ox (CFPlus::Map self)
1115 ALIAS: 1224 ALIAS:
1116 oy = 1 1225 oy = 1
1117 x = 2 1226 x = 2
1118 y = 3 1227 y = 3
1119 w = 4 1228 w = 4
1130 } 1239 }
1131 OUTPUT: 1240 OUTPUT:
1132 RETVAL 1241 RETVAL
1133 1242
1134void 1243void
1135scroll (CFClient::Map self, int dx, int dy) 1244scroll (CFPlus::Map self, int dx, int dy)
1136 CODE: 1245 CODE:
1137{ 1246{
1138 if (dx > 0) 1247 if (dx > 0)
1139 map_blank (self, self->x, self->y, dx - 1, self->h); 1248 map_blank (self, self->x, self->y, dx - 1, self->h);
1140 else if (dx < 0) 1249 else if (dx < 0)
1156 self->y += MAP_EXTEND_Y; 1265 self->y += MAP_EXTEND_Y;
1157 } 1266 }
1158} 1267}
1159 1268
1160void 1269void
1161map1a_update (CFClient::Map self, SV *data_) 1270map1a_update (CFPlus::Map self, SV *data_, int extmap)
1162 CODE: 1271 CODE:
1163{ 1272{
1164 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1273 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1165 uint8_t *data_end = (uint8_t *)SvEND (data_); 1274 uint8_t *data_end = (uint8_t *)SvEND (data_);
1166 mapcell *cell; 1275 mapcell *cell;
1168 1277
1169 while (data < data_end) 1278 while (data < data_end)
1170 { 1279 {
1171 flags = (data [0] << 8) + data [1]; data += 2; 1280 flags = (data [0] << 8) + data [1]; data += 2;
1172 1281
1173 x = ((flags >> 10) & 63) + self->x; 1282 x = self->x + ((flags >> 10) & 63);
1174 y = ((flags >> 4) & 63) + self->y; 1283 y = self->y + ((flags >> 4) & 63);
1175 1284
1176 cell = map_get_cell (self, x, y); 1285 cell = map_get_cell (self, x, y);
1177 1286
1178 if (flags & 15) 1287 if (flags & 15)
1179 { 1288 {
1180 if (cell->darkness < 0) 1289 if (!cell->darkness)
1181 { 1290 {
1182 cell->darkness = 0; 1291 cell->darkness = 256;
1183 cell->face [0] = 0; 1292 cell->face [0] = 0;
1184 cell->face [1] = 0; 1293 cell->face [1] = 0;
1185 cell->face [2] = 0; 1294 cell->face [2] = 0;
1186 } 1295 }
1187 1296
1188 cell->darkness = flags & 8 ? *data++ : 255;
1189
1190 //TODO: don't trust server data to be in-range(!) 1297 //TODO: don't trust server data to be in-range(!)
1298
1299 if (flags & 8)
1300 {
1301 if (extmap)
1302 {
1303 uint8_t ext, cmd;
1304
1305 do
1306 {
1307 ext = *data++;
1308 cmd = ext & 0x3f;
1309
1310 if (cmd < 4)
1311 cell->darkness = 255 - ext * 64 + 1;
1312 else if (cmd == 5) // health
1313 {
1314 cell->stat_width = 1;
1315 cell->stat_hp = *data++;
1316 }
1317 else if (cmd == 6) // monster width
1318 cell->stat_width = *data++ + 1;
1319 else if (ext & 0x40) // unknown, multibyte => skip
1320 data += *data + 1;
1321 else
1322 data++;
1323 }
1324 while (ext & 0x80);
1325 }
1326 else
1327 cell->darkness = *data++ + 1;
1328 }
1191 1329
1192 if (flags & 4) 1330 if (flags & 4)
1193 { 1331 {
1194 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1332 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1195 } 1333 }
1203 { 1341 {
1204 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1342 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1205 } 1343 }
1206 } 1344 }
1207 else 1345 else
1346 {
1208 cell->darkness = -1; 1347 cell->darkness = 0;
1348 cell->stat_hp = 0;
1349 }
1209 } 1350 }
1210} 1351}
1211 1352
1212SV * 1353SV *
1213mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1354mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1214 CODE: 1355 CODE:
1215{ 1356{
1216 int x1, x; 1357 int x1, x;
1217 int y1, y; 1358 int y1, y;
1218 int z; 1359 int z;
1268} 1409}
1269 OUTPUT: 1410 OUTPUT:
1270 RETVAL 1411 RETVAL
1271 1412
1272void 1413void
1273draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1414draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1274 PPCODE: 1415 CODE:
1275{ 1416{
1276 int vx, vy; 1417 int vx, vy;
1277 int x, y, z; 1418 int x, y, z;
1278 int last_name; 1419 int last_name;
1279 mapface face; 1420 mapface face;
1280 int sw4 = (sw + 3) & ~3;
1281 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1282 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1283 1421
1284 memset (darkness, 255, sw4 * sh);
1285 SvPOK_only (darkness_sv);
1286 SvCUR_set (darkness_sv, sw4 * sh);
1287
1288 vx = self->x + (self->w - sw) / 2 - shift_x; 1422 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1289 vy = self->y + (self->h - sh) / 2 - shift_y; 1423 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1290 1424
1291 /* 1425 /*
1292 int vx = self->vx = self->w >= sw 1426 int vx = self->vx = self->w >= sw
1293 ? self->x + (self->w - sw) / 2 1427 ? self->x + (self->w - sw) / 2
1294 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1428 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1298 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1432 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1299 */ 1433 */
1300 1434
1301 glColor4ub (255, 255, 255, 255); 1435 glColor4ub (255, 255, 255, 255);
1302 1436
1437 glEnable (GL_BLEND);
1303 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1438 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1304 glEnable (GL_BLEND);
1305 glEnable (GL_TEXTURE_2D); 1439 glEnable (GL_TEXTURE_2D);
1306 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1440 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1307 1441
1308 glBegin (GL_QUADS); 1442 glBegin (GL_QUADS);
1309 1443
1318 for (x = 0; x < sw; x++) 1452 for (x = 0; x < sw; x++)
1319 if (row->c0 <= x + vx && x + vx < row->c1) 1453 if (row->c0 <= x + vx && x + vx < row->c1)
1320 { 1454 {
1321 mapcell *cell = row->col + (x + vx - row->c0); 1455 mapcell *cell = row->col + (x + vx - row->c0);
1322 1456
1323 darkness[y * sw4 + x] = cell->darkness < 0
1324 ? 255 - FOW_DARKNESS
1325 : 255 - cell->darkness;
1326
1327 face = cell->face [z]; 1457 face = cell->face [z];
1328 1458
1329 if (face) 1459 if (face && face < self->texs)
1330 { 1460 {
1331 maptex tex = self->tex [face]; 1461 maptex tex = self->tex [face];
1332 1462
1333 int px = (x + 1) * 32 - tex.w; 1463 int px = (x + 1) * 32 - tex.w;
1334 int py = (y + 1) * 32 - tex.h; 1464 int py = (y + 1) * 32 - tex.h;
1350 } 1480 }
1351 1481
1352 glEnd (); 1482 glEnd ();
1353 1483
1354 glDisable (GL_TEXTURE_2D); 1484 glDisable (GL_TEXTURE_2D);
1485
1486 // top layer: overlays such as the health bar
1487 for (y = 0; y < sh; y++)
1488 if (0 <= y + vy && y + vy < self->rows)
1489 {
1490 maprow *row = self->row + (y + vy);
1491
1492 for (x = 0; x < sw; x++)
1493 if (row->c0 <= x + vx && x + vx < row->c1)
1494 {
1495 mapcell *cell = row->col + (x + vx - row->c0);
1496
1497 int px = x * 32;
1498 int py = y * 32;
1499
1500 if (cell->stat_hp)
1501 {
1502 int width = cell->stat_width * 32;
1503 int thick = sh / 28 + 1 + cell->stat_width;
1504
1505 glColor4ub (0, 0, 0, 128);
1506 glRectf (px + 1, py,
1507 px + width - 1, py + thick + 2);
1508
1509 glColor4ub (cell->stat_hp, 255 - cell->stat_hp, 0, 192);
1510 glRectf (px + 2,
1511 py + 1,
1512 px + width - 2 - cell->stat_hp * (width - 4) / 255, py + thick + 1);
1513 }
1514 }
1515 }
1516
1355 glDisable (GL_BLEND); 1517 glDisable (GL_BLEND);
1518}
1519
1520void
1521draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1522 CODE:
1523{
1524 static float color[16][3] = {
1525 { 0.00F, 0.00F, 0.00F },
1526 { 1.00F, 1.00F, 1.00F },
1527 { 0.00F, 0.00F, 0.55F },
1528 { 1.00F, 0.00F, 0.00F },
1529
1530 { 1.00F, 0.54F, 0.00F },
1531 { 0.11F, 0.56F, 1.00F },
1532 { 0.93F, 0.46F, 0.00F },
1533 { 0.18F, 0.54F, 0.34F },
1534
1535 { 0.56F, 0.73F, 0.56F },
1536 { 0.80F, 0.80F, 0.80F },
1537 { 0.55F, 0.41F, 0.13F },
1538 { 0.99F, 0.77F, 0.26F },
1539
1540 { 0.74F, 0.65F, 0.41F },
1541
1542 { 0.00F, 1.00F, 1.00F },
1543 { 1.00F, 0.00F, 1.00F },
1544 { 1.00F, 1.00F, 0.00F },
1545 };
1546
1547 int x, y;
1548
1549 glEnable (GL_TEXTURE_2D);
1550 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1551 glEnable (GL_BLEND);
1552 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1553 glBegin (GL_QUADS);
1554
1555 for (y = 0; y < h; y++)
1556 for (x = 0; x < w; x++)
1557 {
1558 unsigned char m = data [x + y * w];
1559
1560 if (m)
1561 {
1562 float *c = color [m & 15];
1563
1564 float tx1 = m & 0x40 ? 0.5 : 0.;
1565 float tx2 = tx1 + 0.5;
1566
1567 glColor4f (c[0], c[1], c[2], 0.75);
1568 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1569 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1570 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1571 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1572 }
1573 }
1574
1575 glEnd ();
1576 glDisable (GL_BLEND);
1577 glDisable (GL_TEXTURE_2D);
1578}
1579
1580void
1581fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1582 PPCODE:
1583{
1584 int vx, vy;
1585 int x, y;
1586 int sw4 = (sw + 3) & ~3;
1587 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1588 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1589
1590 memset (darkness, 255, sw4 * sh);
1591 SvPOK_only (darkness_sv);
1592 SvCUR_set (darkness_sv, sw4 * sh);
1593
1594 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1595 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1596
1597 for (y = 0; y < sh; y++)
1598 if (0 <= y + vy && y + vy < self->rows)
1599 {
1600 maprow *row = self->row + (y + vy);
1601
1602 for (x = 0; x < sw; x++)
1603 if (row->c0 <= x + vx && x + vx < row->c1)
1604 {
1605 mapcell *cell = row->col + (x + vx - row->c0);
1606
1607 darkness[y * sw4 + x] = cell->darkness
1608 ? 255 - (cell->darkness - 1)
1609 : 255 - FOW_DARKNESS;
1610 }
1611 }
1356 1612
1357 EXTEND (SP, 3); 1613 EXTEND (SP, 3);
1358 PUSHs (sv_2mortal (newSViv (sw4))); 1614 PUSHs (sv_2mortal (newSViv (sw4)));
1359 PUSHs (sv_2mortal (newSViv (sh))); 1615 PUSHs (sv_2mortal (newSViv (sh)));
1360 PUSHs (darkness_sv); 1616 PUSHs (darkness_sv);
1361} 1617}
1362 1618
1363SV * 1619SV *
1364get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1620get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1365 CODE: 1621 CODE:
1366{ 1622{
1367 int x, y, x1, y1; 1623 int x, y, x1, y1;
1368 SV *data_sv = newSV (w * h * 7 + 5); 1624 SV *data_sv = newSV (w * h * 7 + 5);
1369 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1625 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1431} 1687}
1432 OUTPUT: 1688 OUTPUT:
1433 RETVAL 1689 RETVAL
1434 1690
1435void 1691void
1436set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1692set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1437 PPCODE: 1693 PPCODE:
1438{ 1694{
1439 int x, y, z; 1695 int x, y, z;
1440 int w, h; 1696 int w, h;
1441 int x1, y1; 1697 int x1, y1;
1473 1729
1474 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1730 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1475 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1731 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1476 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1732 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1477 1733
1478 if (cell->darkness <= 0) 1734 if (cell->darkness == 0)
1479 { 1735 {
1480 cell->darkness = -1; 1736 cell->darkness = 0;
1481 1737
1482 for (z = 0; z <= 2; z++) 1738 for (z = 0; z <= 2; z++)
1483 { 1739 {
1484 cell->face[z] = face[z]; 1740 cell->face[z] = face[z];
1485 1741
1490 } 1746 }
1491 } 1747 }
1492 } 1748 }
1493} 1749}
1494 1750
1495MODULE = CFClient PACKAGE = CFClient::MixChunk 1751MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1496 1752
1497CFClient::MixChunk 1753CFPlus::MixChunk
1498new_from_file (SV *class, char *path) 1754new_from_file (SV *class, char *path)
1499 CODE: 1755 CODE:
1500 RETVAL = Mix_LoadWAV (path); 1756 RETVAL = Mix_LoadWAV (path);
1501 OUTPUT: 1757 OUTPUT:
1502 RETVAL 1758 RETVAL
1503 1759
1504void 1760void
1505DESTROY (CFClient::MixChunk self) 1761DESTROY (CFPlus::MixChunk self)
1506 CODE: 1762 CODE:
1507 Mix_FreeChunk (self); 1763 Mix_FreeChunk (self);
1508 1764
1509int 1765int
1510volume (CFClient::MixChunk self, int volume = -1) 1766volume (CFPlus::MixChunk self, int volume = -1)
1511 CODE: 1767 CODE:
1512 RETVAL = Mix_VolumeChunk (self, volume); 1768 RETVAL = Mix_VolumeChunk (self, volume);
1513 OUTPUT: 1769 OUTPUT:
1514 RETVAL 1770 RETVAL
1515 1771
1516int 1772int
1517play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1773play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1518 CODE: 1774 CODE:
1519 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1775 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1520 OUTPUT: 1776 OUTPUT:
1521 RETVAL 1777 RETVAL
1522 1778
1523MODULE = CFClient PACKAGE = CFClient::MixMusic 1779MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1524 1780
1525int 1781int
1526volume (int volume = -1) 1782volume (int volume = -1)
1527 CODE: 1783 CODE:
1528 RETVAL = Mix_VolumeMusic (volume); 1784 RETVAL = Mix_VolumeMusic (volume);
1529 OUTPUT: 1785 OUTPUT:
1530 RETVAL 1786 RETVAL
1531 1787
1532CFClient::MixMusic 1788CFPlus::MixMusic
1533new_from_file (SV *class, char *path) 1789new_from_file (SV *class, char *path)
1534 CODE: 1790 CODE:
1535 RETVAL = Mix_LoadMUS (path); 1791 RETVAL = Mix_LoadMUS (path);
1536 OUTPUT: 1792 OUTPUT:
1537 RETVAL 1793 RETVAL
1538 1794
1539void 1795void
1540DESTROY (CFClient::MixMusic self) 1796DESTROY (CFPlus::MixMusic self)
1541 CODE: 1797 CODE:
1542 Mix_FreeMusic (self); 1798 Mix_FreeMusic (self);
1543 1799
1544int 1800int
1545play (CFClient::MixMusic self, int loops = -1) 1801play (CFPlus::MixMusic self, int loops = -1)
1546 CODE: 1802 CODE:
1547 RETVAL = Mix_PlayMusic (self, loops); 1803 RETVAL = Mix_PlayMusic (self, loops);
1548 OUTPUT: 1804 OUTPUT:
1549 RETVAL 1805 RETVAL
1550 1806
1551MODULE = CFClient PACKAGE = CFClient::OpenGL 1807MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1552 1808
1553BOOT: 1809BOOT:
1554{ 1810{
1555 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1811 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1556 static const struct { 1812 static const struct {
1557 const char *name; 1813 const char *name;
1558 IV iv; 1814 IV iv;
1559 } *civ, const_iv[] = { 1815 } *civ, const_iv[] = {
1560# define const_iv(name) { # name, (IV)name } 1816# define const_iv(name) { # name, (IV)name }
1567 const_iv (GL_SCISSOR_TEST), 1823 const_iv (GL_SCISSOR_TEST),
1568 const_iv (GL_DEPTH_TEST), 1824 const_iv (GL_DEPTH_TEST),
1569 const_iv (GL_ALPHA_TEST), 1825 const_iv (GL_ALPHA_TEST),
1570 const_iv (GL_NORMALIZE), 1826 const_iv (GL_NORMALIZE),
1571 const_iv (GL_RESCALE_NORMAL), 1827 const_iv (GL_RESCALE_NORMAL),
1828 const_iv (GL_FRONT),
1829 const_iv (GL_BACK),
1572 const_iv (GL_AND), 1830 const_iv (GL_AND),
1573 const_iv (GL_ONE), 1831 const_iv (GL_ONE),
1574 const_iv (GL_ZERO), 1832 const_iv (GL_ZERO),
1575 const_iv (GL_SRC_ALPHA), 1833 const_iv (GL_SRC_ALPHA),
1576 const_iv (GL_DST_ALPHA), 1834 const_iv (GL_DST_ALPHA),
1577 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1835 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578 const_iv (GL_ONE_MINUS_DST_ALPHA), 1836 const_iv (GL_ONE_MINUS_DST_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE), 1837 const_iv (GL_SRC_ALPHA_SATURATE),
1580 const_iv (GL_RGB), 1838 const_iv (GL_RGB),
1581 const_iv (GL_RGBA), 1839 const_iv (GL_RGBA),
1840 const_iv (GL_RGBA4),
1841 const_iv (GL_RGBA8),
1842 const_iv (GL_RGB5_A1),
1582 const_iv (GL_UNSIGNED_BYTE), 1843 const_iv (GL_UNSIGNED_BYTE),
1583 const_iv (GL_UNSIGNED_SHORT), 1844 const_iv (GL_UNSIGNED_SHORT),
1584 const_iv (GL_UNSIGNED_INT), 1845 const_iv (GL_UNSIGNED_INT),
1585 const_iv (GL_ALPHA), 1846 const_iv (GL_ALPHA),
1586 const_iv (GL_INTENSITY), 1847 const_iv (GL_INTENSITY),
1618 const_iv (GL_SEPARABLE_2D), 1879 const_iv (GL_SEPARABLE_2D),
1619 const_iv (GL_CONVOLUTION_2D), 1880 const_iv (GL_CONVOLUTION_2D),
1620 const_iv (GL_CONVOLUTION_BORDER_MODE), 1881 const_iv (GL_CONVOLUTION_BORDER_MODE),
1621 const_iv (GL_CONSTANT_BORDER), 1882 const_iv (GL_CONSTANT_BORDER),
1622 const_iv (GL_LINES), 1883 const_iv (GL_LINES),
1884 const_iv (GL_LINE_STRIP),
1623 const_iv (GL_LINE_LOOP), 1885 const_iv (GL_LINE_LOOP),
1624 const_iv (GL_QUADS), 1886 const_iv (GL_QUADS),
1625 const_iv (GL_QUAD_STRIP), 1887 const_iv (GL_QUAD_STRIP),
1626 const_iv (GL_TRIANGLES), 1888 const_iv (GL_TRIANGLES),
1627 const_iv (GL_TRIANGLE_STRIP), 1889 const_iv (GL_TRIANGLE_STRIP),
1660 OUTPUT: 1922 OUTPUT:
1661 RETVAL 1923 RETVAL
1662 1924
1663int glGetError () 1925int glGetError ()
1664 1926
1927void glFinish ()
1928
1665void glClear (int mask) 1929void glClear (int mask)
1666 1930
1667void glClearColor (float r, float g, float b, float a = 1.0) 1931void glClearColor (float r, float g, float b, float a = 1.0)
1668 PROTOTYPE: @ 1932 PROTOTYPE: @
1669 1933
1692void glPushMatrix () 1956void glPushMatrix ()
1693 1957
1694void glPopMatrix () 1958void glPopMatrix ()
1695 1959
1696void glLoadIdentity () 1960void glLoadIdentity ()
1961
1962void glDrawBuffer (int buffer)
1963
1964void glReadBuffer (int buffer)
1697 1965
1698# near_ and far_ are due to microsofts buggy "c" compiler 1966# near_ and far_ are due to microsofts buggy "c" compiler
1699void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1967void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1700 1968
1701# near_ and far_ are due to microsofts buggy "c" compiler 1969# near_ and far_ are due to microsofts buggy "c" compiler
1731 r *= a; 1999 r *= a;
1732 g *= a; 2000 g *= a;
1733 b *= a; 2001 b *= a;
1734 } 2002 }
1735 // microsoft visual "c" rounds instead of truncating... 2003 // microsoft visual "c" rounds instead of truncating...
1736 glColor4ub (MIN ((int)(r * 256.f), 255), 2004 glColor4f (r, g, b, a);
1737 MIN ((int)(g * 256.f), 255),
1738 MIN ((int)(b * 256.f), 255),
1739 MIN ((int)(a * 256.f), 255));
1740 2005
1741void glInterleavedArrays (int format, int stride, char *data) 2006void glInterleavedArrays (int format, int stride, char *data)
1742 2007
1743void glDrawElements (int mode, int count, int type, char *indices) 2008void glDrawElements (int mode, int count, int type, char *indices)
1744 2009
1821 2086
1822void glEndList () 2087void glEndList ()
1823 2088
1824void glCallList (int list) 2089void glCallList (int list)
1825 2090
1826

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines