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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines