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.112 by root, Mon Jun 12 14:55:41 2006 UTC vs.
Revision 1.151 by root, Sat Aug 19 18:17:18 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>
15#include <stdlib.h> 20#include <stdlib.h>
16 21
18#include <SDL_endian.h> 23#include <SDL_endian.h>
19#include <SDL_image.h> 24#include <SDL_image.h>
20#include <SDL_mixer.h> 25#include <SDL_mixer.h>
21#include <SDL_opengl.h> 26#include <SDL_opengl.h>
22 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
23#include <glib/gmacros.h> 31#include <glib/gmacros.h>
24 32
25#include <pango/pango.h> 33#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 34
30#ifndef _WIN32 35#ifndef _WIN32
31# include <sys/types.h> 36# include <sys/types.h>
32# include <sys/socket.h> 37# include <sys/socket.h>
33# include <netinet/in.h> 38# include <netinet/in.h>
40 typedef signed char int8_t; 45 typedef signed char int8_t;
41 typedef signed short int16_t; 46 typedef signed short int16_t;
42 typedef signed int int32_t; 47 typedef signed int int32_t;
43#endif 48#endif
44 49
45#include "glext.h" 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
46 51
47#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
48 53
49#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
51 56
52#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
53 64
54static struct 65static struct
55{ 66{
56#define GL_FUNC(ptr,name) ptr name; 67#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 68#include "glfunc.h"
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 77 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 78 else
68 glBlendFunc (sa, da); 79 glBlendFunc (sa, da);
69} 80}
70 81
82#include "texcache.c"
83
84#include "pango-font.c"
85#include "pango-fontmap.c"
86#include "pango-render.c"
87
71typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
73 90
74typedef 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}
75 110
76typedef struct cf_layout { 111typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 112 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 113 float r, g, b, a; // default color for rgba mode
80 int base_height; 114 int base_height;
81 CFClient__Font font; 115 CFPlus__Font font;
82} *CFClient__Layout; 116} *CFPlus__Layout;
83 117
84static CFClient__Font default_font; 118static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 119static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 120static PangoFontMap *opengl_fontmap;
87 121
88static void 122static void
89substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
90{ 124{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 126#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 128#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 130}
101 131
102static void 132static void
103layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
104{ 134{
105 /* 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
106 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
107 */ 137 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
112 142
113 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
114} 144}
115 145
116static void 146static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
120 153
121 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 156
124 *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;
125} 162}
126 163
127typedef uint16_t mapface; 164typedef uint16_t mapface;
128 165
129typedef struct { 166typedef struct {
132 float s, t; 169 float s, t;
133 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
134} maptex; 171} maptex;
135 172
136typedef struct { 173typedef struct {
137 int16_t darkness; 174 uint16_t darkness;
138 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_width, stat_hp;
139} mapcell; 177} mapcell;
140 178
141typedef struct { 179typedef struct {
142 int32_t c0, c1; 180 int32_t c0, c1;
143 mapcell *col; 181 mapcell *col;
152 int texs; 190 int texs;
153 maptex *tex; 191 maptex *tex;
154 192
155 int32_t rows; 193 int32_t rows;
156 maprow *row; 194 maprow *row;
157} *CFClient__Map; 195} *CFPlus__Map;
158 196
159static char * 197static char *
160prepend (char *ptr, int sze, int inc) 198prepend (char *ptr, int sze, int inc)
161{ 199{
162 char *p; 200 char *p;
180 218
181#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))
182#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))
183 221
184static maprow * 222static maprow *
185map_get_row (CFClient__Map self, int y) 223map_get_row (CFPlus__Map self, int y)
186{ 224{
187 if (0 > y) 225 if (0 > y)
188 { 226 {
189 int extend = - y + MAP_EXTEND_Y; 227 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 228 Prepend (maprow, self->row, self->rows, extend);
228 266
229 return row->col + (x - row->c0); 267 return row->col + (x - row->c0);
230} 268}
231 269
232static mapcell * 270static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 271map_get_cell (CFPlus__Map self, int x, int y)
234{ 272{
235 return row_get_cell (map_get_row (self, y), x); 273 return row_get_cell (map_get_row (self, y), x);
236} 274}
237 275
238static void 276static void
239map_clear (CFClient__Map self) 277map_clear (CFPlus__Map self)
240{ 278{
241 int r; 279 int r;
242 280
243 for (r = 0; r < self->rows; r++) 281 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 282 Safefree (self->row[r].col);
252 self->row = 0; 290 self->row = 0;
253 self->rows = 0; 291 self->rows = 0;
254} 292}
255 293
256static void 294static void
257map_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)
258{ 296{
259 int x, y; 297 int x, y;
260 maprow *row; 298 maprow *row;
299 mapcell *cell;
261 300
262 for (y = y0; y < y0 + h; y++) 301 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 302 if (y >= 0)
264 { 303 {
265 if (y >= self->rows) 304 if (y >= self->rows)
271 if (x >= row->c0) 310 if (x >= row->c0)
272 { 311 {
273 if (x >= row->c1) 312 if (x >= row->c1)
274 break; 313 break;
275 314
276 row->col[x - row->c0].darkness = -1; 315 cell = row->col + x - row->c0;
316
317 cell->darkness = 0;
318 cell->stat_hp = 0;
277 } 319 }
278 } 320 }
279} 321}
280 322
281static void 323static void
302 ev.data2 = 0; 344 ev.data2 = 0;
303 345
304 SDL_PushEvent ((SDL_Event *)&ev); 346 SDL_PushEvent ((SDL_Event *)&ev);
305} 347}
306 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
307MODULE = CFClient PACKAGE = CFClient 366MODULE = CFPlus PACKAGE = CFPlus
308 367
309PROTOTYPES: ENABLE 368PROTOTYPES: ENABLE
310 369
311BOOT: 370BOOT:
312{ 371{
313 HV *stash = gv_stashpv ("CFClient", 1); 372 HV *stash = gv_stashpv ("CFPlus", 1);
314 static const struct { 373 static const struct {
315 const char *name; 374 const char *name;
316 IV iv; 375 IV iv;
317 } *civ, const_iv[] = { 376 } *civ, const_iv[] = {
318# define const_iv(name) { # name, (IV)name } 377# define const_iv(name) { # name, (IV)name }
419 478
420 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; )
421 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 480 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
422} 481}
423 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
424void 494void
425pango_init () 495pango_init ()
426 CODE: 496 CODE:
427 // delayed, so it can pick up new fonts added by AddFontResourceEx
428{ 497{
429 {
430 ft2_fontmap = pango_ft2_font_map_new (); 498 opengl_fontmap = pango_opengl_font_map_new ();
431 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);
432 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 500 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
433 }
434 {
435 cairo_font_options_t *fopt = cairo_font_options_create ();
436 cairo_fontmap = pango_cairo_font_map_get_default ();
437 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438#ifdef _WIN32
439 // cairo looks like shit eaten twice on windows
440 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441#else
442 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443#endif
444 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446 pango_cairo_context_set_font_options (cairo_context, fopt);
447 cairo_font_options_destroy (fopt);
448 }
449} 501}
450 502
451int 503int
452SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 504SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
453 505
454void 506void
455SDL_Quit () 507SDL_Quit ()
456 508
457void 509void
464 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 516 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 517 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
466 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 518 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
467 519
468 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 520 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 521 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
470 522
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 525 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
474 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 526 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
475 527
476 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
477 533
478 SDL_EnableUNICODE (1); 534 SDL_EnableUNICODE (1);
479 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 535 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
480 536
481 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 537 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
568 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 624 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
569 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 625 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
570 break; 626 break;
571 } 627 }
572 628
573 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 629 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
574 } 630 }
575} 631}
576 632
577int 633int
578Mix_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)
594#endif 650#endif
595 651
596void 652void
597add_font (char *file) 653add_font (char *file)
598 CODE: 654 CODE:
599 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 655 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
600#ifdef _WIN32
601 // cairo... sigh... requires win2000
602 AddFontResourceEx (file, FR_PRIVATE, 0);
603#endif
604 656
605void 657void
606load_image_inline (SV *image_) 658load_image_inline (SV *image_)
607 ALIAS: 659 ALIAS:
608 load_image_file = 1 660 load_image_file = 1
650 702
651 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 703 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
652 704
653 assert (surface2->pitch == surface2->w * 4); 705 assert (surface2->pitch == surface2->w * 4);
654 706
707 SDL_LockSurface (surface2);
655 EXTEND (SP, 5); 708 EXTEND (SP, 6);
656 PUSHs (sv_2mortal (newSViv (surface2->w))); 709 PUSHs (sv_2mortal (newSViv (surface2->w)));
657 PUSHs (sv_2mortal (newSViv (surface2->h))); 710 PUSHs (sv_2mortal (newSViv (surface2->h)));
658 SDL_LockSurface (surface2);
659 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 711 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
660 SDL_UnlockSurface (surface2);
661 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)));
662 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 713 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
663 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 714 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
715 SDL_UnlockSurface (surface2);
664 716
665 SDL_FreeSurface (surface); 717 SDL_FreeSurface (surface);
666 SDL_FreeSurface (surface2); 718 SDL_FreeSurface (surface2);
667} 719}
668 720
711void 763void
712_exit (int retval) 764_exit (int retval)
713 CODE: 765 CODE:
714 _exit (retval); 766 _exit (retval);
715 767
716MODULE = CFClient PACKAGE = CFClient::Font 768MODULE = CFPlus PACKAGE = CFPlus::Font
717 769
718CFClient::Font 770CFPlus::Font
719new_from_file (SV *class, char *path, int id = 0) 771new_from_file (SV *class, char *path, int id = 0)
720 CODE: 772 CODE:
721{ 773{
722 int count; 774 int count;
723 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 775 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
726} 778}
727 OUTPUT: 779 OUTPUT:
728 RETVAL 780 RETVAL
729 781
730void 782void
731DESTROY (CFClient::Font self) 783DESTROY (CFPlus::Font self)
732 CODE: 784 CODE:
733 pango_font_description_free (self); 785 pango_font_description_free (self);
734 786
735void 787void
736make_default (CFClient::Font self) 788make_default (CFPlus::Font self)
737 CODE: 789 CODE:
738 default_font = self; 790 default_font = self;
739 791
740MODULE = CFClient PACKAGE = CFClient::Layout 792MODULE = CFPlus PACKAGE = CFPlus::Layout
741 793
742CFClient::Layout 794void
743new (SV *class, int rgba = 0) 795reset_glyph_cache ()
796 CODE:
797 tc_clear ();
798
799CFPlus::Layout
800new (SV *class)
744 CODE: 801 CODE:
745 New (0, RETVAL, 1, struct cf_layout); 802 New (0, RETVAL, 1, struct cf_layout);
746 803
747 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 804 RETVAL->pl = pango_layout_new (opengl_context);
748 RETVAL->rgba = rgba;
749 RETVAL->r = 1.; 805 RETVAL->r = 1.;
750 RETVAL->g = 1.; 806 RETVAL->g = 1.;
751 RETVAL->b = 1.; 807 RETVAL->b = 1.;
752 RETVAL->a = 1.; 808 RETVAL->a = 1.;
753 RETVAL->base_height = MIN_FONT_HEIGHT; 809 RETVAL->base_height = MIN_FONT_HEIGHT;
757 layout_update_font (RETVAL); 813 layout_update_font (RETVAL);
758 OUTPUT: 814 OUTPUT:
759 RETVAL 815 RETVAL
760 816
761void 817void
762DESTROY (CFClient::Layout self) 818DESTROY (CFPlus::Layout self)
763 CODE: 819 CODE:
764 g_object_unref (self->pl); 820 g_object_unref (self->pl);
765 Safefree (self); 821 Safefree (self);
766 822
767int
768is_rgba (CFClient::Layout self)
769 CODE:
770 RETVAL = self->rgba;
771 OUTPUT:
772 RETVAL
773
774void 823void
775set_text (CFClient::Layout self, SV *text_) 824set_text (CFPlus::Layout self, SV *text_)
776 CODE: 825 CODE:
777{ 826{
778 STRLEN textlen; 827 STRLEN textlen;
779 char *text = SvPVutf8 (text_, textlen); 828 char *text = SvPVutf8 (text_, textlen);
780 829
781 pango_layout_set_text (self->pl, text, textlen); 830 pango_layout_set_text (self->pl, text, textlen);
782} 831}
783 832
784void 833void
785set_markup (CFClient::Layout self, SV *text_) 834set_markup (CFPlus::Layout self, SV *text_)
786 CODE: 835 CODE:
787{ 836{
788 STRLEN textlen; 837 STRLEN textlen;
789 char *text = SvPVutf8 (text_, textlen); 838 char *text = SvPVutf8 (text_, textlen);
790 839
791 pango_layout_set_markup (self->pl, text, textlen); 840 pango_layout_set_markup (self->pl, text, textlen);
792} 841}
793 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
794SV * 928SV *
795get_text (CFClient::Layout self) 929get_text (CFPlus::Layout self)
796 CODE: 930 CODE:
797 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 931 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
798 sv_utf8_decode (RETVAL); 932 sv_utf8_decode (RETVAL);
799 OUTPUT: 933 OUTPUT:
800 RETVAL 934 RETVAL
801 935
802void 936void
803set_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.)
804 CODE: 938 CODE:
805 self->r = r; 939 self->r = r;
806 self->g = g; 940 self->g = g;
807 self->b = b; 941 self->b = b;
808 self->a = a; 942 self->a = a;
809 943
810void 944void
811set_font (CFClient::Layout self, CFClient::Font font = 0) 945set_font (CFPlus::Layout self, CFPlus::Font font = 0)
812 CODE: 946 CODE:
813 if (self->font != font) 947 if (self->font != font)
814 { 948 {
815 self->font = font; 949 self->font = font;
816 layout_update_font (self); 950 layout_update_font (self);
817 } 951 }
818 952
819void 953void
820set_height (CFClient::Layout self, int base_height) 954set_height (CFPlus::Layout self, int base_height)
821 CODE: 955 CODE:
822 if (self->base_height != base_height) 956 if (self->base_height != base_height)
823 { 957 {
824 self->base_height = base_height; 958 self->base_height = base_height;
825 layout_update_font (self); 959 layout_update_font (self);
826 } 960 }
827 961
828void 962void
829set_width (CFClient::Layout self, int max_width = -1) 963set_width (CFPlus::Layout self, int max_width = -1)
830 CODE: 964 CODE:
831 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);
832 966
833void 967void
834set_indent (CFClient::Layout self, int indent) 968set_indent (CFPlus::Layout self, int indent)
835 CODE: 969 CODE:
836 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 970 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
837 971
838void 972void
839set_spacing (CFClient::Layout self, int spacing) 973set_spacing (CFPlus::Layout self, int spacing)
840 CODE: 974 CODE:
841 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 975 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
842 976
843void 977void
844set_ellipsise (CFClient::Layout self, int ellipsise) 978set_ellipsise (CFPlus::Layout self, int ellipsise)
845 CODE: 979 CODE:
846 pango_layout_set_ellipsize (self->pl, 980 pango_layout_set_ellipsize (self->pl,
847 ellipsise == 1 ? PANGO_ELLIPSIZE_START 981 ellipsise == 1 ? PANGO_ELLIPSIZE_START
848 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 982 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
849 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 983 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
850 : PANGO_ELLIPSIZE_NONE 984 : PANGO_ELLIPSIZE_NONE
851 ); 985 );
852 986
853void 987void
854set_single_paragraph_mode (CFClient::Layout self, int spm) 988set_single_paragraph_mode (CFPlus::Layout self, int spm)
855 CODE: 989 CODE:
856 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 990 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
857 991
858void 992void
859size (CFClient::Layout self) 993size (CFPlus::Layout self)
860 PPCODE: 994 PPCODE:
861{ 995{
862 int w, h; 996 int w, h;
863 997
864 layout_get_pixel_size (self, &w, &h); 998 layout_get_pixel_size (self, &w, &h);
867 PUSHs (sv_2mortal (newSViv (w))); 1001 PUSHs (sv_2mortal (newSViv (w)));
868 PUSHs (sv_2mortal (newSViv (h))); 1002 PUSHs (sv_2mortal (newSViv (h)));
869} 1003}
870 1004
871int 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
872xy_to_index (CFClient::Layout self, int x, int y) 1018xy_to_index (CFPlus::Layout self, int x, int y)
873 CODE: 1019 CODE:
874{ 1020{
875 int index, trailing; 1021 int index, trailing;
876 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);
877 RETVAL = index; 1023 RETVAL = index;
878} 1024}
879 OUTPUT: 1025 OUTPUT:
880 RETVAL 1026 RETVAL
881 1027
882void 1028void
883cursor_pos (CFClient::Layout self, int index) 1029cursor_pos (CFPlus::Layout self, int index)
884 PPCODE: 1030 PPCODE:
885{ 1031{
886 PangoRectangle strong_pos; 1032 PangoRectangle strong_pos;
887 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1033 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
888 1034
891 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1037 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1038 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893} 1039}
894 1040
895void 1041void
896render (CFClient::Layout self) 1042render (CFPlus::Layout self, float x, float y, int flags = 0)
897 PPCODE: 1043 PPCODE:
898{ 1044 pango_opengl_render_layout_subpixel (
899 SV *retval; 1045 self->pl,
900 int w, h; 1046 x * PANGO_SCALE, y * PANGO_SCALE,
1047 self->r, self->g, self->b, self->a,
1048 flags
1049 );
901 1050
902 layout_get_pixel_size (self, &w, &h); 1051MODULE = CFPlus PACKAGE = CFPlus::Texture
903 1052
904 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)
905 { 1061 {
906 cairo_surface_t *surface; 1062 int nw = minpot (ow);
907 cairo_t *cairo; 1063 int nh = minpot (oh);
908 1064
909 retval = newSV (w * h * 4); 1065 if (nw != ow || nh != oh)
910 SvPOK_only (retval);
911 SvCUR_set (retval, w * h * 4);
912
913 memset (SvPVX (retval), 0, w * h * 4);
914
915 surface = cairo_image_surface_create_for_data (
916 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
917 cairo = cairo_create (surface);
918 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
919
920 pango_cairo_show_layout (cairo, self->pl);
921
922 cairo_destroy (cairo);
923 cairo_surface_destroy (surface);
924
925 // what a mess, and its premultiplied, too :(
926 { 1066 {
927 uint32_t *p = (uint32_t *)SvPVX (retval); 1067 if (SvOK (data_))
928 uint32_t *e = p + w * h;
929
930 while (p < e)
931 { 1068 {
932 uint32_t rgba = *p; 1069 STRLEN datalen;
933 rgba = (rgba >> 24) | (rgba << 8); 1070 char *data = SvPVbyte (data_, datalen);
934#if 0 1071 int bpp = datalen / (ow * oh);
935#ifdef _WIN32 1072 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
936 {//D
937 uint8_t r = rgba >> 24;
938 uint8_t g = rgba >> 16;
939 uint8_t b = rgba >> 8;
940 uint8_t a = rgba >> 0;
941 1073
942 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_);
943 } 1082 }
944#endif 1083
945#endif 1084 sv_setiv (w_, nw);
946 rgba = SDL_SwapBE32 (rgba); 1085 sv_setiv (h_, nh);
947 *p++ = rgba;
948 } 1086 }
949 }
950
951 EXTEND (SP, 5);
952 PUSHs (sv_2mortal (newSViv (w)));
953 PUSHs (sv_2mortal (newSViv (h)));
954 PUSHs (sv_2mortal (retval));
955 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
956 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
957 } 1087 }
958 else
959 {
960 FT_Bitmap bitmap;
961
962 retval = newSV (w * h);
963 SvPOK_only (retval);
964 SvCUR_set (retval, w * h);
965
966 bitmap.rows = h;
967 bitmap.width = w;
968 bitmap.pitch = w;
969 bitmap.buffer = (unsigned char*)SvPVX (retval);
970 bitmap.num_grays = 256;
971 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
972
973 memset (bitmap.buffer, 0, w * h);
974
975 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
976
977 EXTEND (SP, 5);
978 PUSHs (sv_2mortal (newSViv (w)));
979 PUSHs (sv_2mortal (newSViv (h)));
980 PUSHs (sv_2mortal (retval));
981 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
982 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
983 }
984} 1088}
985 1089
986MODULE = CFClient PACKAGE = CFClient::Texture
987
988void 1090void
989draw_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.)
990 PROTOTYPE: $$$;$$ 1092 PROTOTYPE: $$$;$$
991 ALIAS: 1093 ALIAS:
992 draw_quad_alpha = 1 1094 draw_quad_alpha = 1
993 draw_quad_alpha_premultiplied = 2 1095 draw_quad_alpha_premultiplied = 2
994 CODE: 1096 CODE:
1032 glDisable (GL_ALPHA_TEST); 1134 glDisable (GL_ALPHA_TEST);
1033 glDisable (GL_BLEND); 1135 glDisable (GL_BLEND);
1034 } 1136 }
1035} 1137}
1036 1138
1037MODULE = CFClient PACKAGE = CFClient::Map 1139MODULE = CFPlus PACKAGE = CFPlus::Map
1038 1140
1039CFClient::Map 1141CFPlus::Map
1040new (SV *class, int map_width, int map_height) 1142new (SV *class, int map_width, int map_height)
1041 CODE: 1143 CODE:
1042 New (0, RETVAL, 1, struct map); 1144 New (0, RETVAL, 1, struct map);
1043 RETVAL->x = 0; 1145 RETVAL->x = 0;
1044 RETVAL->y = 0; 1146 RETVAL->y = 0;
1054 RETVAL->row = 0; 1156 RETVAL->row = 0;
1055 OUTPUT: 1157 OUTPUT:
1056 RETVAL 1158 RETVAL
1057 1159
1058void 1160void
1059DESTROY (CFClient::Map self) 1161DESTROY (CFPlus::Map self)
1060 CODE: 1162 CODE:
1061{ 1163{
1062 map_clear (self); 1164 map_clear (self);
1063 Safefree (self->face); 1165 Safefree (self->face);
1064 Safefree (self->tex); 1166 Safefree (self->tex);
1065 Safefree (self); 1167 Safefree (self);
1066} 1168}
1067 1169
1068void 1170void
1069clear (CFClient::Map self) 1171clear (CFPlus::Map self)
1070 CODE: 1172 CODE:
1071 map_clear (self); 1173 map_clear (self);
1072 1174
1073void 1175void
1074set_face (CFClient::Map self, int face, int texid) 1176set_face (CFPlus::Map self, int face, int texid)
1075 CODE: 1177 CODE:
1076{ 1178{
1077 while (self->faces <= face) 1179 while (self->faces <= face)
1078 { 1180 {
1079 Append (mapface, self->face, self->faces, self->faces); 1181 Append (mapface, self->face, self->faces, self->faces);
1082 1184
1083 self->face [face] = texid; 1185 self->face [face] = texid;
1084} 1186}
1085 1187
1086void 1188void
1087set_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)
1088 CODE: 1190 CODE:
1089{ 1191{
1090 while (self->texs <= texid) 1192 while (self->texs <= texid)
1091 { 1193 {
1092 Append (maptex, self->tex, self->texs, self->texs); 1194 Append (maptex, self->tex, self->texs, self->texs);
1116 // from transparent color bleeding and ugly wrapping effects. 1218 // from transparent color bleeding and ugly wrapping effects.
1117 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1219 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1118} 1220}
1119 1221
1120int 1222int
1121ox (CFClient::Map self) 1223ox (CFPlus::Map self)
1122 ALIAS: 1224 ALIAS:
1123 oy = 1 1225 oy = 1
1124 x = 2 1226 x = 2
1125 y = 3 1227 y = 3
1126 w = 4 1228 w = 4
1137 } 1239 }
1138 OUTPUT: 1240 OUTPUT:
1139 RETVAL 1241 RETVAL
1140 1242
1141void 1243void
1142scroll (CFClient::Map self, int dx, int dy) 1244scroll (CFPlus::Map self, int dx, int dy)
1143 CODE: 1245 CODE:
1144{ 1246{
1145 if (dx > 0) 1247 if (dx > 0)
1146 map_blank (self, self->x, self->y, dx - 1, self->h); 1248 map_blank (self, self->x, self->y, dx - 1, self->h);
1147 else if (dx < 0) 1249 else if (dx < 0)
1163 self->y += MAP_EXTEND_Y; 1265 self->y += MAP_EXTEND_Y;
1164 } 1266 }
1165} 1267}
1166 1268
1167void 1269void
1168map1a_update (CFClient::Map self, SV *data_) 1270map1a_update (CFPlus::Map self, SV *data_, int extmap)
1169 CODE: 1271 CODE:
1170{ 1272{
1171 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1273 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1172 uint8_t *data_end = (uint8_t *)SvEND (data_); 1274 uint8_t *data_end = (uint8_t *)SvEND (data_);
1173 mapcell *cell; 1275 mapcell *cell;
1174 int x, y, flags; 1276 int x, y, flags;
1175 1277
1176 while (data < data_end) 1278 while (data < data_end - 1)
1177 { 1279 {
1178 flags = (data [0] << 8) + data [1]; data += 2; 1280 flags = (data [0] << 8) + data [1]; data += 2;
1179 1281
1180 x = ((flags >> 10) & 63) + self->x; 1282 x = self->x + ((flags >> 10) & 63);
1181 y = ((flags >> 4) & 63) + self->y; 1283 y = self->y + ((flags >> 4) & 63);
1182 1284
1183 cell = map_get_cell (self, x, y); 1285 cell = map_get_cell (self, x, y);
1184 1286
1185 if (flags & 15) 1287 if (flags & 15)
1186 { 1288 {
1187 if (cell->darkness < 0) 1289 if (!cell->darkness)
1188 { 1290 {
1189 cell->darkness = 0; 1291 cell->darkness = 256;
1190 cell->face [0] = 0; 1292 cell->face [0] = 0;
1191 cell->face [1] = 0; 1293 cell->face [1] = 0;
1192 cell->face [2] = 0; 1294 cell->face [2] = 0;
1193 } 1295 }
1194 1296
1195 cell->darkness = flags & 8 ? *data++ : 255;
1196
1197 //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 }
1198 1329
1199 if (flags & 4) 1330 if (flags & 4)
1200 { 1331 {
1201 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;
1202 } 1333 }
1210 { 1341 {
1211 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;
1212 } 1343 }
1213 } 1344 }
1214 else 1345 else
1346 {
1215 cell->darkness = -1; 1347 cell->darkness = 0;
1348 cell->stat_hp = 0;
1349 }
1216 } 1350 }
1217} 1351}
1218 1352
1219SV * 1353SV *
1220mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1354mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1221 CODE: 1355 CODE:
1222{ 1356{
1223 int x1, x; 1357 int x1, x;
1224 int y1, y; 1358 int y1, y;
1225 int z; 1359 int z;
1275} 1409}
1276 OUTPUT: 1410 OUTPUT:
1277 RETVAL 1411 RETVAL
1278 1412
1279void 1413void
1280draw (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)
1281 PPCODE: 1415 CODE:
1282{ 1416{
1283 int vx, vy; 1417 int vx, vy;
1284 int x, y, z; 1418 int x, y, z;
1285 int last_name; 1419 int last_name;
1286 mapface face; 1420 mapface face;
1287 int sw4 = (sw + 3) & ~3;
1288 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1289 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1290 1421
1291 memset (darkness, 255, sw4 * sh);
1292 SvPOK_only (darkness_sv);
1293 SvCUR_set (darkness_sv, sw4 * sh);
1294
1295 vx = self->x + (self->w - sw) / 2 - shift_x; 1422 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1296 vy = self->y + (self->h - sh) / 2 - shift_y; 1423 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1297 1424
1298 /* 1425 /*
1299 int vx = self->vx = self->w >= sw 1426 int vx = self->vx = self->w >= sw
1300 ? self->x + (self->w - sw) / 2 1427 ? self->x + (self->w - sw) / 2
1301 : 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));
1305 : 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));
1306 */ 1433 */
1307 1434
1308 glColor4ub (255, 255, 255, 255); 1435 glColor4ub (255, 255, 255, 255);
1309 1436
1437 glEnable (GL_BLEND);
1310 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1438 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311 glEnable (GL_BLEND);
1312 glEnable (GL_TEXTURE_2D); 1439 glEnable (GL_TEXTURE_2D);
1313 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1440 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314 1441
1315 glBegin (GL_QUADS); 1442 glBegin (GL_QUADS);
1316 1443
1325 for (x = 0; x < sw; x++) 1452 for (x = 0; x < sw; x++)
1326 if (row->c0 <= x + vx && x + vx < row->c1) 1453 if (row->c0 <= x + vx && x + vx < row->c1)
1327 { 1454 {
1328 mapcell *cell = row->col + (x + vx - row->c0); 1455 mapcell *cell = row->col + (x + vx - row->c0);
1329 1456
1330 darkness[y * sw4 + x] = cell->darkness < 0
1331 ? 255 - FOW_DARKNESS
1332 : 255 - cell->darkness;
1333
1334 face = cell->face [z]; 1457 face = cell->face [z];
1335 1458
1336 if (face) 1459 if (face && face < self->texs)
1337 { 1460 {
1338 maptex tex = self->tex [face]; 1461 maptex tex = self->tex [face];
1339 1462
1340 int px = (x + 1) * 32 - tex.w; 1463 int px = (x + 1) * 32 - tex.w;
1341 int py = (y + 1) * 32 - tex.h; 1464 int py = (y + 1) * 32 - tex.h;
1357 } 1480 }
1358 1481
1359 glEnd (); 1482 glEnd ();
1360 1483
1361 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, 223);
1506 glRectf (px + 1, py - thick - 2,
1507 px + width - 1, py);
1508
1509 glColor4ub (cell->stat_hp, 255 - cell->stat_hp, 0, 223);
1510 glRectf (px + 2,
1511 py - thick - 1,
1512 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1513 }
1514 }
1515 }
1516
1362 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 }
1363 1612
1364 EXTEND (SP, 3); 1613 EXTEND (SP, 3);
1365 PUSHs (sv_2mortal (newSViv (sw4))); 1614 PUSHs (sv_2mortal (newSViv (sw4)));
1366 PUSHs (sv_2mortal (newSViv (sh))); 1615 PUSHs (sv_2mortal (newSViv (sh)));
1367 PUSHs (darkness_sv); 1616 PUSHs (darkness_sv);
1368} 1617}
1369 1618
1370SV * 1619SV *
1371get_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)
1372 CODE: 1621 CODE:
1373{ 1622{
1374 int x, y, x1, y1; 1623 int x, y, x1, y1;
1375 SV *data_sv = newSV (w * h * 7 + 5); 1624 SV *data_sv = newSV (w * h * 7 + 5);
1376 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1625 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1438} 1687}
1439 OUTPUT: 1688 OUTPUT:
1440 RETVAL 1689 RETVAL
1441 1690
1442void 1691void
1443set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1692set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1444 PPCODE: 1693 PPCODE:
1445{ 1694{
1446 int x, y, z; 1695 int x, y, z;
1447 int w, h; 1696 int w, h;
1448 int x1, y1; 1697 int x1, y1;
1480 1729
1481 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1730 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1482 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1731 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1483 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1732 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1484 1733
1485 if (cell->darkness <= 0) 1734 if (cell->darkness == 0)
1486 { 1735 {
1487 cell->darkness = -1; 1736 cell->darkness = 0;
1488 1737
1489 for (z = 0; z <= 2; z++) 1738 for (z = 0; z <= 2; z++)
1490 { 1739 {
1491 cell->face[z] = face[z]; 1740 cell->face[z] = face[z];
1492 1741
1497 } 1746 }
1498 } 1747 }
1499 } 1748 }
1500} 1749}
1501 1750
1502MODULE = CFClient PACKAGE = CFClient::MixChunk 1751MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1503 1752
1504CFClient::MixChunk 1753CFPlus::MixChunk
1505new_from_file (SV *class, char *path) 1754new_from_file (SV *class, char *path)
1506 CODE: 1755 CODE:
1507 RETVAL = Mix_LoadWAV (path); 1756 RETVAL = Mix_LoadWAV (path);
1508 OUTPUT: 1757 OUTPUT:
1509 RETVAL 1758 RETVAL
1510 1759
1511void 1760void
1512DESTROY (CFClient::MixChunk self) 1761DESTROY (CFPlus::MixChunk self)
1513 CODE: 1762 CODE:
1514 Mix_FreeChunk (self); 1763 Mix_FreeChunk (self);
1515 1764
1516int 1765int
1517volume (CFClient::MixChunk self, int volume = -1) 1766volume (CFPlus::MixChunk self, int volume = -1)
1518 CODE: 1767 CODE:
1519 RETVAL = Mix_VolumeChunk (self, volume); 1768 RETVAL = Mix_VolumeChunk (self, volume);
1520 OUTPUT: 1769 OUTPUT:
1521 RETVAL 1770 RETVAL
1522 1771
1523int 1772int
1524play (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)
1525 CODE: 1774 CODE:
1526 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1775 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1527 OUTPUT: 1776 OUTPUT:
1528 RETVAL 1777 RETVAL
1529 1778
1530MODULE = CFClient PACKAGE = CFClient::MixMusic 1779MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1531 1780
1532int 1781int
1533volume (int volume = -1) 1782volume (int volume = -1)
1534 CODE: 1783 CODE:
1535 RETVAL = Mix_VolumeMusic (volume); 1784 RETVAL = Mix_VolumeMusic (volume);
1536 OUTPUT: 1785 OUTPUT:
1537 RETVAL 1786 RETVAL
1538 1787
1539CFClient::MixMusic 1788CFPlus::MixMusic
1540new_from_file (SV *class, char *path) 1789new_from_file (SV *class, char *path)
1541 CODE: 1790 CODE:
1542 RETVAL = Mix_LoadMUS (path); 1791 RETVAL = Mix_LoadMUS (path);
1543 OUTPUT: 1792 OUTPUT:
1544 RETVAL 1793 RETVAL
1545 1794
1546void 1795void
1547DESTROY (CFClient::MixMusic self) 1796DESTROY (CFPlus::MixMusic self)
1548 CODE: 1797 CODE:
1549 Mix_FreeMusic (self); 1798 Mix_FreeMusic (self);
1550 1799
1551int 1800int
1552play (CFClient::MixMusic self, int loops = -1) 1801play (CFPlus::MixMusic self, int loops = -1)
1553 CODE: 1802 CODE:
1554 RETVAL = Mix_PlayMusic (self, loops); 1803 RETVAL = Mix_PlayMusic (self, loops);
1555 OUTPUT: 1804 OUTPUT:
1556 RETVAL 1805 RETVAL
1557 1806
1558MODULE = CFClient PACKAGE = CFClient::OpenGL 1807MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1559 1808
1560BOOT: 1809BOOT:
1561{ 1810{
1562 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1811 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1563 static const struct { 1812 static const struct {
1564 const char *name; 1813 const char *name;
1565 IV iv; 1814 IV iv;
1566 } *civ, const_iv[] = { 1815 } *civ, const_iv[] = {
1567# define const_iv(name) { # name, (IV)name } 1816# define const_iv(name) { # name, (IV)name }
1574 const_iv (GL_SCISSOR_TEST), 1823 const_iv (GL_SCISSOR_TEST),
1575 const_iv (GL_DEPTH_TEST), 1824 const_iv (GL_DEPTH_TEST),
1576 const_iv (GL_ALPHA_TEST), 1825 const_iv (GL_ALPHA_TEST),
1577 const_iv (GL_NORMALIZE), 1826 const_iv (GL_NORMALIZE),
1578 const_iv (GL_RESCALE_NORMAL), 1827 const_iv (GL_RESCALE_NORMAL),
1828 const_iv (GL_FRONT),
1829 const_iv (GL_BACK),
1579 const_iv (GL_AND), 1830 const_iv (GL_AND),
1580 const_iv (GL_ONE), 1831 const_iv (GL_ONE),
1581 const_iv (GL_ZERO), 1832 const_iv (GL_ZERO),
1582 const_iv (GL_SRC_ALPHA), 1833 const_iv (GL_SRC_ALPHA),
1583 const_iv (GL_DST_ALPHA), 1834 const_iv (GL_DST_ALPHA),
1584 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1835 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585 const_iv (GL_ONE_MINUS_DST_ALPHA), 1836 const_iv (GL_ONE_MINUS_DST_ALPHA),
1586 const_iv (GL_SRC_ALPHA_SATURATE), 1837 const_iv (GL_SRC_ALPHA_SATURATE),
1587 const_iv (GL_RGB), 1838 const_iv (GL_RGB),
1588 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),
1589 const_iv (GL_UNSIGNED_BYTE), 1843 const_iv (GL_UNSIGNED_BYTE),
1590 const_iv (GL_UNSIGNED_SHORT), 1844 const_iv (GL_UNSIGNED_SHORT),
1591 const_iv (GL_UNSIGNED_INT), 1845 const_iv (GL_UNSIGNED_INT),
1592 const_iv (GL_ALPHA), 1846 const_iv (GL_ALPHA),
1593 const_iv (GL_INTENSITY), 1847 const_iv (GL_INTENSITY),
1625 const_iv (GL_SEPARABLE_2D), 1879 const_iv (GL_SEPARABLE_2D),
1626 const_iv (GL_CONVOLUTION_2D), 1880 const_iv (GL_CONVOLUTION_2D),
1627 const_iv (GL_CONVOLUTION_BORDER_MODE), 1881 const_iv (GL_CONVOLUTION_BORDER_MODE),
1628 const_iv (GL_CONSTANT_BORDER), 1882 const_iv (GL_CONSTANT_BORDER),
1629 const_iv (GL_LINES), 1883 const_iv (GL_LINES),
1884 const_iv (GL_LINE_STRIP),
1630 const_iv (GL_LINE_LOOP), 1885 const_iv (GL_LINE_LOOP),
1631 const_iv (GL_QUADS), 1886 const_iv (GL_QUADS),
1632 const_iv (GL_QUAD_STRIP), 1887 const_iv (GL_QUAD_STRIP),
1633 const_iv (GL_TRIANGLES), 1888 const_iv (GL_TRIANGLES),
1634 const_iv (GL_TRIANGLE_STRIP), 1889 const_iv (GL_TRIANGLE_STRIP),
1667 OUTPUT: 1922 OUTPUT:
1668 RETVAL 1923 RETVAL
1669 1924
1670int glGetError () 1925int glGetError ()
1671 1926
1927void glFinish ()
1928
1672void glClear (int mask) 1929void glClear (int mask)
1673 1930
1674void glClearColor (float r, float g, float b, float a = 1.0) 1931void glClearColor (float r, float g, float b, float a = 1.0)
1675 PROTOTYPE: @ 1932 PROTOTYPE: @
1676 1933
1699void glPushMatrix () 1956void glPushMatrix ()
1700 1957
1701void glPopMatrix () 1958void glPopMatrix ()
1702 1959
1703void glLoadIdentity () 1960void glLoadIdentity ()
1961
1962void glDrawBuffer (int buffer)
1963
1964void glReadBuffer (int buffer)
1704 1965
1705# near_ and far_ are due to microsofts buggy "c" compiler 1966# near_ and far_ are due to microsofts buggy "c" compiler
1706void 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_)
1707 1968
1708# near_ and far_ are due to microsofts buggy "c" compiler 1969# near_ and far_ are due to microsofts buggy "c" compiler
1738 r *= a; 1999 r *= a;
1739 g *= a; 2000 g *= a;
1740 b *= a; 2001 b *= a;
1741 } 2002 }
1742 // microsoft visual "c" rounds instead of truncating... 2003 // microsoft visual "c" rounds instead of truncating...
1743 glColor4ub (MIN ((int)(r * 256.f), 255), 2004 glColor4f (r, g, b, a);
1744 MIN ((int)(g * 256.f), 255),
1745 MIN ((int)(b * 256.f), 255),
1746 MIN ((int)(a * 256.f), 255));
1747 2005
1748void glInterleavedArrays (int format, int stride, char *data) 2006void glInterleavedArrays (int format, int stride, char *data)
1749 2007
1750void glDrawElements (int mode, int count, int type, char *indices) 2008void glDrawElements (int mode, int count, int type, char *indices)
1751 2009
1828 2086
1829void glEndList () 2087void glEndList ()
1830 2088
1831void glCallList (int list) 2089void glCallList (int list)
1832 2090
1833

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines