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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines